diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java index 67ab828c..0e0c2bfe 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java @@ -98,4 +98,8 @@ public class SpecialProjectPreDesign extends BaseEntity @TableField(exist = false) private String adcd; + + @TableField(exist = false) + private String status; + } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java index 614b8771..00f62de1 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java @@ -36,5 +36,6 @@ public interface SpecialProjectPreDesignMapper extends BaseMapper listProject(@Param("adcd") String subString, @Param("projectName") String projectName, + @Param("status") String status, Page page); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java index feba04ed..774e24a4 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java @@ -73,6 +73,7 @@ public class SpecialProjectPreDesignService extends BaseService page=specialProjectPreDesignMapper.listProject(sysXzqhService.getSubString(data.getAdcd()), data.getProjectName(), + data.getStatus(), new Page<>(sp.getPageNum(), sp.getPageSize())); diff --git a/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdEnterpriseInfo.java b/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdEnterpriseInfo.java index b677a3d8..9ea9d63f 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdEnterpriseInfo.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdEnterpriseInfo.java @@ -186,4 +186,7 @@ public class BsSgcYxjdEnterpriseInfo extends BaseEntity private String proCode; + @TableField(exist = false) + private String status; + } diff --git a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java index 0eacac03..5ded1c51 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java @@ -42,6 +42,7 @@ public interface BsSgcYxjdEnterpriseInfoMapper extends BaseMapper listProject(@Param("adcd") String subString, @Param("enterpriseName") String enterpriseName, + @Param("status") String status, Page page); } diff --git a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java index 1f279f2f..6029c794 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java @@ -161,7 +161,8 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService page=bsSgcYxjdEnterpriseInfoMapper.listProject(sysXzqhService.getSubString(data.getAdcd()), data.getEnterpriseName(), + IPage page=bsSgcYxjdEnterpriseInfoMapper.listProject(sysXzqhService.getSubString(data.getAdcd()), + data.getEnterpriseName(),data.getStatus(), new Page<>(sp.getPageNum(), sp.getPageSize())); diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml index 3ea4dfb9..a349492d 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml @@ -103,8 +103,19 @@ 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 - where pi.pro_code in (SELECT DISTINCT PROJECT_CODE - FROM bs_slgc_qqjd_pro_bid_result ) and pi.pro_no in (SELECT DISTINCT PRO_NO - FROM bs_slgc_qqjd_pro_bid_result ) + + pi.pro_code in (SELECT DISTINCT PROJECT_CODE + FROM bs_slgc_qqjd_pro_bid_result ) and pi.pro_no in (SELECT DISTINCT PRO_NO + FROM bs_slgc_qqjd_pro_bid_result ) + + and adcd like concat(#{adcd},'%') + + + and project_name like concat('%',#{projectName},'%') + + + and status=#{status} + + diff --git a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml index 36250bdf..b206171a 100644 --- a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml @@ -116,15 +116,19 @@