Browse Source

修改导出,其他改为导出其他加括号里显示说明

anderx 1 year ago
parent
commit
ae9b21931c

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

@@ -1344,7 +1344,8 @@
     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,
-    a.split_status splitStatus,a.split_super splitSuper, a.split_id splitId,ttm.contract_term contractTerm,ttm.service_year serviceYear
+    a.split_status splitStatus,a.split_super splitSuper, a.split_id splitId,ttm.contract_term contractTerm,ttm.service_year serviceYear,
+    toa.type as type,toa.type_explain as typeExplain
     from (select task_id from t_task_log a where task_receiver=#{aid ,jdbcType=VARCHAR} UNION select task_id from t_task_log a
     where task_allocator=#{aid ,jdbcType=VARCHAR}) 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

+ 4 - 2
src/main/java/com/goafanti/order/controller/AdminOrderReceivablesApiController.java

@@ -215,10 +215,12 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
 		for (OrderListBo e : list) {
 			if (e.getType()!=null){
 				String[] split = e.getType().split(",");
-				StringBuffer str=new StringBuffer();
+				StringBuilder str=new StringBuilder();
 				for (String s : split) {
 					if (s.equals("0")){
-						str.append(e.getTypeExplain()).append(",");
+						str.append(ApprovalTypeEnums.getDesc(s))
+								.append("(").append(e.getTypeExplain()).append(")")
+								.append(",");
 					}else {
 						String desc = ApprovalTypeEnums.getDesc(Integer.parseInt(s));
 						str.append(desc).append(",");

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

@@ -386,7 +386,14 @@ public class OrderProjectApiController extends CertifyApiController {
 					StringBuilder stringBuilder = new StringBuilder();
 					Arrays.stream(split).forEach(
 							s->{
-								stringBuilder.append(ApprovalTypeEnums.getDesc(s)).append(",");
+								if (ApprovalTypeEnums.QT.getCode().equals(Integer.valueOf(s))){
+									stringBuilder.append(ApprovalTypeEnums.getDesc(s))
+											.append("(").append(e.getTypeExplain()).append(")")
+											.append(",");
+								}else {
+									stringBuilder.append(ApprovalTypeEnums.getDesc(s)).append(",");
+								}
+
 							}
 					);
 					e.setType(stringBuilder.substring(0,stringBuilder.length()-1));

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

@@ -1373,10 +1373,12 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			}
 			if (out.getType()!=null){
 				String[] split = out.getType().split(",");
-				StringBuffer str=new StringBuffer();
+				StringBuilder str=new StringBuilder();
 				for (String s : split) {
 					if (s.equals("0")){
-						str.append(out.getTypeExplain()).append(",");
+						str.append(ApprovalTypeEnums.getDesc(s))
+								.append("(").append(out.getTypeExplain()).append(")")
+								.append(",");
 					}else {
 						String desc = ApprovalTypeEnums.getDesc(Integer.parseInt(s));
 						str.append(desc).append(",");

+ 7 - 2
src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java

@@ -112,8 +112,13 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 				String[] split = e.getType().split(",");
 				StringBuilder sb=new StringBuilder();
 				for (String s : split) {
-					String desc = ApprovalTypeEnums.getDesc(s);
-					sb.append(desc).append(",");
+					if (ApprovalTypeEnums.QT.getCode().equals(Integer.valueOf(s))){
+						sb.append(ApprovalTypeEnums.getDesc(s))
+								.append("(").append(e.getTypeExplain()).append(")")
+								.append(",");
+					}else {
+						sb.append(ApprovalTypeEnums.getDesc(s)).append(",");
+					}
 				}
 				e.setType(sb.substring(0,sb.length()-1));
 			}