diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectQry.java index ebde74c..c12baf4 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectQry.java @@ -56,7 +56,7 @@ public class KeyProjectQry implements Serializable { private LocalDate planWorkEndDate; @ApiModelProperty(value = "创建单位id") - private Integer corpinfoId; + private Long corpinfoId; @ApiModelProperty(value = "创建单位名称") private String corpinfName; diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml index bc45320..23ccc66 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml @@ -289,68 +289,68 @@ kp.delete_enum = 'FALSE' - - AND kp.project_name LIKE CONCAT('%', #{params.projectName}, '%') + + AND kp.project_name LIKE CONCAT('%', #{projectName}, '%') - - AND kp.jurisdiction_corpinfo_id = #{params.jurisdictionCorpinfoId} + + AND kp.jurisdiction_corpinfo_id = #{jurisdictionCorpinfoId} - - AND kp.jurisdiction_department_id = #{params.jurisdictionDepartmentId} + + AND kp.jurisdiction_department_id = #{jurisdictionDepartmentId} - - AND kp.jurisdiction_user_id = #{params.jurisdictionUserId} + + AND kp.jurisdiction_user_id = #{jurisdictionUserId} - - AND kp.xgf_corpinfo_id = #{params.xgfCorpinfoId} + + AND kp.xgf_corpinfo_id = #{xgfCorpinfoId} - - AND xgfci.corp_name LIKE CONCAT('%', #{params.xgfCorpinfoName}, '%') + + AND xgfci.corp_name LIKE CONCAT('%', #{xgfCorpinfoName}, '%') - - AND cp.corp_name LIKE CONCAT('%', #{params.corpinfName}, '%') + + AND cp.corp_name LIKE CONCAT('%', #{corpinfName}, '%') - - AND kp.xgf_master_user_id = #{params.xgfMasterUserId} + + AND kp.xgf_master_user_id = #{xgfMasterUserId} - - AND kp.master_department_id = #{params.masterDepartmentId} + + AND kp.master_department_id = #{masterDepartmentId} - - AND kp.apply_status = #{params.applyStatus} + + AND kp.apply_status = #{applyStatus} - + AND kp.apply_status IN - + #{status} - - AND kp.plan_work_start_date #{params.planWorkStartDate} + + AND kp.plan_work_start_date #{planWorkStartDate} - - AND kp.plan_work_end_date = ]]> #{params.planWorkEndDate} + + AND kp.plan_work_end_date = ]]> #{planWorkEndDate} - - AND kp.corpinfo_id = #{params.corpinfoId} + + AND kp.corpinfo_id = #{corpinfoId} - - AND kp.project_type = #{params.projectType} + + AND kp.project_type = #{projectType} GROUP BY kp.key_project_id