Browse Source

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

anderx 3 years ago
parent
commit
2032ee1dfe

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

@@ -1978,7 +1978,8 @@
   <select id="selectProjectSotpList" resultType="com.goafanti.order.bo.OutselectProjectSotp">
     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
+    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
     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

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

@@ -27,10 +27,17 @@ public class OutselectProjectSotp {
      */
     private Integer stopStatus;
     private Integer tid;
-    /**
-     * 项目暂停状态 0否 1已发起
-     */
+
     private Integer projectStopStatus;
+    private Integer projectstopType;
+
+    public Integer getProjectstopType() {
+        return projectstopType;
+    }
+
+    public void setProjectstopType(Integer projectstopType) {
+        this.projectstopType = projectstopType;
+    }
 
     public Integer getTid() {
         return tid;