Browse Source

导出异常修改

anderx 5 years ago
parent
commit
7904175d69

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

@@ -71,7 +71,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		return res.data(orderNewService.addOrderTask(t));
 	}
 	/**
-	 * 修改项目
+	 * 修改项目(营销员)
 	 * @param t
 	 * @return
 	 */

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

@@ -426,19 +426,20 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		tl.setAid(TokenManager.getAdminId());
 		if (t.getStatus()!=null) {
 			if (t.getStatus()!=task2.getStatus()) {
-				String s="将当前项目状态修改为";
-				//0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+				String s="将当前项目状态修改为:";
+				//状态 0未开始 1已开始 2已暂停 3已驳回 4已完成 5未完成退单 6已完成退单
 				if (t.getStatus()==0)s+="未开始";
 				else if (t.getStatus()==1)s+="已开始";
 				else if (t.getStatus()==2)s+="已暂停";
-				else if (t.getStatus()==3)s+="已完成";
-				else if (t.getStatus()==4)s+="已驳回";
-				else if (t.getStatus()==5)s+="以退单";
+				else if (t.getStatus()==3)s+="已驳回";
+				else if (t.getStatus()==4)s+="已完成";
+				else if (t.getStatus()==5)s+="项目已完成 已退单";
+				else if (t.getStatus()==6)s+="项目未完成 已退单";
 				tl.setContent(s);
 				taskLogMapper.insertSelective(tl);
 			}
 			if (t.getTaskRefund()!=task2.getTaskRefund()) {
-				String s="将当前项目退单修改为";
+				String s="将当前项目退单修改为:";
 				if (t.getTaskRefund()==0)s+="未完成";
 				if (t.getTaskRefund()==1)s+="已完成";
 				if (t.getTaskRefund()==2)s+="其他";
@@ -446,7 +447,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				taskLogMapper.insertSelective(tl);
 			}
 			if (t.getFormRetrieve()!=task2.getFormRetrieve()) {
-				String s="将当前满意度表格回收修改为";
+				String s="将当前满意度表格回收修改为:";
 				if (t.getFormRetrieve()==0)s+="未回收";
 				if (t.getFormRetrieve()==1)s+="已回收";
 				if (t.getFormRetrieve()==2)s+="其他";
@@ -1028,8 +1029,5 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	public List<OutTaskProgressLog> selectTaskProgressLog(Integer tid) {
 		return taskProgressLogMapper.selectTaskProgressLog(tid);
 	}
-
-
-	
 	
 }

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

@@ -300,7 +300,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 				String[] ss= {"申请数","驳回数","下证数"};
 				Collections.addAll(ls, ss);
 			}else if (ib.getStatus()==0) {
-				String[] ss= {"完成数","公示/立项数"};
+				String[] ss= {"完成数","公示数"};
 				Collections.addAll(ls, ss);
 			}
     		String[] ss= {"签单额(万元)","成本(万元)","利润(万元)"};
@@ -344,11 +344,11 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
     				//"申请数","驳回数","下证数"
     				case "申请数": o = ob.getApplyCount().toString(); break;
     				//"完成数","公示/立项数"
-    				case "公示/立项数": o = ob.getSetUpCount().toString(); break;
+    				case "公示数": o = ob.getPublicityCount().toString(); break;
     				
-    				case "签单额(万元)": o = ob.getAmountCount().toString(); break;
-    				case "成本(万元)": o = ob.getCostAmount().toString(); break;
-    				case "利润(万元)": o = ob.getProfit().toString(); break;
+    				case "签单额(万元)": o = ob.getAmountCount().stripTrailingZeros().toPlainString(); break;
+    				case "成本(万元)": o = ob.getCostAmount().stripTrailingZeros().toPlainString(); break;
+    				case "利润(万元)": o = ob.getProfit().stripTrailingZeros().toPlainString(); break;
     				default: o = ""; break;
     				}
     				XSSFCell c = r.createCell(i);