From bc54f6ec7d50169fdbbc3b429a5faf62c27ea91e Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Mon, 18 Dec 2023 11:02:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=BB=BA=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jwtech/quartz/task/progressTask.java | 80 ++++++++++++++++--- .../BsSgcJsjdBuiContevalController.java | 7 +- .../BsSgcJsjdBuiProgressController.java | 34 +++++++- .../build/domain/BsSgcJsjdBuiContInfo.java | 3 + .../build/domain/BsSgcJsjdBuiConteval.java | 10 +-- 5 files changed, 114 insertions(+), 20 deletions(-) diff --git a/jwtech-quartz/src/main/java/com/jwtech/quartz/task/progressTask.java b/jwtech-quartz/src/main/java/com/jwtech/quartz/task/progressTask.java index ba12bbc3..5ffa9824 100644 --- a/jwtech-quartz/src/main/java/com/jwtech/quartz/task/progressTask.java +++ b/jwtech-quartz/src/main/java/com/jwtech/quartz/task/progressTask.java @@ -29,8 +29,7 @@ public class progressTask { public void progress() throws ParseException { LocalDate date = LocalDate.now(); - int dayOfYear = date.getYear(); - int monthValue = date.getMonthValue(); + int dayOfMonth = date.getDayOfMonth(); if (dayOfMonth == 1) { @@ -45,15 +44,13 @@ public class progressTask { String proCode = bsSgcjsjdBuiProInfo.getProCode(); BsSgcJsjdBuiProgress bsSgcJsjdBuiProgress = new BsSgcJsjdBuiProgress(); - BaseEntityUtils.preInsert(bsSgcJsjdBuiProgress); bsSgcJsjdBuiProgress.setProNo(proNo); bsSgcJsjdBuiProgress.setProCode(proCode); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM"); Date date1 = new Date(); String formatted = format.format(date1); Date parse = format.parse(formatted); - int year = parse.getYear(); - int month = parse.getMonth(); + Calendar cal = Calendar.getInstance(); cal.add(Calendar.MONTH, -1); @@ -91,11 +88,6 @@ public class progressTask { } } - - - - - bsSgcJsjdBuiProgress.setCreateTime(new Date()); bsSgcJsjdBuiProgress.setMonthly(parse); @@ -108,6 +100,74 @@ public class progressTask { } } + }else { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("project_status", "0"); + + List bsSgcjsjdBuiProInfos = bsSgcjsjdBuiProInfoMapper.selectList(queryWrapper); + + if (!bsSgcjsjdBuiProInfos.isEmpty()) { + for (BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo : bsSgcjsjdBuiProInfos) { + String proNo = bsSgcjsjdBuiProInfo.getProNo(); + String proCode = bsSgcjsjdBuiProInfo.getProCode(); + + BsSgcJsjdBuiProgress bsSgcJsjdBuiProgress = new BsSgcJsjdBuiProgress(); + bsSgcJsjdBuiProgress.setProNo(proNo); + bsSgcJsjdBuiProgress.setProCode(proCode); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM"); + Date date1 = new Date(); + String formatted = format.format(date1); + Date parse = format.parse(formatted); + + + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.MONTH, -1); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); + String string = sdf.format(cal.getTime()); + + Date lastMonth = format.parse(string); + if (lastMonth.getMonth() == 12) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("pro_no", proNo); + wrapper.eq("pro_code", proCode); + wrapper.eq("monthly", lastMonth); + BsSgcJsjdBuiProgress buiProgress = bsSgcJsjdBuiProgressMapper.selectOne(wrapper); + if (buiProgress != null) { + bsSgcJsjdBuiProgress.setYearlyCumulativeWorkload((double) 0); + bsSgcJsjdBuiProgress.setProjectOverallWorkload(buiProgress.getProjectOverallWorkload()); + + }else { + bsSgcJsjdBuiProgress.setYearlyCumulativeWorkload((double) 0); + bsSgcJsjdBuiProgress.setProjectOverallWorkload((double) 0); + } + }else { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("pro_no", proNo); + wrapper.eq("pro_code", proCode); + wrapper.eq("monthly", lastMonth); + BsSgcJsjdBuiProgress buiProgress = bsSgcJsjdBuiProgressMapper.selectOne(wrapper); + if (buiProgress != null) { + bsSgcJsjdBuiProgress.setYearlyCumulativeWorkload(buiProgress.getYearlyCumulativeWorkload()); + bsSgcJsjdBuiProgress.setProjectOverallWorkload(buiProgress.getProjectOverallWorkload()); + + }else { + bsSgcJsjdBuiProgress.setYearlyCumulativeWorkload((double) 0); + bsSgcJsjdBuiProgress.setProjectOverallWorkload((double) 0); + } + } + + bsSgcJsjdBuiProgress.setCreateTime(new Date()); + + bsSgcJsjdBuiProgress.setMonthly(parse); + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH)); + + bsSgcJsjdBuiProgress.setEndingTime(calendar.getTime()); + bsSgcJsjdBuiProgress.setFillingStatus("0"); + bsSgcJsjdBuiProgressMapper.insert(bsSgcJsjdBuiProgress); + + } + } } diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiContevalController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiContevalController.java index 3e8aad15..19894254 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiContevalController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiContevalController.java @@ -50,9 +50,12 @@ public class BsSgcJsjdBuiContevalController extends BaseController */ @PostMapping("/list") @ApiOperation("合同履约评价列表") - public IPage list(@RequestBody SearchParam sp) + public List list(@RequestBody SearchParam sp) { - return bsSgcJsjdBuiContevalService.selectPage(sp); + +// List list = bsSgcJsjdBuiContevalService.list(); + return bsSgcJsjdBuiContevalService.list(); +// return bsSgcJsjdBuiContevalService.selectPage(sp); } /** diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressController.java index 32a99e1e..653ef0ba 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressController.java @@ -1,6 +1,7 @@ package com.kms.build.controller; import java.util.Arrays; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -113,12 +114,37 @@ public class BsSgcJsjdBuiProgressController extends BaseController //未修改前的月度完成量 Double monthlyWorkload = byId.getMonthlyWorkload(); + + + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.MONTH, -1); + bsSgcJsjdBuiProgress.setYearlyCumulativeWorkload(bsSgcJsjdBuiProgress.getYearlyCumulativeWorkload()-monthlyWorkload+bsSgcJsjdBuiProgress.getMonthlyWorkload()); + bsSgcJsjdBuiProgress.setProjectOverallWorkload(bsSgcJsjdBuiProgress.getProjectOverallWorkload()-monthlyWorkload+bsSgcJsjdBuiProgress.getMonthlyWorkload()); + bsSgcJsjdBuiProgressService.updateById(bsSgcJsjdBuiProgress); + + + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("pro_code", proCode); queryWrapper.eq("pro_no", proNo); List list = bsSgcJsjdBuiProgressService.list(queryWrapper); - for (BsSgcJsjdBuiProgress sgcJsjdBuiProgress : list) { + for (BsSgcJsjdBuiProgress buiProgress : list) { + if (monthly.before(buiProgress.getMonthly())) { + if (buiProgress.getMonthly().getYear() == year) { + buiProgress.setYearlyCumulativeWorkload(buiProgress.getYearlyCumulativeWorkload() + -monthlyWorkload+bsSgcJsjdBuiProgress.getYearlyCumulativeWorkload()); + } + + + buiProgress.setProjectOverallWorkload(buiProgress.getProjectOverallWorkload() + -monthlyWorkload+bsSgcJsjdBuiProgress.getProjectOverallWorkload()); + bsSgcJsjdBuiProgressService.updateById(buiProgress); + } + } + + + /*for (BsSgcJsjdBuiProgress sgcJsjdBuiProgress : list) { if (monthly.after(sgcJsjdBuiProgress.getMonthly())) { if (sgcJsjdBuiProgress.getMonthly().getYear() == year) { sgcJsjdBuiProgress.setYearlyCumulativeWorkload(sgcJsjdBuiProgress.getYearlyCumulativeWorkload() -monthlyWorkload+bsSgcJsjdBuiProgress.getMonthlyWorkload()); @@ -126,10 +152,12 @@ public class BsSgcJsjdBuiProgressController extends BaseController sgcJsjdBuiProgress.setProjectOverallWorkload(sgcJsjdBuiProgress.getProjectOverallWorkload() - monthlyWorkload + bsSgcJsjdBuiProgress.getMonthlyWorkload()); bsSgcJsjdBuiProgressService.updateById(sgcJsjdBuiProgress); } - } + }*/ + + - return toAjax(bsSgcJsjdBuiProgressService.updateById(bsSgcJsjdBuiProgress)); + return AjaxResult.success(); } /** diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContInfo.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContInfo.java index 469a19b1..5c6d59c4 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContInfo.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContInfo.java @@ -174,4 +174,7 @@ public class BsSgcJsjdBuiContInfo extends BaseEntity @ApiModelProperty("是否有子节点") private Boolean hasChildren; + + private String score; + } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiConteval.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiConteval.java index c4948a8e..87a09448 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiConteval.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiConteval.java @@ -30,11 +30,10 @@ public class BsSgcJsjdBuiConteval extends BaseEntity @ApiModelProperty("创建人") private String createUid; - /** UPDATE_UID */ - @Excel(name = "UPDATE_UID") - @ApiModelProperty("UPDATE_UID") + /** 更新人 */ + @Excel(name = "更新人") + @ApiModelProperty("更新人") private String updateUid; - /** 数源部门 */ @Excel(name = "数源部门") @ApiModelProperty("数源部门") @@ -48,6 +47,7 @@ public class BsSgcJsjdBuiConteval extends BaseEntity private String score; - private String order; + private String ordered; + }