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 50fcd404..e79a1da5 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 @@ -122,6 +122,7 @@ public class BsSgcJsjdBuiProgressController extends BaseController cal.add(Calendar.MONTH, -1); bsSgcJsjdBuiProgress.setYearlyCumulativeWorkload(bsSgcJsjdBuiProgress.getYearlyCumulativeWorkload()-monthlyWorkload+bsSgcJsjdBuiProgress.getMonthlyWorkload()); bsSgcJsjdBuiProgress.setProjectOverallWorkload(bsSgcJsjdBuiProgress.getProjectOverallWorkload()-monthlyWorkload+bsSgcJsjdBuiProgress.getMonthlyWorkload()); + bsSgcJsjdBuiProgress.setUpdateTime(new Date()); bsSgcJsjdBuiProgressService.updateById(bsSgcJsjdBuiProgress); @@ -141,6 +142,7 @@ public class BsSgcJsjdBuiProgressController extends BaseController buiProgress.setProjectOverallWorkload(buiProgress.getProjectOverallWorkload() -monthlyWorkload+bsSgcJsjdBuiProgress.getProjectOverallWorkload()); + buiProgress.setUpdateTime(new Date()); bsSgcJsjdBuiProgressService.updateById(buiProgress); } } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPurposeFunds.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPurposeFunds.java index fe874457..e85ada98 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPurposeFunds.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPurposeFunds.java @@ -112,7 +112,7 @@ public class BsSgcJsjdBuiPurposeFunds extends BaseEntity @TableField(exist = false) private List timeScope; - + //中央应付金额 private String centerPayableAmount; private String provincialPayableAmount; @@ -126,7 +126,7 @@ public class BsSgcJsjdBuiPurposeFunds extends BaseEntity - + //中央实付金额 private String centerPaidinAmount; private String provincialPaidinAmount; diff --git a/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdZhxx.java b/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdZhxx.java index f0b62cfa..28bbbb43 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdZhxx.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdZhxx.java @@ -68,4 +68,6 @@ public class BsSgcYxjdZhxx extends BaseEntity @ApiModelProperty("附件") private String owerDept; + private String publishPerson; + } diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml index 3260021f..8eb4ee8c 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml @@ -10,7 +10,9 @@ pp.project_type, bp.YEARLY_CUMULATIVE_WORKLOAD, bp.UPDATE_TIME, - pp.is_major + pp.is_major, + pi.project_code, + bp.PRO_NO FROM `bs_sgc_jsjd_bui_progress` bp JOIN ( SELECT *, max( create_time ) FROM `bs_sgc_jsjd_bui_progress` GROUP BY PRO_CODE, PRO_NO ) t ON t.id = bp.id @@ -25,6 +27,8 @@ + +