Browse Source

修改列表参数

anderx 3 years ago
parent
commit
25f4a134a8

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

@@ -1975,9 +1975,9 @@
   </select>
 
   <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 sotpType,a.status sotpStatus,
+    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 projectSotpStatus
+    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
     from task_sopt 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

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

@@ -20,17 +20,17 @@ public class OutselectProjectSotp {
     private BigDecimal commodityPrice;
     private String reason;
     private String annexUrl;
-    private Integer sotpType;
+    private Integer stopType;
 
     /**
      *  审核状态 0=发起,1=通过,2=拒绝
      */
-    private Integer sotpStatus;
+    private Integer stopStatus;
     private Integer tid;
     /**
      * 项目暂停状态 0否 1已发起
      */
-    private Integer projectSotpStatus;
+    private Integer projectStopStatus;
 
     public Integer getTid() {
         return tid;
@@ -40,13 +40,7 @@ public class OutselectProjectSotp {
         this.tid = tid;
     }
 
-    public Integer getProjectSotpStatus() {
-        return projectSotpStatus;
-    }
 
-    public void setProjectSotpStatus(Integer projectSotpStatus) {
-        this.projectSotpStatus = projectSotpStatus;
-    }
 
     public Long getId() {
         return id;
@@ -64,20 +58,28 @@ public class OutselectProjectSotp {
         this.annexUrl = annexUrl;
     }
 
-    public Integer getSotpStatus() {
-        return sotpStatus;
+    public Integer getStopType() {
+        return stopType;
+    }
+
+    public void setStopType(Integer stopType) {
+        this.stopType = stopType;
+    }
+
+    public Integer getStopStatus() {
+        return stopStatus;
     }
 
-    public void setSotpStatus(Integer sotpStatus) {
-        this.sotpStatus = sotpStatus;
+    public void setStopStatus(Integer stopStatus) {
+        this.stopStatus = stopStatus;
     }
 
-    public Integer getSotpType() {
-        return sotpType;
+    public Integer getProjectStopStatus() {
+        return projectStopStatus;
     }
 
-    public void setSotpType(Integer sotpType) {
-        this.sotpType = sotpType;
+    public void setProjectStopStatus(Integer projectStopStatus) {
+        this.projectStopStatus = projectStopStatus;
     }
 
     public String getCreateTimes() {

+ 21 - 20
src/main/java/com/goafanti/order/bo/OutselectProjectSotpBo.java

@@ -33,9 +33,28 @@ public class OutselectProjectSotpBo extends  OutselectProjectSotp{
     private BigDecimal commodityPrice;
     @Excel(name = "原因")
     private String reason;
-    private Integer sotpType;
-    private Integer sotpStatus;
+    private Integer stopType;
+    private Integer stopStatus;
 
+    @Override
+    public Integer getStopType() {
+        return stopType;
+    }
+
+    @Override
+    public void setStopType(Integer stopType) {
+        this.stopType = stopType;
+    }
+
+    @Override
+    public Integer getStopStatus() {
+        return stopStatus;
+    }
+
+    @Override
+    public void setStopStatus(Integer stopStatus) {
+        this.stopStatus = stopStatus;
+    }
 
     public String getStatusName() {
         return statusName;
@@ -175,23 +194,5 @@ public class OutselectProjectSotpBo extends  OutselectProjectSotp{
         this.reason = reason;
     }
 
-    @Override
-    public Integer getSotpType() {
-        return sotpType;
-    }
-
-    @Override
-    public void setSotpType(Integer sotpType) {
-        this.sotpType = sotpType;
-    }
 
-    @Override
-    public Integer getSotpStatus() {
-        return sotpStatus;
-    }
-
-    @Override
-    public void setSotpStatus(Integer sotpStatus) {
-        this.sotpStatus = sotpStatus;
-    }
 }

+ 5 - 5
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -737,16 +737,16 @@ public class OrderProjectApiController extends CertifyApiController {
 				OutselectProjectSotpBo o = new OutselectProjectSotpBo();
 				BeanUtils.copyProperties(use,o);
 				StringBuffer str =new StringBuffer();
-				if (o.getSotpStatus()==0){
+				if (o.getStopStatus()==0){
 					str=str.append("已发起");
-				}else if (o.getSotpStatus()==1){
+				}else if (o.getStopStatus()==1){
 					str=str.append("已完成");
-				}else if (o.getSotpStatus()==2){
+				}else if (o.getStopStatus()==2){
 					str=str.append("已拒绝");
 				}
-				if (o.getSotpType()==0){
+				if (o.getStopType()==0){
 					str=str.append("暂停");
-				}else if (o.getSotpStatus()==1){
+				}else if (o.getStopStatus()==1){
 					str=str.append("重启");
 				}
 				o.setStatusName(str.toString());