Browse Source

完成暂停或者重启时,修改成对所有项目做判断

anderx 3 years ago
parent
commit
28e14a634d

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

@@ -1979,7 +1979,7 @@
     select DATE_FORMAT(a.create_time,'%Y-%m-%d %H:%i:%S') createTimes,dg.name province,c.contract_no contractNo, a.type stopType,a.status stopStatus,
     c.order_no orderNo ,tom.buyer_name userName,b.cname ,b.commodity_name projectName,b.commodity_quantity commodityQuantity ,a.annex_url annexUrl,
     tom.service_type serviceType , b.receiver_name receiverName ,b.status ,b.commodity_price commodityPrice ,a.reason,a.id,b.id tid,
-    ,ttm.stop_status projectStopStatus ttm.stop_type projectstopType
+    ttm.stop_status projectStopStatus, ttm.stop_type projectStopType
     from task_stop a left join t_order_task b on a.tid=b.id
     left join t_order_new  c on b.order_no =c.order_no
     left join t_task_mid ttm on b.id=ttm.tid

+ 5 - 5
src/main/java/com/goafanti/order/bo/OutselectProjectSotp.java

@@ -29,14 +29,14 @@ public class OutselectProjectSotp {
     private Integer tid;
 
     private Integer projectStopStatus;
-    private Integer projectstopType;
+    private Integer projectStopType;
 
-    public Integer getProjectstopType() {
-        return projectstopType;
+    public Integer getProjectStopType() {
+        return projectStopType;
     }
 
-    public void setProjectstopType(Integer projectstopType) {
-        this.projectstopType = projectstopType;
+    public void setProjectStopType(Integer projectStopType) {
+        this.projectStopType = projectStopType;
     }
 
     public Integer getTid() {