diff --git a/jwtech-admin-page/src/layout/components/Navbar.vue b/jwtech-admin-page/src/layout/components/Navbar.vue index 58b1bffe..b0966d63 100644 --- a/jwtech-admin-page/src/layout/components/Navbar.vue +++ b/jwtech-admin-page/src/layout/components/Navbar.vue @@ -224,7 +224,7 @@ export default { type: "warning", }).then(() => { this.$store.dispatch("LogOut").then(() => { - location.href = "http://210.76.82.26/wr-portal/login?redirect=%2Fhome"; + location.href = "https://210.76.82.26/wr-portal/login?redirect=%2Fhome"; // window.open("http://210.76.82.26/wr-portal/login", "_self"); }); }); diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/index.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/index.vue index 8f5fb63a..044e0881 100644 --- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/index.vue +++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/index.vue @@ -502,6 +502,7 @@ export default { } }, remoteMethod(query) { + this.proQueryParams.data.proNo=null; if (query !== "") { // console.log(444, query); this.proQueryParams.data.projectName = query; @@ -520,6 +521,7 @@ export default { // if (!keyWork) { console.log(666); this.proQueryParams.data.projectName = null; + this.proQueryParams.data.proNo=null; listInfo(this.proQueryParams).then((res) => { this.projectNameOptions[0].options = res.records; }); @@ -532,13 +534,17 @@ export default { console.log(res) this.form.proNo = res.proNo; this.form.proCode = res.id; + this.form.projectName=res.projectName; this.form.sectionName=res.sectionName; - this.form.adcd = res.adcd; + if (res.adcd){ + this.form.adcd = res.adcd; + } }, /** 查询农民工实名信息关联项目列表 */ getList() { this.loading = true; + this.queryParams.data.proNo=null; listRealNamePro(this.queryParams).then((response) => { this.realNameProList = response.records; this.total = response.total; diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue index 5ed4a1d5..e52c8cc7 100644 --- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue +++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue @@ -354,7 +354,7 @@ import { export default { name: "Gckzfdb", - props: ["proNo", "proCode"], + props: ["proNo", "projectCode"], data() { return { @@ -445,7 +445,7 @@ export default { getList() { this.loading = true; this.queryParams.data.proNo = this.proNo; - this.queryParams.data.proCode = this.proCode; + this.queryParams.data.projectCode = this.projectCode; listGckzfdb(this.queryParams).then((response) => { this.gckzfdbList = response.records; this.total = response.total; @@ -574,7 +574,7 @@ export default { }); } else { this.form.proNo = this.proNo; - this.form.proCode = this.proCode; + this.form.projectCode = this.projectCode; addGckzfdb(this.form).then((response) => { if (response.code === 200) { this.msgSuccess("新增成功"); diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/index.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/index.vue index f52ac4ec..59ce3344 100644 --- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/index.vue +++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/index.vue @@ -35,7 +35,7 @@ > @@ -57,7 +57,7 @@ > @@ -69,7 +69,7 @@ > @@ -79,7 +79,7 @@ name="marginAccount" :lazy="true" > - + @@ -102,7 +102,7 @@ > @@ -145,7 +145,7 @@ name="jlProjectmanager" :lazy="true" > - + - + @@ -206,6 +206,9 @@ export default { getList() { getRealNamePro(this.$route.query.baseDataId).then((response) => { this.formData = response.data; + if (!response.data.sectionName){ + this.formData.proCode=null; + } console.log(111, this.formData); }); }, diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue index 549467ff..29c5d047 100644 --- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue +++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue @@ -1082,6 +1082,7 @@ export default { this.loading = true; this.queryParams.data.proNo = this.proNo; this.queryParams.data.proCode = this.proCode; + console.log(this.proCode) listRealName(this.queryParams).then((response) => { this.realNameList = response.records; this.total = response.total; diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue index f0615ea1..7905002a 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue @@ -1204,10 +1204,10 @@ export default { this.reset(); this.open = true; - this.title = "添加竣工验收"; + this.title = "添加项目完工验收"; }, viewInfo(row) { - this.viewTitle = "查看竣工验收"; + this.viewTitle = "查看完工验收"; this.projectAcceptanceMsg = row; console.log("projectAcceptanceMsg", row); this.viewOpen = true; diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/index.vue index 6790e950..5c84a600 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/index.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/index.vue @@ -82,7 +82,7 @@ v-if="activeName === 'qualityControl'" :projectName="formData.projectName" :proNo="formData.proNo" - :proCode="formData.proCode" + :proCode="null" /> - + - - - - - + 已绑定 diff --git a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue index a59776c7..5b1f300a 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue @@ -86,7 +86,7 @@ singleUserList = JSONObject.parseArray(records, SingleUser.class); for (SingleUser singleUser : singleUserList) { + String id = singleUser.getId(); QueryWrapper query = Wrappers.query(); query.eq("single_user_id",id); SysUser user = userService.getOne(query,false); Boolean flag = (ObjectUtil.isEmpty(user)); + if(flag){ user = new SysUser(); user.preInsert(); @@ -114,8 +117,13 @@ public class WaterScheduled { SingleOrg org = singleUser.getOrg(); List collect =new ArrayList<>(); List roleList = singleUser.getRoleList(); + for (SingleRole roles:roleList){ - SysRole roleName = roleService.getOne(new QueryWrapper().eq("role_name", roles.getName())); + if (roles.getCode().equals("YW00111")||roles.getCode().equals("YW00177")||roles.equals("YW00178") + ||roles.getCode().equals("YW00179")||roles.equals("YW00180")){ + user.setUserType("01"); + } + SysRole roleName = roleService.getOne(new QueryWrapper().eq("role_key", roles.getCode())); if (ObjectUtil.isNotEmpty(roleName)){ collect.add(roleName.getId()); } @@ -129,7 +137,9 @@ public class WaterScheduled { user.setDeptId(org.getId()); String type = singleUser.getType(); if(type.equals("GA")||type.equals("DEV_OPS")){ //政务机构 - user.setUserType("00"); + if (StringUtils.isEmpty(user.getUserType())) { + user.setUserType("00"); + } if(CollectionUtil.isEmpty(roles)){ String deptId = user.getDeptId(); SysDept byId = deptService.getById(deptId); @@ -153,12 +163,16 @@ public class WaterScheduled { } } }else if(type.equals("SVC")||type.equals("ORG")||type.equals("LP")){ //服务机构 - user.setUserType("01"); + if (StringUtils.isEmpty(user.getUserType())) { + user.setUserType("01"); + } if(CollectionUtil.isEmpty(roles)){ collect.add(YW00112); } }else if(type.equals("FIRM")){ //厂商 - user.setUserType("00"); + if (StringUtils.isEmpty(user.getUserType())) { + user.setUserType("00"); + } if(CollectionUtil.isEmpty(roles)){ collect.add(YW00106); } diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java index 32e7bda7..f4b3d347 100644 --- a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java +++ b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java @@ -182,8 +182,8 @@ public class SysLoginController extends BaseController { @GetMapping("/signOnLogin") public ModelAndView signOnLogin(HttpServletRequest request, HttpServletResponse response, - @RequestParam(name = "page",required = false) String page, - @RequestParam(name = "token")String token, + @RequestParam(name = "page",required = false) String page, + @RequestParam(name = "token")String token, @RequestParam(name = "type",required = false)String type) throws IOException { WaterResult waterResult; CountDownLatch countDownLatch = new CountDownLatch(1); diff --git a/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java b/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java index f1e8791e..c336d166 100644 --- a/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java +++ b/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java @@ -184,7 +184,7 @@ public class evaluateTask { @Autowired BsSgcJsjdBuiComAccService bsSgcJsjdBuiComAccService; //项目法人履职评价 - @Scheduled(cron = "0 0/2 * * * ?") //每天0点1分执行 + @Scheduled(cron = "0 0 1 * * ?") //每天1点执行 public void proEvaluate(){ List list = bsSgcJsjdBuiConstrMeasService.list(null); LocalDate date = LocalDate.now(); @@ -199,307 +199,465 @@ public class evaluateTask { .orderByDesc("COMPLETION_ACCEPTANCE_TIME")); List list2 = bsSgcjsjdBuiProInfoService.list(new QueryWrapper() .eq("PRO_NO", bsSgcJsjdBuiConstrMeas.getProNo())); - BsSgcJsjdBuiComAcc one = list1.get(0); - BsSgcjsjdBuiProInfo bs = list2.get(0); LocalDate localDate = null; - if (ObjectUtil.isNotEmpty(one.getCompletionAcceptanceTime())) { - localDate = one.getCompletionAcceptanceTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + int monthValue1 = 0; + int dayOfYear2 = 0; + BsSgcJsjdBuiComAcc one=new BsSgcJsjdBuiComAcc(); + if (CollectionUtil.isNotEmpty(list1)){ + one = list1.get(0); + if (ObjectUtil.isNotEmpty(one.getCompletionAcceptanceTime())) { + localDate = one.getCompletionAcceptanceTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + monthValue1=localDate.getMonthValue(); + dayOfYear2=localDate.getYear(); + } } - int monthValue1 = localDate.getMonthValue(); - int dayOfYear2 = localDate.getYear(); - Date approvalTime1 = bsSgcJsjdBuiConstrMeas.getApprovalTime1(); - if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiConstrMeas.getApprovalTime1()) && ObjectUtil.isNotEmpty(one.getCompletionAcceptanceTime())) { - Date date2=Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); - long l = DateUtil.betweenYear(approvalTime1, date2, true) + 1; - LocalDate approvalTime = approvalTime1.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - int month = approvalTime.getMonthValue(); - int year = approvalTime.getYear(); - for (int i = 0; i <= l; i++) { - if (i != l && i == 0) { - if (month <= 3) { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setCycle(year + "-" + 1 + "至" + year + "-" + 3); - BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + BsSgcjsjdBuiProInfo bs=new BsSgcjsjdBuiProInfo(); + if (CollectionUtil.isNotEmpty(list2)) { + bs = list2.get(0); + } + if (bsSgcJsjdBuiConstrMeas.getSectionName().equals(bs.getProjectName())) { + Date approvalTime1 = bsSgcJsjdBuiConstrMeas.getApprovalTime1(); + if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiConstrMeas.getApprovalTime1()) && ObjectUtil.isNotEmpty(one.getCompletionAcceptanceTime())) { + Date date2 = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); + long l = DateUtil.betweenYear(approvalTime1, date2, true); + LocalDate approvalTime = approvalTime1.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + int month = approvalTime.getMonthValue(); + int year = approvalTime.getYear(); + for (int i = 0; i <= l; i++) { + if (dayOfYear2 != year && i == 0) { + if (month <= 3) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(one.getProNo()); + legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setCycle(year + "-" + 1 + "至" + year + "-" + 3); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); - legalEvaluate.setCycle(year + "-" + 4 + "至" + year + "-" + 6); - BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId1)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); + legalEvaluate.setCycle(year + "-" + 4 + "至" + year + "-" + 6); + BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId1)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); - legalEvaluate.setCycle(year + "-" + 7 + "至" + year + "-" + 9); - BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId2)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); + legalEvaluate.setCycle(year + "-" + 7 + "至" + year + "-" + 9); + BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId2)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); - legalEvaluate.setCycle(year + "-" + 9 + "至" + year + "-" + 12); - BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId3)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - - } else if (month <= 6 && month > 4) { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); - legalEvaluate.setCycle(year + "-" + 4 + "至" + year + "-" + 6); - BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId1)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); + legalEvaluate.setCycle(year + "-" + 9 + "至" + year + "-" + 12); + BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId3)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + + } else if (month <= 6 && month > 4) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(one.getProNo()); + legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); + legalEvaluate.setCycle(year + "-" + 4 + "至" + year + "-" + 6); + BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId1)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); - legalEvaluate.setCycle(year + "-" + 7 + "至" + year + "-" + 9); - BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId2)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); + legalEvaluate.setCycle(year + "-" + 7 + "至" + year + "-" + 9); + BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId2)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); - legalEvaluate.setCycle(year + "-" + 10 + "至" + year + "-" + 12); - BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId3)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - } else if (month <= 9 && month > 6) { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); - legalEvaluate.setCycle(year + "-" + 7 + "至" + year + "-" + 9); - BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId2)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); + legalEvaluate.setCycle(year + "-" + 10 + "至" + year + "-" + 12); + BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId3)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } else if (month <= 9 && month > 6) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(one.getProNo()); + legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); + legalEvaluate.setCycle(year + "-" + 7 + "至" + year + "-" + 9); + BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId2)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); - legalEvaluate.setCycle(year + "-" + 10 + "至" + year + "-" + 12); - BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId3)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - } else { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); - legalEvaluate.setCycle(year + "-" + 10 + "至" + year + "-" + 12); - BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId3)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - } - } else if (i == l) { - if (dayOfYear2==year+i) { - for (int j = month,i1=1; j <= monthValue1; j = j + 3,i++) { - if (j <=3) { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setCycle(dayOfYear2 + "-" + 1 + "至" + dayOfYear2 + "-" + 3); - BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - - } else if (j <= 6 && j > 3) { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setCycle(dayOfYear2+ "-" + 4 + "至" + dayOfYear2 +"-" + 6); - BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId)) { - legalEvaluate.setEvaluateStatus("0"); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); + legalEvaluate.setCycle(year + "-" + 10 + "至" + year + "-" + 12); + BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId3)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } else { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(one.getProNo()); + legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); + legalEvaluate.setCycle(year + "-" + 10 + "至" + year + "-" + 12); + BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId3)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - } else if (j <= 9 && j > 6) { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setCycle(dayOfYear2 + "-" + 7 + "至" + dayOfYear2+ "-" + 9); - BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId)) { - legalEvaluate.setEvaluateStatus("0"); + } else if (i == l) { + if (dayOfYear2 == year) { + for (int j = month, i1 = 1; j <= monthValue1 + 2; j = j + 3, i1++) { + if (j <= 3) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(one.getProNo()); + legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setCycle(dayOfYear2 + "-" + 1 + "至" + dayOfYear2 + "-" + 3); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + + } else if (j <= 6 && j > 3) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(one.getProNo()); + legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setCycle(dayOfYear2 + "-" + 4 + "至" + dayOfYear2 + "-" + 6); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } else if (j <= 9 && j > 6) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(one.getProNo()); + legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setCycle(dayOfYear2 + "-" + 7 + "至" + dayOfYear2 + "-" + 9); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } else { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(one.getProNo()); + legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setCycle(dayOfYear2 + "-" + 10 + "至" + dayOfYear2 + "-" + 12); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } + } + } else { + if (monthValue1 <= 3) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(one.getProNo()); + legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setCycle(dayOfYear2 + "-" + 1 + "至" + dayOfYear2 + "-" + 3); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + + } else if (monthValue1 <= 6 && monthValue1 > 3) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(one.getProNo()); + legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setCycle(dayOfYear2 + "-" + 1 + "至" + dayOfYear2 + "-" + 3); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); + legalEvaluate.setCycle(dayOfYear2 + "-" + 4 + "至" + dayOfYear2 + "-" + 6); + BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId1)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } else if (monthValue1 <= 9 && monthValue1 > 6) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(one.getProNo()); + legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setCycle(dayOfYear2 + "-" + 1 + "至" + dayOfYear2 + "-" + 3); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); + legalEvaluate.setCycle(dayOfYear2 + "-" + 4 + "至" + dayOfYear2 + "-" + 6); + BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId1)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); + legalEvaluate.setCycle(dayOfYear2 + "-" + 7 + "至" + dayOfYear2 + "-" + 9); + BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId2)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } else { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(one.getProNo()); + legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setCycle(dayOfYear2 + "-" + 1 + "至" + dayOfYear2 + "-" + 3); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); + legalEvaluate.setCycle(dayOfYear2 + "-" + 4 + "至" + dayOfYear2 + "-" + 6); + BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId1)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); + legalEvaluate.setCycle(dayOfYear2 + "-" + 7 + "至" + dayOfYear2 + "-" + 9); + BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId2)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); + legalEvaluate.setCycle(dayOfYear2 + "-" + 10 + "至" + dayOfYear2 + "-" + 12); + BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId3)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); } else { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setCycle(dayOfYear2 + "-" + 10 + "至" + dayOfYear2 + "-" + 12); - BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - } - } - } - } else { - for (int j = 1,i1=1; j <= 10; j = j + 3,i++) { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + i1); - legalEvaluate.setCycle((year + i-1) + "-" + j + "至" + (year + i-1) + "-" + (j + 2)); - BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId3)) { - legalEvaluate.setEvaluateStatus("0"); + for (int j = 1, i1 = 1; j <= 10; j = j + 3, i1++) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(one.getProNo()); + legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + i1); + legalEvaluate.setCycle((year + i) + "-" + j + "至" + (year + i) + "-" + (j + 2)); + BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId3)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); } } - } - }else { - long l = DateUtil.betweenYear(approvalTime1, date1, true) + 1; - LocalDate approvalTime = approvalTime1.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - int month = approvalTime.getMonthValue(); - int year = approvalTime.getYear(); - for (int i = 0; i <= l; i++) { - if (i != l && i == 0) { - if (month <= 3) { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setCycle(year + "-" + 1 + "至" + year + "-" + 3); - BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } else { + + /** 无竣工验收 + * + * */ + long l = DateUtil.betweenYear(approvalTime1, date1, true); + LocalDate approvalTime = approvalTime1.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + int month = approvalTime.getMonthValue(); + int year = approvalTime.getYear(); + for (int i = 0; i <= l; i++) { + if (dayOfYear != year && i == 0) { + if (month <= 3) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo()); + legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode()); + legalEvaluate.setCycle(year + "-" + 1 + "至" + year + "-" + 3); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); - legalEvaluate.setCycle(year + "-" + 4 + "至" + year + "-" + 6); - BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId1)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); + legalEvaluate.setCycle(year + "-" + 4 + "至" + year + "-" + 6); + BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId1)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); - legalEvaluate.setCycle(year + "-" + 7 + "至" + year + "-" + 9); - BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId2)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); + legalEvaluate.setCycle(year + "-" + 7 + "至" + year + "-" + 9); + BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId2)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); - legalEvaluate.setCycle(year + "-" + 9 + "至" + year + "-" + 12); - BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId3)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - - - } else if (month <= 6 && month > 4) { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); - legalEvaluate.setCycle(year + "-" + 4 + "至" + year + "-" + 6); - BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId1)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); + legalEvaluate.setCycle(year + "-" + 9 + "至" + year + "-" + 12); + BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId3)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + + + } else if (month <= 6 && month > 3) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo()); + legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode()); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); + legalEvaluate.setCycle(year + "-" + 4 + "至" + year + "-" + 6); + BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId1)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); - legalEvaluate.setCycle(year + "-" + 7 + "至" + year + "-" + 9); - BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId2)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); + legalEvaluate.setCycle(year + "-" + 7 + "至" + year + "-" + 9); + BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId2)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); - legalEvaluate.setCycle(year + "-" + 10 + "至" + year + "-" + 12); - BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId3)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - } else if (month <= 9 && month > 6) { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); - legalEvaluate.setCycle(year + "-" + 7 + "至" + year + "-" + 9); - BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId2)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); + legalEvaluate.setCycle(year + "-" + 10 + "至" + year + "-" + 12); + BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId3)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } else if (month <= 9 && month > 6) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo()); + legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode()); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); + legalEvaluate.setCycle(year + "-" + 7 + "至" + year + "-" + 9); + BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId2)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); - legalEvaluate.setCycle(year + "-" + 10 + "至" + year + "-" + 12); - BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId3)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - } else { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); - legalEvaluate.setCycle(year + "-" + 10 + "至" + year + "-" + 12); - BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId3)) { - legalEvaluate.setEvaluateStatus("0"); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); + legalEvaluate.setCycle(year + "-" + 10 + "至" + year + "-" + 12); + BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId3)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } else { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo()); + legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode()); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); + legalEvaluate.setCycle(year + "-" + 10 + "至" + year + "-" + 12); + BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId3)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - } - } else if (i == l) { - if (year+i==dayOfYear){ - for (int j = month,i1=1; j <= monthValue; j = j + 3,i++) { - if (j <=3) { + } else if (i == l) { + if (year == dayOfYear) { + for (int j = month, i1 = 1; j <= monthValue + 2; j = j + 3, i1++) { + if (j <= 3) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i1 + 1); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo()); + legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode()); + legalEvaluate.setCycle(dayOfYear + "-" + 1 + "至" + dayOfYear + "-" + 3); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + + } else if (j <= 6 && j > 3) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo()); + legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode()); + legalEvaluate.setCycle(dayOfYear + "-" + 4 + "至" + dayOfYear + "-" + 6); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } else if (j <= 9 && j > 6) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo()); + legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode()); + legalEvaluate.setCycle(dayOfYear + "-" + 7 + "至" + dayOfYear + "-" + 9); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } else { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo()); + legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode()); + legalEvaluate.setCycle(dayOfYear + "-" + 10 + "至" + dayOfYear + "-" + 12); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } + } + } else { + if (monthValue <= 3) { BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo()); + legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode()); legalEvaluate.setCycle(dayOfYear + "-" + 1 + "至" + dayOfYear + "-" + 3); BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); if (ObjectUtil.isEmpty(byId)) { @@ -507,154 +665,104 @@ public class evaluateTask { } bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - } else if (j <= 6 && j > 3) { + } else if (monthValue <= 6 && monthValue > 3) { BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo()); + legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode()); legalEvaluate.setCycle(dayOfYear + "-" + 1 + "至" + dayOfYear + "-" + 3); BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); if (ObjectUtil.isEmpty(byId)) { legalEvaluate.setEvaluateStatus("0"); } bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - } else if (j <= 9 && j > 6) { + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); + legalEvaluate.setCycle(dayOfYear + "-" + 4 + "至" + dayOfYear + "-" + 6); + BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId1)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + } else if (monthValue <= 9 && monthValue > 6) { BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setCycle(dayOfYear + "-" + 7 + "至" + dayOfYear + "-" + 9); + legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo()); + legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode()); + legalEvaluate.setCycle(dayOfYear + "-" + 1 + "至" + dayOfYear + "-" + 3); BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); if (ObjectUtil.isEmpty(byId)) { legalEvaluate.setEvaluateStatus("0"); } bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); + legalEvaluate.setCycle(dayOfYear + "-" + 4 + "至" + dayOfYear + "-" + 6); + BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId1)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); + legalEvaluate.setCycle(dayOfYear + "-" + 7 + "至" + dayOfYear + "-" + 9); + BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId2)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); } else { BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setCycle(dayOfYear + "-" + 10 + "至" + dayOfYear + "-" + 12); + legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo()); + legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode()); + legalEvaluate.setCycle(dayOfYear + "-" + 1 + "至" + dayOfYear + "-" + 3); BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); if (ObjectUtil.isEmpty(byId)) { legalEvaluate.setEvaluateStatus("0"); } bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); + legalEvaluate.setCycle(dayOfYear + "-" + 4 + "至" + dayOfYear + "-" + 6); + BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId1)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); + legalEvaluate.setCycle(dayOfYear + "-" + 7 + "至" + dayOfYear + "-" + 9); + BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId2)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); + legalEvaluate.setCycle(dayOfYear + "-" + 10 + "至" + dayOfYear + "-" + 12); + BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId3)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); } } - }else { - if (month <= 3) { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setCycle((year+i) + "-" + 1 + "至" + (year+i) + "-" + 3); - BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - - } else if (month <= 6 && month > 3) { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setCycle((year+i) + "-" + 1 + "至" + (year+i) + "-" + 3); - BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); - legalEvaluate.setCycle((year+i) + "-" + 4 + "至" + (year+i) + "-" + 6); - BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId1)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - } else if (month <= 9 && month > 6) { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setCycle((year+i) + "-" + 1 + "至" +(year+i) + "-" + 3); - BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); - legalEvaluate.setCycle((year+i)+ "-" + 4 + "至" + (year+i) + "-" + 6); - BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId1)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); - legalEvaluate.setCycle((year+i) + "-" + 7 + "至" + (year+i) + "-" + 9); - BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId2)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); } else { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 1); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setCycle((year+i) + "-" + 1 + "至" + (year+i) + "-" + 3); - BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 2); - legalEvaluate.setCycle((year+i) + "-" + 4 + "至" + (year+i) + "-" + 6); - BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId1)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 3); - legalEvaluate.setCycle((year+i) + "-" + 7 + "至" + (year+i) + "-" + 9); - BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId2)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + 4); - legalEvaluate.setCycle((year+i) + "-" + 10 + "至" + (year+i) + "-" + 12); - BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId3)) { - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - } - } - } else { - for (int j = 1,i1=1; j <= 10; j = j + 3,i++) { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + i1); - legalEvaluate.setCycle((year + i-1) + "-" + j + "至" + (year + i-1) + "-" + (j + 2)); - BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId3)) { - legalEvaluate.setEvaluateStatus("0"); + for (int j = 1, i1 = 1; j <= 10; j = j + 3, i1++) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setLegalPerson(bs.getProjectUnitLegal()); + legalEvaluate.setProNo(bsSgcJsjdBuiConstrMeas.getProNo()); + legalEvaluate.setProCode(bsSgcJsjdBuiConstrMeas.getProCode()); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i + i1); + legalEvaluate.setCycle((year + i) + "-" + j + "至" + (year + i) + "-" + (j + 2)); + BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId3)) { + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); } } - }} + } + } }); } diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiDedicatedAccountController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiDedicatedAccountController.java index 8e2d9910..dbdd89c0 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiDedicatedAccountController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiDedicatedAccountController.java @@ -6,8 +6,11 @@ import java.util.List; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jianwei.common.core.controller.BaseController; +import com.jianwei.common.core.domain.ConditionView; import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.utils.StringUtils; import com.jianwei.common.utils.poi.ExcelUtil; import com.kms.build.domain.BsSgcJsjdBuiGzbzj; import com.kms.build.mapper.BsSgcJsjdBuiGzbzjMapper; @@ -61,13 +64,22 @@ public class BsSgcJsjdBuiDedicatedAccountController extends BaseController @ApiOperation("农民工工资专用账户列表") public IPage list(@RequestBody SearchParam sp) { - IPage iPage = bsSgcJsjdBuiDedicatedAccountService.selectPage(sp); + ConditionView cv = new ConditionView("dedicatedAccounts",sp.getData().getDedicatedAccounts(),"like"); + sp.setCv(cv); + sp.getData().setDedicatedAccounts(null); + + QueryWrapper wrapper = BeanToWrapper.getWrapper(sp); + if (StringUtils.isEmpty(sp.getData().getProCode())){ + wrapper.isNull("pro_code"); + } + IPage iPage = bsSgcJsjdBuiDedicatedAccountService.getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper); + List records = iPage.getRecords(); List list=new ArrayList<>(); for (BsSgcJsjdBuiDedicatedAccount bs:records){ List bsSgcJsjdBuiGzbzjs = bsSgcJsjdBuiGzbzjMapper.selectList(new QueryWrapper().eq("dedicated_accounts", bs.getId())); if (CollUtil.isNotEmpty(bsSgcJsjdBuiGzbzjs)){ - bs.setChildren(bsSgcJsjdBuiGzbzjs); + bs.setChildren(bsSgcJsjdBuiGzbzjs); } list.add(bs); } diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiGzbzjController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiGzbzjController.java index 56dc2ecd..fcf4db78 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiGzbzjController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiGzbzjController.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.utils.StringUtils; import com.jianwei.common.utils.poi.ExcelUtil; import com.kms.build.domain.BsSgcJsjdBuiDedicatedAccount; import com.kms.build.domain.BsSgcJsjdBuiGzbzj; diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiRealNameController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiRealNameController.java index 9879e3dc..76273a5d 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiRealNameController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiRealNameController.java @@ -10,6 +10,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jianwei.common.core.controller.BaseController; +import com.jianwei.common.core.domain.ConditionView; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.core.domain.entity.SysDictData; import com.jianwei.common.utils.StringUtils; @@ -63,6 +64,7 @@ public class BsSgcJsjdBuiRealNameController extends BaseController @ApiOperation("农民工人员实名制信息列表") public IPage list(@RequestBody SearchParam sp) { + return bsSgcJsjdBuiRealNameService.selectPage(sp); } diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSourceFundsController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSourceFundsController.java index c9b4f97f..64594d8b 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSourceFundsController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSourceFundsController.java @@ -246,7 +246,6 @@ public class BsSgcJsjdBuiSourceFundsController extends BaseController { //获取项目基本信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("pro_No", bsSgcJsjdBuiSourceFunds.getProNo()); - queryWrapper.eq("pro_Code", bsSgcJsjdBuiSourceFunds.getProCode()); BsSgcjsjdBuiProInfo proInfo = bsSgcjsjdBuiProInfoService.getOne(queryWrapper); @@ -258,7 +257,6 @@ public class BsSgcJsjdBuiSourceFundsController extends BaseController { QueryWrapper fundsQueryWrapper = new QueryWrapper<>(); fundsQueryWrapper.eq("pro_No", bsSgcJsjdBuiSourceFunds.getProNo()); - fundsQueryWrapper.eq("pro_Code", bsSgcJsjdBuiSourceFunds.getProCode()); List funds = bsSgcJsjdBuiSourceFundsService.list(fundsQueryWrapper); BigDecimal totalFunds = new BigDecimal(0); @@ -325,7 +323,6 @@ public class BsSgcJsjdBuiSourceFundsController extends BaseController { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.set("release_funds", subtract); updateWrapper.eq("pro_No", bsSgcJsjdBuiSourceFunds.getProNo()); - updateWrapper.eq("pro_Code", bsSgcJsjdBuiSourceFunds.getProCode()); bsSgcjsjdBuiProInfoService.update(updateWrapper); @@ -354,7 +351,6 @@ public class BsSgcJsjdBuiSourceFundsController extends BaseController { String proCode = funds.getProCode(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("pro_No", proNo); - queryWrapper.eq("pro_Code", proCode); BsSgcjsjdBuiProInfo proInfo = bsSgcjsjdBuiProInfoService.getOne(queryWrapper); proInfo.setReleaseFunds(proInfo.getReleaseFunds().subtract(subTotal)); diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdTransmit.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdTransmit.java new file mode 100644 index 00000000..04f5e868 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdTransmit.java @@ -0,0 +1,46 @@ +package com.kms.build.controller; + + +import com.jianwei.common.core.controller.BaseController; +import com.jianwei.common.core.domain.AjaxResult; +import com.jianwei.common.core.domain.entity.SysUser; +import com.kms.build.domain.BsSgcjsjdBuiProInfo; +import com.kms.build.domain.TransmissionType; +import com.kms.build.domain.TransmitDto; +import com.kms.build.service.BsSgcJsjdTransmitService; +import com.kms.system.service.SysUserService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/transmit") +public class BsSgcJsjdTransmit extends BaseController { + + @Autowired + BsSgcJsjdTransmitService bsSgcJsjdTransmitService; + + @PostMapping + public AjaxResult transmit(@RequestBody TransmitDto transmit){ + if (!transmit.getToken().equals("Sgc@2024")){ + return AjaxResult.error("令牌不正确"); + + } + + if (transmit.getTransmissionType().equals("proInfo")){ + return bsSgcJsjdTransmitService.proInfoTransmit(transmit); + } + + + + return AjaxResult.error(); + } + +} + + + + diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealName.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealName.java index ab56dc7c..ce48afea 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealName.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealName.java @@ -1,6 +1,9 @@ package com.kms.build.domain; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -81,6 +84,7 @@ public class BsSgcJsjdBuiRealName extends BaseEntity private String updateUid; /** $column.columnComment */ + @TableField(value = "pro_code", select = true) private String proCode; /** $column.columnComment */ diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealNamePro.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealNamePro.java index dcbf7687..8f0b6488 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealNamePro.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealNamePro.java @@ -33,8 +33,8 @@ public class BsSgcJsjdBuiRealNamePro extends BaseEntity private String sectionName; /** 项目编码 */ - @Excel(name = "项目编码") - @ApiModelProperty("项目编码") + @Excel(name = "标段项目的id") + @ApiModelProperty("标段项目的id") private String proCode; /** 行政区划 */ @@ -47,6 +47,7 @@ public class BsSgcJsjdBuiRealNamePro extends BaseEntity @ApiModelProperty("是否有项目书审批") private String isApproval; + /** $column.columnComment */ @Excel(name = "是否有项目书审批") @ApiModelProperty("是否有项目书审批") diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiUnpaidWages.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiUnpaidWages.java index 2f3f964e..82bd9058 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiUnpaidWages.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiUnpaidWages.java @@ -41,6 +41,8 @@ public class BsSgcJsjdBuiUnpaidWages extends BaseEntity @ApiModelProperty("项目号") private String proNo; + private String proCode; + /** 欠薪金额 */ @Excel(name = "欠薪金额") @ApiModelProperty("欠薪金额") diff --git a/jwtech-system/src/main/java/com/kms/build/domain/TransmissionType.java b/jwtech-system/src/main/java/com/kms/build/domain/TransmissionType.java new file mode 100644 index 00000000..eae39d11 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/domain/TransmissionType.java @@ -0,0 +1,15 @@ +package com.kms.build.domain; + + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum TransmissionType { + ProInfo("proInfo",new BsSgcjsjdBuiProInfo(),"shui_pro.bs_sgc_jsjd_bui_pro_info"); + + private String type; + private Object object; + private String tableName; +} diff --git a/jwtech-system/src/main/java/com/kms/build/domain/TransmitDto.java b/jwtech-system/src/main/java/com/kms/build/domain/TransmitDto.java new file mode 100644 index 00000000..c12b39a4 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/domain/TransmitDto.java @@ -0,0 +1,16 @@ +package com.kms.build.domain; + + +import lombok.Data; + +import java.util.LinkedHashMap; +import java.util.List; + +@Data +public class TransmitDto { + String token; + String TransmissionType; + Boolean isList; + Object data; + List> list; +} diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiAttendanceInformationService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiAttendanceInformationService.java index e2855c04..5dfd0b1e 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiAttendanceInformationService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiAttendanceInformationService.java @@ -1,5 +1,12 @@ package com.kms.build.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.mybaitsplus.BeanToWrapper; +import com.jianwei.common.utils.StringUtils; +import com.kms.build.domain.BsSgcJsjdBuiRealName; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.build.mapper.BsSgcJsjdBuiAttendanceInformationMapper; @@ -13,5 +20,11 @@ import com.kms.build.domain.BsSgcJsjdBuiAttendanceInformation; */ @Service public class BsSgcJsjdBuiAttendanceInformationService extends BaseService{ - + public IPage selectPage(SearchParam sp){ + QueryWrapper wrapper = BeanToWrapper.getWrapper(sp); + if (StringUtils.isEmpty(sp.getData().getProCode())){ + wrapper.isNull("pro_code"); + } + return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper ); + } } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java index dbfd0909..d684b426 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java @@ -39,7 +39,6 @@ public class BsSgcJsjdBuiEnteInfoService extends BaseService proInfoQueryWrapper = new QueryWrapper<>(); proInfoQueryWrapper.eq(proNo != null, "pro_no", proNo); - BsSgcjsjdBuiProInfo proInfo = bsSgcjsjdBuiProInfoMapper.selectOne(proInfoQueryWrapper); @@ -50,7 +49,7 @@ public class BsSgcJsjdBuiEnteInfoService extends BaseService bsSgcJsjdBuiEnteInfos = bsSgcJsjdBuiEnteInfoMapper.selectList(queryWrapper); - if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiEnteInfos)) { + if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiEnteInfos)&&ObjectUtil.isNotEmpty(proInfo)) { proInfo.setEnterpriseInfoList(bsSgcJsjdBuiEnteInfos); } return AjaxResult.success(proInfo); diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGckzfdbService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGckzfdbService.java index bd3442af..11bc4ec2 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGckzfdbService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGckzfdbService.java @@ -1,6 +1,13 @@ package com.kms.build.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.mybaitsplus.BeanToWrapper; +import com.jianwei.common.utils.StringUtils; import com.kms.build.domain.BsSgcJsjdBuiGckzfdb; +import com.kms.build.domain.BsSgcJsjdBuiSalaryEnsure; import com.kms.build.mapper.BsSgcJsjdBuiGckzfdbMapper; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; @@ -14,5 +21,11 @@ import com.jianwei.common.core.service.BaseService; */ @Service public class BsSgcJsjdBuiGckzfdbService extends BaseService{ - + public IPage selectPage(SearchParam sp){ + QueryWrapper wrapper = BeanToWrapper.getWrapper(sp); + if (StringUtils.isEmpty(sp.getData().getProjectCode())){ + wrapper.isNull("PROJECT_CODE"); + } + return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper ); + } } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java index 502e415d..b1c4a27b 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java @@ -10,11 +10,9 @@ import com.github.pagehelper.PageInfo; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.core.domain.entity.SysDept; import com.jianwei.common.core.domain.entity.SysUser; -import com.kms.build.domain.BsSgcJsjdBuiSalaryEnsure; -import com.kms.build.domain.BsSgcjsjdBuiProInfo; +import com.kms.build.domain.*; import com.kms.build.domain.dto.GzjbDto; -import com.kms.build.mapper.BsSgcJsjdBuiSalaryEnsureMapper; -import com.kms.build.mapper.BsSgcjsjdBuiProInfoMapper; +import com.kms.build.mapper.*; import com.kms.common.utils.UserUtils; import com.kms.earlyStage.mapper.BsSlgcQqjdLybzjMapper; import com.kms.earlyStage.mapper.BsSlgcQqjdTbbzjMapper; @@ -25,8 +23,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; -import com.kms.build.mapper.BsSgcJsjdBuiGzjbMapper; -import com.kms.build.domain.BsSgcJsjdBuiGzjb; import java.util.ArrayList; import java.util.List; @@ -64,6 +60,12 @@ public class BsSgcJsjdBuiGzjbService extends BaseService sp) { SysUser sysUser = UserUtils.getUser(); @@ -96,6 +98,28 @@ public class BsSgcJsjdBuiGzjbService extends BaseServicecmLw=new LambdaQueryWrapper<>(); + List bsSgcJsjdBuiConstrMeas = bsSgcJsjdBuiConstrMeasMapper.selectList(cmLw + .eq(BsSgcJsjdBuiConstrMeas::getProNo, gz.getProNo()).orderByAsc(BsSgcJsjdBuiConstrMeas::getApprovalTime1)); + if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiConstrMeas)){ + gz.setIsStart("1"); + gz.setStartTime(bsSgcJsjdBuiConstrMeas.get(0).getApprovalTime1()); + }else { + gz.setIsStart("0"); + } + + LambdaQueryWrapperaccLw=new LambdaQueryWrapper<>(); + ListbsSgcJsjdBuiComAccs=bsSgcJsjdBuiComAccMapper.selectList(accLw + .eq(BsSgcJsjdBuiComAcc::getProNo,gz.getProNo()) + .eq(BsSgcJsjdBuiComAcc::getSectionName,gz.getProjectName())); + if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiComAccs)){ + gz.setIsEnd("1"); + gz.setEndTime(bsSgcJsjdBuiComAccs.get(0).getCompletionAcceptanceTime()); + }else { + gz.setIsEnd("0"); + } + gzjb.add(gz); } Page page = new Page<>(); diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiLaborManagementService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiLaborManagementService.java index f6cff615..1904f229 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiLaborManagementService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiLaborManagementService.java @@ -1,5 +1,12 @@ package com.kms.build.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.mybaitsplus.BeanToWrapper; +import com.jianwei.common.utils.StringUtils; +import com.kms.build.domain.BsSgcJsjdBuiPublicity; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.build.mapper.BsSgcJsjdBuiLaborManagementMapper; @@ -13,5 +20,11 @@ import com.kms.build.domain.BsSgcJsjdBuiLaborManagement; */ @Service public class BsSgcJsjdBuiLaborManagementService extends BaseService{ - + public IPage selectPage(SearchParam sp){ + QueryWrapper wrapper = BeanToWrapper.getWrapper(sp); + if (StringUtils.isEmpty(sp.getData().getProCode())){ + wrapper.isNull("pro_code"); + } + return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper ); + } } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProjectManagementService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProjectManagementService.java index a1f2e17e..efca1030 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProjectManagementService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProjectManagementService.java @@ -2,10 +2,12 @@ package com.kms.build.service; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.mybaitsplus.BeanToWrapper; +import com.jianwei.common.utils.StringUtils; import com.kms.build.domain.BsSgcJsjdBuiAttendanceConstruction; import com.kms.build.mapper.BsSgcJsjdBuiAttendanceConstructionMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +31,12 @@ public class BsSgcJsjdBuiProjectManagementService extends BaseService selectPage1(SearchParam sp){ - Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp)); + QueryWrapper wrapper = BeanToWrapper.getWrapper(sp); + if (StringUtils.isEmpty(sp.getData().getProCode())){ + wrapper.isNull("pro_code"); + } + + Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper); Listrecords = page.getRecords(); ListbsSgcJsjdBuiProjectManagements=new ArrayList<>(); for (BsSgcJsjdBuiProjectManagement bs:records){ diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiPublicityService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiPublicityService.java index cd031256..12afeada 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiPublicityService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiPublicityService.java @@ -1,6 +1,13 @@ package com.kms.build.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.mybaitsplus.BeanToWrapper; +import com.jianwei.common.utils.StringUtils; import com.kms.build.domain.BsSgcJsjdBuiPublicity; +import com.kms.build.domain.BsSgcJsjdBuiSalaryEnsure; import com.kms.build.mapper.BsSgcJsjdBuiPublicityMapper; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; @@ -14,5 +21,11 @@ import com.jianwei.common.core.service.BaseService; */ @Service public class BsSgcJsjdBuiPublicityService extends BaseService{ - + public IPage selectPage(SearchParam sp){ + QueryWrapper wrapper = BeanToWrapper.getWrapper(sp); + if (StringUtils.isEmpty(sp.getData().getProCode())){ + wrapper.isNull("pro_code"); + } + return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper ); + } } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiRealNameService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiRealNameService.java index ed6a9040..33aaab19 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiRealNameService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiRealNameService.java @@ -1,5 +1,11 @@ package com.kms.build.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.mybaitsplus.BeanToWrapper; +import com.jianwei.common.utils.StringUtils; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.build.mapper.BsSgcJsjdBuiRealNameMapper; @@ -13,5 +19,11 @@ import com.kms.build.domain.BsSgcJsjdBuiRealName; */ @Service public class BsSgcJsjdBuiRealNameService extends BaseService{ - + public IPage selectPage(SearchParam sp){ + QueryWrapper wrapper = BeanToWrapper.getWrapper(sp); + if (StringUtils.isEmpty(sp.getData().getProCode())){ + wrapper.isNull("pro_code"); + } + return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper ); + } } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSalaryEnsureService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSalaryEnsureService.java index 36f905de..25f0ce78 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSalaryEnsureService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSalaryEnsureService.java @@ -1,5 +1,12 @@ package com.kms.build.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.mybaitsplus.BeanToWrapper; +import com.jianwei.common.utils.StringUtils; +import com.kms.build.domain.BsSgcJsjdBuiSalaryPayable; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.build.mapper.BsSgcJsjdBuiSalaryEnsureMapper; @@ -13,5 +20,11 @@ import com.kms.build.domain.BsSgcJsjdBuiSalaryEnsure; */ @Service public class BsSgcJsjdBuiSalaryEnsureService extends BaseService{ - + public IPage selectPage(SearchParam sp){ + QueryWrapper wrapper = BeanToWrapper.getWrapper(sp); + if (StringUtils.isEmpty(sp.getData().getProCode())){ + wrapper.isNull("pro_code"); + } + return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper ); + } } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSalaryPayableService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSalaryPayableService.java index 2b5ef0e8..d0f231c6 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSalaryPayableService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSalaryPayableService.java @@ -1,5 +1,12 @@ package com.kms.build.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.mybaitsplus.BeanToWrapper; +import com.jianwei.common.utils.StringUtils; +import com.kms.build.domain.BsSgcJsjdBuiAttendanceInformation; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.build.mapper.BsSgcJsjdBuiSalaryPayableMapper; @@ -13,5 +20,11 @@ import com.kms.build.domain.BsSgcJsjdBuiSalaryPayable; */ @Service public class BsSgcJsjdBuiSalaryPayableService extends BaseService{ - + public IPage selectPage(SearchParam sp){ + QueryWrapper wrapper = BeanToWrapper.getWrapper(sp); + if (StringUtils.isEmpty(sp.getData().getProCode())){ + wrapper.isNull("pro_code"); + } + return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper ); + } } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSupervisoryUnitManagementService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSupervisoryUnitManagementService.java index 358585f9..81040c7a 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSupervisoryUnitManagementService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiSupervisoryUnitManagementService.java @@ -2,10 +2,12 @@ package com.kms.build.service; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.mybaitsplus.BeanToWrapper; +import com.jianwei.common.utils.StringUtils; import com.kms.build.domain.BsSgcJsjdBuiAttendanceConstruction; import com.kms.build.domain.BsSgcJsjdBuiAttendanceSupervisor; import com.kms.build.domain.BsSgcJsjdBuiProjectManagement; @@ -32,7 +34,12 @@ public class BsSgcJsjdBuiSupervisoryUnitManagementService extends BaseService selectPage1(SearchParam sp){ - Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp)); + QueryWrapper wrapper = BeanToWrapper.getWrapper(sp); + if (StringUtils.isEmpty(sp.getData().getProCode())){ + wrapper.isNull("pro_code"); + } + + Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()),wrapper); List records = page.getRecords(); ListbsSgcJsjdBuiSupervisoryUnitManagements=new ArrayList<>(); for (BsSgcJsjdBuiSupervisoryUnitManagement bs:records){ diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiUnpaidWagesService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiUnpaidWagesService.java index 2f8e53c9..407653db 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiUnpaidWagesService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiUnpaidWagesService.java @@ -1,5 +1,12 @@ package com.kms.build.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.mybaitsplus.BeanToWrapper; +import com.jianwei.common.utils.StringUtils; +import com.kms.build.domain.BsSgcJsjdBuiLaborManagement; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.build.mapper.BsSgcJsjdBuiUnpaidWagesMapper; @@ -13,5 +20,11 @@ import com.kms.build.domain.BsSgcJsjdBuiUnpaidWages; */ @Service public class BsSgcJsjdBuiUnpaidWagesService extends BaseService{ - + public IPage selectPage(SearchParam sp){ + QueryWrapper wrapper = BeanToWrapper.getWrapper(sp); + if (StringUtils.isEmpty(sp.getData().getProCode())){ + wrapper.isNull("pro_code"); + } + return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper ); + } } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdTransmitService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdTransmitService.java new file mode 100644 index 00000000..e4703ce0 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdTransmitService.java @@ -0,0 +1,76 @@ +package com.kms.build.service; + + +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.jianwei.common.core.domain.AjaxResult; +import com.kms.build.domain.BsSgcjsjdBuiProInfo; +import com.kms.build.domain.TransmitDto; +import com.kms.common.utils.BaseEntityUtils; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +@Service +public class BsSgcJsjdTransmitService { + + @Autowired + BsSgcjsjdBuiProInfoService bsSgcjsjdBuiProInfoService; + + public static List convertList(List> sourceList, Class targetClass) { + List targetList = new ArrayList<>(); + if (sourceList == null || sourceList.isEmpty()) { + return targetList; + } + try { + for (LinkedHashMap map : sourceList) { + T targetObj = targetClass.getDeclaredConstructor().newInstance(); + for (Map.Entry entry : map.entrySet()) { + String key = entry.getKey(); + Object value = entry.getValue(); + try { + String setterMethod = "set" + Character.toUpperCase(key.charAt(0)) + key.substring(1); + targetClass.getMethod(setterMethod, value.getClass()).invoke(targetObj, value); + } catch (NoSuchMethodException e) { + // Skip if there's no matching setter + } + } + targetList.add(targetObj); + } + } catch (Exception e) { + e.printStackTrace(); // 打印异常信息 + } + return targetList; + } + + + public AjaxResult proInfoTransmit(TransmitDto transmitDto){ + boolean b=false; + Boolean type=transmitDto.getIsList(); + + if (type){ + List bsSgcjsjdBuiProInfos = this.convertList(transmitDto.getList(), BsSgcjsjdBuiProInfo.class); + for (BsSgcjsjdBuiProInfo bs:bsSgcjsjdBuiProInfos){ + BaseEntityUtils.preInsert(bs); + } + b = bsSgcjsjdBuiProInfoService.saveBatch(bsSgcjsjdBuiProInfos); + } + if (!type){ + BsSgcjsjdBuiProInfo data = (BsSgcjsjdBuiProInfo) transmitDto.getData(); + BaseEntityUtils.preInsert(data); + b=bsSgcjsjdBuiProInfoService.save(data); + } + + if (b){ + return AjaxResult.success("传输成功"); + }else { + return AjaxResult.error("传输失败"); + } + } +} diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java index e8b666ee..8517b4f5 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java @@ -36,6 +36,7 @@ import lombok.Data; import org.apache.ibatis.reflection.wrapper.BaseWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; import java.math.BigDecimal; import java.time.Period; @@ -157,13 +158,15 @@ public class BsSgcjsjdBuiProInfoService extends BaseService bsSgcJsjdBuiSectionInfos = bsSgcJsjdBuiSectionInfoMapper.getByUser(sysUser.getDeptId(), sysUser.getUserType(), data.getId(), data.getProjectName(), "create_time", sp.getPageNum(), sp.getPageSize(), sp.getData().getProNo(), null); + ListbsSgcjsjdBuiProInfos=bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getDeptId(), sysUser.getUserType(), data.getId(), data.getProjectName(), + null, + "create_time", sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),null,isMajor); + ListbsSgcjsjdBuiProInfoList=new ArrayList<>(); if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiSectionInfos)){ for (BsSgcJsjdBuiSectionInfo bs:bsSgcJsjdBuiSectionInfos){ - list=bsSgcjsjdBuiProInfoMapper.selectList(Wrappers.lambdaQuery(BsSgcjsjdBuiProInfo.class) + BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo=bsSgcjsjdBuiProInfoMapper.selectOne(Wrappers.lambdaQuery(BsSgcjsjdBuiProInfo.class) .eq(BsSgcjsjdBuiProInfo::getProNo,bs.getProNo())); - - for (BsSgcjsjdBuiProInfo record : list) { - String proNo = record.getProNo(); + String proNo = bsSgcjsjdBuiProInfo.getProNo(); QueryWrapperqueryWrapper = new QueryWrapper<>(); queryWrapper.eq("pro_no", proNo); List bsSgcJsjdBuiContInfos = @@ -176,30 +179,68 @@ public class BsSgcjsjdBuiProInfoService extends BaseService qw = new QueryWrapper<>(); - qw.eq("PROJECT_NAME", record.getProjectName()); + qw.eq("PROJECT_NAME", bsSgcjsjdBuiProInfo.getProjectName()); SpecialProjectProposal one = specialProjectProposalMapper.selectList(qw).get(0); if (ObjectUtil.isNotEmpty(one)) { - record.setProjectName(one.getProjectName()); - record.setAdcd(one.getAdcd()); - if (StringUtil.isEmpty(record.getProNo())) { - record.setProNo(one.getProNo()); + bsSgcjsjdBuiProInfo.setProjectName(one.getProjectName()); + bsSgcjsjdBuiProInfo.setAdcd(one.getAdcd()); + if (StringUtil.isEmpty(bsSgcjsjdBuiProInfo.getProNo())) { + bsSgcjsjdBuiProInfo.setProNo(one.getProNo()); } } - if (ObjectUtil.isEmpty(record.getProNo())){ - record.setProNo(record.getId()); + if (ObjectUtil.isEmpty(bsSgcjsjdBuiProInfo.getProNo())){ + bsSgcjsjdBuiProInfo.setProNo(bsSgcjsjdBuiProInfo.getId()); } - bsSgcjsjdBuiProInfoMapper.updateById(record); + bsSgcjsjdBuiProInfoMapper.updateById(bsSgcjsjdBuiProInfo); } + + bsSgcjsjdBuiProInfoList.add(bsSgcjsjdBuiProInfo); + } } - Page page = new Page<>(); - page.setRecords(list); - return page; - } + + for (BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo:bsSgcjsjdBuiProInfos){ + String proNo = bsSgcjsjdBuiProInfo.getProNo(); + QueryWrapperqueryWrapper = new QueryWrapper<>(); + queryWrapper.eq("pro_no", proNo); + List bsSgcJsjdBuiContInfos = + bsSgcJsjdBuiContInfoService.list(queryWrapper); + BigDecimal contractPayment = BigDecimal.ZERO; + for (BsSgcJsjdBuiContInfo bsSgcJsjdBuiContInfo : bsSgcJsjdBuiContInfos) { + BigDecimal actualPayment = bsSgcJsjdBuiContInfo.getActualPayment(); + if (actualPayment == null) { + actualPayment = BigDecimal.ZERO; + } + contractPayment = contractPayment.add(actualPayment); + } + bsSgcjsjdBuiProInfo.setContractPayment(contractPayment); + if (StringUtil.isEmpty(bsSgcjsjdBuiProInfo.getProjectName())||StringUtil.isEmpty(bsSgcjsjdBuiProInfo.getAdcd())||StringUtil.isEmpty(bsSgcjsjdBuiProInfo.getProNo())){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("PROJECT_NAME", bsSgcjsjdBuiProInfo.getProjectName()); + SpecialProjectProposal one = specialProjectProposalMapper.selectList(qw).get(0); + + if (ObjectUtil.isNotEmpty(one)) { + bsSgcjsjdBuiProInfo.setProjectName(one.getProjectName()); + bsSgcjsjdBuiProInfo.setAdcd(one.getAdcd()); + if (StringUtil.isEmpty(bsSgcjsjdBuiProInfo.getProNo())) { + bsSgcjsjdBuiProInfo.setProNo(one.getProNo()); + } + } + if (ObjectUtil.isEmpty(bsSgcjsjdBuiProInfo.getProNo())){ + bsSgcjsjdBuiProInfo.setProNo(bsSgcjsjdBuiProInfo.getId()); + } + bsSgcjsjdBuiProInfoMapper.updateById(bsSgcjsjdBuiProInfo); + } + if (!bsSgcjsjdBuiProInfoList.contains(bsSgcjsjdBuiProInfo)){ + bsSgcjsjdBuiProInfoList.add(bsSgcjsjdBuiProInfo); + } } + Page page = new Page<>(); + page.setRecords(bsSgcjsjdBuiProInfoList); + return page; } if (ObjectUtil.isNull(params)) { @@ -444,7 +485,8 @@ public class BsSgcjsjdBuiProInfoService extends BaseService list = bsSgcjsjdBuiProInfoMapper.getHistogram(user.getId(),user.getUserType(),sysXzqhService.getSubString(xzqhId)); + List list; + list = bsSgcjsjdBuiProInfoMapper.getHistogram(user.getId(),user.getUserType(),sysXzqhService.getSubString(xzqhId)); HashMap map = new HashMap<>(); for (int i = 0; i < list.size(); i++) { Use use = new Use(); @@ -465,17 +507,13 @@ public class BsSgcjsjdBuiProInfoService extends BaseService() - .eq("pro_no", sp.getData().getProNo()).eq("section_name",bsSgcjsjdBuiProInfo.getProjectName())); - if (!ObjectUtil.isEmpty(bsSgcJsjdBuiConstrMeas)) { - if (!ObjectUtil.isEmpty(bsSgcJsjdBuiConstrMeas.getReportTime1())) { - stageStatistics.setPreliminaryApprovalDate(bsSgcJsjdBuiConstrMeas.getReportTime1()); + List bsSgcJsjdBuiConstrMeas = bsSgcJsjdBuiConstrMeasMapper.selectList(new QueryWrapper() + .eq("pro_no", sp.getData().getProNo()).eq("section_name", bsSgcjsjdBuiProInfo.getProjectName()).orderByAsc("approval_time1")); + if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiConstrMeas)) { + if (!ObjectUtil.isEmpty(bsSgcJsjdBuiConstrMeas.get(0).getReportTime1())) { + stageStatistics.setPreliminaryApprovalDate(bsSgcJsjdBuiConstrMeas.get(0).getReportTime1()); stageStatistics.setCurrentStage("0"); } } - BsSgcJsjdBuiComAcc bsSgcJsjdBuiComAcc = bsSgcJsjdBuiComAccMapper.selectOne(new QueryWrapper() - .eq("pro_no", sp.getData().getProNo())); - if (!ObjectUtil.isEmpty(bsSgcJsjdBuiComAcc)) { - if (!ObjectUtil.isEmpty(bsSgcJsjdBuiComAcc.getContractAcceptTime())) { - stageStatistics.setProjectCompletedDate(bsSgcJsjdBuiComAcc.getContractAcceptTime()); + List bsSgcJsjdBuiComAccs = bsSgcJsjdBuiComAccMapper.selectList(new QueryWrapper() + .eq("pro_no", sp.getData().getProNo()).eq("type", "1") + .eq("PROJECT_NAME", sp.getData().getProjectName())); + + List bsSgcJsjdBuiConAccs = bsSgcJsjdBuiComAccMapper.selectList(new QueryWrapper() + .eq("pro_no", sp.getData().getProNo()).eq("type", "0") + .eq("PROJECT_NAME", sp.getData().getProjectName())); + + if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiConAccs)) { + if (!ObjectUtil.isEmpty(bsSgcJsjdBuiConAccs.get(0).getContractAcceptTime())) { + stageStatistics.setProjectCompletedDate(bsSgcJsjdBuiConAccs.get(0).getContractAcceptTime()); stageStatistics.setCurrentStage("2"); } - - if (!ObjectUtil.isEmpty(bsSgcJsjdBuiComAcc.getContractAcceptTime())) { - stageStatistics.setCompletionAcceptanceDate(bsSgcJsjdBuiComAcc.getContractAcceptTime()); + } + if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiComAccs)){ + if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiComAccs.get(0).getCompletionAcceptanceTime())){ + stageStatistics.setCompletionAcceptanceDate(bsSgcJsjdBuiComAccs.get(0).getCompletionAcceptanceTime()); stageStatistics.setCurrentStage("3"); } } diff --git a/jwtech-system/src/main/java/com/kms/build/service/FileService.java b/jwtech-system/src/main/java/com/kms/build/service/FileService.java index d6f7de39..01b09be4 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/FileService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/FileService.java @@ -17,8 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; +import java.util.*; @Service public class FileService extends BaseService { @@ -32,21 +31,30 @@ public class FileService extends BaseService { FileDto fileDto=fileMapper.fileList(proNo, proCode); List fileResponseDtos = handleFileList(fileDto); + LinkedHashSetset=new LinkedHashSet<>(); + Mapmap=new HashMap<>(); + for (FileResponseDto fileResponseDto:fileResponseDtos){ + map.put(fileResponseDto.getFileUrl(),fileResponseDto); + } + Listlist=new ArrayList<>(); + map.forEach((String,FileResponseDto)->{ + list.add(FileResponseDto); + }); + for (int i=1;i<=list.size();i++){ + String num=""; + if (i<10){ + num=proCode+"-00"+i; + } + else if (i<100){ + num=proCode+"-0"+i; + } + else { + num=proCode+"-"+i; + } + list.get(i-1).setFileNo(num); + } - for (int i=1;i<=fileResponseDtos.size();i++){ - String num=""; - if (i<10){ - num=proCode+"-00"+i; - } - else if (i<100){ - num=proCode+"-0"+i; - } - else { - num=proCode+"-"+i; - } - fileResponseDtos.get(i-1).setFileNo(num); - } - return fileResponseDtos; + return list; } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java index 7051d043..9e0ce17b 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java @@ -64,10 +64,10 @@ public class SpecialProjectFeasibilityService extends BaseService(sp.getPageNum(),sp.getPageSize())); }else { - list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(), + list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getDeptId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(), sysXzqhService.getSubString(data.getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize())); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java index 361ff45b..c247d023 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java @@ -18,7 +18,10 @@ import com.kms.build.domain.BsSgcjsjdBuiProInfo; import com.kms.build.mapper.BsSgcJsjdBuiSectionInfoMapper; import com.kms.common.utils.UserUtils; import com.kms.earlyStage.domain.*; +import com.kms.system.domain.SysUserPro; +import com.kms.system.mapper.SysUserProMapper; import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysUserProService; import com.kms.system.service.SysXzqhService; import javafx.print.Collation; import org.springframework.beans.factory.annotation.Autowired; @@ -92,10 +95,10 @@ public class SpecialProjectPreDesignService extends BaseService(sp.getPageNum(),sp.getPageSize())); }else { - list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(), + list = specialProjectPreDesignMapper.getByUserPro(sysUser.getDeptId(),sysUser.getUserType(),data.getId(),data.getProjectName(), sysXzqhService.getSubString(data.getAdcd()),sp.getData().getProjectKind(),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize())); } @@ -122,6 +125,9 @@ public class SpecialProjectPreDesignService extends BaseService listProject(SearchParam sp) { BsSgcjsjdBuiProInfo data = sp.getData(); @@ -130,13 +136,13 @@ public class SpecialProjectPreDesignService extends BaseService(sp.getPageNum(), sp.getPageSize())); } if (user.getUserType().equals("01")){ - page = specialProjectPreDesignMapper.listProject(user.getId(), sysXzqhService.getSubString(data.getAdcd()), data.getProjectName(), + page = specialProjectPreDesignMapper.listProject(user.getDeptId(), sysXzqhService.getSubString(data.getAdcd()), data.getProjectName(), data.getBindStatus(), new Page<>(sp.getPageNum(), sp.getPageSize())); Listrecords=page.getRecords(); @@ -145,11 +151,24 @@ public class SpecialProjectPreDesignService extends BaseServicelw=new LambdaQueryWrapper<>(); + List userPro = sysUserProMapper.selectList(new QueryWrapper().eq("pro_no", pd.getProNo()).eq("user_id", user.getDeptId())); + if (CollUtil.isNotEmpty(userPro)){ + pd.setBindStatus("1"); + }else { + pd.setBindStatus("0"); + } List bsSgcJsjdBuiSectionInfos = bsSgcJsjdBuiSectionInfoMapper.selectList(lw.eq(BsSgcJsjdBuiSectionInfo::getProNo, pd.getProNo())); + for (BsSgcJsjdBuiSectionInfo se:bsSgcJsjdBuiSectionInfos){ + List userPros = sysUserProMapper.selectList(new QueryWrapper().eq("section_no", se.getId()).eq("user_id", user.getDeptId())); + if (CollUtil.isNotEmpty(userPros)){ + pd.setBindStatus("1"); + se.setBindStatus("1"); + }else { + se.setBindStatus("0"); + } + } if (CollUtil.isNotEmpty(bsSgcJsjdBuiSectionInfos)){ pd.setChildren(bsSgcJsjdBuiSectionInfos); - }else { - pd.setChildren(new ArrayList<>()); } list.add(pd); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java index a67c3442..2a773f3b 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java @@ -55,8 +55,9 @@ public class SpecialProjectProposalService extends BaseService sp) { SysUser sysUser = UserUtils.getUser(); + SpecialProjectProposal data = sp.getData(); - if (sysUser.getUserType().equals("00") && data.getAdcd() == null) { + if (data.getAdcd() == null) { String deptId = sysUser.getDeptId(); SysDept sysDept = sysDeptService.get(deptId); String xzqhId = sysDept.getXzqhId(); @@ -89,10 +90,10 @@ public class SpecialProjectProposalService extends BaseService(sp.getPageNum(),sp.getPageSize()),data.getProjectKind()); }else { - list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(), + list = specialProjectProposalMapper.getByUserPro(sysUser.getDeptId(),sysUser.getUserType(),data.getId(),data.getProjectName(), data.getProjectCode(),sysXzqhService.getSubString(data.getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()),data.getProjectKind()); } return list; diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml index 4666f2ae..2f26d51d 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml @@ -239,17 +239,16 @@ - select count(*) from bs_sgc_jsjd_bui_real_name_pro np + select count(*) from bs_sgc_jsjd_bui_real_name_pro np WHERE - np.pro_code COLLATE utf8mb4_general_ci IN ( - SELECT - sys_user_pro.section_no COLLATE utf8mb4_general_ci - FROM - sys_user_pro + (np.pro_no COLLATE utf8mb4_general_ci IN ( + SELECT sys_user_pro.pro_no COLLATE utf8mb4_general_ci + FROM sys_user_pro - - AND user_id=#{userId}) + + user_id=#{userId}) - + and np.project_name like concat('%',#{projectName},'%') @@ -709,19 +722,47 @@ and np.PRO_NO=#{proNo} - + and np.adcd like concat(#{adcd},'%') - + and id=#{id} and np.is_approval=#{isApproval} - + ) + or + (np.pro_code COLLATE utf8mb4_general_ci IN ( + SELECT sys_user_pro.section_no COLLATE utf8mb4_general_ci + FROM sys_user_pro + + + user_id=#{userId}) + + + and np.project_name like concat('%',#{projectName},'%') + + + and np.PRO_CODE=#{proCode} + + + and np.PRO_NO=#{proNo} + + + and np.adcd like concat(#{adcd},'%') + + + and id=#{id} + + + and np.is_approval=#{isApproval} + + ) + select count(*) from bs_sgc_jsjd_bui_real_name_pro np and np.project_name like concat('%',#{projectName},'%') diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml index 42ce6ac7..b47a9ece 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml @@ -98,97 +98,168 @@ +