Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

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

@@ -73,6 +73,8 @@ public class ProjectController {
     @Resource
     private UserMapper userMapper;
     @Resource
+    private WxCorpInfoMapper wxCorpInfoMapper;
+    @Resource
     private OperationRecordService operationRecordService;
     @RequestMapping("/testRead")
     public HttpRespMsg testRead(String jobId) {
@@ -665,6 +667,7 @@ public class ProjectController {
         HttpRespMsg msg = new HttpRespMsg();
         List<String> heads = new ArrayList<>();
         Company company = companyMapper.selectById(companyId);
+        WxCorpInfo wxCorpInfo=wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id",companyId));
         List<ProjectStage> projectStageList = projectStageMapper.selectList(new QueryWrapper<ProjectStage>().eq("company_id", company.getId()));
         List<ProviderCategory> providerCategoryList = providerCategoryMapper.selectList(new QueryWrapper<ProviderCategory>().eq("company_id", companyId));
         List<ProjectLevel> projectLevelList = projectLevelMapper.selectList(new QueryWrapper<ProjectLevel>().eq("company_id", companyId));
@@ -927,7 +930,8 @@ public class ProjectController {
                                 case "Participants":
                                     comment = drawing.createCellComment(anchor);
                                     // 输入批注信息
-                                    comment.setString(new HSSFRichTextString(MessageUtils.message("excel.manyPeople")));
+                                    comment.setString(
+                                            wxCorpInfo.getSaasSyncContact()!=1? new HSSFRichTextString(MessageUtils.message("excel.manyPeople")):new HSSFRichTextString(MessageUtils.message("excel.manyPeoplePlus")));
                                     cell.setCellComment(comment);
                                     break;
                                 case "项目经理":
@@ -935,7 +939,8 @@ public class ProjectController {
                                     comment = drawing.createCellComment(anchor);
                                     // 输入批注信息
                                     //comment.setString(new HSSFRichTextString("项目经理需存在于参与人中"));
-                                    comment.setString(new HSSFRichTextString(MessageUtils.message("excel.projectManager")));
+                                    comment.setString(
+                                            wxCorpInfo.getSaasSyncContact()!=1?new HSSFRichTextString(MessageUtils.message("excel.projectManager")):new HSSFRichTextString(MessageUtils.message("excel.projectManagerPlus")));
                                     cell.setCellComment(comment);
                                     break;
                                 case "开始日期":

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

@@ -136,6 +136,8 @@ public class WeiXinCorpController {
     private SysRoleFunctionService sysRoleFunctionService;
     @Resource
     private UserService userService;
+    @Resource
+    private CompanyReportMapper companyReportMapper;
     @Autowired
     RestTemplate restTemplate;
     @Resource
@@ -1408,6 +1410,14 @@ public class WeiXinCorpController {
                         projectAuditor.setAuditorName(user.getName());
                         projectAuditor.setProjectId(project.getId());
                         projectAuditorMapper.insert(projectAuditor);
+                        //todo: 生成项目报表服务默认条目
+                        Integer[] arrayInteger=new Integer[]{1,2,3,4,7};
+                        for (Integer integerItem : arrayInteger) {
+                            CompanyReport companyReport=new CompanyReport();
+                            companyReport.setCompanyId(company.getId());
+                            companyReport.setReportFormId(integerItem);
+                            companyReportMapper.insert(companyReport);
+                        }
                         //todo： 生成初始项目相关示例任务分组/任务阶段以及示例任务
                         TaskGroup taskGroup = new TaskGroup();
                         taskGroup.setProjectId(project.getId())
@@ -3332,6 +3342,14 @@ public class WeiXinCorpController {
                         setting.setCompanyId(company.getId());
                         projectBasecostSettingMapper.insert(setting);
                     }
+                    //todo: 生成项目报表服务默认条目
+                    Integer[] arrayInteger=new Integer[]{1,2,3,4,7};
+                    for (Integer integerItem : arrayInteger) {
+                        CompanyReport companyReport=new CompanyReport();
+                        companyReport.setCompanyId(company.getId());
+                        companyReport.setReportFormId(integerItem);
+                        companyReportMapper.insert(companyReport);
+                    }
                     String accessToken = getCorpConcactAccessToken(wxCorpInfo);
                     //获取组织架构 同步部门
                     String departmentInfoResp=wxCorpInfoService.getDepartmentInfoWithApplication(accessToken);

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

@@ -128,6 +128,8 @@ public class DingDingServiceImpl implements DingDingService {
     private DdCallbackMapper ddCallbackMapper;
     @Resource
     private ContactSyncLogMapper contactSyncLogMapper;
+    @Resource
+    private CompanyReportMapper companyReportMapper;
 
 
     @Value("${configEnv.isPrivateDeploy}")
@@ -182,6 +184,14 @@ public class DingDingServiceImpl implements DingDingService {
                     setting.setCompanyId(company.getId());
                     projectBasecostSettingMapper.insert(setting);
                 }
+                //todo: 生成项目报表服务默认条目
+                Integer[] arrayInteger=new Integer[]{1,2,3,4,7};
+                for (Integer integerItem : arrayInteger) {
+                    CompanyReport companyReport=new CompanyReport();
+                    companyReport.setCompanyId(company.getId());
+                    companyReport.setReportFormId(integerItem);
+                    companyReportMapper.insert(companyReport);
+                }
                 //生成费用报销默认条目
                 String[] expenseTypes = Constant.EXPENSE_TYPES;
                 List<String> commonly = new ArrayList<>();
@@ -298,6 +308,14 @@ public class DingDingServiceImpl implements DingDingService {
                 setting.setCompanyId(company.getId());
                 projectBasecostSettingMapper.insert(setting);
             }
+            //todo: 生成项目报表服务默认条目
+            Integer[] arrayInteger=new Integer[]{1,2,3,4,7};
+            for (Integer integerItem : arrayInteger) {
+                CompanyReport companyReport=new CompanyReport();
+                companyReport.setCompanyId(company.getId());
+                companyReport.setReportFormId(integerItem);
+                companyReportMapper.insert(companyReport);
+            }
         }
 
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -215,7 +215,7 @@ public class TimingTask {
         List<LeaveSheet> leaveSheetList=new ArrayList<>();
         List<BusinessTrip> businessTripList=new ArrayList<>();
         //Todo: 获取打卡数据
-        HttpRespMsg workDataMsg = dockWithMLD.getResult("http://10.1.10.41:20170/api/cube/restful/interface/getModeDataPageList/getWorkData", jsonString);
+        HttpRespMsg workDataMsg = dockWithMLD.getResult("http://10.1.10.51:20175/api/cube/restful/interface/getModeDataPageList/getWorkData", jsonString);
         List<Map<String,Object>> workDataList= (List<Map<String, Object>>) workDataMsg.data;
         for (Map<String, Object> map : workDataList) {
             UserFvTime userFvTime=new UserFvTime();
@@ -246,10 +246,10 @@ public class TimingTask {
             userFvTimeService.saveOrUpdateBatch(userFvTimeList);
         }
         //Todo: 获取请假数据
-        HttpRespMsg leaveRecordMsg = dockWithMLD.getResult("http://10.1.10.41:20170/api/cube/restful/interface/getModeDataPageList/getLeaveRecord", jsonString);
+        HttpRespMsg leaveRecordMsg = dockWithMLD.getResult("http://10.1.10.51:20175/api/cube/restful/interface/getModeDataPageList/getLeaveRecord", jsonString);
         List<Map<String,Object>> leaveRecordList= (List<Map<String, Object>>) leaveRecordMsg.data;
         for (Map<String, Object> map : leaveRecordList) {
-            User user = userMapper.selectOne(new QueryWrapper<User>().eq("job_number", map.get("userId")));
+            User user = userMapper.selectOne(new QueryWrapper<User>().eq("job_number", map.get("rybh")));
             if(user==null){
                 continue;
             }
@@ -284,10 +284,10 @@ public class TimingTask {
             leaveSheetService.saveOrUpdateBatch(leaveSheetList);
         }
         //Todo: 获取出差数据
-        HttpRespMsg travelRecordMsg = dockWithMLD.getResult("http://10.1.10.41:20170/api/cube/restful/interface/getModeDataPageList/getTravelRecord", jsonString);
+        HttpRespMsg travelRecordMsg = dockWithMLD.getResult("http://10.1.10.51:20175/api/cube/restful/interface/getModeDataPageList/getTravelRecord", jsonString);
         List<Map<String,Object>> travelRecordList= (List<Map<String, Object>>) travelRecordMsg.data;
         for (Map<String, Object> map : travelRecordList) {
-            User user = userMapper.selectOne(new QueryWrapper<User>().eq("job_number", map.get("userId")));
+            User user = userMapper.selectOne(new QueryWrapper<User>().eq("job_number", map.get("rybh")));
             if(user==null){
                 continue;
             }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages.properties

@@ -536,8 +536,10 @@ fileName.leaveRemaining = 假期剩余表
 #excel
 excel.publicProject=是否为公共项目
 excel.projectName=项目名称必填
-excel.manyPeople=多个参与人使用中文逗号(，)隔开
-excel.projectManager=项目经理需存在于参与人中
+excel.manyPeople=多个参与人(“姓名/工号”)使用中文逗号(，)隔开
+excel.manyPeoplePlus=多个参与人(“工号”)使用中文逗号(，)隔开
+excel.projectManager=项目经理(“姓名/工号”)需存在于参与人中
+excel.projectManagerPlus=项目经理(“姓名/工号”)需存在于参与人中
 excel.projectCharge=负责人需存在于参与人中
 excel.dateFormat=日期格式:yyyy-MM-dd
 excel.forExample=例如: 2021-01-01

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages_en_US.properties

@@ -536,8 +536,10 @@ fileName.leaveRemaining = Leave Remaining Table
 #excel
 excel.publicProject=Whether it is a public project
 excel.projectName=Project name is required
-excel.manyPeople=Multiple participants are separated by commas (,)
-excel.projectManager=The project manager must exist in the participants
+excel.manyPeople=Multiple participants ("name/jobNumber") are separated by commas (,)
+excel.manyPeoplePlus=Multiple participants ("jobNumber") are separated by commas (,)
+excel.projectManager=The project manager ("name/jobNumber") must exist in the participants
+excel.projectManagerPlus=The project manager ("jobNumber") must exist in the participants
 excel.projectCharge=The person in charge must exist in the participants
 excel.dateFormat=Date Format:yyyy-MM-dd
 excel.forExample=for example: 2021-01-01