Browse Source

暂停项目导出修改

anderx 10 months ago
parent
commit
cd547b613f

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

@@ -3009,7 +3009,7 @@ progress_tid = values(progress_tid)
         where split_super = #{tid}
     </select>
 
-    <select id="selectProjectStopList" resultType="com.goafanti.order.bo.OutselectProjectSotp">
+    <select id="selectProjectStopList" resultType="com.goafanti.order.bo.OutSelectProjectStop">
         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.salesman_name salesmanName,

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

@@ -3,7 +3,7 @@ package com.goafanti.order.bo;
 
 import java.math.BigDecimal;
 
-public class OutselectProjectSotp {
+public class OutSelectProjectStop {
 
     private Long id;
     private String createTimes;

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

@@ -4,7 +4,7 @@ import com.goafanti.common.utils.excel.Excel;
 
 import java.math.BigDecimal;
 
-public class OutselectProjectSotpBo extends  OutselectProjectSotp{
+public class OutSelectProjectStopBo extends  OutSelectProjectStop{
 
     @Excel(name = "时间")
     private String createTimes;

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

@@ -747,13 +747,13 @@ public class OrderProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/selectProjectStop/export" ,method = RequestMethod.GET)
 	public Result selectProjectStopExport(String orderNo,String userName,String depId,String contractNo, String projectName,Integer status,
 									String startTime, String endTime, String receiverId,Integer shiroType, Integer pageNo,Integer pageSize){
-		NewExcelUtil newExcelUtil=new NewExcelUtil(OutselectProjectSotpBo.class);
+		NewExcelUtil newExcelUtil=new NewExcelUtil(OutSelectProjectStopBo.class);
 		Pagination<?> p = orderProjectService.selectProjectStop(orderNo, userName, depId, contractNo,
 				projectName, status, startTime, endTime, receiverId, shiroType, pageNo, pageSize);
-		List<OutselectProjectSotp> list = (List<OutselectProjectSotp>) p.getList();
-		List<OutselectProjectSotpBo> list2=new ArrayList<>();
-			for (OutselectProjectSotp use : list) {
-				OutselectProjectSotpBo o = new OutselectProjectSotpBo();
+		List<OutSelectProjectStop> list = (List<OutSelectProjectStop>) p.getList();
+		List<OutSelectProjectStopBo> list2=new ArrayList<>();
+			for (OutSelectProjectStop use : list) {
+				OutSelectProjectStopBo o = new OutSelectProjectStopBo();
 				BeanUtils.copyProperties(use,o);
 				StringBuilder str =new StringBuilder();
 				if (o.getStopStatus()==0){