修改柘中消息提醒

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java

@@ -481,7 +481,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
             }
         }
         //柘中报销人填写报销单信息,完善填报金额,第一审核人,第二审核人信息,给第一审核人发送信息
-        if (!isNew&& auditSetting != null && auditSetting.getAuditType() == 2&&sheet.getReviewProcess()==0){
+        if (!isNew&& auditSetting != null && auditSetting.getAuditType() == 2&&sheet.getReviewProcess()==0&&expenseMainType!=null){
             log.info("柘中报销人填写报销单信息,完善填报金额,第一审核人,第二审核人信息,给第一审核人发送信息");
             //发送给第一审核人审核
             List<User> targetUserList = new ArrayList<>();
@@ -762,6 +762,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
         ExpenseSheet sheet = expenseSheetMapper.selectById(id);
+        ExpenseMainType expenseMainType = expenseMainTypeService.getById(sheet.getType());
         ExpenseAuditSetting expenseAuditSetting = expenseAuditSettingMapper.selectById(user.getCompanyId());
         if(expenseAuditSetting!=null&&expenseAuditSetting.getAuditType()==2){
             if(sheet.getReviewProcess()!=null&&sheet.getReviewProcess()==0&& org.apache.commons.lang3.StringUtils.isNotEmpty(sheet.getSecondCheckerId())){
@@ -815,12 +816,14 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                         informationList.add(information);
                     }
                     informationService.saveBatch(informationList);
-                }{
+                }
+                else if(wxCorpInfo != null&&expenseMainType!=null){
                     User targetUser = userMapper.selectById(sheet.getOwnerId());
                     //推送到企业微信
                     StringBuilder stringBuilder = new StringBuilder();
-                    stringBuilder.append("报销人:").append("$userName="+targetUser.getCorpwxUserid()+"$")
-                            .append(",填写了机械费用报销单的信息,请及时审核");
+                    stringBuilder.append("请及时审核").append("报销人:").append("$userName="+targetUser.getCorpwxUserid()+"$")
+                            .append(expenseMainType.getName()).append("的报销单");
+
 
                     wxCorpInfoService.sendWXCorpMsg(wxCorpInfo,secondChecker.getCorpwxUserid(), stringBuilder.toString(), "expense",
                             WxCorpInfoServiceImpl.TEXT_CARD_MSG_EXPENSE_NEED);