生产产品接口修改

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

@@ -2,6 +2,7 @@ package com.iamberry.rst.core.pts;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 产品类
@@ -17,6 +18,10 @@ public class Produce implements Serializable {
     private Date produceCreateTime;         //创建时间
     private Date produceUpdateTime;         //修改时间
 
+    private Integer employeeId;            //员工id
+
+    private List<ProduceProcess>  process;  //工序集合
+
     public Integer getProduceId() {
         return produceId;
     }
@@ -65,6 +70,22 @@ public class Produce implements Serializable {
         this.produceUpdateTime = produceUpdateTime;
     }
 
+    public List<ProduceProcess> getProcess() {
+        return process;
+    }
+
+    public void setProcess(List<ProduceProcess> process) {
+        this.process = process;
+    }
+
+    public Integer getEmployeeId() {
+        return employeeId;
+    }
+
+    public void setEmployeeId(Integer employeeId) {
+        this.employeeId = employeeId;
+    }
+
     @Override
     public String toString() {
         return "Produce{" +

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

@@ -2,6 +2,7 @@ package com.iamberry.rst.core.pts;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 产品工序类
@@ -21,6 +22,8 @@ public class ProduceProcess implements Serializable {
     private Date processCreateTime;       //创建时间
     private Date processUpdateTime;       //修改时间
 
+    private List<ProcessNode> nodes;  //节点集合
+
     public Integer getProcessId() {
         return processId;
     }
@@ -109,6 +112,14 @@ public class ProduceProcess implements Serializable {
         this.processUpdateTime = processUpdateTime;
     }
 
+    public List<ProcessNode> getNodes() {
+        return nodes;
+    }
+
+    public void setNodes(List<ProcessNode> nodes) {
+        this.nodes = nodes;
+    }
+
     @Override
     public String toString() {
         return "ProduceProcess{" +

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

@@ -13,4 +13,97 @@
         FROM
             tb_rst_pts_produce
     </select>
+
+
+    <!--获取产品工序节点的接口sql-start-->
+    <resultMap id="ProduceMap" type="com.iamberry.rst.core.pts.Produce">
+        <id column="produce_id" property="produceId" />
+        <result column="produce_name" property="produceName" />
+        <result column="produce_status" property="produceStatus" />
+        <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"
+                    ofType="com.iamberry.rst.core.pts.ProduceProcess" select="getProduceProcessList"/>
+    </resultMap>
+
+    <resultMap id="ProduceProcessMap" type="com.iamberry.rst.core.pts.ProduceProcess">
+        <id column="process_id" property="processId"/>
+        <result column="produce_id" property="produceId"/>
+        <result column="process_no" property="processNo"/>
+        <result column="process_name" property="processName"/>
+        <result column="employee_id" property="employeeId"/>
+        <result column="drive_id" property="driveId"/>
+        <result column="process_status" property="processStatus"/>
+        <result column="process_sort" property="processSort"/>
+        <result column="process_remake" property="processRemake"/>
+        <result column="process_create_time" property="processCreateTime"/>
+        <result column="process_update_time" property="processUpdateTime"/>
+        <collection property="nodes" column="process_id" javaType="ArrayList"
+                    ofType="com.iamberry.rst.core.pts.ProcessNode" select="getProcessNodeList"/>
+    </resultMap>
+
+    <resultMap id="ProcessNodeMap" type="com.iamberry.rst.core.pts.ProcessNode">
+        <id column="node_id" property="nodeId"/>
+        <result column="produce_id" property="produceId"/>
+        <result column="process_id" property="processId"/>
+        <result column="node_no" property="nodeNo"/>
+        <result column="node_status" property="nodeStatus"/>
+        <result column="node_des" property="nodeDes"/>
+        <result column="node_create_time" property="nodeCreateTime"/>
+        <result column="node_update_time" property="nodeUpdateTime"/>
+    </resultMap>
+
+    <select id="getAllProduceList" parameterType="java.lang.Integer" resultMap="ProduceMap">
+        SELECT
+            tp.produce_id,
+            tp.produce_name,
+            tp.produce_status,
+            tp.produce_remake,
+            tp.produce_create_time,
+            tp.produce_update_time,
+            ts.employee_id
+        FROM
+            	tb_rst_pts_produce tp
+        LEFT JOIN tb_rst_pts_produce_process ts ON tp.produce_id = ts.produce_id AND ts.employee_id = #{employeeId}
+        GROUP BY tp.produce_id
+    </select>
+
+    <select id="getProduceProcessList" parameterType="java.util.HashMap" resultMap="ProduceProcessMap">
+       SELECT
+            ts.process_id,
+            ts.produce_id,
+            ts.process_no,
+            ts.process_name,
+            ts.employee_id,
+            ts.drive_id,
+            ts.process_status,
+            ts.process_sort,
+            ts.process_remake,
+            ts.process_create_time,
+            ts.process_update_time
+        FROM
+            tb_rst_pts_produce_process ts
+        WHERE  ts.produce_id = #{produceId}
+        AND ts.employee_id = #{employeeId}
+    </select>
+
+    <select id="getProcessNodeList" parameterType="java.lang.Integer" resultMap="ProcessNodeMap">
+        SELECT
+            tn.node_id,
+            tn.produce_id,
+            tn.process_id,
+            tn.node_no,
+            tn.node_status,
+            tn.node_des,
+            tn.node_create_time,
+            tn.node_update_time
+        FROM
+            tb_rst_pts_process_node tn
+        WHERE  tn.process_id = #{processId}
+    </select>
+    <!--获取产品工序节点的接口sql-start-->
+
+
 </mapper>

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

@@ -86,10 +86,10 @@ public class ProduceController {
             rsj.addResponseKeyValue("员工id为空");
             return rsj;
         }
-
         List<Produce> list = produceService.getAllProduceList(Integer.valueOf(employeeId));
-
-
+        rsj.setResultCode(200);
+        rsj.setResultMsg("SUCCESS");
+        rsj.addResponseKeyValue("returnMsg",list);
         return rsj;
     }