diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/peopleInformation/PeopleInformationCmd.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/peopleInformation/PeopleInformationCmd.java index 89aeada75a805eda78eeadd24fee7d8690448ed0..a3c61e870530e9b2eacc491149b130f7771f6f9d 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/peopleInformation/PeopleInformationCmd.java +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/peopleInformation/PeopleInformationCmd.java @@ -10,6 +10,7 @@ import lombok.NoArgsConstructor; import javax.validation.Valid; import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.Size; import java.math.BigInteger; @@ -46,6 +47,7 @@ public class PeopleInformationCmd extends BaseDTO { @Valid @ApiModelProperty("鑱屽伐浜烘暟") @Min(value = 0, message = "鑱屽伐浜烘暟锛堝湪缂栧湪鑱岋級浜烘暟涓嶈兘涓鸿礋鏁�") + @Max(value = 100000000,message = "鑱屽伐浜烘暟锛堝湪缂栧湪鑱岋級浜烘暟涓嶈兘瓒呰繃100000000") private Long compilationWorkers; /** @@ -54,6 +56,7 @@ public class PeopleInformationCmd extends BaseDTO { @Valid @ApiModelProperty("鍚堝悓鍒惰亴宸ヤ汉鏁�") @Min(value = 0, message = "鍚堝悓鍒惰亴宸ヤ汉鏁颁笉鑳戒负璐熸暟") + @Max(value = 100000000,message = "鍚堝悓鍒惰亴宸ヤ汉鏁颁笉鑳借秴杩�100000000") private Long contractWorkers; /** @@ -62,6 +65,7 @@ public class PeopleInformationCmd extends BaseDTO { @Valid @ApiModelProperty("寮曡繘浜烘墠") @Min(value = 0, message = "寮曡繘浜烘墠锛堥潪缂栵級浜烘暟涓嶈兘涓鸿礋鏁�") + @Max(value = 100000000,message = "寮曡繘浜烘墠锛堥潪缂栵級浜烘暟涓嶈兘瓒呰繃100000000") private Long personnel; /** @@ -70,6 +74,7 @@ public class PeopleInformationCmd extends BaseDTO { @Valid @ApiModelProperty("鍗氬+鍚�") @Min(value = 0, message = "鍗氬+鍚庝汉鏁颁笉鑳戒负璐熸暟") + @Max(value = 100000000,message = "鍗氬+鍚庝汉鏁颁笉鑳借秴杩�100000000") private Long postdoctor; /** @@ -78,6 +83,7 @@ public class PeopleInformationCmd extends BaseDTO { @Valid @ApiModelProperty("澶栨暀") @Min(value = 0, message = "澶栨暀浜烘暟涓嶈兘涓鸿礋鏁�") + @Max(value = 100000000,message = "澶栨暀浜烘暟涓嶈兘瓒呰繃100000000") private Long foreignTeachers; /** @@ -86,6 +92,7 @@ public class PeopleInformationCmd extends BaseDTO { @Valid @ApiModelProperty("鑱屽伐浜烘暟鍚堣锛堝湪缂栧湪鑱屽強鍚堝悓鍒惰亴宸�)") @Min(value = 0, message = "鑱屽伐浜烘暟鍚堣锛堝湪缂栧湪鑱屽強鍚堝悓鍒惰亴宸�)涓嶈兘涓鸿礋鏁�") + @Max(value = 100000000,message = "鑱屽伐浜烘暟鍚堣锛堝湪缂栧湪鑱屽強鍚堝悓鍒惰亴宸�)涓嶈兘瓒呰繃100000000") private Long compilationContractWorkers; /** @@ -94,6 +101,7 @@ public class PeopleInformationCmd extends BaseDTO { @Valid @ApiModelProperty("鑱屽伐浜烘暟鍚堣锛堝悇绫讳汉鍛橈級") @Min(value = 0, message = "鑱屽伐浜烘暟鍚堣锛堝悇绫讳汉鍛橈級涓嶈兘涓鸿礋鏁�") + @Max(value = 100000000,message = "鑱屽伐浜烘暟鍚堣锛堝悇绫讳汉鍛橈級涓嶈兘瓒呰繃100000000") private Long allWorkers; } diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryOut.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryOut.java index 510d287c7f85af7ad2ed434b794c060a4a993691..97dc10e8ed2898ce587635b7b4633bfade765e29 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryOut.java +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryOut.java @@ -116,4 +116,7 @@ public class ProjectLibraryOut extends BaseDto implements Serializable { @ApiModelProperty("椤圭洰鐘舵€� 1鍦ㄥ缓 2涓 3瀹岀粨") private Integer projectState; + + @ApiModelProperty("澶囨敞json瀵硅薄") + private String summaryJson; } diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectLibraryMapper.xml b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectLibraryMapper.xml index 2fdbb171783d1eb33ccd293be30cf8c16911fa08..40ab3b3abffe5743acc28dbef741c5f354ca667a 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectLibraryMapper.xml +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectLibraryMapper.xml @@ -90,6 +90,7 @@ <select id="queryProjectLibraryPage" resultType="com.seasky.projectplan.dto.projectlibrary.ProjectLibraryOut"> select pl.id projectLibraryID,pl.year, ppb.id id, pl.plan_money planMoney,pl.project_name projectName, ppb.department_code departmentCode,ppb.department_name departmentName, + ppb.summary_json as summaryJson, ppb.project_type projectType,ppb.identification,ppb.total_money totalMoney, ppb.project_leader_id projectLeaderId,ppb.project_leader_name projectLeaderName,ppb.project_leader_code projectLeaderCode, ppb.plan_type planType,ppb.state,ppb.identification,ppb.project_state, diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/QuotaManageMapper.xml b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/QuotaManageMapper.xml index 72ebc6fae888b768e532e490b8f3dcabc370979f..f3a68b21bd0adbee1535200c17bcd4d0fc45a412 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/QuotaManageMapper.xml +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/QuotaManageMapper.xml @@ -164,7 +164,7 @@ and dept_name = #{pm.deptName} </if> <if test="pm.projectTypeName != null and pm.projectTypeName != ''"> - and project_type_name like concat('%',#{pm.projectTypeName}.'%') + and project_type_name like concat('%',#{pm.projectTypeName},'%') </if> <if test="pm.projectName != null and pm.projectName != ''"> and project_name like concat('%',#{pm.projectName},'%') diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java index 2400eaa5cad3da63d0597f90b93c68faf9b48931..30ed10c6299fce75d63aeb0199397dcc60601ef1 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java @@ -1,5 +1,6 @@ package com.seasky.projectplan.infrastructure.reader.projectlibrary; +import cn.hutool.core.util.NumberUtil; import cn.hutool.system.SystemUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -335,6 +336,13 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { } List<ProjectLibraryOut> list = projectLibraryMapper.queryProjectLibraryPage(qry); for (ProjectLibraryOut projectLibraryOut : list) { + JSONObject jsonObject1 = JSON.parseObject(projectLibraryOut.getSummaryJson()); + String downMoney1 = jsonObject1.getString("downMoney"); + if (ObjectUtils.isEmpty(downMoney1)){ + projectLibraryOut.setQuotaMoney(BigDecimal.ZERO); + }else { + projectLibraryOut.setQuotaMoney(new BigDecimal(downMoney1)); + } String valByKey = ""; if (projectLibraryOut.getIdentification() == 0) { valByKey = ProjectLevelEnum.getValByKey(String.valueOf(Integer.parseInt(projectLibraryOut.getLevel()) + 1));