项目预警开发

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

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;

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

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 @@
         <result property="yearlyCumulativeWorkload" column="YEARLY_CUMULATIVE_WORKLOAD"/>
         <result property="updateTime" column="UPDATE_TIME"/>
         <result property="isMajor" column="is_major"/>
+        <result property="proNo" column="pro_no"/>
+        <result property="proCode" column="project_code"/>
     </resultMap>
 
     <select id="getProgress" resultMap="BsSgcjsjdBuiProgress">

jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml

@@ -28,7 +28,8 @@
                pi.is_major,
                pi.total,
                pp.COMPILING_UNIT,
-               pp.IS_BELONG_PLANNING
+               pp.IS_BELONG_PLANNING,
+               pi.pro_no
         from bs_sgc_jsjd_bui_pro_info pi left join bs_slgc_qqjd_spe_pro_proposal pp
             on pi.pro_code = pp.project_code and pi.pro_no = pp.pro_no
     </sql>
@@ -109,6 +110,7 @@
         <result property="constructionNature" column="CONSTRUCTION_NATURE"/>
         <result property="isBelong" column="IS_BELONG_PLANNING"/>
         <result property="total" column="total"/>
+        <result property="proNo" column="pro_no"/>
     </resultMap>
 
 
@@ -192,6 +194,7 @@
             </if>
             <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
         </where>
+        GROUP BY pi.PRO_CODE
         order by pi.${orderBy} desc
 
     </select>