Browse Source

导出BUG修复

anderx 6 years ago
parent
commit
acf08077f5

+ 7 - 12
src/main/java/com/goafanti/common/mapper/TaskProgressMapper.xml

@@ -295,19 +295,14 @@ order by a.create_time
 	where task_id=  #{id,jdbcType=INTEGER}
   </select>
   <select id="selectMyTaskList" resultType="com.goafanti.order.bo.TOrderTaskListBo">
- 	  select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,
+ 	    	    select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,
     a.project_status as projectStatus,a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
-    a.commodity_quantity as commodityQuantity,f.nickname as userName,h.name as depName,ifnull(i.alreadyNumber,0)as alreadyNumber
-    from t_task_log x left join  t_order_task a on x.task_id=a.id 
-  	left join business_project b on a.commodity_id=b.id
-  	left join business_category c on b.cid=c.id
-    left join admin d on a.task_receiver=d.id
-    left join t_order_new e on a.order_no=e.order_no
-    left join user f on e.buyer_id=f.id
-    left join department h on e.order_dep=h.id
-    left join (select task_id , sum(already_number) as alreadyNumber from task_progress group by task_id) i on a.id=i.task_id
-    where e.delete_sign=0 
-    and x.task_receiver= #{aid,jdbcType=VARCHAR}
+    a.commodity_quantity as commodityQuantity,ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName
+  	from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id 
+  	left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
+    left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress 
+    group by task_id) i on a.id=i.task_id where e.delete_sign=0  and e.order_status not in (5,7)
+    and a.task_receiver= #{aid,jdbcType=VARCHAR}
     order by a.task_distribution_time desc 
   </select>
 </mapper>

+ 1 - 1
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -514,7 +514,7 @@ public class ExportExcelUtil {
 					case "订单编号": o = ob.getOrderNo();setWidth(sheet, i, o,1); break;
 					case "业务别类": o = ob.getCname();setWidth(sheet, i, o,2);break;
 					case "客户名称(软著数/下证数)":  
-						if(null!=ob.getTaskName()&&ob.getTaskName().contains("软著")){
+						if(null!=ob.getTaskName()&&ob.getTaskName().contains("软作权")){
 							o =ob.getUserName()+"("+ob.getCommodityQuantity()+"/"+ob.getAlreadyNumber()+")";
 						}else {
 							o = ob.getUserName();