报告修改提交

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

@@ -83,4 +83,9 @@ public class EvaluateReportController {
 	}
 
 
+
+
+
+
+
 }

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

@@ -8,9 +8,13 @@ import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IEvaluationWarningInfoService;
 import com.ims.eval.service.IEvaluationWarningRuleService;
 import io.swagger.annotations.ApiOperation;
+import javafx.beans.binding.SetExpression;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
 /**
  * <p>
  *  前端控制器
@@ -46,9 +50,18 @@ public class EvaluationWarningRuleController {
 	@ApiOperation(value = "考评预警规则添加、更新", notes = "")
 	@PostMapping(value = "rule/save")
 	public R EvaluationWarningRuleSave(@RequestHeader(value = "Code", required = false) String code, @RequestBody EvaluationWarningRule warningRule){
-		boolean flag = warningRuleService.saveOrUpdate(code, warningRule);
-		if (flag) {
-			return R.ok();
+		try {
+			String decode = URLDecoder.decode(warningRule.getExpression(), "UTF-8");
+			String expression = decode.replaceAll(" ", "+");
+			warningRule.setExpression(expression);
+			boolean flag = warningRuleService.saveOrUpdate(code, warningRule);
+			if (flag) {
+				return R.ok();
+			}
+
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+			return R.error();
 		}
 		return R.error();
 	}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluateReportMapper.java

@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.eval.entity.EvaluateReport;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ims.eval.entity.Indicator;
+import com.ims.eval.entity.dto.response.EvaluateReportInfoResDTO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -26,4 +29,11 @@ public interface EvaluateReportMapper extends BaseMapper<EvaluateReport> {
 		 @Param("year")String year,
 		 @Param("month")String month);
 
+
+	 List<EvaluateReportInfoResDTO> selectList(@Param("binSection")String binSection,
+											   @Param("organizationEvaluationId") String organizationEvaluationId,
+											   @Param("checkCycle")String checkCycle,
+											   @Param("year")String year,
+											   @Param("month")String month);
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluationPortalMapper.java

@@ -17,4 +17,6 @@ import java.util.Map;
 public interface EvaluationPortalMapper extends BaseMapper<EvaluationPortal> {
 
     List<Map<String, Object>> selectPortalList(String binSection, String year, String season);
+
+	List<EvaluationPortal> selectEvaluationPortalList(String year, String season,String binSection, String memo1);
 }

ims-service/ims-eval/src/main/java/com/ims/eval/dao/ResponsibilityIndicatorInfoMapper.java

@@ -1,5 +1,6 @@
 package com.ims.eval.dao;
 
+import com.ims.eval.config.permission.DataPermission;
 import com.ims.eval.entity.ResponsibilityIndicatorInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ims.eval.entity.dto.response.ResponsibilityIndicatorInfoResDTO;
@@ -15,13 +16,16 @@ import java.util.List;
  * @author wang
  * @since 2023-03-08
  */
