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

@@ -123,7 +123,7 @@ public class GroupBudgetReviewController {
             taskGroupMapper.updateById(taskGroup);
             //项目人天按照分组工时增加
             double day = project.getManDay();
-            day=day+groupBudgetReview.getChangeManDay();
+            day=day+(groupBudgetReview.getChangeManDay()==null?0:groupBudgetReview.getChangeManDay());
             project.setManDay(day);
             projectMapper.updateById(project);
         }

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

@@ -179,7 +179,7 @@ public class ProjectApprovalController {
                             //控件id指定到指定控件
                             String templateId = property.getString("id");
                             //控件名称 这里为了统一工时管家格式 限制企业需要用到我们提供的名称（项目编号 项目名称 项目分类 项目类型 项目经理 级别 合同金额 计划开始日期 计划结束日期）
-                            String title = property.getString("title");
+                            JSONArray titleArray = property.getJSONArray("title");
                             //控件类型 在这里统一用Text  Text-文本；Textarea-多行文本；Number-数字；Money-金额；Date-日期/日期+时间；Selector-单选/多选；Contact-成员/部门；Tips-说明文字；File-附件；Table-明细；Attendance-假勤控件；Vacation-请假控件；Location-位置；RelatedApproval-关联审批单；Formula-公式；DateRange-时长；BankAccount-收款账户
                             String control = property.getString("control");
                             //是否必填
@@ -190,7 +190,8 @@ public class ProjectApprovalController {
                             content.put("control",control);
                             content.put("id",templateId);
                             JSONObject value=new JSONObject();
-                            switch (title){
+                            JSONObject titleOb = titleArray.getJSONObject(0);
+                            switch (titleOb.getString("text")){
                                 case "项目编号":
                                     value.put("text",projectApproval.getProjectCode());
                                     break;
@@ -198,13 +199,13 @@ public class ProjectApprovalController {
                                     value.put("text",projectApproval.getProjectName());
                                     break;
                                 case "项目分类":
-                                    value.put("text",projectApproval.getCategoryName());
+                                    value.put("text",projectApproval.getCategoryName()==null?"":projectApproval.getCategoryName());
                                     break;
                                 case "项目类型":
                                     value.put("text",projectApproval.getIsPublic()==0?"正式项目":"非项目");
                                     break;
                                 case "项目经理":
-                                    value.put("text",projectApproval.getInchargerName());
+                                    value.put("text",projectApproval.getInchargerName()==null?"":projectApproval.getInchargerName());
                                     break;
                                 case "级别":
                                     value.put("text",arr[projectApproval.getLevel()-1]);
@@ -224,8 +225,11 @@ public class ProjectApprovalController {
                         }
                         apply_data.put("contents",contents);
                         requestData.put("apply_data",apply_data);
+                        requestData.put("approver",new JSONArray());
+                        requestData.put("summary_list",new JSONArray());
                         System.out.println("===============>发送到企业微信的数据"+requestData);
-//                    wxCorpInfoService.applyEvent(request,requestData);
+                        //发送到企业微信
+                        wxCorpInfoService.applyEvent(request,requestData);
                     }else {
                         throw  new Exception("企业暂未同步服务商审批模板,推送企业微信审批失败,请联系服务商!");
                     }

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

@@ -2364,7 +2364,7 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
         headers.setContentType(type);
         headers.add("Accept", MediaType.APPLICATION_JSON.toString());
         JSONObject requestMap = new JSONObject();
-        requestMap.put("open_template_id","1bc0b9fc084369083b6abb970d658f3a_75187226");
+        requestMap.put("open_template_id","13WLuP7T82FX6FNjuSnMKMYaT1TtQ5AYvAbmhbSwg");
         HttpEntity<JSONObject> entity = new HttpEntity<>(requestMap, headers);
         ResponseEntity<String> ResponseEntity = restTemplate.postForEntity(url, entity, String.class);
         if (ResponseEntity.getStatusCode() == HttpStatus.OK) {