在建管理修改

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<BsSgcjsjdBuiProInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("project_status", "0");
+
+            List<BsSgcjsjdBuiProInfo> 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<BsSgcJsjdBuiProgress> 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<BsSgcJsjdBuiProgress> 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);
+
+                }
+            }
         }
 
 

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<BsSgcJsjdBuiConteval> sp)
+    public List<BsSgcJsjdBuiConteval> list(@RequestBody SearchParam<BsSgcJsjdBuiConteval> sp)
     {
-        return bsSgcJsjdBuiContevalService.selectPage(sp);
+
+//        List<BsSgcJsjdBuiConteval> list = bsSgcJsjdBuiContevalService.list();
+        return bsSgcJsjdBuiContevalService.list();
+//        return bsSgcJsjdBuiContevalService.selectPage(sp);
     }
 
     /**

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<BsSgcJsjdBuiProgress> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("pro_code", proCode);
         queryWrapper.eq("pro_no", proNo);
         List<BsSgcJsjdBuiProgress> 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();
     }
 
     /**

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;
+
 }

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;
+
 
 }