Browse Source

后端bug修改

dev_kxc
慕月霜笙 11 months ago
parent
commit
5ef45c83cd
  1. 7
      jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiGzjbController.java
  2. 2
      jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java
  3. 18
      jwtech-system/src/main/java/com/kms/build/domain/dto/GzjbDto.java
  4. 48
      jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiGzjbStatisticsVo.java
  5. 7
      jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java
  6. 13
      jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiGzjbMapper.xml
  7. 151
      jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml

7
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);
// }
//
/**
* 新增工作简报
*/

2
jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java

@ -158,6 +158,8 @@ public class BsSgcjsjdBuiProInfoController extends BaseController
return AjaxResult.success(byId);
}
/**
* 新增项目基本信息管理
*/

18
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;

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

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

13
jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiGzjbMapper.xml

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kms.build.mapper.BsSgcJsjdBuiGzjbMapper">
</mapper>

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

@ -249,24 +249,30 @@
<result property="projectName" column="project_name"/>
<result property="adcd" column="adcd"/>
<result property="engineeringGrade" column="ENGINEERING_GRADE"/>
<result property="farmerTotal" column="farmer_total"/>
<result property="farmerNow" column="farmer_now"/>
<result property="farmerYear" column="farmer_year"/>
<result property="farmerTotal" column="totalSum"/>
<result property="farmerNow" column="currentYearSum"/>
<result property="farmerYear" column="famerSum2024"/>
<result property="zfTotal" column="total"/>
<result property="zfLandPaidnAmount" column="zf_land_paidn_amount"/>
<result property="zfCenterPaidinAmount" column="zf_center_paidin_amount"/>
<result property="zfLandPaidnAmount" column="landPadinAmount"/>
<result property="zfCenterPaidinAmount" column="CENTER_PAIDIN_AMOUNT"/>
<result property="xdTotal" column="source_total"/>
<result property="xdLandPaidnAmount" column="source_land"/>
<result property="xdCenterPaidinAmount" column="source_center"/>
<result property="isStart" column="is_start"/>
<result property="isEnd" column="is_end"/>
<result property="startTime" column="start_time"/>
<result property="endTime" column="commencement_date"/>
<result property="remark" column="remark"/>
<result property="startTime" column="commencement_date"/>
<result property="endTime" column="planned_completion_date"/>
<result property="remark" column="REMARK"/>
<result property="proCode" column="pro_code"/>
<result property="bidTime" column="REPORT_TIME"/>
<result property="proNo" column="pro_no"/>
<result property="isBelon" column="IS_BELONG_PLANNING"/>
<result property="centralArrangedFunds" column="CENTRAL_ARRANGED_FUNDS"/>
<result property="approvalNo" column="approval_no"/>
<result property="localFunds" column="local_funds"/>
<result property="projectInvestmentEstimate" column="PROJECT_INVESTMENT_ESTIMATE"/>
<result property="isConstruction" column="is_construction"/>
<result property="fundsTotal" column="TOTAL"/>
</resultMap>
@ -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,
<!-- ca.COMPLETION_ACCEPTANCE_TIME,-->
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 &gt; DATE_FORMAT( #{startDate}, '%Y-%m-%d' )
AND ca.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
AND ca.PRO_NO = #{proNo}
<!-- ca.CREATE_TIME &gt; DATE_FORMAT( #{startDate}, '%Y-%m-%d' )-->
<!-- AND ca.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )-->
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 &gt; DATE_FORMAT( #{startDate}, '%Y-%m-%d' )
AND pbi.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
AND pbi.PRO_NO = #{proNo}
<!-- pbi.CREATE_TIME &gt; DATE_FORMAT( #{startDate}, '%Y-%m-%d' )-->
<!-- AND pbi.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )-->
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 &gt; DATE_FORMAT( #{startDate}, '%Y-%m-%d' )
AND sf.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
AND sf.PRO_NO = #{proNo}
<!-- sf.CREATE_TIME &gt; DATE_FORMAT( #{startDate}, '%Y-%m-%d' )-->
<!-- AND sf.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )-->
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 &gt; DATE_FORMAT( #{startDate}, '%Y-%m-%d' )
AND ci.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
AND ci.PRO_NO = #{proNo}
<!-- ci.CREATE_TIME &gt; DATE_FORMAT( #{startDate}, '%Y-%m-%d' )-->
<!-- AND ci.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )-->
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 &gt; DATE_FORMAT( #{startDate},'%Y-%m-%d' )
AND pf.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
AND pf.PRO_NO = #{proNo}
<!-- pf.CREATE_TIME &gt; DATE_FORMAT( #{startDate},'%Y-%m-%d' )-->
<!-- AND pf.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )-->
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}
<if test="userType==01">
WHERE
pi.PRO_NO IN (
SELECT
PRO_NO
FROM
sys_user_pro
<where>
<if test="userId!=null and userId!=''">
AND user_id=#{userId})
</if>
<if test="adcd!=null and adcd !=''">
and adcd like concat(#{adcd},'%')
</if>
</where>
order by pi.${orderBy} desc
</if>
<if test="userType==00">
<if test="adcd!=null and adcd !=''">
and adcd like concat(#{adcd},'%')
</if>
</if>
<!-- <if test="userType==01">-->
<!-- WHERE-->
<!-- pi.PRO_NO IN (-->
<!-- SELECT-->
<!-- PRO_NO-->
<!-- FROM-->
<!-- sys_user_pro-->
<!-- <where>-->
<!-- <if test="userId!=null and userId!=''">-->
<!-- AND user_id=#{userId})-->
<!-- </if>-->
<!-- <if test="adcd!=null and adcd !=''">-->
<!-- and adcd like concat(#{adcd},'%')-->
<!-- </if>-->
<!-- </where>-->
<!-- order by pi.${orderBy} desc-->
<!-- </if>-->
<!-- <if test="userType==00">-->
<!-- <if test="adcd!=null and adcd !=''">-->
<!-- and adcd like concat(#{adcd},'%')-->
<!-- </if>-->
<!-- </if>-->
GROUP BY info.PRO_CODE
</select>

Loading…
Cancel
Save