anderx 5 years ago
parent
commit
212b4b8fd6

+ 10 - 4
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1885,8 +1885,11 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	<if test="projectSituation !=null">
 	and a.status = #{projectSituation}
 	</if>
-	<if test="amountStart !=null and amountEnd != null">
-	and a.commodity_price between #{amountStart} and #{amountEnd}
+	<if test=" projectAmount !=null and projectAmount != 9">
+	and a.commodity_price &gt;=  #{amountStart} and  a.commodity_price &lt;  #{amountEnd}
+	</if>
+	<if test=" projectAmount == 9">
+	and a.commodity_price &gt;=  #{amountStart} 
 	</if>
   	<if test="page_sql!=null">
 			${page_sql}
@@ -1926,8 +1929,11 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	<if test="declarationBatch !=null">
 	and a.declaration_batch = #{declarationBatch}
 	</if>
-	<if test="amountStart !=null and amountEnd != null">
-	and a.commodity_price between #{amountStart} and #{amountEnd}
+	<if test=" projectAmount !=null and projectAmount != 9">
+	and a.commodity_price &gt;=  #{amountStart} and  a.commodity_price &lt;  #{amountEnd}
+	</if>
+	<if test=" projectAmount == 9">
+	and a.commodity_price &gt;=  #{amountStart} 
 	</if>
   </select>
   

+ 6 - 4
src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java

@@ -53,6 +53,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 		if(ps.getDeclarationBatch()!=null)params.put("declarationBatch", ps.getDeclarationBatch());
 		if(ps.getProjectSituation()!=null)params.put("projectSituation", ps.getProjectSituation());
 		if(ps.getProjectAmount()!=null) {
+			
 			// 0~0.5万、0.5~1万、1~2万、2~5万、5~10万、10~30万、30~50万、50到80万、80万上
 			double s = 0,e=0;
 			if (ps.getProjectAmount()==0) { s=0;e=0.5;
@@ -64,8 +65,9 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 			}else if (ps.getProjectAmount()==6) {s=10;e=30;
 			}else if (ps.getProjectAmount()==7) {s=30;e=50;
 			}else if (ps.getProjectAmount()==8) {s=50;e=80;
-			}else if (ps.getProjectAmount()==9) {s=80;e=9999;
+			}else if (ps.getProjectAmount()==9) {s=80;
 			}
+			params.put("projectAmount", ps.getProjectAmount());
 			params.put("amountStart", s);
 			params.put("amountEnd", e);
 		}
@@ -323,9 +325,9 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
     				case "抽查数": o = ob.getSpotCheckCount().toString(); break;
     				case "未通过": o = ob.getFailedCount().toString(); break;
     				//受理数 完结数 授权数 驳回数
-    				case "受理数": o = ob.getFailedCount().toString(); break;
-    				case "完结数": o = ob.getFailedCount().toString(); break;
-    				case "授权数": o = ob.getFailedCount().toString(); break;
+    				case "受理数": o = ob.getAcceptCount().toString(); break;
+    				case "完结数": o = ob.getCompleteCount().toString(); break;
+    				case "授权数": o = ob.getAuthorizeCount().toString(); break;
     				case "驳回数": o = ob.getRejectCount().toString(); break;
     				//下证数
     				case "下证数": o = ob.getCertificatesCount().toString(); break;