Merge remote-tracking branch 'liujiankang/master'

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/ProcessNode.java

@@ -20,6 +20,8 @@ public class ProcessNode implements Serializable {
     private Date nodeCreateTime;       //创建时间
     private Date nodeUpdateTime;       //修改时间
 
+    private Integer employeeId;         //员工id
+
     public Integer getNodeId() {
         return nodeId;
     }
@@ -84,6 +86,14 @@ public class ProcessNode implements Serializable {
         this.nodeStatus = nodeStatus;
     }
 
+    public Integer getEmployeeId() {
+        return employeeId;
+    }
+
+    public void setEmployeeId(Integer employeeId) {
+        this.employeeId = employeeId;
+    }
+
     @Override
     public String toString() {
         return "ProcessNode{" +

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml

@@ -25,8 +25,7 @@
         <result column="produce_remake" property="produceRemake" />
         <result column="produce_create_time" property="produceCreateTime" />
         <result column="produce_update_time" property="produceUpdateTime" />
-        <result column="employee_id" property="employeeId" />
-        <collection property="process" column="{produceId = produce_id ,employeeId = employee_id}" javaType="ArrayList"
+        <collection property="process" column="{produceId = produce_id}" javaType="ArrayList"
                     ofType="com.iamberry.rst.core.pts.ProduceProcess" select="getProduceProcessList"/>
     </resultMap>
     <resultMap id="ProduceProcessMap" type="com.iamberry.rst.core.pts.ProduceProcess">
@@ -63,13 +62,10 @@
         tp.produce_status,
         tp.produce_remake,
         tp.produce_create_time,
-        tp.produce_update_time,
-        ts.employee_id
+        tp.produce_update_time
         FROM
         tb_rst_pts_produce tp
-        LEFT JOIN tb_rst_pts_produce_process ts ON tp.produce_id = ts.produce_id
-        WHERE  tp.produce_status = 1  AND ts.employee_id = #{employeeId}
-        GROUP BY tp.produce_id
+        WHERE  tp.produce_status = 1
     </select>
     <select id="getProduceProcessList" parameterType="java.util.HashMap" resultMap="ProduceProcessMap">
         SELECT
@@ -77,7 +73,7 @@
         ts.produce_id,
         ts.process_no,
         ts.process_name,
-        ts.employee_id,
+        ifnull(ts.employee_id,0) as employee_id,
         ts.drive_id,
         ts.process_status,
         ts.process_type,
@@ -88,7 +84,6 @@
         FROM
         tb_rst_pts_produce_process ts
         WHERE  ts.produce_id = #{produceId}
-        AND ts.employee_id = #{employeeId}
         AND ts.process_status = 1
         ORDER BY ts.process_sort
     </select>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/ProduceAppController.java

@@ -1,7 +1,9 @@
 package com.iamberry.rst.controllers.pts;
 
 import com.iamberry.rst.core.order.Order;
+import com.iamberry.rst.core.pts.ProcessNode;
 import com.iamberry.rst.core.pts.Produce;
+import com.iamberry.rst.core.pts.ProduceProcess;
 import com.iamberry.rst.faces.pts.ProduceService;
 import com.iamberry.wechat.tools.RespJsonBean;
 import com.iamberry.wechat.tools.ResponseJson;
@@ -46,6 +48,21 @@ public class ProduceAppController {
         }
         //查询员工所做的产品，产品的工序，工序的节点操作
         List<Produce> list = produceService.getAllProduceList(Integer.valueOf(employeeId));
+        for(Produce produce : list ){
+            produce.setEmployeeId(0);
+            for(ProduceProcess produceProcess : produce.getProcess()){
+                Integer emId = produceProcess.getEmployeeId();
+                if ( emId != Integer.valueOf(employeeId)){
+                    emId = 0;
+                }else{
+                    produce.setEmployeeId(emId);
+                }
+                produceProcess.setEmployeeId(emId);
+                for (ProcessNode processNode : produceProcess.getNodes()){
+                    processNode.setEmployeeId(emId);
+                }
+            }
+        }
         if(list.size() < 1){
             rsj.setResultCode(500);
             rsj.setResultMsg("ERROR");