项目统计指标开发

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

jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java

@@ -36,5 +36,6 @@ public interface SpecialProjectPreDesignMapper extends BaseMapper<SpecialProject
 
     IPage<SpecialProjectPreDesign> listProject(@Param("adcd") String subString,
                                                @Param("projectName") String projectName,
+                                               @Param("status") String status,
                                                Page page);
 }

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java

@@ -73,6 +73,7 @@ public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPr
 
 
         IPage<SpecialProjectPreDesign> page=specialProjectPreDesignMapper.listProject(sysXzqhService.getSubString(data.getAdcd()), data.getProjectName(),
+                data.getStatus(),
                 new Page<>(sp.getPageNum(), sp.getPageSize()));
 
 

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

jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java

@@ -42,6 +42,7 @@ public interface BsSgcYxjdEnterpriseInfoMapper extends BaseMapper<BsSgcYxjdEnter
 
     IPage<BsSgcYxjdEnterpriseInfo> listProject(@Param("adcd") String subString,
                                                @Param("enterpriseName") String enterpriseName,
+                                               @Param("status") String status,
                                                Page page);
 
 }

jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java

@@ -161,7 +161,8 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
         BsSgcYxjdEnterpriseInfo data = sp.getData();
 
 
-        IPage<BsSgcYxjdEnterpriseInfo> page=bsSgcYxjdEnterpriseInfoMapper.listProject(sysXzqhService.getSubString(data.getAdcd()), data.getEnterpriseName(),
+        IPage<BsSgcYxjdEnterpriseInfo> page=bsSgcYxjdEnterpriseInfoMapper.listProject(sysXzqhService.getSubString(data.getAdcd()),
+                data.getEnterpriseName(),data.getStatus(),
                 new Page<>(sp.getPageNum(), sp.getPageSize()));
 
 

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
+        <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 )
+            <if test="adcd!=null and adcd !=''">
+                and adcd like concat(#{adcd},'%')
+            </if>
+            <if test="projectName!=null and projectName!=''">
+                and project_name like concat('%',#{projectName},'%')
+            </if>
+            <if test="status!=null and status!=''">
+                and status=#{status}
+            </if>
+        </where>
     </select>
 </mapper>

jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml

@@ -116,15 +116,19 @@
 
     </select>
     <select id="listProject" resultMap="EnterpriseInfo">
-        select * from bs_sgc_yxjd_enterprise_info
+        select * from bs_sgc_yxjd_enterprise_info ei left join sys_user_enterprise su on ei.id=su.enterprise_id
         <where>
 
             <if test="enterpriseName!=null and enterpriseName!=''">
-                and enterprise_name like concat('%',#{enterpriseName},'%')
+                and ei.enterprise_name like concat('%',#{enterpriseName},'%')
             </if>
             <if test="adcd!=null and adcd !=''">
-                and adcd like concat(#{adcd},'%')
+                and ei.adcd like concat(#{adcd},'%')
             </if>
+            <if test="status!=null and status!=''">
+                and su.status=#{status}
+            </if>
+
         </where>
         order by ${orderBy} desc
     </select>