anderx лет назад: 3
Родитель
Сommit
c682ab0029

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

@@ -183,78 +183,6 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 
 
 
-
-	/**
-	 * 处理搜索条件
-	 * @param ib
-	 * @return
-	 */
-	private String getInputString(InputProjectStatistics ib) {
-		String str="搜索条件:";
-		int i=1;
-		if(ib.getStartDate()!=null) {
-			str=StringUtils.join(str,i++,"-派单时间:",ib.getStartDate(),"~",ib.getEndDate(),"   ");
-		}
-
-		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.getDeps()!=null)str=StringUtils.join(str,i++,"-订单部门:",ib.getDepName(),"   ");
-		if(ib.getThchDeps()!=null)str=StringUtils.join(str,i++,"-责任部门:",ib.getThchDepName(),"   ");
-		if(ib.getProjectStatus()!=null)str=StringUtils.join(str,i++,"-项目别类:",ib.getProjectStatusName(),"   ");
-		if(ib.getProjectType()!=null)str=StringUtils.join(str,i++,"-项目分类:",ib.getProjectTypeName(),"   ");
-		if(ib.getOrderNo()!=null)str=StringUtils.join(str,i++,"-订单编号:",ib.getOrderNo(),"   ");
-		if(ib.getContractNo()!=null)str=StringUtils.join(str,i++,"-合同编号:",ib.getContractNo(),"   ");
-		if(ib.getUserName()!=null)str=StringUtils.join(str,i++,"-客户名称:",ib.getUserName(),"   ");
-		if(ib.getDeclarationBatch()!=null)str=StringUtils.join(str,i++,"-申报批次:",ib.getDeclarationBatch(),"   ");
-		if(ib.getProjectSituation()!=null) {
-			//0 正常 1专利 2软著 3审计 4双软
-			String str3="";
-			if (ib.getProjectSituation()==0) { str3="通用";
-			}else if (ib.getProjectAmount()==1) { str3="专利";
-			}else if (ib.getProjectAmount()==2) { str3="软著";
-			}else if (ib.getProjectAmount()==3) { str3="审计";
-			}else if (ib.getProjectAmount()==4) { str3="双软";
-			}
-			str=StringUtils.join(str,i++,"-项目情况:",str3,"   ");
-		}
-		if(ib.getProjectAmount()!=null) {
-			String str2="";
-			// 0~0.5万、0.5~1万、1~2万、2~5万、5~10万、10~30万、30~50万、50到80万、80万上
-			if (ib.getProjectAmount()==0) { str2="0~0.5万";
-			}else if (ib.getProjectAmount()==1) { str2="0~0.5万";
-			}else if (ib.getProjectAmount()==2) { str2="0.5~1万";
-			}else if (ib.getProjectAmount()==3) { str2="1~2万";
-			}else if (ib.getProjectAmount()==4) { str2="2~5万";
-			}else if (ib.getProjectAmount()==5) { str2="5~10万";
-			}else if (ib.getProjectAmount()==6) { str2="10~30万";
-			}else if (ib.getProjectAmount()==7) { str2="30~50万";
-			}else if (ib.getProjectAmount()==8) { str2="50到80万";
-			}else if (ib.getProjectAmount()==9) { str2="80万上";
-			}
-			str=StringUtils.join(str,i++,"-项目金额:",str2,"   ");
-		}
-		if(i==1)str=StringUtils.join(str,"无");
-		return str;
-
-	}
-
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<OutProvincialStatistics> selectProvincialStatistics(InputProvincialStatistics is) {