Browse Source

暂停项目导出修改

anderx 10 months ago
parent
commit
3cccf76828

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

@@ -3009,10 +3009,10 @@ progress_tid = values(progress_tid)
         where split_super = #{tid}
     </select>
 
-    <select id="selectProjectSotpList" resultType="com.goafanti.order.bo.OutselectProjectSotp">
+    <select id="selectProjectStopList" 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,
+        tom.service_type serviceType , b.receiver_name receiverName ,b.status ,b.commodity_price commodityPrice ,a.reason,a.id,b.id tid,tom.salesman_name salesmanName,
         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
@@ -3077,7 +3077,7 @@ progress_tid = values(progress_tid)
         </if>
     </select>
 
-    <select id="selectProjectSotpCount" resultType="java.lang.Integer">
+    <select id="selectProjectStopCount" resultType="java.lang.Integer">
         select count(*)
         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

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

@@ -15,6 +15,7 @@ public class OutselectProjectSotp {
     private String projectName;
     private Integer commodityQuantity;
     private String serviceType;
+    private String salesmanName;
     private String receiverName;
     private Integer status;
     private BigDecimal commodityPrice;
@@ -31,6 +32,14 @@ public class OutselectProjectSotp {
     private Integer projectStopStatus;
     private Integer projectStopType;
 
+    public String getSalesmanName() {
+        return salesmanName;
+    }
+
+    public void setSalesmanName(String salesmanName) {
+        this.salesmanName = salesmanName;
+    }
+
     public Integer getProjectStopType() {
         return projectStopType;
     }

+ 11 - 0
src/main/java/com/goafanti/order/bo/OutselectProjectSotpBo.java

@@ -24,6 +24,8 @@ public class OutselectProjectSotpBo extends  OutselectProjectSotp{
     private Integer commodityQuantity;
     @Excel(name = "服务类型")
     private String serviceType;
+    @Excel(name = "营销员")
+    private String salesmanName;
     @Excel(name = "咨询师/咨询师经理")
     private String receiverName;
     @Excel(name = "项目状态")
@@ -36,6 +38,15 @@ public class OutselectProjectSotpBo extends  OutselectProjectSotp{
     private Integer stopType;
     private Integer stopStatus;
 
+
+    public String getSalesmanName() {
+        return salesmanName;
+    }
+
+    public void setSalesmanName(String salesmanName) {
+        this.salesmanName = salesmanName;
+    }
+
     @Override
     public Integer getStopType() {
         return stopType;

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

@@ -2010,7 +2010,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			return new Pagination<>();
 		}
 
-		return findPage("selectProjectSotpList","selectProjectSotpCount",params,pageNo,pageSize);
+		return findPage("selectProjectStopList","selectProjectStopCount",params,pageNo,pageSize);
 	}
 
 	@Override