moral.git - Gitblit

			@@ -118,7 +118,7 @@
			//单号
			String allocationNum = "JBD-" + dateString + String.format("%04d", i);
			allocation.setAllocationNum(allocationNum);
			if(Objects.nonNull(allocationCond.getEscalationUnitId())&&allocationCond.getEscalationUnitId().toString().length()==6) {
			if(Objects.nonNull(allocationCond.getEscalationUnitId())&& escalationType(allocationCond.getEscalationUnitId())) {
			allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
			}
			if(NEW_BUILT.equals(allocationCond.getState())) {
			@@ -154,7 +154,7 @@
			}
			//获取用户信息
			Allocation allocation = allocationUpdateCond.convert();
			if(Objects.nonNull(allocationUpdateCond.getEscalationUnitId())&&allocationUpdateCond.getEscalationUnitId().toString().length()==6) {
			if(Objects.nonNull(allocationUpdateCond.getEscalationUnitId())&& escalationType(allocationUpdateCond.getEscalationUnitId())) {
			allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
			}
			if(NEW_BUILT.equals(allocationUpdateCond.getState())) {
			@@ -286,7 +286,7 @@
			HashMap<String, Object> typeMap = new HashMap<>();
			List<Allocation> allocations1 = polluteTypeMap.get(polluteType);
			QueryWrapper<SysDictData> sysDictDataQueryWrapper = new QueryWrapper<>();
			sysDictDataQueryWrapper.eq("dict_type_id",31);
			sysDictDataQueryWrapper.eq("dict_type_id",32);
			sysDictDataQueryWrapper.eq("dataKey",polluteType);
			SysDictData sysDictData = sysDictDataMapper.selectOne(sysDictDataQueryWrapper);
			typeMap.put("name",sysDictData.getDataValue());
			@@ -782,4 +782,12 @@
			}
			return 1;
			}
			private boolean escalationType(Integer id){
			boolean f = false;
			String code = responsibilityUnitMapper.selectAreaCode(id);
			if(code.length() == 6){
			return true;
			}
			return f;
			}
			}

			@@ -101,7 +101,7 @@
			userInfo.put("email", userBo.getEmail());
			userInfo.put("mobile", userBo.getMobile());
			userInfo.put("unitId",userBo.getUnitId());
			userInfo.put("unName",responsibilityUnit.getAreaName());
			userInfo.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"未选择责任单位");
			userInfo.put("wechat", userBo.getWechat());
			userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
			userInfo.put("isAdmin", userBo.getIsAdmin());
			@@ -115,7 +115,7 @@
			result.put("unitId",userBo.getUnitId());
			result.put("userId", userBo.getId());
			result.put("account", userBo.getAccount());
			result.put("unName",Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"未选择责任单位");
			result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"未选择责任单位");
			} catch (Exception e) {
			log.error("token生成异常：" + e.getMessage());
			result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
			@@ -181,12 +181,11 @@
			//生成token，并存入redis
			String token = TokenUtils.getTokenApp(new StringBuffer("00").append(user.getId().toString()).toString(),userInfo);
			result.put("token", token);
			result.put("token", token);
			result.put("userName", user.getUserName());
			result.put("unitId",user.getUnitId());
			result.put("userId", user.getId());
			result.put("account", user.getAccount());
			result.put("unName",Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"未选择责任单位");
			result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"未选择责任单位");
			} catch (Exception e) {
			log.error("token生成异常：" + e.getMessage());
			result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
			@@ -261,7 +260,7 @@
			userInfo.put("email", userBo.getEmail());
			userInfo.put("mobile", userBo.getMobile());
			userInfo.put("unitId",userBo.getUnitId());
			userInfo.put("unName",responsibilityUnit.getAreaName());
			userInfo.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"未选择责任单位");
			userInfo.put("wechat", userBo.getWechat());
			userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
			userInfo.put("isAdmin", userBo.getIsAdmin());

	screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java	14 ●●●●● patch \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java	9 ●●●●● patch \| view \| raw \| blame \| history