anderx 5 years ago
parent
commit
7857e3a1f5

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

@@ -1912,7 +1912,7 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	and td.id= #{thchDepId}
   	</if>
   	<if test="projectStatus !=null">
-	and bc.id= #{projectStatus}
+	and bp.cid= #{projectStatus}
   	</if>
   	<if test="projectType !=null">
 	and bp.type= #{projectType}
@@ -1929,6 +1929,9 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	<if test="declarationBatch !=null">
 	and a.declaration_batch = #{declarationBatch}
 	</if>
+	<if test="projectSituation !=null">
+	and a.status = #{projectSituation}
+	</if>
 	<if test=" projectAmount !=null and projectAmount != 9">
 	and a.commodity_price &gt;=  #{amountStart} and  a.commodity_price &lt;  #{amountEnd}
 	</if>

+ 3 - 3
src/main/java/com/goafanti/order/bo/OutProjectStatistics.java

@@ -23,7 +23,7 @@ public class OutProjectStatistics {
 	private Integer  setUpStatus;
 	private Integer  highTechstatus;
 	private String setUpTime;
-	private String  spotCheckStatus;
+	private Integer  spotCheckStatus;
 	private String  contactMobile;
 	private String  legalPersonTel;
 	private String  certificateNumber;
@@ -70,10 +70,10 @@ public class OutProjectStatistics {
 	public void setSetUpTime(String setUpTime) {
 		this.setUpTime = setUpTime;
 	}
-	public String getSpotCheckStatus() {
+	public Integer getSpotCheckStatus() {
 		return spotCheckStatus;
 	}
-	public void setSpotCheckStatus(String spotCheckStatus) {
+	public void setSpotCheckStatus(Integer spotCheckStatus) {
 		this.spotCheckStatus = spotCheckStatus;
 	}
 	public String getContactMobile() {

+ 7 - 1
src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java

@@ -145,7 +145,13 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
     				//是否立项 立项时间 是否抽查 联系人电话 法人电话 证书编号 申报批次
     				case "是否立项": o = ob.getSetUpStatus()==null?"":ob.getSetUpStatus()==1?"是":"否"; break;
     				case "立项时间": o = ob.getSetUpTime(); break;
-    				case "是否抽查": o = ob.getSpotCheckStatus(); break;
+    				case "是否抽查": 
+    					//是否抽查 0否 1未通过 2通过
+    					if (ob.getSpotCheckStatus()==null) o="";
+    					if (ob.getSpotCheckStatus()==0) o="否";
+    					if (ob.getSpotCheckStatus()==1) o="未通过";
+    					if (ob.getSpotCheckStatus()==2) o="通过";
+    					break;
     				case "联系人电话": o = ob.getContactMobile(); break;
     				case "法人电话": o = ob.getLegalPersonTel(); break;
     				case "证书编号": o = ob.getCertificateNumber(); break;