Browse Source

项目汇总列表新增筛选与列表字段

anderx 3 weeks ago
parent
commit
17fa268323

+ 12 - 0
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -2382,6 +2382,12 @@
         <if test=" projectAmount == 9">
             and a.commodity_price &gt;=  #{amountStart}
         </if>
+        <if test="nda !=null">
+            and b.nda = #{nda}
+        </if>
+        <if test="breachClause !=null">
+            and b.breach_clause = #{breachClause}
+        </if>
         <if test="page_sql!=null">
             ${page_sql}
         </if>
@@ -2534,6 +2540,12 @@
         <if test=" projectAmount == 9">
             and a.commodity_price &gt;=  #{amountStart}
         </if>
+        <if test="nda !=null">
+            and b.nda = #{nda}
+        </if>
+        <if test="breachClause !=null">
+            and b.breach_clause = #{breachClause}
+        </if>
     </select>
 
     <select id="selectProvincialStatisticsListByPage" resultType="com.goafanti.order.bo.OutProvincialStatistics">

+ 2 - 0
src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java

@@ -92,6 +92,8 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 		if(ps.getProjectId()!=null) params.put("projectId", ps.getProjectId());
 		if(ps.getScreen()!=null) params.put("screen", ps.getScreen());
 		if (ps.getSdStatus()!=null)params.put("sdStatus",ps.getSdStatus());
+		if(ps.getNda()!=null)params.put("nda", ps.getNda());
+		if(ps.getBreachClause()!=null)params.put("breachClause", ps.getBreachClause());
 		if(ps.getPageNo()!=null)pageNo=ps.getPageNo();
 		if(ps.getPageSize()!=null)pageSize=ps.getPageSize();
 		Pagination<OutProjectStatistics> p = (Pagination<OutProjectStatistics>)findPage("selectProjectStatisticsListByPage",