公共指标处理

ims-service/ims-eval/src/main/java/com/ims/eval/config/permission/PermissionAspect.java

@@ -255,7 +255,6 @@ public class PermissionAspect implements Interceptor {
 
 			} else {
 				condition = table.getAlias().getName() + "." + DEPT_ID + "=''";
-				;
 			}
 
 			//取得原SQL的where条件

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

@@ -45,7 +45,7 @@ public interface IndicatorMapper extends BaseMapper<Indicator> {
 								 @Param("evaluationCycle") String evaluationCycle);
 
 
-
+	@DataPermission(isPermission = false)
 	List<IndicatorResDTO> selectListByIds(@Param("indicatorIds")List<String> indicatorIds);
 
 

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

@@ -1,7 +1,10 @@
 package com.ims.eval.dao;
 
-import com.ims.eval.entity.OrganizationEvaluationCommonInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ims.eval.config.permission.DataPermission;
+import com.ims.eval.entity.OrganizationEvaluationCommonInfo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +14,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author wang
  * @since 2023-09-11
  */
+@DataPermission
 public interface OrganizationEvaluationCommonInfoMapper extends BaseMapper<OrganizationEvaluationCommonInfo> {
 
+	List<OrganizationEvaluationCommonInfo> selectListAll(String organizationEvaluationId, String indicatorId, String organizationId, String deptId);
+
 }

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

@@ -6,6 +6,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -103,6 +104,7 @@ public class EvaluationPortal extends Model {
 	/**
 	 * 创建时间
 	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
 	private Date createTime;
 
 
@@ -113,4 +115,9 @@ public class EvaluationPortal extends Model {
 	private String memo2;
 	private String memo3;
 	private String memo4;
+
+	/**
+	 * 部门名称
+	 */
+	private String deptName;
 }

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

@@ -1,53 +0,0 @@
-package com.ims.eval.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author wang
- * @since 2023-09-11
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class OrganizationEvaluationCommonInfo extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    private String id;
-
-    /**
-     * 指标明细id
-     */
-    private String organizationEvaluationInfoId;
-
-    /**
-     * 指标部门id
-     */
-    private String deptId;
-
-    /**
-     * 组织id
-     */
-    private String organizationId;
-
-    /**
-     * 量化值
-     */
-    private BigDecimal quantifiedValue;
-
-    /**
-     * 非量化值
-     */
-    private String nonQuantifiedValue;
-
-
-}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/request/AddEvaluationInfoDTO.java

