审批系统开发

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApprovalOrderServiceImpl.java

@@ -57,7 +57,7 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
         approvalInfo.setApprovalStatus(1);
         approvalInfo.setAdminId(admin.getAdminId());
         approvalInfo.setApprovalApplicant(approvalProduction.getApplicantName());
-        approvalInfo.setActivitiId(tasknfo.get("pid").toString());
+        approvalInfo.setActivitiId(tasknfo.get("key").toString());
         approvalInfo.setApprovalDetails("html内容");
         approvalInfo.setApprovalRemark(approvalProduction.getProductionRemark());
         int returnValue = approvalOrderMapper.insertApprovalInfo(approvalInfo);
@@ -83,6 +83,9 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
             approvalOrderMapper.insertProductionContract(approvalProductionContract);
         }
         //封装生产审批产品项
+        for(ApprovalProductionItem approvalProductionItem : listApprovalProductionItem){
+            approvalProductionItem.setProductionId(approvalProduction.getProductionId());
+        }
         int returnValue3 = approvalOrderMapper.insertItem(listApprovalProductionItem);
         if(returnValue3 < 1){
             throw new RuntimeException("添加生产审批产品项信息失败");
@@ -103,7 +106,7 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
         if(tasknfo.get("users") == null){
             throw new RuntimeException("获取下一个审批人信息失败"+tasknfo);
         }
-        String[] split = tasknfo.get("users").toString().split(",");
+        String[] split = (String[])tasknfo.get("users");
         for (String name : split){
             //通过name查询管理员id
             Admin approvalAdmin = sysMapper.getByName(name);
@@ -116,6 +119,7 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
             recordInfo.setAdminId(approvalAdmin.getAdminId());
             recordInfo.setRecordState(1);
             recordInfo.setTaskId(tasknfo.get("taskId").toString());
+            recordInfo.setApprovalTime(new Date());
             if(approvalOrderMapper.insertHistoricalRecord(recordInfo) < 1){
                 throw new RuntimeException("添加历史审批信息失败"+tasknfo);
             }
@@ -125,16 +129,6 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
                 throw new RuntimeException("修改审批信息失败"+tasknfo);
             }
         }
-        HistoricalRecord historicalRecord = new HistoricalRecord();
-        historicalRecord.setApprovalId(approvalInfo.getApprovalId());
-        historicalRecord.setAdminId(admin.getAdminId());
-        historicalRecord.setRecordState(1);
-        historicalRecord.setTaskId(tasknfo.get("taskId").toString());
-        historicalRecord.setApprovalTime(new Date());
-        int returnValue5 = approvalOrderMapper.insertHistoricalRecord(historicalRecord);
-        if(returnValue5 < 1){
-            throw new RuntimeException("添加生产审批历史记录失败");
-        }
         return true;
     }
 

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

@@ -173,13 +173,12 @@
   <insert id="insertProductionContract" parameterType="ApprovalProductionContract">
     INSERT INTO tb_rst_approval_production_contract(
     contract_id,
-    production_id,
+    approval_id,
     contract_url,
-    contract_type,
     contract_create_time
     )
     VALUES
-    (#{contractId},#{productionId},#{contractUrl},#{contractType},NOW())
+    (#{contractId},#{approvalId},#{contractUrl},NOW())
   </insert>
 
   <insert id="insertProcessInfo" parameterType="ProcessInfo">
@@ -204,7 +203,7 @@
     record_create_time
     )
     VALUES
-    (#{approvalId},#{adminId},#{processDesc},#{processState},NOW())
+    (#{approvalId},#{adminId},#{recordState},#{taskId},#{approvalTime},NOW())
   </insert>
 
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -249,7 +249,7 @@ public class ApprovalController {
                     if(taskMap.get("users") == null){
                         return  ResponseJson.getFAILURE();
                     }
-                    String[] split = taskMap.get("users").toString().split(",");
+                    String[] split = (String[])taskMap.get("users");
                     for (String name : split){
                         //通过name查询管理员id
                        Admin approvalAdmin = sysService.getByName(name);