Selaa lähdekoodia

Merge branch 'test' of jishutao/kede-server into prod

gitadmin 4 vuotta sitten
vanhempi
commit
aa34bfbfe9

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

@@ -1649,7 +1649,7 @@ date_format(e.create_time ,'%Y-%m-%d')creteTime
   <select id="selectProjectStatisticsListByPage" resultType="com.goafanti.order.bo.OutProjectStatistics">
 	select  date_format( a.task_distribution_time, '%Y-%m-%d %H:%i:%S' ) distributionTime ,d.name province  ,c.name depName,e.salesman_name salesmanName,
 	b.contract_no contractNo ,b.order_no orderNo ,e.buyer_name userName,bc.cname ,a.commodity_name pname,ta.name techName,td.name techDepName,
-	a.status projectStatus,a.id,
+	a.project_status projectStatus,a.id,
 	<if test="status==1">
 	a.set_up_status setUpStatus , date_format( a.set_up_time , '%Y-%m-%d' ) setUpTime ,a.spot_check_status spotCheckStatus ,b.contact_mobile contactMobile ,
 	 b.legal_person_tel legalPersonTel , a.certificate_number certificateNumber,a.declaration_batch declarationBatch,
@@ -1696,13 +1696,13 @@ date_format(e.create_time ,'%Y-%m-%d')creteTime
 	right join (select tid ,apply_count sqs,reject_count bhs,certificates_count xzs from t_task_mid 
 	where apply_count &gt; 0)tj on a.id=tj.tid
 	</if>
-	where a.split_status in (0,2) and a.task_status in (1,2,3)
+	where a.split_status in (0,2) 
 	<!--  筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 -->
 	<if test="screen ==0">
-	and a.status in(0,1,2,3,5)
+	and a.project_status in(1,2,3)
 	</if>
 	<if test="screen ==2">
-	and a.status in(4,6)
+	and a.project_status &gt; 3
 	</if>	
 	<if test="screen ==3">
 	and a.set_up_status =1
@@ -1790,13 +1790,13 @@ date_format(e.create_time ,'%Y-%m-%d')creteTime
 	right join (select tid ,apply_count sqs,reject_count bhs,certificates_count xzs from t_task_mid 
 	where apply_count &gt; 0)tj on a.id=tj.tid
 	</if>
-	where a.split_status in (0,2) and a.task_status in (1,2,3)
+	where a.split_status in (0,2) 
 	<!--  筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 -->
 	<if test="screen ==0">
-	and a.status in(0,1,2,3,5)
+	and a.project_status in(1,2,3)
 	</if>
 	<if test="screen ==2">
-	and a.status in(4,6)
+	and a.project_status &gt; 3
 	</if>	
 	<if test="screen ==3">
 	and a.set_up_status =1
@@ -1918,7 +1918,7 @@ date_format(e.create_time ,'%Y-%m-%d')creteTime
 	left join (select id,commodity_quantity cq from t_order_task where project_status &gt; 3)wcs on a.id=wcs.id
 	left join (select id,commodity_quantity cq from t_order_task where  if_publicity=1)gss on a.id=gss.id
 	</if>
-	where  b.order_dep is not null and a.split_status in(0,2) and a.task_status in (1,2,3)
+	where a.split_status in(0,2)
 	<if test="startDate != null and endDate != null">
   	and a.task_distribution_time between #{startDate} and #{endDate}
   	</if>
@@ -1950,7 +1950,7 @@ left join department de on x.department_id=de.id left join business_category bc
 	from t_order_task a left join t_order_new b on a.order_no =b.order_no left join t_task_mid ttm on a.id=ttm.tid 
 	left join department dep on b.order_dep =dep.id  left join admin ad on a.task_receiver =ad.id
 	left join business_project bp on a.commodity_id =bp.id 
-	where  b.order_dep is not null  and a.split_status in(0,2) and a.task_status in (1,2,3)
+	where   a.split_status in(0,2) 
 	<if test="startDate != null and endDate != null">
   	and a.task_distribution_time between #{startDate} and #{endDate}
   	</if>

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

@@ -30,7 +30,7 @@ import com.goafanti.order.bo.InputProjectStatistics;
 import com.goafanti.order.bo.InputProvincialStatistics;
 import com.goafanti.order.bo.OutProjectStatistics;
 import com.goafanti.order.bo.OutProvincialStatistics;
-import com.goafanti.order.enums.ProjectType;
+import com.goafanti.order.enums.NewProjectStatus;
 import com.goafanti.order.service.ProjectStatisticsService;
 
 @Service
@@ -144,7 +144,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
     				case "项目名称": o = ob.getPname(); break;
     				case "负责部门": o = ob.getTechDepName(); break;
     				case "咨询师/咨询经理": o = ob.getTechName(); break;
-    				case "项目状态": o = ProjectType.getValueByCode(ob.getProjectStatus()); break;
+    				case "项目状态": o = NewProjectStatus.getValueByCode(ob.getProjectStatus()); break;
     				
     				//是否立项 立项时间 是否抽查 联系人电话 法人电话 证书编号 申报批次
     				case "是否立项": o = ob.getSetUpStatus()==null?"":ob.getSetUpStatus()==1?"是":"否"; break;

+ 6 - 6
src/main/resources/props/config_local.properties

@@ -2,13 +2,13 @@ dev.name=local
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-•#
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft20210528?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+•#
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -60,7 +60,7 @@ user.private.max=1000
 #客户释放提醒
 user_remind_days=15
 
-static.host=//static.jishutao.com/1.1.78
+static.host=//static.jishutao.com/1.1.79
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload