Merge branch 'master' of http://124.70.43.205:3000/wangchangsheng/evaluation

ims-service/ims-eval/src/main/java/com/ims/eval/config/ImaConfig.java

@@ -31,6 +31,16 @@ public class ImaConfig {
 	private String menuPro;
 
 
+
+
+
+	@Value("${iam.flow-url.dev}")
+	private String flowUrlDev;
+
+	@Value("${iam.flow-url.pro}")
+	private String flowUrlPro;
+
+
 	public String getMenu() {
 
 		if("dev".equals(active)) {
@@ -49,4 +59,12 @@ public class ImaConfig {
 	}
 
 
+	public String getFlowUrl() {
+		if("dev".equals(active)){
+			return flowUrlDev;
+		}
+		return flowUrlPro;
+	}
+
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/controller/BinStageController.java

@@ -49,7 +49,7 @@ public class BinStageController {
 				  @RequestParam(value = "type", required = false) String type) {
 		List<BinStage> list = CacheContext.bseList;
 		if(StringUtils.isNotEmpty(type)){
-			 list =list.stream().filter(t->t.getType().equals(type)).collect(Collectors.toList());
+			 list =list.stream().filter(t->!t.getType().equals(type)).collect(Collectors.toList());
 		}
 
 		if(StringUtils.isNotEmpty(stageName)){

ims-service/ims-eval/src/main/java/com/ims/eval/service/custom/impl/WorkflowServiceImpl.java

@@ -89,7 +89,7 @@ public class WorkflowServiceImpl {
 		map.put("opinion", doAction.getOpinion());
 
 		HttpEntity<Map> param = new HttpEntity<>(map, headers);
-		ResponseEntity<String> responseEntity2 = restTemplate.exchange("http://10.65.78.23:8080/bpm/instance/doAction", HttpMethod.POST, param, String.class);
+		ResponseEntity<String> responseEntity2 = restTemplate.exchange(imaConfig.getFlowUrl() +"/bpm/instance/doAction", HttpMethod.POST, param, String.class);
 		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
 		if (200 == responseEntity2.getStatusCodeValue()) {
 			FlowResult result = JSON.parseObject(responseEntity2.getBody()).toJavaObject(FlowResult.class);
@@ -124,7 +124,7 @@ public class WorkflowServiceImpl {
 		map.put("offset", todoTask.getOffset());
 		map.put("limit", todoTask.getLimit());
 		HttpEntity<Map> param = new HttpEntity<>(map, headers);
-		ResponseEntity<String> responseEntity2 = restTemplate.exchange("http://10.65.78.23:8080/bpm/my/todoTaskList", HttpMethod.POST, param, String.class);
+		ResponseEntity<String> responseEntity2 = restTemplate.exchange(imaConfig.getFlowUrl() +"/bpm/my/todoTaskList", HttpMethod.POST, param, String.class);
 		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
 		//
 		if (200 == responseEntity2.getStatusCodeValue()) {
@@ -165,7 +165,7 @@ public class WorkflowServiceImpl {
 			map.put("offset", "");
 			map.put("limit", "99999");
 			HttpEntity<Map> param = new HttpEntity<>(map, headers);
-			ResponseEntity<String> responseEntity2 = restTemplate.exchange("http://10.65.78.23:8080/bpm/my/todoTaskList", HttpMethod.POST, param, String.class);
+			ResponseEntity<String> responseEntity2 = restTemplate.exchange(imaConfig.getFlowUrl() +"/bpm/my/todoTaskList", HttpMethod.POST, param, String.class);
 			log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
 			//
 			if (200 == responseEntity2.getStatusCodeValue()) {
@@ -223,7 +223,7 @@ public class WorkflowServiceImpl {
 		map.put("opinion",isOkAction.getOpinion());
 		map.put("iamCode",isOkAction.getIamCode());
 		HttpEntity<Map> param = new HttpEntity<>(map, headers);
-		ResponseEntity<String> responseEntity2 = restTemplate.exchange("http://10.65.78.23:8080/bpm/task/doAction", HttpMethod.POST,param,String.class);
+		ResponseEntity<String> responseEntity2 = restTemplate.exchange(imaConfig.getFlowUrl() +"/bpm/task/doAction", HttpMethod.POST,param,String.class);
 		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
 		if(200== responseEntity2.getStatusCodeValue()){
 
@@ -255,7 +255,7 @@ public class WorkflowServiceImpl {
 		headers.add("code", request.getHeader("code"));
 
 		HttpEntity<Map> param = new HttpEntity<>(null, headers);
-		ResponseEntity<String> responseEntity2 = restTemplate.postForEntity("http://10.65.78.23:8080/bpm/instance/getInstanceAndChildren?id={1}&iamCode={2}",
+		ResponseEntity<String> responseEntity2 = restTemplate.postForEntity(imaConfig.getFlowUrl() +"/bpm/instance/getInstanceAndChildren?id={1}&iamCode={2}",
 			param, String.class, id, iamCode);
 
 		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
@@ -280,7 +280,7 @@ public class WorkflowServiceImpl {
 		headers.add("code", request.getHeader("code"));
 
 		HttpEntity<Map> param = new HttpEntity<>(null, headers);
-		ResponseEntity<String> responseEntity2 = restTemplate.postForEntity("http://10.65.78.23:8080/bpm/instance/getOpinion?instId={1}&iamCode={2}",
+		ResponseEntity<String> responseEntity2 = restTemplate.postForEntity(imaConfig.getFlowUrl() +"/bpm/instance/getOpinion?instId={1}&iamCode={2}",
 			param, String.class, instId, iamCode);
 
 		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/DeptResponsibilityServiceImpl.java

@@ -79,6 +79,10 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 	@Autowired
 	private IUserService userService;
 
+	@Autowired
+	private IMultipleBrandService multipleBrandService;
+
+
 	@Override
 	public IPage<DeptResponsibility> list(Integer pageNum, Integer pageSize, String id, String responsibilityCode, String cycleUnit, List<String> checkCycle, String beginDate, String endDate, String stage, String createBy, String year, String month, String des) {
 
@@ -165,35 +169,56 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 		//查询当前周期下对应的考评权重（需要考评的单位）
 		List<OrganizationEvaluationRule> evaluationRules = organizationEvaluationRuleService.getOrganizationEvaluationRuleByYearAndCycle(organizationType, checkCycle, year, "");
 
+
+		if(null == evaluationRules || evaluationRules.size()<=0){
+			throw new CustomException(oriResponsibility.getYear()+"年单位权重未配置");
+		}
 		//遍历考核的单位
 		for (OrganizationEvaluationRule evaluationRule : evaluationRules) {
+
 			//规则集合
 			List<EvaluateRule> evaluateRuleList = new ArrayList<>();
 			//根据权重获取对应的考评规则
 			//生产经营
 			double scjyWeight = evaluationRule.getScjyWeight();
 			if (scjyWeight > 0) {
-				List<EvaluateRule> scjyevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(evaluationRule.getBinSection(), CacheContext.bseCodeObject.get("SCJY").getId()+","+CacheContext.bseCodeObject.get("ZDZX").getId()+","+CacheContext.bseCodeObject.get("KJCX").getId(), "NDKP", evaluationRule.getYear());
+				List<EvaluateRule> scjyevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(evaluationRule.getBinSection(), CacheContext.bseCodeObject.get("SCJY").getId(), "NDKP", evaluationRule.getYear());
 				if (null != scjyevaluateRuleList && scjyevaluateRuleList.size() > 0) {
 					evaluateRuleList.addAll(scjyevaluateRuleList);
 				}
 			}
-			//前期
-			double qqWeight = evaluationRule.getQqWeight();
-			if (qqWeight > 0) {
-				List<EvaluateRule> qqevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("QQ").getId(), CacheContext.bseCodeObject.get("QQXM").getId(), "NDKP", evaluationRule.getYear());
-				if (null != qqevaluateRuleList && qqevaluateRuleList.size() > 0) {
-					evaluateRuleList.addAll(qqevaluateRuleList);
+
+			//判断多块牌子  是否在该序列加权平均
+			List<MultipleBrand> dkpz = multipleBrandService.getMultipleBranList2(evaluationRule.getOrganizationId(), "", "", evaluationRule.getEvaluationCycle(), evaluationRule.getYear(), "");
+			List<MultipleBrand> filteredList = dkpz.stream()
+				.filter(multipleBrand -> !"0".equals(multipleBrand.getParentId()))
+				.collect(Collectors.toList());
+			if (null == filteredList ||  filteredList.size() <= 0) {
+				//重点专项科技创新
+				List<EvaluateRule> zkevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("KJCX").getId() + "," + CacheContext.bsnCodeObject.get("ZDZX").getId(), CacheContext.bseCodeObject.get("ZDZX").getId() + "," + CacheContext.bseCodeObject.get("KJCX").getId(), "NDKP", evaluationRule.getYear());
+
+				if (null != zkevaluateRuleList && zkevaluateRuleList.size() > 0) {
+					evaluateRuleList.addAll(zkevaluateRuleList);
 				}
 			}
-			//基建
-			double jjWeight = evaluationRule.getJjWeight();
-			if (jjWeight > 0) {
-				List<EvaluateRule> jjevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("JJ").getId(), CacheContext.bseCodeObject.get("JJXM").getId(), "NDKP", evaluationRule.getYear());
-				if (null != jjevaluateRuleList && jjevaluateRuleList.size() > 0) {
-					evaluateRuleList.addAll(jjevaluateRuleList);
+
+				//前期
+				double qqWeight = evaluationRule.getQqWeight();
+				if (qqWeight > 0) {
+					List<EvaluateRule> qqevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("QQ").getId(), CacheContext.bseCodeObject.get("QQXM").getId(), "NDKPALL", "0000");
+					if (null != qqevaluateRuleList && qqevaluateRuleList.size() > 0) {
+						evaluateRuleList.addAll(qqevaluateRuleList);
+					}
 				}
-			}
+				//基建
+				double jjWeight = evaluationRule.getJjWeight();
+				if (jjWeight > 0) {
+					List<EvaluateRule> jjevaluateRuleList = evaluateRuleService.getEvaluateRuleByYear(CacheContext.bsnCodeObject.get("JJ").getId(), CacheContext.bseCodeObject.get("JJXM").getId(), "NDKPALL", "0000");
+					if (null != jjevaluateRuleList && jjevaluateRuleList.size() > 0) {
+						evaluateRuleList.addAll(jjevaluateRuleList);
+					}
+				}
+
 			//获取考评规则的id
 			List<String> ruleIds = evaluateRuleList.stream().map(EvaluateRule::getId).collect(Collectors.toList());
 			//通过规则id获取对应的规则明细
@@ -269,7 +294,7 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 		DeptResponsibility responsibility = baseMapper.selectById(id);
 		if (StringUtils.isNotEmpty(state)) {
 			if ("任务书签订".equals(state)) {
-				state = "流程结束";
+				state = "流程已结束";
 			}
 			responsibility.setStage(state);
 		}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluateRuleServiceImpl.java

@@ -164,6 +164,7 @@ public class EvaluateRuleServiceImpl extends ServiceImpl<EvaluateRuleMapper, Eva
 			qw.lambda().eq(EvaluateRule::getYear, year);
 		}
 
+		qw.lambda().eq(EvaluateRule::getEnable, true);
 		qw.lambda().orderByDesc(EvaluateRule::getCreateTime);
 
 		List<EvaluateRule> list = baseMapper.selectList(qw);
@@ -179,9 +180,11 @@ public class EvaluateRuleServiceImpl extends ServiceImpl<EvaluateRuleMapper, Eva
 			qw.lambda().eq(EvaluateRule::getBinSection, entity.getBinSection());
 			qw.lambda().eq(EvaluateRule::getBinStage, entity.getBinStage());
 			qw.lambda().eq(EvaluateRule::getEnable, true);
+			qw.lambda().eq(EvaluateRule::getYear, entity.getYear());
+			qw.lambda().eq(EvaluateRule::getCheckCycle, entity.getCheckCycle());
 			List<EvaluateRule> list = baseMapper.selectList(qw);
 			if (null != list && list.size() > 0) {
-				throw new CustomException("当前模块规则已存在,如若新增规则，请禁用已存在规则");
+				throw new CustomException("当前模块规则已存在");
 			}
 
 			entity.setCreateTime(new Date());//创建时间

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/MultipleBrandServiceImpl.java

@@ -62,10 +62,20 @@ public class MultipleBrandServiceImpl extends ServiceImpl<MultipleBrandMapper, M
 		}
 
 		brands = brands.stream().filter(f->!"0".equals(f.getParentId())).collect(Collectors.toList());
-		Map<String ,List<MultipleBrand>> brandMap = brands.stream().collect(Collectors.groupingBy(MultipleBrand::getParentId));
+//		Map<String ,List<MultipleBrand>> brandMap = brands.stream().collect(Collectors.groupingBy(MultipleBrand::getParentId));
+
+//		Map<String, List<MultipleBrand>> groupedBrands = brands.stream()
+//			.collect(Collectors.groupingBy(brand -> brand.getParentId() + "_" + brand.getCheckCycle()));
 		for (MultipleBrand brandsVO : result) {
 			// 循环一级之后子级
-			brandsVO.setChildren(brandMap.get(brandsVO.getOrganizationId()));
+			List<MultipleBrand>  newbrands = null;
+			if("NDKP".equals(brandsVO.getCheckCycle())){
+
+				newbrands = brands.stream().filter(f->brandsVO.getOrganizationId().equals(f.getParentId()) && brandsVO.getCheckCycle().equals(f.getCheckCycle())).collect(Collectors.toList());
+			}else{
+				newbrands = brands.stream().filter(f->brandsVO.getOrganizationId().equals(f.getParentId()) && brandsVO.getCheckCycle().equals(f.getCheckCycle()) && brandsVO.getMonth().equals(f.getMonth())).collect(Collectors.toList());
+			}
+			brandsVO.setChildren(newbrands);
 		}
 		return result;
 	}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationEvaluationServiceImpl.java

@@ -546,7 +546,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 		OrganizationEvaluation evaluation = baseMapper.selectById(id);
 
 		if("人事部审核".equals(state)){
-			state = "流程结束";
+			state = "流程已结束";
 
 			//流程结束  计算相应的得分和汇总报告
 			boolean b1 = organizationEvaluationInfoService.calculationByEvaluationId("","",id,"");

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/ResponsibilityIndicatorInfoServiceImpl.java

@@ -217,7 +217,7 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 
 		//判断是否是（重点专项和管理事项）
 		List<Map> indicatorMap = new ArrayList<>();
-		if ("ZDZX".equals(CacheContext.bseIdObject.get(binStage).getStageCode()) || "GLSX".equals(CacheContext.bseIdObject.get(binStage).getStageCode())) {
+		if ("ZDZX".equals(CacheContext.bseIdObject.get(binStage).getStageCode()) || "KJCX".equals(CacheContext.bseIdObject.get(binStage).getStageCode())) {
 			DeptResponsibility dby = deptResponsibilityService.getById(responsibilityId);
 			if(null == dby){
 				return null;
@@ -357,7 +357,7 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 
 				if ("1".equals(quantified)) {
 
-					if (MathCalculatorUtil.isNumber(String.valueOf(valueMap.get(entry.getKey().replace("ID_", "")).toString()))) {
+					if (MathCalculatorUtil.isNumber(String.valueOf(valueMap.get(entry.getKey().replace("ID_", ""))))) {
 						info.setQuantifiedValue(Double.valueOf(valueMap.get(entry.getKey().replace("ID_", "")).toString()));
 					} else {
 						info.setQuantifiedValue(0);

ims-service/ims-eval/src/main/resources/application.yml

@@ -27,10 +27,13 @@ iam:
   gateway-url:
     dev: http://10.65.78.23:18600/
     pro: http://10.65.79.83:86/
-
   menu:
     dev: 10105
     pro: 6802
+  flow-url:
+    dev: http://10.65.78.23:8080
+    pro: http://10.65.79.85:8080
+
 
 
 

ims-service/ims-eval/src/main/resources/mappers/IndicatorMapper.xml

@@ -203,7 +203,7 @@
                 AND i.id in
                 <foreach item="item" collection="ids" separator="," open="(" close=")" index="">'${item}'</foreach>
             </if>
-            and d.option_code in ('JHZ','DBZ','MBZ','YFTR','SLFMZLSL','SLSYXXZLSL','KYRW')
+            and d.option_code in ('JHZ','DBZ','MBZ','HZ','HJ','YHZ','YHQ','DHQ','DHZ','JDGZ','FZ','JJTZ','FJJTZ')
         </where>
         order by   i.order_num asc
     </select>

ims-service/ims-eval/src/main/resources/mappers/MultipleBrandMapper.xml

@@ -37,8 +37,10 @@
 
             </where>
 
+            order by m.year,m.month,m.check_cycle desc
 
-    </select>
+
+        </select>