Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/GroupBudgetReviewController.java

@@ -108,10 +108,10 @@ public class GroupBudgetReviewController {
             httpRespMsg.setError("验证失败");
             return httpRespMsg;
         }
+        Integer groupId = groupBudgetReview.getGroupId();
+        TaskGroup taskGroup = taskGroupMapper.selectById(groupId);
         if(checkType==1){
             //审核通过计算到任务分组的项目人天
-            Integer groupId = groupBudgetReview.getGroupId();
-            TaskGroup taskGroup = taskGroupMapper.selectById(groupId);
             Double manDay = taskGroup.getManDay();
             BigDecimal bigDecimal = new BigDecimal(manDay==null?0:manDay);
             bigDecimal=bigDecimal.add(new BigDecimal(groupBudgetReview.getChangeManDay()==null?0:groupBudgetReview.getChangeManDay()));
@@ -139,7 +139,7 @@ public class GroupBudgetReviewController {
             String corpwxUserid = user.getCorpwxUserid();
             if (corpwxUserid != null) {
                 WxCorpInfo info = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id",checker.getCompanyId()));
-                wxCorpInfoService.sendWXCorpMsg(info, corpwxUserid,sb.toString(), "budgetReview", WxCorpInfoServiceImpl.TEXT_CARD_MSG_REPORT_DENY);
+                wxCorpInfoService.sendWXCorpMsg(info, corpwxUserid,sb.toString(), "projectInside/"+taskGroup.getProjectId()+"@adjustBudget-"+taskGroup.getId(), WxCorpInfoServiceImpl.TEXT_CARD_MSG_REPORT_DENY);
             }
         }
         return  httpRespMsg;

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

@@ -256,7 +256,7 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
     @Override
     public void sendWXCorpMsg(WxCorpInfo corpInfo, String corpUserid, String msg, String pageRouter, Integer msgType) {
         try {
-            if (isDev) return;
+//            if (isDev) return;
             log.info("发送企业微信消息===" + corpUserid);
             System.out.println("发送企业微信消息===" + corpUserid);
             String accessToken = getCorpAccessToken(corpInfo);
@@ -310,7 +310,7 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                     //费用报销
                     title = "工时管家:任务到期通知";
                 }
-                else if ("budgetReview".equals(pageRouter)) {
+                else if (pageRouter.contains("projectInside")) {
                     //预估工时审核
                     title = "预估工时审核通知";
                 }