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

@@ -830,6 +830,50 @@ public class TimingTask {
                 }
                 if (plan.getId()!=null){
                     planService.update(new UpdateWrapper<Plan>().eq("id", plan.getId()).set("money_of_job",plan.getMoneyOfJob()));
+                    int count = reportService.count(new QueryWrapper<Report>().eq("plan_id", plan.getId()));
+                    if (count!=userTeams.size()){
+//                        log.info("userTeams的长度:"+userTeams.size());
+//                        log.info("userTeams的内容:"+(userTeams.isEmpty() ?"":userTeams.toString()));
+//                        log.info("plan.getSettlementAmount():"+plan.getSettlementAmount());
+                        reportService.remove(new QueryWrapper<Report>().eq("plan_id", plan.getId()));
+                        List<Report> reportList = new ArrayList<>();
+                        List<PlanExtraInfo> planExtraInfoList = new ArrayList<>();
+
+                        //处理人员日报数据
+                        for (String userTeam : userTeams) {
+                            Optional<User> user = userList.stream().filter(u -> u.getCorpwxRealUserid() != null && u.getCorpwxRealUserid().equals(userTeam)).findFirst();
+                            if (user.isPresent()) {
+                                Report report = new Report();
+                                report.setCreateDate(createDate);
+                                report.setCreatorId(user.get().getId());
+                                report.setCreateTime(LocalDateTime.now());
+                                BigDecimal bigDecimal = new BigDecimal(workTime);
+                                report.setWorkingTime(bigDecimal.doubleValue());
+                                report.setCost(plan.getSettlementAmount().divide(BigDecimal.valueOf(userTeams.size()), 2, RoundingMode.HALF_UP));
+                                report.setStatus(2);
+                                report.setPlanId(plan.getId());
+                                report.setCompanyId(7);
+                                report.setDeptId(user.get().getDepartmentId());
+                                report.setSteelNumArray(steelNumArray);
+                                reportList.add(report);
+                            }
+                        }
+                        if (reportList.size() > 0) {
+                            reportService.saveBatch(reportList);
+                            for (Report report : reportList) {
+                                PlanExtraInfo planExtraInfo = new PlanExtraInfo();
+                                planExtraInfo.setPlanId(plan.getId());
+                                planExtraInfo.setReportId(report.getId());
+                                planExtraInfo.setOperationName(operationName);
+                                planExtraInfo.setPartName(partName);
+                                planExtraInfoList.add(planExtraInfo);
+                            }
+                            if (planExtraInfoList.size() > 0) {
+                                extraInfoService.saveBatch(planExtraInfoList);
+                            }
+                            log.info("日报人员数据与计划中人员数据不一致,删除并重新新增==>"+plan.getProductOrderNum());
+                        }
+                    }
                     log.info("TaskChangeNoticeNum===>"+plan.getTaskChangeNoticeNum()+"更改的东西==>"+plan.getMoneyOfJob());
                 }else {
                     planService.save(plan);
@@ -846,7 +890,7 @@ public class TimingTask {
                             report.setCreateTime(LocalDateTime.now());
                             BigDecimal bigDecimal = new BigDecimal(workTime);
                             report.setWorkingTime(bigDecimal.doubleValue());
-                            report.setCost(plan.getSettlementAmount().divide(BigDecimal.valueOf(userTeams.size())).setScale(2, RoundingMode.HALF_UP));
+                            report.setCost(plan.getSettlementAmount().divide(BigDecimal.valueOf(userTeams.size()), 2, RoundingMode.HALF_UP));
                             report.setStatus(2);
                             report.setPlanId(plan.getId());
                             report.setCompanyId(7);
@@ -1123,6 +1167,50 @@ public class TimingTask {
 
                 if (plan.getId()!=null){
                     planService.update(new UpdateWrapper<Plan>().eq("id", plan.getId()).set("money_of_job",plan.getMoneyOfJob()));
+                    int count = reportService.count(new QueryWrapper<Report>().eq("plan_id", plan.getId()));
+                    if (count!=userTeams.size()){
+//                        log.info("userTeams的长度:"+userTeams.size());
+//                        log.info("userTeams的内容:"+(userTeams.isEmpty() ?"":userTeams.toString()));
+//                        log.info("plan.getSettlementAmount():"+plan.getSettlementAmount());
+                        reportService.remove(new QueryWrapper<Report>().eq("plan_id", plan.getId()));
+                        List<Report> reportList = new ArrayList<>();
+                        List<PlanExtraInfo> planExtraInfoList = new ArrayList<>();
+
+                        //处理人员日报数据
+                        for (String userTeam : userTeams) {
+                            Optional<User> user = userList.stream().filter(u -> u.getCorpwxRealUserid() != null && u.getCorpwxRealUserid().equals(userTeam)).findFirst();
+                            if (user.isPresent()) {
+                                Report report = new Report();
+                                report.setCreateDate(createDate);
+                                report.setCreatorId(user.get().getId());
+                                report.setCreateTime(LocalDateTime.now());
+                                BigDecimal bigDecimal = new BigDecimal(workTime);
+                                report.setWorkingTime(bigDecimal.doubleValue());
+                                report.setCost(plan.getSettlementAmount().divide(BigDecimal.valueOf(userTeams.size()), 2, RoundingMode.HALF_UP));
+                                report.setStatus(2);
+                                report.setPlanId(plan.getId());
+                                report.setCompanyId(7);
+                                report.setDeptId(user.get().getDepartmentId());
+                                report.setSteelNumArray(steelNumArray);
+                                reportList.add(report);
+                            }
+                        }
+                        if (reportList.size() > 0) {
+                            reportService.saveBatch(reportList);
+                            for (Report report : reportList) {
+                                PlanExtraInfo planExtraInfo = new PlanExtraInfo();
+                                planExtraInfo.setPlanId(plan.getId());
+                                planExtraInfo.setReportId(report.getId());
+                                planExtraInfo.setOperationName(operationName);
+                                planExtraInfo.setPartName(partName);
+                                planExtraInfoList.add(planExtraInfo);
+                            }
+                            if (planExtraInfoList.size() > 0) {
+                                extraInfoService.saveBatch(planExtraInfoList);
+                            }
+                            log.info("日报人员数据与计划中人员数据不一致,删除并重新新增==>"+plan.getProductOrderNum());
+                        }
+                    }
                     log.info("TaskChangeNoticeNum===>"+plan.getTaskChangeNoticeNum()+"更改的东西==>"+plan.getMoneyOfJob());
                 }else {
                     planService.save(plan);
@@ -1140,7 +1228,7 @@ public class TimingTask {
                             report.setCreateTime(LocalDateTime.now());
                             BigDecimal bigDecimal = new BigDecimal(workTime);
                             report.setWorkingTime(bigDecimal.doubleValue());
-                            report.setCost(plan.getSettlementAmount().divide(BigDecimal.valueOf(userTeams.size())).setScale(2, RoundingMode.HALF_UP));
+                            report.setCost(plan.getSettlementAmount().divide(BigDecimal.valueOf(userTeams.size()), 2, RoundingMode.HALF_UP));
                             report.setStatus(2);
                             report.setPlanId(plan.getId());
                             report.setCompanyId(7);

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 10010
+  port: 10090
   tomcat:
     uri-encoding: utf-8
     max-http-form-post-size: -1
@@ -140,7 +140,7 @@ encodingAesKey: 8DdeJrkKk9t3N5tCWuWqB7hat5W4O68SMi2KH5opwU6
 providerSecret: wlwGIUXskWKsNtCfKUsAfJ6ueba55rZnqZvcC-rUM6nQ-LnRDyYgISQ2BO-UlL_A
 
 configEnv:
-  isDev: true
+  isDev: false
   # 是否是私有化部署，企业内部应用
   isPrivateDeploy: true