Browse Source

Merge branch 'test'

# Conflicts:
#	src/main/java/com/goafanti/order/bo/InputProjectStatistics.java
#	src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java
anderx 3 years ago
parent
commit
78f9316180

+ 1 - 1
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -48,7 +48,7 @@ public class AFTConstants {
 	/**	外包审核员 */
 	public static final String  OUTSOURCE_AUDITOR                   = "9991";
 	/** 人事管理员*/
-	public static final String  PERSONNEL_AUDITOR                 = "9991";
+	public static final String  PERSONNEL_AUDITOR                 = "9990";
 	/** 专利管理员 */
 	public static final String  PATENT_AUDITOR 	                  	= "9992";
 	/** 公司管理 */

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

@@ -24,7 +24,6 @@ public class InputProjectStatistics {
 	private String projectTypeName;
 
 	private Integer province;
-
 	private String provinceName;
 	private String projectId;
 	/**

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

@@ -96,25 +96,28 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 			if(ib.getStatus()==null)ib.setStatus(0);
 			@SuppressWarnings("unchecked")
 			List<OutProjectStatistics> list=  (List<OutProjectStatistics>) selectTaskList(ib).getList();
-			String[] comment = {"派单时间","派单省份","订单部门","营销员","合同编号","订单编号","签单客户","项目类型","项目名称","负责部门",
-					"咨询师/咨询经理","项目状态"};
+			String[] comment = {"派单时间","派单省份","订单部门","营销员","合同编号","订单编号","签单客户","项目类型","项目名称"};
 			List<String> ls = new ArrayList<String>();
 			Collections.addAll(ls, comment);
-    		if (ib.getStatus()==1) {
+			if (ib.getStatus()==null||ib.getStatus()==0){
+				String[] ss= {"数量","负责部门","咨询师/咨询经理","项目状态"};
+				Collections.addAll(ls, ss);
+			}else if (ib.getStatus()==1) {
 				//高新、科技
     			//是否立项 立项时间 是否抽查 联系人电话 法人电话 证书编号 申报批次
-    			String[] ss= {"是否立项","立项时间","是否抽查","联系人电话","法人电话","证书编号","申报批次"};
+    			String[] ss= {"负责部门","咨询师/咨询经理","项目状态","是否立项","立项时间","是否抽查","联系人电话","法人电话","证书编号","申报批次"};
     			Collections.addAll(ls, ss);
 			}else if (ib.getStatus()==2) {
 				//双软
-    			ls.add("下证时间");
+				String[] ss= {"负责部门","咨询师/咨询经理","项目状态","下证时间"};
+				Collections.addAll(ls, ss);
 			}else if (ib.getStatus()==3) {
 				//软著
-				String[] ss= {"软著数量/已下证","有无材料","加急天数","下证时间","证书编号","成本","利润"};
+				String[] ss= {"负责部门","咨询师/咨询经理","项目状态","软著数量/已下证","有无材料","加急天数","下证时间","证书编号","成本","利润"};
 				Collections.addAll(ls, ss);
 			}else if (ib.getStatus()==4) {
 				//专利
-				String[] ss= {"是否高新","项目数量/下证数","驳回数","专利号","专利名称","受理时间","下证时间","成本","利润"};
+				String[] ss= {"负责部门","咨询师/咨询经理","项目状态","是否高新","项目数量/下证数","驳回数","专利号","专利名称","受理时间","下证时间","成本","利润"};
 				Collections.addAll(ls, ss);
 			}
     		ls.add("签单金额");
@@ -127,7 +130,6 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
     		XSSFRow row = sheet.createRow(2);
     		//4.创建一个cell
     		XSSFCell cell = row.createCell(0);
-    		//处理搜索条件
     		cell.setCellValue(getInputString(ib));
     		sheet.addMergedRegion(new CellRangeAddress(2, 2, 0, comment.length-1));//合并单元格
     		for (OutProjectStatistics ob : list) {
@@ -148,6 +150,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
     				case "签单客户": o = ob.getUserName(); break;
     				case "项目类型": o = ob.getCname(); break;
     				case "项目名称": o = ob.getPname(); break;
+    				case "数量": o = ob.getCommodityQuantity().toString(); break;
     				case "负责部门": o = ob.getTechDepName(); break;
     				case "咨询师/咨询经理": o = ob.getTechName(); break;
     				case "项目状态": o = NewProjectStatus.getValueByCode(ob.getProjectStatus()); break;
@@ -208,7 +211,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 
 
 	/**
-	 * 拼接搜索参数
+	 * 处理搜索条件
 	 * @param ib
 	 * @return
 	 */
@@ -216,10 +219,28 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 		String str="搜索条件:";
 		int i=1;
 		if(ib.getStartDate()!=null) {
-			str=StringUtils.join(str,i++,"-开始时间:",ib.getStartDate(),"   ");
+			str=StringUtils.join(str,i++,"-派单时间:",ib.getStartDate(),"~",ib.getEndDate(),"   ");
 		}
-		if(ib.getEndDate()!=null)str=StringUtils.join(str,i++,"-结束时间:",ib.getEndDate(),"   ");
-		if (ib.getProvinceName()!=null)str=StringUtils.join(str,i++,"-省份:",ib.getProvinceName(),"   ");
+
+		if(ib.getScreen()!=null){
+			//筛选项 0库存 1 派单 2 完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+			String screenName="";
+			if (ib.getScreen()==0)screenName=StringUtils.join("库存");
+			else if (ib.getScreen()==1)screenName=StringUtils.join("派单");
+			else if (ib.getScreen()==2)screenName=StringUtils.join("完成");
+			else if (ib.getScreen()==3)screenName=StringUtils.join("立项");
+			else if (ib.getScreen()==4)screenName=StringUtils.join("抽查");
+			else if (ib.getScreen()==5)screenName=StringUtils.join("未通过");
+			else if (ib.getScreen()==6)screenName=StringUtils.join("受理");
+			else if (ib.getScreen()==7)screenName=StringUtils.join("完结");
+			else if (ib.getScreen()==8)screenName=StringUtils.join("授权");
+			else if (ib.getScreen()==9)screenName=StringUtils.join("驳回");
+			else if (ib.getScreen()==10)screenName=StringUtils.join("下证");
+			else if (ib.getScreen()==11)screenName=StringUtils.join("申请");
+
+			str=StringUtils.join(str,i++,"-筛选分类:",screenName,"   ");
+		}
+		if(ib.getProvinceName()!=null)str=StringUtils.join(str,i++,"-省份:",ib.getProvinceName(),"   ");
 		if(ib.getDepId()!=null)str=StringUtils.join(str,i++,"-订单部门:",ib.getDepName(),"   ");
 		if(ib.getThchDepId()!=null)str=StringUtils.join(str,i++,"-责任部门:",ib.getThchDepName(),"   ");
 		if(ib.getProjectStatus()!=null)str=StringUtils.join(str,i++,"-项目别类:",ib.getProjectStatusName(),"   ");

+ 5 - 3
src/main/resources/props/config_local.properties

@@ -45,13 +45,12 @@ user_remind_days=15
 #提前提醒天数
 user_channel_days=90
 
-portal.host=//sf.jishutao.com/portal/2.0.6
-avatar.upload.host=//sb.jishutao.com/upload
+
 #static.host=//172.16.0.53/1.2.02
 #avatar.host=//172.16.0.253
 
 #avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.05
+static.host=//static.jishutao.com/1.2.06
 avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.05
 #static.host=http://172.16.1.187/prod/1.2.05
@@ -62,6 +61,9 @@ wx.appSecret=081744369d42405be58fe37f892631f7
 wx.state=trial
 wx.clockInRange=1000
 
+portal.host=//sf.jishutao.com/portal/2.0.6
+avatar.upload.host=//sb.jishutao.com/upload
+
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload
 

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -43,7 +43,7 @@ user_remind_days=15
 #提前提醒天数
 user_channel_days=90
 
-static.host=//static.jishutao.com/1.2.05
+static.host=//static.jishutao.com/1.2.06
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload