Browse Source

修改部门接口为2种,一种分层级,一种部分层级

anderx 3 years ago
parent
commit
83be2d1ecb
1 changed files with 54 additions and 84 deletions
  1. 54 84
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

+ 54 - 84
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -616,119 +616,89 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		return 1;
 	}
 
+
+
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderNewBo> orderNewList(String aid,String name, String orderNo, String starTime, String endTime,Integer specially,Integer approval,
-			Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer amountStatus,
-												String contractStart, String contractEnd,String uid,Integer projectType,Integer processStatus,  Integer pageNo, Integer pageSize) {
+	public Pagination<TOrderNewBo> orderNewList(InputOrderNewListBo in) {
 		Map<String, Object> params = new HashMap<>();
-		if (specially!=null&&(specially==0||specially==1||specially==2||specially==4||specially==5||specially==7)) {
+		if (in.getSpecially()!=null&&(in.getSpecially()==0||in.getSpecially()==1||in.getSpecially()==2||in.getSpecially()==4||in.getSpecially()==5||in.getSpecially()==7)) {
 			//0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询
-			if (specially!=3&&specially!=4) {
-				if (aid ==null){
+			if (in.getSpecially()!=3&&in.getSpecially()!=4) {
+				if (in.getAid() ==null){
 					params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 				}else{
-					params.put("aid", aid);
+					params.put("aid", in.getAid());
 				}
 			}
 			//(咨询师管理列表 0 未分配 1部分   2全部)
-			if(specially==4) {
-				params.put("distribution",distribution);
+			if(in.getSpecially()==4) {
+				params.put("distribution",in.getDistribution());
 			}
 
-		}else if(specially==8){
-			if (StringUtils.isNotBlank(uid)) {
-				params.put("uid", uid);
+		}else if(in.getSpecially()==8){
+			if (StringUtils.isNotBlank(in.getUid())) {
+				params.put("uid", in.getUid());
 			}
-		}else if (specially==9){
-			if (StringUtils.isNotBlank(aid)) {
-				params.put("aid", aid);
+		}else if (in.getSpecially()==9){
+			if (StringUtils.isNotBlank(in.getAid())) {
+				params.put("aid", in.getAid());
 			}
 		}
-			params.put("specially",specially);
-		if (StringUtils.isNotBlank(name)) {
-			params.put("name", name);
+			params.put("specially",in.getSpecially());
+		if (StringUtils.isNotBlank(in.getName())) {
+			params.put("name", in.getName());
 		}
 		// 计算出所有本部门及所属部门的ID
-		List<Department> deps = new ArrayList<>();
-		if(specially==1||specially==5) {
-			if (depId!=null){
-				deps=departmentService.selectSubDeps(depId,0,1);
-				if(deps.isEmpty()){
-					return new Pagination(1,10,0);
-				}
+		if(in.getSpecially()==1||in.getSpecially()==5) {
+			List<String>departmentList=new ArrayList<>();
+			if (in.getDeps()!=null){
+				departmentList=departmentService.selectSubDeps(in.getDeps());
 			}else {
-				deps=departmentService.selectMyDeps();
+				departmentList=departmentService.selectMyDeps();
 			}
+			params.put("deps",departmentList);
 		}else {
-			if (StringUtils.isNotBlank(depId)) {
-				deps=departmentService.getLowerDep(depId);
+			if (in.getDeps()!=null) {
+				params.put("deps",departmentService.parseArray(in.getDeps()));
 			}
 		}
-		if (!deps.isEmpty())params.put("deps",deps);
-		if (StringUtils.isNotBlank(contractNo)) {
-			params.put("contractNo", contractNo);
+
+		if (StringUtils.isNotBlank(in.getContractNo())) {
+			params.put("contractNo", in.getContractNo());
 		}
-		if (null!=liquidationStatus) {
-			params.put("liquidationStatus", liquidationStatus);
-			if (null !=approval) {
-				params.put("approval", approval);
-			}
-			if(null != amountStatus) {
-				params.put("amountStatus", amountStatus);
-			}
-			if (StringUtils.isNotBlank(orderNo)) {
-				params.put("orderNo", orderNo);
-			}
-			if (StringUtils.isNotBlank(starTime)) {
-				params.put("starTime", starTime);
-			}
-			if (StringUtils.isNotBlank(endTime)) {
-				params.put("endTime", endTime+" 23:59:59");
-			}
-			if (StringUtils.isNotBlank(contractStart)) {
-				params.put("contractStart", contractStart);
-			}
-			if (StringUtils.isNotBlank(contractEnd)) {
-				params.put("contractEnd", contractEnd+" 23:59:59");
-			}
-			if(null != projectType) {
-				params.put("projectType",projectType);
-			}
-			if(null != processStatus) {
-				params.put("processStatus",processStatus);
-			}
-		} else {
-			if (null !=approval) {
-				params.put("approval", approval);
+		if (null!=in.getLiquidationStatus()) {
+			params.put("liquidationStatus", in.getLiquidationStatus());
+		}
+			if (null !=in.getApproval()) {
+				params.put("approval", in.getApproval());
 			}
-			if(null != amountStatus) {
-				params.put("amountStatus", amountStatus);
+			if(null != in.getAmountStatus()) {
+				params.put("amountStatus", in.getAmountStatus());
 			}
-			if (StringUtils.isNotBlank(orderNo)) {
-				params.put("orderNo", orderNo);
+			if (StringUtils.isNotBlank(in.getOrderNo())) {
+				params.put("orderNo", in.getOrderNo());
 			}
-			if (StringUtils.isNotBlank(starTime)) {
-				params.put("starTime", starTime);
+			if (StringUtils.isNotBlank(in.getStarTime())) {
+				params.put("starTime", in.getStarTime());
 			}
-			if (StringUtils.isNotBlank(endTime)) {
-				params.put("endTime", endTime+" 23:59:59");
+			if (StringUtils.isNotBlank(in.getEndTime())) {
+				params.put("endTime", in.getEndTime()+" 23:59:59");
 			}
-			if (StringUtils.isNotBlank(contractStart)) {
-				params.put("contractStart", contractStart);
+			if (StringUtils.isNotBlank(in.getContractStart())) {
+				params.put("contractStart", in.getContractStart());
 			}
-			if (StringUtils.isNotBlank(contractEnd)) {
-				params.put("contractEnd", contractEnd+" 23:59:59");
+			if (StringUtils.isNotBlank(in.getContractEnd())) {
+				params.put("contractEnd", in.getContractEnd()+" 23:59:59");
 			}
-			if(null != projectType) {
-				params.put("projectType",projectType);
+			if(null != in.getProjectType()) {
+				params.put("projectType",in.getProjectType());
 			}
-			if(null != processStatus) {
-				params.put("processStatus",processStatus);
+			if(null != in.getProcessStatus()) {
+				params.put("processStatus",in.getProcessStatus());
 			}
-		}
-		params.put("outsource", outsource);
-		Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, pageNo, pageSize);
+		params.put("outsource", in.getOutsource());
+		Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, in.getPageNo(), in.getPageSize());
 		return p;
 	}
 
@@ -1772,8 +1742,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(in.getName())) {
 			params.put("name", in.getName());
 		}
-		if (StringUtils.isNotBlank(in.getDepId())) {
-			params.put("deps", departmentService.getLowerDep(in.getDepId()));
+		if (in.getDeps()!=null) {
+			params.put("deps",departmentService.parseArray(in.getDeps()));
 		}
 		if (StringUtils.isNotBlank(in.getAdminName())) {
 			params.put("adminName", in.getAdminName());