@@ -37,6 +37,17 @@ public class AddEvaluationInfoDTO {
 	private String binStage;
 
 	/**
+	 * 指标部门id
+	 */
+	private String deptId;
+
+
+	/**
+	 * 指标部门name
+	 */
+	private String deptName;
+
+	/**
 	 * 指标项值(key，value)
 	 */
 	private Map<String,Object> optionMap;

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

@@ -1,16 +0,0 @@
-package com.ims.eval.service;
-
-import com.ims.eval.entity.OrganizationEvaluationCommonInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author wang
- * @since 2023-09-11
- */
-public interface IOrganizationEvaluationCommonInfoService extends IService<OrganizationEvaluationCommonInfo> {
-
-}

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

@@ -40,8 +40,12 @@ public class EvaluationPortalServiceImpl extends ServiceImpl<EvaluationPortalMap
 	@Autowired
 	private IOrganizationEvaluationService organizationEvaluationService;
 
+	@Autowired
 	private IEvaluationScoreCountService evaluationScoreCountService;
 
+	@Autowired
+	private EvaluationPortalMapper evaluationPortalMapper;
+
 	@Override
 	public Map<String, Object> getPortalData(String binSection, String year, String season) {
 		Map<String, Object> map = new HashMap<>();
@@ -142,11 +146,19 @@ public class EvaluationPortalServiceImpl extends ServiceImpl<EvaluationPortalMap
 	@Override
 	public Map<String, String> getHomeSeason() {
 		Map<String, String> hs = new HashMap<>();
-		EvaluationPortal portal = baseMapper.getHomeSeason();
+		EvaluationPortal portal = null;
+		try {
+			portal = evaluationPortalMapper.getHomeSeason();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 
 		if(null != portal){
 			hs.put("year",portal.getYear());
 			hs.put("season",portal.getSeason());
+		}else {
+			hs.put("year",DateUtils.getYear(new Date())+"");
+			hs.put("season",DateUtils.getSeason(new Date())+"");
 		}
 		return hs;
 	}

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

@@ -1,20 +0,0 @@
-package com.ims.eval.service.impl;
-
-import com.ims.eval.entity.OrganizationEvaluationCommonInfo;
-import com.ims.eval.dao.OrganizationEvaluationCommonInfoMapper;
-import com.ims.eval.service.IOrganizationEvaluationCommonInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author wang
- * @since 2023-09-11
- */
-@Service
-public class OrganizationEvaluationCommonInfoServiceImpl extends ServiceImpl<OrganizationEvaluationCommonInfoMapper, OrganizationEvaluationCommonInfo> implements IOrganizationEvaluationCommonInfoService {
-
-}

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

@@ -1043,19 +1043,19 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 			boolean b = this.saveOrUpdateBatch(evaluationInfos);
 			if(b && null !=evaluationInfos && evaluationInfos.size()>0){
 				OrganizationEvaluationInfo info = this.getById(scoreid);
-				List<EvaluationScoreCount>  listcount = evaluatioinScoreCountService.getEvaluationScoreCountList(info.getOrganizationEvaluationId(),info.getOrganizationEvaluationRuleId(),info.getIndicatorId(),"");
-				if(null != listcount && listcount.size()>0){
-					EvaluationScoreCount count = listcount.get(0);
-					count.setJfScore(jfScore);
-					count.setKfScore(kfScore);
-					count.setJfRemark(jfRemark);
-					count.setKfRemark(kfRemark);
-					count.setScore(score);
-					count.setObversionScore(score);
-					evaluatioinScoreCountService.saveOrUpdate(count);
-				}else {
+//				List<EvaluationScoreCount>  listcount = evaluatioinScoreCountService.getEvaluationScoreCountList(info.getOrganizationEvaluationId(),info.getOrganizationEvaluationRuleId(),info.getIndicatorId(),"");
+//				if(null != listcount && listcount.size()>0){
+//					EvaluationScoreCount count = listcount.get(0);
+//					count.setJfScore(jfScore);
+//					count.setKfScore(kfScore);
+//					count.setJfRemark(jfRemark);
+//					count.setKfRemark(kfRemark);
+//					count.setScore(score);
+//					count.setObversionScore(score);
+//					evaluatioinScoreCountService.saveOrUpdate(count);
+//				}else {
 					calculationByEvaluationId("", info.getIndicatorId(),info.getOrganizationEvaluationId(),"");
-				}
+//				}
 			}
 		}
 		return true;
@@ -1067,11 +1067,11 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 
 		for (AddEvaluationInfoDTO addEvaluationInfoDTO : addEvaluationInfoDTOs) {
 
-			List<OrganizationEvaluationInfoResDTO> infoResDTOList = baseMapper.selectEvaluationInfoList(addEvaluationInfoDTO.getOrganizationEvaluationId(),"", addEvaluationInfoDTO.getIndicatorId(),addEvaluationInfoDTO.getBinSection(),addEvaluationInfoDTO.getBinStage(),addEvaluationInfoDTO.getOrganizationId());
-
-			if(null != infoResDTOList && infoResDTOList.size()>0){
-				throw new CustomException("该组织已存在当前指标");
-			}
+//			List<OrganizationEvaluationInfoResDTO> infoResDTOList = baseMapper.selectEvaluationInfoList(addEvaluationInfoDTO.getOrganizationEvaluationId(),"", addEvaluationInfoDTO.getIndicatorId(),addEvaluationInfoDTO.getBinSection(),addEvaluationInfoDTO.getBinStage(),addEvaluationInfoDTO.getOrganizationId());
+//
+//			if(null != infoResDTOList && infoResDTOList.size()>0){
+//				throw new CustomException("该组织已存在当前指标");
+//			}
 
 			//1.获取考评id(获取此考评记录)
 			String organizationEvaluationId = addEvaluationInfoDTO.getOrganizationEvaluationId();

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

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.OrganizationEvaluationCommonInfoMapper">
+
+<!--
+
+    <select id="selectEvaluationInfoList" resultType="com.ims.eval.entity.dto.response.OrganizationEvaluationInfoResDTO">
+
+        select
+        ei.id,
+        oe.id organizationEvaluationId,
+        ei.indicator_id,
+        ei.is_quantified,
+        id.is_quantified isQuantified2,
+        be.stage_name,
+        be.id binStage,
+        bn.id binSection,
+        bn.section_name,
+        oer.id organizationEvaluationRuleId,
+        oer.organization_name,
+        oer.organization_id,
+        oer.organization_short_name,
+        dd.key_name deptName,
+        it.type_name,
+        i.indicator_name,
+        id.child_name,
+        id.child_code,
+        id.option_name,
+        id.option_code,
+        ei.quantified_value,
+        ei.non_quantified_value,
+        i.unit,
+        ei.state,
+        ri.min_score,
+        ri.max_score
+        from
+        organization_evaluation_info ei
+        inner join organization_evaluation_rule oer on oer.id = ei.organization_evaluation_rule_id
+        inner join organization_evaluation oe on oe.id = ei.organization_evaluation_id
+        left join indicator i on ei.indicator_id = i.id
+        left join  evaluate_rule_info ri on ri.indicator_id = i.id and ei.evaluate_rule_info_id = ri.id
+        left join bin_stage be on i.bin_stage = be.id
+        left join bin_section bn on i.bin_section = bn.id
+        left join indicator_type it on i.indicator_type_id = it.id
+        left join indicator_dictionary id on ei.indicator_dictionary_id = id.id
+        inner join data_dictionary dd on dd.data_key = i.dept_id
+        <where>
+
+            <if test="organizationEvaluationId !=null and organizationEvaluationId !=''">
+                and  ei.organization_evaluation_id  = #{organizationEvaluationId}
+            </if>
+
+
+            <if test="indicatorId !=null and indicatorId !=''">
+                and  ei.indicator_id = #{indicatorId}
+            </if>
+
+
+            <if test="binSection !=null and binSection !=''">
+                and bn.id = #{binSection}
+            </if>
+
+
+            <if test="binStage !=null and binStage !=''">
+                and  be.id = #{binStage}
+            </if>
+
+            <if test="organizationId !=null and organizationId !=''">
+                and  oer.organization_id = #{organizationId}
+            </if>
+
+
+            <if test="organizationShortName !=null and organizationShortName !=''">
+                and  oer.organization_short_name  like   CONCAT('%',#{organizationShortName},'%')
+            </if>
+
+
+
+
+            and id.option_code not in ('CZMAX','CZMIN','LRGXKLMAX','LRGXKLMIN','DWQWLRMAX','DWQWLRMIN','LRGXKHMAX','LRGXKHMIN')
+        </where>
+
+        order by oer.order_num asc
+
+    </select>
+
+-->
+
+    <select id="selectListAll" resultType="com.ims.eval.entity.OrganizationEvaluationCommonInfo">
+        SELECT
+            *
+        FROM  organization_evaluation_common_info ci
+        <where>
+            <if test="organizationEvaluationId !=null and organizationEvaluationId !=''">
+                and ci.organization_evaluation_id = #{organizationEvaluationId}
+            </if>
+
+            <if test="indicatorId !=null and indicatorId !=''">
+                and ci.indicator_id = #{indicatorId}
+            </if>
+
+            <if test="organizationId !=null and organizationId !=''">
+                and ci.organization_id = #{organizationId}
+            </if>
+
+        </where>
+    </select>
+</mapper>

pom.xml

@@ -217,7 +217,7 @@
         <repository>
             <id>localrepo</id>
             <name>Local Repository</name>
-            <url>file://D:\repositories\eval\maven_pakage\maven</url>
+            <url>file://D:\java\maven\repository-gddl</url>
         </repository>
         <repository>
             <id>aliyun-repos</id>