[签章]提前生成并保存电子签章id

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBackBillController.java

@@ -100,11 +100,13 @@ public class AllotBackBillController {
         });
         //生成发件单位电子签章id
         Long signId = snowflake.creatNextId();
+        Long signId2 = snowflake.creatNextId();
         //存储退回单
         AllotBackBill allotBackBill = allotBackBillSaveVo.toDo();
         allotBackBill.setAllotBillId(taskBto.getBillId());
         allotBackBill.setSendUseraId(userUtils.getCurrentUserId());
         allotBackBill.setLeftSignatureId(signId.toString());
+        allotBackBill.setRightSignatureId(signId2.toString());
         AllotBackBill allotBackBill1 = allotBackBillService.addEntity(allotBackBill);
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(allotBackBill1.getCreateTime());
@@ -204,11 +206,8 @@ public class AllotBackBillController {
         if (allotReceiveConfirmVo.getStatus() == 0) {
             //业务完结
             taskService.update(taskService.moveToEnd(taskBto));
-            //生成接收单位电子签章id
-            Long signId = snowflake.creatNextId();
             //更新账单
             allotBackBill.setBackStatus(3);
-            allotBackBill.setRightSignatureId(signId.toString());
             allotBackBillService.update(allotBackBill);
             for (String s : strings) {
                 //改变接收无误的装备的状态
@@ -225,7 +224,7 @@ public class AllotBackBillController {
             }
             log.info("[配发模块]:配发退回审核成功并入库");
             myWebSocket.sendMessage1();
-            return ResponseEntity.ok(signId.toString());
+            return ResponseEntity.ok("审核成功");
         }
         //审核失败
         if (allotReceiveConfirmVo.getStatus() == 1) {

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -90,6 +90,11 @@ public class AllotBillController {
         int year = calendar.get(Calendar.YEAR);
         String num = "NO:第" + year + "PF" + allotBillEntity.getId() + "号";
         allotBillEntity.setNum(num);
+        //生成电子签章id
+        Long signId = snowflake.creatNextId();
+        Long signId2 = snowflake.creatNextId();
+        allotBillEntity.setLeftSignatureId(signId.toString());
+        allotBillEntity.setRightSignatureId(signId2.toString());
         allotBillService.update(allotBillEntity);
         Integer billId = allotBillEntity.getId();
         Integer userId = userUtils.getCurrentUserId();
@@ -127,9 +132,6 @@ public class AllotBillController {
             AllotBill allotBillEntity = allotBillService.getOne(taskBto.getBillId());
             allotBillEntity.setAllotStatus(2);
             allotBillEntity.setSendTime(TimestampUtil.getCurrentTimestamp());
-            //生成发起单位电子签章id
-            Long signId = snowflake.creatNextId();
-            allotBillEntity.setLeftSignatureId(signId.toString());
             allotBillService.update(allotBillEntity);
             //task推至下一阶段
             TaskBto taskBto1 = taskService.moveToNext(taskBto, allotBillEntity.getReceiveUseraId());
@@ -153,7 +155,7 @@ public class AllotBillController {
             }
             log.info("[配发模块]:配发审核成功并出库");
             myWebSocket.sendMessage1();
-            return ResponseEntity.ok(signId.toString());
+            return ResponseEntity.ok("审核成功");
         }
         //2.审核失败
         if (allotBillConfirmVo.getStatus() == 1) {
@@ -246,11 +248,8 @@ public class AllotBillController {
         if (allotReceiveConfirmVo.getStatus() == 0) {
             //业务完结
             taskService.update(taskService.moveToEnd(taskBto));
-            //生成接收单位电子签章id
-            Long signId = snowflake.creatNextId();
             //更新账单
             allotBillEntity.setAllotStatus(5);
-            allotBillEntity.setRightSignatureId(signId.toString());
             allotBillService.update(allotBillEntity);
             for (String s : strings) {
                 //改变接收无误的装备的状态
@@ -267,7 +266,7 @@ public class AllotBillController {
             }
             log.info("[配发模块]:审核成功并入库");
             myWebSocket.sendMessage1();
-            return ResponseEntity.ok(signId.toString());
+            return ResponseEntity.ok("审核成功");
         }
         //审核失败
         if (allotReceiveConfirmVo.getStatus() == 1) {

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -120,6 +120,11 @@ public class RepairController {
         }
         repairBill.setStartUserA(userPublicService.getOne(repairBillSaveVo.getStartUseraId()).getName());
         repairBill.setStartUserB(userPublicService.getOne(repairBillSaveVo.getStartUserbId()).getName());
+        //生成单位电子签章id
+        Long signId = snowflake.creatNextId();
+        Long signId2 = snowflake.creatNextId();
+        repairBill.setLeftSignatureId(signId.toString());
+        repairBill.setRightSignatureId(signId2.toString());
         RepairBill repairBill1 = deviceRepairBillService.addEntity(repairBill);
         Calendar calendar = Calendar.getInstance();
         String s1 = "NO:第" + calendar.get(Calendar.YEAR) + "WX" + repairBill1.getId() + "号";
@@ -250,9 +255,6 @@ public class RepairController {
                 repairBill.setRepairStatus(2);
                 repairSendBill.setRepairStatus(2);
             }
-            //生成发件单位电子签章id
-            Long signId = snowflake.creatNextId();
-            repairBill.setLeftSignatureId(signId.toString());
             deviceRepairBillService.update(repairBill);
             deviceRepairSendBillService.update(repairSendBill);
             //修改装备状态，存装备日志
@@ -272,7 +274,7 @@ public class RepairController {
                 }
             }
             myWebSocket.sendMessage1();
-            return ResultUtil.success(signId.toString());
+            return ResultUtil.success("审核成功");
         }
         //审核失败
         if (deviceRepairConfirmVo.getStatus() == 1) {
@@ -410,9 +412,6 @@ public class RepairController {
             //修改维修单，送修单状态
             repairBill.setRepairStatus(4);
             repairSendBill.setRepairStatus(5);
-            //生成收件单位签章id
-            Long signId = snowflake.creatNextId();
-            repairBill.setRightSignatureId(signId.toString());
             deviceRepairBillService.update(repairBill);
             deviceRepairSendBillService.update(repairSendBill);
             for (String s : strings) {
@@ -434,7 +433,7 @@ public class RepairController {
                 deviceRepairDetailService.update(deviceRepairDetailEntity);
             });
             myWebSocket.sendMessage1();
-            return ResultUtil.success(signId.toString());
+            return ResultUtil.success("审核成功");
         }
         //审核失败
         if (repairConfirmVo.getStatus() == 1) {
@@ -529,6 +528,11 @@ public class RepairController {
         Calendar calendar = Calendar.getInstance();
         String s1 = "NO:第" + calendar.get(Calendar.YEAR) + "HZ" + repairBackBill.getId() + "号";
         repairBackBill.setDocNum(s1);
+        //生成单位签章id
+        Long signId = snowflake.creatNextId();
+        Long signId2 = snowflake.creatNextId();
+        repairBackBill.setLeftSignatureId(signId.toString());
+        repairBackBill.setRightSignatureId(signId2.toString());
         RepairBackBill deviceRepairBackBillEntity1 = deviceRepairBackBillService.save(repairBackBill);
         //发起维修退回子业务
         List<Integer> userIds = new ArrayList<>();
@@ -583,9 +587,6 @@ public class RepairController {
         if (repairConfirmVo.getStatus() == 0) {
             //改变账单状态
             repairBackBill.setBackStatus(2);
-            //生成发件单位签章id
-            Long signId = snowflake.creatNextId();
-            repairBackBill.setLeftSignatureId(signId.toString());
             deviceRepairBackBillService.update(repairBackBill);
             if (idList.size() > 0) {
                 for (Integer id : idList) {
@@ -612,7 +613,7 @@ public class RepairController {
 //            TaskLogBto taskLogBto = new TaskLogBto(taskBto.getId(),"维修退回审核成功并出库",null);
 //            taskLogService.addLog(taskLogBto);
             myWebSocket.sendMessage1();
-            return ResultUtil.success(signId.toString());
+            return ResultUtil.success("审核成功");
         }
         //审核失败
         if (repairConfirmVo.getStatus() == 1) {
@@ -760,14 +761,8 @@ public class RepairController {
         if (repairConfirmVo.getStatus() == 0) {
             //业务完结
             taskService.update(taskService.moveToEnd(taskBto));
-            //存业务日志
-//            TaskLogBto taskLogBto = new TaskLogBto(taskBto.getId(),"维修退回装备入库审核成功",null);
-//            taskLogService.addLog(taskLogBto);
             //更新退回单状态
             repairBackBill.setBackStatus(5);
-            //生成接收单位签章id
-            Long signId = snowflake.creatNextId();
-            repairBackBill.setRightSignatureId(signId.toString());
             deviceRepairBackBillService.update(repairBackBill);
             List<Integer> integerList = new ArrayList<>();
             for (String s : strings) {
@@ -795,7 +790,7 @@ public class RepairController {
                 repairDetails.forEach(repairDetail -> repairDetail.setRepairStatus(5));
             });
             myWebSocket.sendMessage1();
-            return ResultUtil.success(signId.toString());
+            return ResultUtil.success("审核成功");
         }
         //审核失败
         if (repairConfirmVo.getStatus() == 1) {