+@DataPermission
 public interface ResponsibilityIndicatorInfoMapper extends BaseMapper<ResponsibilityIndicatorInfo> {
 
 
+
 	List<ResponsibilityIndicatorInfoResDTO> listByresponsibilityId(@Param("deptResponsibilityIds") List<String> deptResponsibilityIds,
 																   @Param("dept") String dept,
 																   @Param("optionCode") String optionCode,
 																   @Param("organizationId") String organizationId);
 
+	@DataPermission(isPermission = false)
 	List<ResponsibilityIndicatorInfoResDTO> selectResponsibilityIndicatorInfoList(@Param("deptResponsibilityId") String deptResponsibilityId, @Param("isQuantified") String isQuantified, @Param("dataState") String dataState);
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationScoreCount.java

@@ -57,4 +57,21 @@ public class 	EvaluationScoreCount extends Model {
 	private String isQuantified;
 
 
+	/**
+	 * 备注；
+	 */
+	private String  remark;
+
+	/**
+	 * 板块code；
+	 */
+	private String stageCode;
+
+	/**
+	 * 基准分标记
+	 */
+	private String standard;
+
+
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/ResponsibilityIndicatorInfo.java

@@ -101,4 +101,9 @@ public class ResponsibilityIndicatorInfo extends Model {
 	 * 数据状态
 	 */
 	private String dataState;
+
+	/**
+	 * 部门id
+	 */
+	private String deptId;
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/response/EvaluateReportInfoResDTO.java

@@ -0,0 +1,125 @@
+package com.ims.eval.entity.dto.response;
+
+import lombok.Data;
+
+@Data
+public class EvaluateReportInfoResDTO {
+
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 主键id
+	 */
+	private String id;
+
+
+	/**
+	 * 业务版块
+	 */
+	private String binSection;
+
+	/**
+	 * 业务版块name
+	 */
+	private String binSectionName;
+
+	/**
+	 * 周期
+	 */
+	private String checkCycle;
+
+	/**
+	 * 年
+	 */
+	private String year;
+
+	/**
+	 * 月
+	 */
+	private String month;
+
+
+
+	/**
+	 * 考评报告id
+	 */
+	private String evaluateReportId;
+
+
+	/**
+	 * 考评组织ID
+	 */
+	private String organizationId;
+
+	/**
+	 * 考评组织名称
+	 */
+	private String organizationName;
+
+	/**
+	 * 生产经营得分
+	 */
+	private double scjyScore;
+
+	/**
+	 * 前期得分
+	 */
+	private double qqScore;
+
+	/**
+	 * 基建得分
+	 */
+	private double jjScore;
+
+	/**
+	 * 加分项
+	 */
+	private double addScore;
+
+	/**
+	 * 减分项
+	 */
+	private double subScore;
+
+	/**
+	 * 加减分合计
+	 */
+	private double addSubScore;
+
+	/**
+	 * 综合得分
+	 */
+	private double zhScore;
+
+	/**
+	 * 经营业绩系数
+	 */
+	private double jyyjXs;
+
+	/**
+	 * 关键业绩得分
+	 */
+	private double gjyjXs;
+
+	/**
+	 * 党建考核乘数
+	 */
+	private double djkhCs;
+
+	/**
+	 * 分数
+	 */
+	private double score;
+
+	/**
+	 * 折算分数
+	 */
+	private double discountScore;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/response/OrganizationEvaluationInfoResDTO.java

@@ -133,4 +133,14 @@ public class OrganizationEvaluationInfoResDTO {
 	 *计算公式
 	 */
 	private String formula;
+
+	/**
+	 * 基准分
+	 */
+	private double standardScore;
+
+	/**
+	 * 板块code
+	 */
+	private String stageCode;
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/response/ResponsibilityIndicatorInfoResDTO.java

@@ -59,6 +59,11 @@ public class ResponsibilityIndicatorInfoResDTO {
 	private String organizationName;
 
 	/**
+	 * 组织名(简称)
+	 */
+	private String  organizationShortName;
+
+	/**
 	 * 组织规则id
 	 */
 	private String organizationEvaluationRuleId;
@@ -118,10 +123,12 @@ public class ResponsibilityIndicatorInfoResDTO {
 	/**
 	 * 修改标记
 	 */
-	private Boolean updateMark;
+	private Boolean updateMark = true;
 
 	/**
 	 * 数据状态
 	 */
 	private String dataState;
+
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluateReportService.java

@@ -3,6 +3,7 @@ package com.ims.eval.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.entity.EvaluateReport;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ims.eval.entity.dto.response.EvaluateReportInfoResDTO;
 
 import java.util.List;
 
@@ -23,4 +24,8 @@ public interface IEvaluateReportService extends IService<EvaluateReport> {
 
 	List<EvaluateReport> list(String organizationEvaluationId,String binSection);
 
+
+	List<EvaluateReportInfoResDTO> list(String organizationEvaluationId, String binSection, String checkCycle, String year, String month);
+
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluationPortalService.java

@@ -2,7 +2,9 @@ package com.ims.eval.service;
 
 import com.ims.eval.entity.EvaluationPortal;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ims.eval.entity.EvaluationPortalAttach;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -23,4 +25,29 @@ public interface IEvaluationPortalService extends IService<EvaluationPortal> {
 	 */
 	Map<String, Object> getPortalData(String binSection, String year, String season);
 
+	/**
+	 * list
+	 * @param year 年
+	 * @param season 季度
+	 * @param binSection 业务板块
+	 * @param memo1 公司id(保存到预留字段)
+	 * @return
+	 */
+	List<EvaluationPortal> getEvaluationPortalList(String year, String season, String binSection, String memo1);
+
+
+	/**
+	 * 保存数据
+	 * @param portal
+	 * @param attach
+	 * @return
+	 */
+	boolean saveSeasonPerformanceRanking(EvaluationPortal portal, EvaluationPortalAttach attach);
+
+
+	/**
+	 * 评级
+	 */
+	void rating(String organizationEvaluationId);
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/custom/WorkflowService.java

@@ -240,10 +240,13 @@ public class WorkflowService {
 				deptResponsibilityService.editState(bizKey,taskName,instId);
 				break;
 			case "yddwkplc"://月度单位考评流程
-				boolean b = organizationEvaluationService.editState(bizKey, taskName,instId);
-				if ("各部门填报".equals(taskName) && b){
-					scoreCalculationSchedule.doTask(bizKey);
-				}
+				organizationEvaluationService.editState(bizKey, taskName,instId);
+				break;
+			case "jddwkplc"://季度单位考评流程
+				 organizationEvaluationService.editState(bizKey, taskName,instId);
+				break;
+			case "nddwkplc"://年度单位考评流程
+				organizationEvaluationService.editState(bizKey, taskName,instId);
 				break;
 			case "dwkpmbxd"://单位考评目标修订
 				evaluationRevisionService.editState(bizKey,taskName,instId);

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

@@ -158,8 +158,8 @@ public class CalculateIndicatorItemInfoServiceImpl extends ServiceImpl<Calculate
 						maxNum.setOptionCode("CZMAX");
 						minNum.setOptionCode("CZMIN");
 					}else if (listEntry.getKey().equals("LRGXL")){
-						maxNum.setOptionCode("LRGXKLMAX");
-						minNum.setOptionCode("LRGXKLMIN");
+						maxNum.setOptionCode("LRGXLMAX");
+						minNum.setOptionCode("LRGXLMIN");
 					}else if (listEntry.getKey().equals("DWQWLR")){
 						maxNum.setOptionCode("DWQWLRMAX");
 						minNum.setOptionCode("DWQWLRMIN");

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

@@ -170,14 +170,16 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 			List<String> evaluateRuleIds = Arrays.asList(evaluationRule.getEvaluateRuleId().split(","));
 			List<EvaluateRule> evaluateRuleList = evaluateRuleService.listAll(evaluateRuleIds);
 			if (null == evaluateRuleList || evaluateRuleList.size() <= 0) {
-				throw new CustomException("未获取到配置的规则");
+				//throw new CustomException("未获取到配置的规则");
+				continue;
 			}
 			//获取考评规则的id
 			List<String> ruleIds = evaluateRuleList.stream().map(EvaluateRule::getId).collect(Collectors.toList());
 			//通过规则id获取对应的规则明细
 			List<EvaluateRuleInfo> ruleInfos = evaluateRuleInfoService.list(ruleIds);
 			if (null == ruleInfos || ruleInfos.size() <= 0) {
-				throw new CustomException("规则明细配置为空");
+//				throw new CustomException("规则明细配置为空");
+				continue;
 			}
 
 
@@ -196,34 +198,14 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 				info.setIndicatorDictionaryId(null);
 				info.setOptionCode("ZRMB");
 				info.setIsQuantified(i.getIsQuantified());
+				info.setState("-1");
 				info.setCreateTime(new Date());
+				info.setDeptId(i.getDeptId());
 				boolean b2 = responsibilityIndicatorInfoService.saveOrUpdate(info);
 				if (!b2) {
 					throw new CustomException("初始化目标责任书明细失败");
 				}
 			});
-
-
-			//通过指标id获取指标明细项
-/*			List<IndicatorResDTO> resDTOS = iIndicatorService.listByIds(indicatorIds);
-			if (null == resDTOS || resDTOS.size() <= 0) {
-				throw new CustomException("指标规则明细项为空");
-			}
-
-
-			resDTOS.stream().forEach(r -> {
-				ResponsibilityIndicatorInfo info = new ResponsibilityIndicatorInfo();
-				info.setDeptResponsibilityId(oriResponsibility.getId());
-				info.setIndicatorId(r.getId());
-				info.setIndicatorDictionaryId(r.getIndicatorDictionaryID());
-				info.setOptionCode(r.getOptionCode());
-				info.setIsQuantified(r.getIsQuantified());
-				info.setCreateTime(new Date());
-				boolean b2 = responsibilityIndicatorInfoService.saveOrUpdate(info);
-				if (!b2) {
-					throw new CustomException("初始化目标责任书明细失败");
-				}
-			});*/
 		}
 
 		return true;
@@ -254,6 +236,9 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 	public boolean editState(String id, String state,String instId) {
 		DeptResponsibility responsibility = baseMapper.selectById(id);
 		if (StringUtils.isNotEmpty(state)) {
+			if("任务书签订".equals(state)){
+				state = "流程结束";
+			}
 			responsibility.setStage(state);
 		}
 		if (StringUtils.isNotEmpty(instId)) {

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

@@ -9,6 +9,7 @@ import com.ims.eval.cache.CacheContext;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.*;
 import com.ims.eval.dao.EvaluateReportMapper;
+import com.ims.eval.entity.dto.response.EvaluateReportInfoResDTO;
 import com.ims.eval.entity.dto.response.EvaluateRuleInfoResDTO;
 import com.ims.eval.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -56,6 +57,9 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 	private CacheContext cache;
 
 	@Autowired
+	private IEvaluationPortalService evaluationPortalService;
+
+	@Autowired
 	private IYearOperatingCoefficientService yearOperatingCoefficientService;
 
 
@@ -66,183 +70,8 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 	//业务阶综合展示
 
 
-	public boolean generateEvaluateReport1(String organizationEvaluationId, boolean backroll) {
-
-
-		//业务ai扮酷
-		List<BinSection> sections = CacheContext.bsnList;
-
-		EvaluateReport evaluateReport = new EvaluateReport();
-		OrganizationEvaluation evaluation = organizationEvaluationService.getById(organizationEvaluationId);
-		if (null == evaluation) {
-			throw new CustomException("没有此靠考评");
-		}
-
-		//获取到对应组织考评规则
-		String evaluationRuleId = evaluation.getOrganizationEvaluationRuleId();
-		if (null == evaluationRuleId || evaluationRuleId.length() <= 0) {
-			throw new CustomException("组织考评id为空");
-		}
-
-		String month = "";
-		//获取单位配置规则
-		List<String> evaluationRuleIds = Arrays.asList(evaluationRuleId.split(","));
-		for (BinSection bi : sections) {
-
-			StringBuilder reportName = new StringBuilder();
-			if ("NDKP".equals(evaluation.getCheckCycle())) {
-				reportName.append("年度-");
-				month = "";
-				evaluateReport.setMonth("-");
-			}
-			if ("JDKP".equals(evaluation.getCheckCycle())) {
-				reportName.append("季度-");
-				evaluateReport.setMonth(evaluation.getMonth());
-
-			}
-			if ("YDKP".equals(evaluation.getCheckCycle())) {
-				reportName.append("月度-");
-				month = evaluation.getMonth();
-				evaluateReport.setMonth(evaluation.getMonth());
-			}
-			reportName.append(bi.getSectionName());
-			if ("DWKP".equals(evaluation.getOrganizationType())) {
-				reportName.append("单位");
-			}
-			if ("BNMKP".equals(evaluation.getOrganizationType())) {
-				reportName.append("部门");
-			}
-			reportName.append("综合考核评分汇总表");
-
-			evaluateReport.setEvaluateReportName(reportName.toString());
-			evaluateReport.setOrganizationEvaluationId(evaluation.getId());
-			evaluateReport.setBinSection(bi.getId());
-			evaluateReport.setBinSectionName(bi.getSectionName());
-			evaluateReport.setOrganizationType(evaluation.getOrganizationType());
-			evaluateReport.setCheckCycle(evaluation.getCheckCycle());
-			evaluateReport.setYear(evaluation.getYear());
-
-			evaluateReport.setCreateTime(new Date());
-			evaluateReport.setCreateBy("");//人员
-
-			List<EvaluateReport> oriReports = list(evaluation.getId(), bi.getId());
-			if (oriReports.size() > 0 && !backroll) {
-				throw new CustomException("综合考核评分汇总已生成");
-			} else {
-				for (EvaluateReport r : oriReports) {
-					boolean b = super.removeById(r.getId());
-					if (!b) {
-						throw new CustomException("综合考核评分汇总重算失败");
-					}
-					List<EvaluateReportInfo> infolist = evaluateReportInfoService.listByReportId(r.getId());
-					if (null != infolist && infolist.size() > 0) {
-						List<String> infolistIds = infolist.stream().map(EvaluateReportInfo::getId).collect(Collectors.toList());
-						b = evaluateReportInfoService.removeByIds(infolistIds);
-						if (!b) {
-							throw new CustomException("综合考核评分汇总重算失败");
-						}
-					}
-				}
-			}
-			boolean b = super.saveOrUpdate(evaluateReport);
-
-			if (!b) {
-				throw new CustomException("综合考核评分汇总表存储失败");
-			}
-
-			List<OrganizationEvaluationRule> ruleList = organizationEvaluationRuleService.getOrganizationEvaluationRuleByIds(evaluationRuleIds, bi.getId());
-			//各板块明细存储
-			List<EvaluateReportInfo> evaluateRuleInfoList = new ArrayList<>();
-			for (OrganizationEvaluationRule rule : ruleList) {
-
-				StringBuilder remark = new StringBuilder();
-				//生产95%基建5%前期0%
-				remark.append("生产").append(rule.getScjyWeight() * 100).append("%");
-				remark.append("基建").append(rule.getJjWeight() * 100).append("%");
-				remark.append("前期").append(rule.getQqWeight() * 100).append("%");
 
-
-				//存储多块牌子数据
-				List<MultipleBrand> brands = multipleBrandService.getMultipleBranList2(rule.getOrganizationId(), "0", bi.getId(), evaluation.getCheckCycle(), evaluation.getYear(), month);
-
-				Double totalProfit = 0.00;//累加收入
-				Double spMultiply = 0.00;//收入
-				Double score;//分数
-				if (null != brands && brands.size() > 0) {
-					for (MultipleBrand mb : brands) {
-						//累加收入
-						totalProfit = totalProfit + mb.getProfit();
-						//累加收入和分数的积
-						spMultiply = spMultiply + mb.getProfit() * mb.getScore();
-
-						List<MultipleBrand> parentBrands = multipleBrandService.getMultipleBranList2("", mb.getOrganizationId(), bi.getId(), evaluation.getCheckCycle(), evaluation.getYear(), month);
-						for (MultipleBrand pb : parentBrands) {
-							//累加收入
-							totalProfit = totalProfit + pb.getProfit();
-							spMultiply = spMultiply + mb.getProfit() * mb.getScore();
-						}
-
-					}
-					score = spMultiply / totalProfit;
-				} else {
-					List<String> evaluateRuleIds = Arrays.asList(rule.getEvaluateRuleId().split(","));
-					List<EvaluateRuleInfoResDTO> evaluateRuleList = evaluateRuleService.getListInIdsInfos(evaluateRuleIds, bi.getId(), "");
-					List<String> indicatorIds = evaluateRuleList.stream().map(EvaluateRuleInfoResDTO::getIndicatorId).collect(Collectors.toList());
-					List<EvaluationScoreCount> scoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), indicatorIds);
-					score = scoreCount.stream().mapToDouble(EvaluationScoreCount::getScore).sum();
-				}
-
-
-				EvaluateReportInfo reportInfo = new EvaluateReportInfo();
-				reportInfo.setEvaluateReportId(evaluateReport.getId());
-				reportInfo.setOrganizationId(rule.getOrganizationId());
-				reportInfo.setOrganizationName(rule.getOrganizationName());
-
-				List<EvaluationScoreCount> scoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, null);
-				score = scoreCount.stream().mapToDouble(EvaluationScoreCount::getScore).sum();
-
-				reportInfo.setScore(DoubleUtils.keepPrecision(score, 2));
-				reportInfo.setDiscountScore(1.0);
-				reportInfo.setRemark(remark.toString());
-				evaluateRuleInfoList.add(reportInfo);
-
-				//加分项
-				EvaluateReportInfo addInfo = new EvaluateReportInfo();
-				addInfo.setEvaluateReportId(evaluateReport.getId());
-				addInfo.setOrganizationId(rule.getOrganizationId());
-				addInfo.setOrganizationName(rule.getOrganizationName());
-				addInfo.setScore(DoubleUtils.keepPrecision(score, 2));
-				addInfo.setDiscountScore(1.0);
-				addInfo.setRemark(remark.toString());
-				evaluateRuleInfoList.add(addInfo);
-				//减分项
-				EvaluateReportInfo subInfo = new EvaluateReportInfo();
-				subInfo.setEvaluateReportId(evaluateReport.getId());
-				subInfo.setOrganizationId(rule.getOrganizationId());
-				subInfo.setOrganizationName(rule.getOrganizationName());
-				subInfo.setScore(DoubleUtils.keepPrecision(score, 2));
-				subInfo.setDiscountScore(1.0);
-				subInfo.setRemark(remark.toString());
-				evaluateRuleInfoList.add(subInfo);
-
-
-			}
-
-			for (EvaluateReportInfo info : evaluateRuleInfoList) {
-				b = evaluateReportInfoService.saveOrUpdate(info);
-				if (!b) {
-					throw new CustomException("综合考核评分汇总明细存储失败");
-				}
-			}
-
-
-		}
-
-		return true;
-	}
-
-
-//	@Transactional
+	@Transactional
 	@Override
 	public boolean generateEvaluateReport(String organizationEvaluationId, boolean backroll) {
 
@@ -265,7 +94,6 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 		for (BinSection bi : sections) {
 
 
-
 			EvaluateReport evaluateReport = new EvaluateReport();
 			StringBuilder reportName = new StringBuilder();
 			if ("NDKP".equals(evaluation.getCheckCycle())) {
@@ -277,11 +105,14 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 				evaluateReport.setMonth("-");
 			}
 			if ("JDKP".equals(evaluation.getCheckCycle())) {
-				if("FD".equals(bi.getSectionCode()) || "GD".equals(bi.getSectionCode())){
-					continue;
-				}
 				reportName.append("季度-");
 				evaluateReport.setMonth(evaluation.getMonth());
+				if("XNYFG".equals(bi.getSectionCode()) || "ZHZC".equals(bi.getSectionCode())||
+					"GCGS".equals(bi.getSectionCode()) || "TJGS".equals(bi.getSectionCode())||
+					"QQ".equals(bi.getSectionCode()) || "JJ".equals(bi.getSectionCode())||
+					"GD".equals(bi.getSectionCode())){
+					continue;
+				}
 
 			}
 			if ("YDKP".equals(evaluation.getCheckCycle())) {
@@ -319,9 +150,11 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 				for(EvaluateReport er : oriReports){
 					List<EvaluateReportInfo> rlist = evaluateReportInfoService.listByReportId(er.getId());
 
-					boolean rlistb =  evaluateReportInfoService.removeByIds(rlist.stream().map(EvaluateReportInfo::getId).collect(Collectors.toList()));
-					if (!rlistb) {
-						throw new CustomException("综合考核评分汇总计算失败");
+					if(null !=rlist && rlist.size()>0){
+						boolean rlistb =  evaluateReportInfoService.removeByIds(rlist.stream().map(EvaluateReportInfo::getId).collect(Collectors.toList()));
+						if (!rlistb) {
+							throw new CustomException("综合考核评分汇总计算失败");
+						}
 					}
 				}
 				boolean oriReportsb = this.removeByIds(oriReports.stream().map(EvaluateReport::getId).collect(Collectors.toList()));
@@ -391,6 +224,7 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 					scjyScore = spMultiply / totalProfit;
 				}
 
+
 				EvaluateReportInfo reportInfo = new EvaluateReportInfo();
 				reportInfo.setEvaluateReportId(evaluateReport.getId());
 				reportInfo.setOrganizationId(rule.getOrganizationId());
@@ -506,6 +340,14 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 		return list;
 	}
 
+	@Override
+	public List<EvaluateReportInfoResDTO> list(String organizationEvaluationId, String binSection, String checkCycle, String year, String month) {
+
+
+
+		return null;
+	}
+
 
 }
 

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

@@ -1,16 +1,24 @@
 package com.ims.eval.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ims.common.utils.DateUtils;
+import com.ims.common.utils.StringUtils;
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.EvaluationPortal;
 import com.ims.eval.dao.EvaluationPortalMapper;
+import com.ims.eval.entity.EvaluationPortalAttach;
+import com.ims.eval.entity.EvaluationScoreCount;
+import com.ims.eval.entity.OrganizationEvaluation;
+import com.ims.eval.service.IEvaluationPortalAttachService;
 import com.ims.eval.service.IEvaluationPortalService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ims.eval.service.IEvaluationScoreCountService;
+import com.ims.eval.service.IOrganizationEvaluationService;
 import groovy.util.logging.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -25,6 +33,15 @@ import java.util.stream.Collectors;
 @Service
 public class EvaluationPortalServiceImpl extends ServiceImpl<EvaluationPortalMapper, EvaluationPortal> implements IEvaluationPortalService {
 
+
+	@Autowired
+	private IEvaluationPortalAttachService evaluationPortalAttachService;
+
+	@Autowired
+	private  IOrganizationEvaluationService organizationEvaluationService;
+
+	private IEvaluationScoreCountService evaluationScoreCountService;
+
 	@Override
 	public Map<String, Object> getPortalData(String binSection, String year, String season) {
 		Map<String, Object> map = new HashMap<>();
@@ -42,4 +59,61 @@ public class EvaluationPortalServiceImpl extends ServiceImpl<EvaluationPortalMap
 
 		return map;
 	}
+
+	@Override
+	public List<EvaluationPortal> getEvaluationPortalList(String year, String season, String binSection, String memo1) {
+
+		List<EvaluationPortal> list = baseMapper.selectEvaluationPortalList(year,season,binSection,memo1);
+
+
+		return list;
+	}
+
+	@Override
+	public boolean saveSeasonPerformanceRanking(EvaluationPortal portal, EvaluationPortalAttach attach) {
+		List<EvaluationPortal> portals = getEvaluationPortalList(portal.getYear(), portal.getSeason(), portal.getBinSection(), portal.getMemo1());
+		if (null != portals && portals.size() > 0) {
+			List<String> idList = portals.stream().map(EvaluationPortal::getId).collect(Collectors.toList());
+			boolean b = this.removeByIds(idList);
+			if (!b) {
+				throw new CustomException("操作失败");
+			}
+
+		}
+		boolean b1 = this.saveOrUpdate(portal);
+		if (!b1) {
+			throw new CustomException("操作失败");
+		}
+		attach.setPortalId(portal.getId());
+		boolean b2 = evaluationPortalAttachService.saveOrUpdate(attach);
+		if (!b2) {
+			throw new CustomException("操作失败");
+		}
+		return b2;
+	}
+
+	@Override
+	public void rating(String OrganizationEvaluation) {
+		OrganizationEvaluation evaluation = null;
+		if(StringUtils.isEmpty(OrganizationEvaluation)){
+			//获取当前日期
+			String  year = String.valueOf(DateUtils.getYear(new Date()));
+			String season = String.valueOf(DateUtils.getSeason(new Date()));
+			evaluation = organizationEvaluationService.list(OrganizationEvaluation,"JDKP",year,season).get(0);
+		}else {
+			 evaluation = organizationEvaluationService.getById(OrganizationEvaluation);
+		}
+		//按照板块获取分数
+
+		evaluationScoreCountService.getListByEvaluationRuleId("","","");
+		evaluation.getId();
+
+
+
+
+
+
+	}
+
+
 }

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

@@ -12,6 +12,8 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -28,7 +30,7 @@ public class MultipleBrandServiceImpl extends ServiceImpl<MultipleBrandMapper, M
 	public IPage<MultipleBrand> getMultipleBranTree(Integer pageNum, Integer pageSize,String id, String parentId,String  binSection,String  checkCycle,String year,String month) {
 		Page<Indicator> page = new Page<>(pageNum, pageSize);
 		IPage<MultipleBrand> list  =  baseMapper.selectMultipleBranTree(page,id,"0",binSection,checkCycle,year,month);
-		List<MultipleBrand> list2  =  baseMapper.selectMultipleBranList(id,parentId,binSection,checkCycle,year,month);
+		List<MultipleBrand> list2  =  baseMapper.selectMultipleBranList(id,"",binSection,checkCycle,year,month);
 
 		List<MultipleBrand> tree = convert(list.getRecords(),list2);
 		list.setRecords(tree);
@@ -59,9 +61,11 @@ public class MultipleBrandServiceImpl extends ServiceImpl<MultipleBrandMapper, M
 			return new ArrayList<>();
 		}
 
+		brands = brands.stream().filter(f->!"0".equals(f.getParentId())).collect(Collectors.toList());
+		Map<String ,List<MultipleBrand>> brandMap = brands.stream().collect(Collectors.groupingBy(MultipleBrand::getParentId));
 		for (MultipleBrand brandsVO : result) {
 			// 循环一级之后子级
-			getChildren(brands, brandsVO);
+			brandsVO.setChildren(brandMap.get(brandsVO.getOrganizationId()));
 		}
 		return result;
 	}

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

@@ -244,7 +244,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 									Map<String, List<OrganizationEvaluationInfoResDTO>> childCodeGropList = indicator.stream().collect(Collectors.groupingBy(OrganizationEvaluationInfoResDTO::getChildCode));
 									double totalScore = 0.00;
 									EvaluationScoreCount scoreCount = new EvaluationScoreCount();
-
+									double standardScore = 0;
 									for (Map.Entry<String, List<OrganizationEvaluationInfoResDTO>> childCodeGropListEntry : childCodeGropList.entrySet()){
 
 										List<CalculateIndicatorItemInfo> calculateIndicatorItemInfo = calculateIndicatorItemInfoMapper.selectList("","","","","",childCodeGropListEntry.getValue().get(0).getOrganizationEvaluationId(),childCodeGropListEntry.getValue().get(0).getChildCode());
@@ -261,6 +261,8 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 											scoreCount.setOrganizationEvaluationId(dto.getOrganizationEvaluationId());
 											scoreCount.setOrganizationEvaluationRuleId(dto.getOrganizationEvaluationRuleId());
 											scoreCount.setIndicatorId(dto.getIndicatorId());
+											scoreCount.setStageCode(dto.getStageCode());
+
 											for (OrganizationEvaluationInfoResDTO f : indicator){
 												if(f.getOptionCode().endsWith("MIN") || f.getOptionCode().endsWith("MAX")){
 													f.setQuantifiedValue(map.get(f.getOptionCode()));
@@ -271,7 +273,14 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 											double score = FormulaUtils.calculateFormula(dto.getFormula());
 											if(dto.getOptionCode().equals("DF")||dto.getOptionCode().equals("DF2")
 												||dto.getOptionCode().equals("JHDF")){
+												standardScore = dto.getStandardScore();
 												totalScore = totalScore+score;
+												//保存加减分原因
+												if("YY".equals(dto.getOptionCode())){
+													scoreCount.setRemark(dto.getNonQuantifiedValue());
+												}else if(!"ZDZX".equals(dto.getStageCode()) && !"GLSX".equals(dto.getStageCode())){
+													scoreCount.setRemark(dto.getIndicatorName());
+												}
 											}
 											log.info(dto.getOrganizationShortName()+"|"+dto.getIndicatorName()+"|"+dto.getOptionCode()+"----------"+dto.getFormula()+"="+score);
 											OrganizationEvaluationInfo info  = baseMapper.selectById(dto.getId());
@@ -286,9 +295,15 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 									if(null==scoreCount.getOrganizationEvaluationId()|| null== scoreCount.getOrganizationEvaluationRuleId() || null == scoreCount.getIndicatorId()){
 											continue;
 									}
+									if(standardScore>0 && totalScore != standardScore){
+										scoreCount.setStandard(totalScore>standardScore?"1":"-1");
+									}else {
+										scoreCount.setStandard("0");
+									}
 									scoreCount.setScore(totalScore);
 									scoreCount.setObversionScore(totalScore);
 									scoreCount.setIsQuantified("1");
+
 									List<EvaluationScoreCount>  listcount = iEvaluatioinScoreCountService.getEvaluationScoreCountList(scoreCount.getOrganizationEvaluationId(),scoreCount.getOrganizationEvaluationRuleId(),scoreCount.getIndicatorId());
 									if(null  != listcount && listcount.size() >0){
 										List<String> ids = listcount.stream().map(EvaluationScoreCount::getId).collect(Collectors.toList());

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

@@ -90,6 +90,9 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 	@Resource
 	private IBinSectionService binSectionService;
 
+	@Autowired
+	private IEvaluateReportService evaluateReportService;
+
 
 	@Override
 	public IPage<OrganizationEvaluation> list(Integer pageNum, Integer pageSize, String id, String organizationEvaluationCode, List<String> checkCycle, String beginDate, String endDate, String stage, String createBy, String year, String month, String des) {
@@ -553,6 +556,16 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 	public boolean editState(String id, String state, String instId) {
 		OrganizationEvaluation evaluation = baseMapper.selectById(id);
 
+		if("人事部审核".equals(state)){
+			state = "流程结束";
+
+			//流程结束  计算相应的得分和汇总报告
+			boolean b1 = organizationEvaluationInfoService.calculationByEvaluationId("","",id,"");
+			if(b1){
+				boolean b2 = evaluateReportService.generateEvaluateReport(id,false);
+			}
+
+		}
 		if (StringUtils.isNotEmpty(state)) {
 			evaluation.setStage(state);
 		}

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

@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.Constant;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.dao.ResponsibilityIndicatorInfoMapper;
+import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.ResponsibilityIndicatorInfo;
 import com.ims.eval.entity.dto.request.ResponsibilityIndicatorInfoUpdateDTO;
 import com.ims.eval.entity.dto.response.MyuserResDTO;
 import com.ims.eval.entity.dto.response.ResponsibilityIndicatorInfoResDTO;
+import com.ims.eval.service.IIndicatorService;
 import com.ims.eval.service.IResponsibilityIndicatorInfoService;
 import com.ims.eval.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,34 +41,14 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 	@Autowired
 	private IUserService userService;
 
+	@Autowired
+	private IIndicatorService indicatorService;
+
 	@Override
 	public Map<String, List<ResponsibilityIndicatorInfoResDTO>> planValueList(List<String> deptResponsibilityIds, String dept, HttpServletRequest request) {
 
-		MyuserResDTO myuser = userService.getSysUser(request);
-		if (null == myuser) {
-			throw new CustomException("暂无权限");
-		}
-		String organizationId = "";
-		boolean updateMark = false;
-		if (null != myuser.getUnitOrg() && null != myuser.getUnitOrg().getParentIds()) {
-			String type = myuser.getUnitOrg().getType();
-			if (Constant.THREE.contains(type) || Constant.FOUR.contains(type)) {
-//				dept = myuser.getDeptName();
-				organizationId = myuser.getUnitId();
-			} else if (Constant.SUB_BRANCH.contains(type)) {
-				dept = "";
-			} else if (myuser.getLoginName().equals("admin")) {
-				dept = "";
-				updateMark = true;
-			} else {
-				throw new CustomException("暂无权限");
-			}
-		}
-		List<ResponsibilityIndicatorInfoResDTO> list = baseMapper.listByresponsibilityId(deptResponsibilityIds, dept, "ZRMB", organizationId);//默认获取指定的怎目标
-		boolean finalUpdateMark = updateMark;
-		list.stream().forEach(i -> {
-			i.setUpdateMark(i.getDeptName().equals(myuser.getDeptName()));
-		});
+		List<ResponsibilityIndicatorInfoResDTO> list = baseMapper.listByresponsibilityId(deptResponsibilityIds, dept, "ZRMB", "");//默认获取指定的怎目标
+
 		Map<String, List<ResponsibilityIndicatorInfoResDTO>> map = list.stream().collect(Collectors.groupingBy(ResponsibilityIndicatorInfoResDTO::getIsQuantified));
 		map.put("quantifiedList", map.remove("是"));
 		map.put("nonQuantifiedList", map.remove("否"));
@@ -98,8 +80,7 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 		indicatorInfo.setQuantifiedValue(infoUpdateDTO.getQuantifiedValue());//量化值
 		indicatorInfo.setNonQuantifiedValue(infoUpdateDTO.getNonQuantifiedValue());//非量化值
 		indicatorInfo.setUpdateTime(new Date());//更新时间
-		indicatorInfo.setUpdateBy(infoUpdateDTO.getUpdateBy());//更新者
-		indicatorInfo.setRemark(infoUpdateDTO.getRemark());//备注
+		indicatorInfo.setRemark(infoUpdateDTO.getRemark());//dicatorInfo.setUpdateBy(infoUpdateDTO.getUpdateBy());//更新者备注
 		return super.saveOrUpdate(indicatorInfo);
 	}
 
@@ -135,6 +116,10 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 				addInfo.setRemark(entity.getRemark());//备注
 				addInfo.setCreateTime(new Date());
 				addInfo.setState("-1");//状态
+
+				Indicator indicator = indicatorService.getById(entity.getIndicatorId());
+				addInfo.setDeptId(indicator.getDeptId());
+
 				boolean b = super.saveOrUpdate(addInfo);
 				if (!b) {
 					throw new CustomException("新增失败");

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

@@ -64,5 +64,39 @@
 
         </where>
     </select>
+    <select id="selectList" resultType="com.ims.eval.entity.dto.response.EvaluateReportInfoResDTO">
+
+        select r.*
+        ,o.des organizationEvaluationDes,
+        b.section_name binSectionName
+        from  evaluate_report r
+        LEFT JOIN organization_evaluation o on r.organization_evaluation_id = o.id
+        INNER JOIN bin_section b on r.bin_section = b.id
+        <where>
+
+
+
+
+            <if test="binSection !=null and binSection !=''">
+                AND r.bin_section = #{binSection}
+            </if>
+
+            <if test="organizationEvaluationId !=null and organizationEvaluationId !=''">
+                AND r.organization_evaluation_id = #{organizationEvaluationId}
+            </if>
+
+            <if test="checkCycle !=null and checkCycle !=''">
+                AND r.checkCycle = #{checkCycle}
+            </if>
+
+            <if test="year !=null and year !=''">
+                AND r.year = #{year}
+            </if>
+            <if test="month !=null and month !=''">
+                AND r.month = #{month}
+            </if>
+
+        </where>
+    </select>
 
 </mapper>

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

@@ -71,6 +71,38 @@
         ORDER BY SCORE DESC
 
     </select>
+    <select id="selectEvaluationPortalList" resultType="com.ims.eval.entity.EvaluationPortal">
+
+        SELECT
+        ep.*
+        FROM
+        evaluation_portal ep
+
+        <where>
+
+            <if test="binSection !=null and binSection !=''">
+                AND ep.bin_section = #{binSection}
+            </if>
+            <if test="year !=null and year !=''">
+                AND ep.year = #{year}
+            </if>
+
+            <if test="season !=null and season !=''">
+                AND ep.season = #{season}
+            </if>
+
+            <if test="season ==null or season !=''">
+                AND ep.season is null
+            </if>
+
+            <if test="memo1 !=null and memo1 !=''">
+                AND ep.memo1 = #{memo1}
+            </if>
+
+        </where>
+
+        ORDER BY SCORE DESC
+    </select>
 
 
 </mapper>

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

@@ -212,7 +212,8 @@
         ei.quantified_value,
         ei.non_quantified_value,
         i.unit,
-        ei.state
+        ei.state,
+        ri.standard_score
         from
         organization_evaluation_info ei
         inner join organization_evaluation_rule oer on oer.id = ei.organization_evaluation_rule_id
@@ -239,8 +240,6 @@
         </if>
 
 
-        and   ei.is_quantified = '是'
-
         </where>
 
         order by be.order_num,oer.organization_short_name,bn.order_num,ri.order_num,id.option_order asc

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

@@ -40,6 +40,7 @@
         bn.section_name,
         oer.id organizationEvaluationRuleId,
         oer.organization_name,
+        oer.organization_short_name,
         dd.key_name deptName,
         it.type_name,
         i.indicator_name,