出库单审批通知

platform-dao/src/main/java/com/platform/dao/enums/SysConfigEnum.java

@@ -48,6 +48,7 @@ public enum SysConfigEnum {
     REPAIR_STRATEGY_MODEL("维修策略模式选择"),
     STORE_SUPER_USERS("仓库管理中的超级用户集合"),
     REPAIR_SEND_SUCCESS_WECHAT_TEMPLATE_ID("报修后通知维修主管"),
+    AUDIT_WECHAT_TEMPLATE_ID("审批通知"),
     PRODUCE_VERIFY_USERS("生产审核人员配置"),
     REPAIR_RECEIVE_SUCCESS_WECHAT_TEMPLATE_ID("报修接收后通知报修人"),
     REPAIR_NOTICE_SUCCESS_WECHAT_TEMPLATE_ID("派工后通知维修人"),

platform-service/src/main/java/com/platform/service/business/impl/OutStoreFormActivitiServiceImpl.java

@@ -116,10 +116,11 @@ public class OutStoreFormActivitiServiceImpl extends BaseFormCheckServiceAbstrac
      */
     private void sendMessageToManger(OutStoreForm outForm){
         SysUser sysUser = sysUserMapper.selectByPrimaryKey(outForm.getUpdateUserId());
+        SysUser applyUser = sysUserMapper.selectByPrimaryKey(outForm.getCreatedUserId());
         String info = MessageTemplateUtil.getOutStoreFormSuccess(outForm.getOutNo());
         Integer detailType = WorkplaceBacklogDetailTypeEnum.OUT_STORE_NOTICE.getValue();
-        String[] values = new String[]{"出库单待审批！",outForm.getOutNo(),"无","无","无","请尽快审批"};
-        String wechatTemplateId = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_SEND_SUCCESS_WECHAT_TEMPLATE_ID.name());;
+        String[] values = new String[]{"出库单待审批！",outForm.getOutNo(),applyUser.getRealName(),DateUtils.dateToString(outForm.getCreatedTime(),DateUtils.PATTERN_YMD_HMS),"请尽快审批"};
+        String wechatTemplateId = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.AUDIT_WECHAT_TEMPLATE_ID.name());;
         String detailUrl = "pages/backlog/backlog";
         List<String> mails = ListUtils.newArrayList();
         List<String> userIds = ListUtils.newArrayList();

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -216,7 +216,14 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     }
                     //待工程师审核
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
-                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                        BigDecimal tempNum = vo.getRepairCount()==null?initNum:vo.getRepairCount();
+                        BigDecimal checkNum = noticeNumberVO.getRepairCheckNum() == null ? initNum : noticeNumberVO.getRepairCheckNum();
+                        noticeNumberVO.setRepairCheckNum(checkNum.add(tempNum));
+                    }
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFYING_ONE.getValue()){
+                        BigDecimal tempNum = vo.getRepairCount()==null?initNum:vo.getRepairCount();
+                        BigDecimal checkNum = noticeNumberVO.getRepairCheckNum() == null ? initNum : noticeNumberVO.getRepairCheckNum();
+                        noticeNumberVO.setRepairCheckNum(checkNum.add(tempNum));
                     }
 //                    //二次派工
 //                    if(vo.getStatus() == RepairApplicationFormStatusEnum.REBACK.getValue() || vo.getStatus() == RepairApplicationFormStatusEnum.REPAIR_FAIL.getValue()){