diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiGzjbController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiGzjbController.java
index a73099be..48be585b 100644
--- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiGzjbController.java
+++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiGzjbController.java
@@ -90,6 +90,13 @@ public class BsSgcJsjdBuiGzjbController extends BaseController
return AjaxResult.success(bsSgcJsjdBuiGzjbService.getById(id));
}
+// @ApiOperation("项目简报统计")
+// @GetMapping(value = "/{id}")
+// public AjaxResult getStatistics(@PathVariable("id") String id){
+// return AjaxResult.success(null);
+// }
+//
+
/**
* 新增工作简报
*/
diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java
index 52a3c11f..393aa209 100644
--- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java
+++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java
@@ -158,6 +158,8 @@ public class BsSgcjsjdBuiProInfoController extends BaseController
return AjaxResult.success(byId);
}
+
+
/**
* 新增项目基本信息管理
*/
diff --git a/jwtech-system/src/main/java/com/kms/build/domain/dto/GzjbDto.java b/jwtech-system/src/main/java/com/kms/build/domain/dto/GzjbDto.java
index 64e77f5a..f9e6d7d2 100644
--- a/jwtech-system/src/main/java/com/kms/build/domain/dto/GzjbDto.java
+++ b/jwtech-system/src/main/java/com/kms/build/domain/dto/GzjbDto.java
@@ -21,6 +21,24 @@ public class GzjbDto implements Serializable {
//行政代码
private String adcd;
+ //批复文号
+ private String approvalNo;
+
+ //项目初设投资
+ private String projectInvestmentEstimate;
+
+ //地方安排投资
+ private String localFunds;
+
+ //中央安排投资
+ private String centralArrangedFunds;
+
+ //合计
+ private String fundsTotal;
+
+ //是否在建
+ private String isConstruction;
+
//工程等级
private String engineeringGrade;
diff --git a/jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiGzjbStatisticsVo.java b/jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiGzjbStatisticsVo.java
new file mode 100644
index 00000000..ee32e39a
--- /dev/null
+++ b/jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiGzjbStatisticsVo.java
@@ -0,0 +1,48 @@
+package com.kms.build.domain.vo;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+
+public class BsSgcJsjdBuiGzjbStatisticsVo {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("中央资金")
+ private BigDecimal centralArrangedFunds;
+
+ @ApiModelProperty("地方资金")
+ private BigDecimal LocalFunds;
+
+ @ApiModelProperty("合计资金")
+ private BigDecimal TotalFunds;
+
+
+
+
+ @ApiModelProperty("中央已下达总金额")
+ private BigDecimal centralReleaseFunds;
+
+ @ApiModelProperty("地方已下达总金额")
+ private BigDecimal LocalReleaseFuds;
+
+ @ApiModelProperty("下达总金额")
+ private BigDecimal releaseFunds;
+
+ @ApiModelProperty("累计用人天数")
+ private String Attendance;
+
+
+ @ApiModelProperty("本年累计用人天数")
+ private Integer AttendanceYear;
+
+ @ApiModelProperty("2024年累计用人天数")
+ private Integer Attendance2024Year;
+
+
+
+}
diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java
index b53eb524..8686827d 100644
--- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java
+++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java
@@ -192,7 +192,12 @@ public class SpecialProjectInfoController extends BaseController {
SpecialProjectInfo byId = specialProjectInfoService.getById(id);
String projectName = byId.getProjectName();
String adcd = byId.getAdcd();
-
+ if (ObjectUtil.isEmpty(adcd)){
+ adcd="0";
+ }
+ if (ObjectUtil.isEmpty(projectName)){
+ projectName="";
+ }
if (projectName.equals(specialProjectInfo.getProjectName()) && adcd.equals(specialProjectInfo.getAdcd())) {
return toAjax(specialProjectInfoService.updateById(specialProjectInfo));
diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiGzjbMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiGzjbMapper.xml
new file mode 100644
index 00000000..4eebc314
--- /dev/null
+++ b/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiGzjbMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
index fe49325c..321e0675 100644
--- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
@@ -249,24 +249,30 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
@@ -306,12 +312,26 @@
pro.IS_BELONG_PLANNING,
info.commencement_date,
pro.PROJECT_NAME,
- ca.COMPLETION_ACCEPTANCE_TIME,
+ SUM(info.CENTRAL_ARRANGED_FUNDS) as CENTRAL_ARRANGED_FUNDS,
+ SUM(info.CITY_LEVEL_FUNDS+info.COUNTY_LEVEL_FUNDS+info.PROVINCIAL_FUNDING+info.TOWNSHIP_INVESTMENTS) as local_funds,
+ info.TOTAL,
+ pro.approval_no,
+ pro.PROJECT_INVESTMENT_ESTIMATE,
+ pro.is_construction,
+
+ info.commencement_date,
+ info.planned_completion_date,
pbi.REPORT_TIME,
+ pro.REMARK,
sf.source_total,
sf.source_center,
sf.source_land,
- pf.total
+ pf.landPadinAmount,
+ pf.CENTER_PAIDIN_AMOUNT,
+ pf.total,
+ att.totalSum,
+ att.currentYearSum,
+ att.famerSum2024
FROM
bs_sgc_jsjd_bui_pro_info info,
bs_slgc_qqjd_spe_pro_proposal pro
@@ -323,9 +343,9 @@
FROM
bs_sgc_jsjd_bui_com_acc ca
WHERE
- ca.CREATE_TIME > DATE_FORMAT( #{startDate}, '%Y-%m-%d' )
- AND ca.CREATE_TIME < DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
- AND ca.PRO_NO = #{proNo}
+
+
+ ca.PRO_NO = #{proNo}
AND ca.pro_code = #{proCode}
) ca ON ca.PRO_NO = pro.PRO_NO
AND ca.PRO_CODE = pro.PROJECT_CODE
@@ -337,9 +357,9 @@
FROM
bs_slgc_qqjd_pro_bid_info pbi
WHERE
- pbi.CREATE_TIME > DATE_FORMAT( #{startDate}, '%Y-%m-%d' )
- AND pbi.CREATE_TIME < DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
- AND pbi.PRO_NO = #{proNo}
+
+
+ pbi.PRO_NO = #{proNo}
AND pbi.project_code = #{proCode}
) pbi ON pbi.PRO_NO = pro.PRO_NO
AND pbi.project_code = pro.PROJECT_CODE
@@ -353,12 +373,12 @@
FROM
bs_sgc_jsjd_bui_source_funds sf
WHERE
- sf.CREATE_TIME > DATE_FORMAT( #{startDate}, '%Y-%m-%d' )
- AND sf.CREATE_TIME < DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
- AND sf.PRO_NO = #{proNo}
+
+
+ sf.PRO_NO = #{proNo}
AND sf.pro_code = #{proCode}
- ) sf ON ca.PRO_NO = pro.PRO_NO
- AND ca.PRO_CODE = pro.PROJECT_CODE
+ ) sf ON sf.PRO_NO = pro.PRO_NO
+ AND sf.PRO_CODE = pro.PROJECT_CODE
LEFT JOIN (
SELECT
CONTRACT_NUMBER,
@@ -367,14 +387,43 @@
FROM
bs_sgc_jsjd_bui_cont_info ci
WHERE
- ci.CREATE_TIME > DATE_FORMAT( #{startDate}, '%Y-%m-%d' )
- AND ci.CREATE_TIME < DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
- AND ci.PRO_NO = #{proNo}
+
+
+ ci.PRO_NO = #{proNo}
AND ci.pro_code = #{proCode}
) ci ON ci.PRO_NO = pro.PRO_NO
AND ci.PRO_CODE = pro.PROJECT_CODE
+ LEFT JOIN (SELECT
+ (
+ SELECT COUNT(1)
+ FROM bs_sgc_jsjd_bui_attendance_information att
+ WHERE att.pro_code = #{proCode}
+ AND att.pro_no = #{proNo}
+ ) AS totalSum,
+ (
+ SELECT COUNT(1)
+ FROM bs_sgc_jsjd_bui_attendance_information att
+ WHERE att.pro_code = #{proCode}
+ AND att.pro_no = #{proNo}
+ AND YEAR(att.create_time) = YEAR(CURDATE())
+ ) AS currentYearSum,
+ COUNT(1) AS famerSum2024,
+ pro_code,
+ pro_no
+ FROM
+ bs_sgc_jsjd_bui_attendance_information att
+ WHERE
+ att.pro_code = #{proCode}
+ AND att.pro_no = #{proNo}
+ AND YEAR(att.create_time) = 2024
+ GROUP BY
+ att.pro_code, att.pro_no)
+ att ON att.pro_code=pro.PROJECT_CODE
+ AND att.pro_no=pro.PRO_NO
LEFT JOIN (
SELECT
+ SUM(pf.center_paidin_amount) as CENTER_PAIDIN_AMOUNT,
+ SUM(pf.provincial_paidin_amount+pf.city_paidin_amount+pf.county_paidin_amount+pf.township_paidin_amount) as landPadinAmount,
SUM( pf.center_paidin_amount + pf.provincial_paidin_amount + pf.city_paidin_amount + pf.county_paidin_amount + pf.township_paidin_amount ) total,
PRO_NO,
pro_code,
@@ -382,9 +431,9 @@
FROM
bs_sgc_jsjd_bui_purpose_funds pf
WHERE
- pf.CREATE_TIME > DATE_FORMAT( #{startDate},'%Y-%m-%d' )
- AND pf.CREATE_TIME < DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
- AND pf.PRO_NO = #{proNo}
+
+
+ pf.PRO_NO = #{proNo}
AND pf.pro_code = #{proCode}
) pf ON ci.CONTRACT_NUMBER = pf.CONTRACT_NUMBER
WHERE
@@ -392,30 +441,30 @@
AND info.PRO_CODE = pro.PROJECT_CODE
AND info.PRO_NO = #{proNo}
AND info.pro_code = #{proCode}
-
- WHERE
- pi.PRO_NO IN (
- SELECT
- PRO_NO
- FROM
- sys_user_pro
-
-
- AND user_id=#{userId})
-
-
-
- and adcd like concat(#{adcd},'%')
-
-
- order by pi.${orderBy} desc
-
-
-
-
- and adcd like concat(#{adcd},'%')
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
GROUP BY info.PRO_CODE