考评详情添加部门修改权限

ims-common/src/main/java/com/ims/common/utils/StringUtils.java

@@ -478,6 +478,32 @@ public class StringUtils{
 	}
 
 
+	/**
+	 * 删除开头字符串
+	 * @param inStr
+	 * @param prefix
+	 * @return
+	 */
+	public static String trimstart(String inStr, String prefix) {
+		if (inStr.startsWith(prefix)) {
+			return (inStr.substring(prefix.length()));
+		}
+		return inStr;
+	}
+
+	/**
+	 * 删除末尾字符串
+	 * @param inStr
+	 * @param suffix
+	 * @return
+	 */
+	public static String trimend(String inStr, String suffix) {
+		if (inStr.endsWith(suffix)) {
+			return (inStr.substring(0,inStr.length()-suffix.length()));
+		}
+		return inStr;
+	}
+
 
 
 

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

@@ -27,6 +27,8 @@ public class Myuser extends Model {
 ////    private String mainPosName;
 //
     private String deptName;
+
+	private OrganizationStructure unitOrg;
 //
 //    private String orgId;
 ////

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

@@ -100,5 +100,10 @@ public class OrganizationEvaluationInfo extends Model {
 	 */
 	private String state;
 
+	/**
+	 * 子指标code
+	 */
+	private String  childCode;
+
 
 }

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

@@ -35,7 +35,7 @@ public class OrganizationStructure extends Model {
 
     private Date createDate;
 
-    private String dbName;
+//    private String dbName;
 
     private String delFlag;
 
@@ -43,7 +43,7 @@ public class OrganizationStructure extends Model {
 
     private String isMarket;
 
-    private String isNewRecord;
+//    private String isNewRecord;
 
     private String name;
 

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

@@ -34,6 +34,11 @@ public class IndicatorResDTO {
 	 */
 	private String optionName;
 
+	/**
+	 * 子指标code
+	 */
+	private String  childCode;
+
 
 
 

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

@@ -96,6 +96,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 					addinfo.setIndicatorId(entity.getIndicatorId());
 					addinfo.setIndicatorDictionaryId(d.getId());
 					addinfo.setOptionCode(d.getOptionCode());
+					addinfo.setChildCode(d.getChildCode());
 					addinfo.setIsQuantified(entity.getIsQuantified());
 					addinfo.setQuantifiedValue(entity.getQuantifiedValue());
 					addinfo.setNonQuantifiedValue(entity.getNonQuantifiedValue());

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

@@ -261,7 +261,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 				List<String> indicatorIds = ruleInfos.stream().map(EvaluateRuleInfo::getIndicatorId).collect(Collectors.toList());
 
 				//获取指标对象
-				List<Indicator> indicators = iIndicatorService.selectByIds(indicatorIds);
+//				List<Indicator> indicators = iIndicatorService.selectByIds(indicatorIds);
 				//通过指标id获取指标明细项
 				List<IndicatorResDTO> resDTOS = iIndicatorService.listByIds(indicatorIds);
 				if (null == resDTOS || resDTOS.size() <= 0) {
@@ -276,6 +276,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					info.setOrganizationEvaluationId(organizationEvaluation.getId());
 					info.setOrganizationEvaluationRuleId(ruleId);
 					info.setIndicatorId(r.getId());
+					info.setChildCode(r.getChildCode());
 					info.setIndicatorDictionaryId(r.getIndicatorDictionaryID());
 					info.setOptionCode(r.getOptionCode());
 					info.setIsQuantified(r.getIsQuantified());
@@ -358,6 +359,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					info.setOrganizationEvaluationId(organizationEvaluation.getId());
 					info.setOrganizationEvaluationRuleId(ruleId);
 					info.setIndicatorId(r.getId());
+					info.setChildCode(r.getChildCode());
 					info.setIndicatorDictionaryId(r.getIndicatorDictionaryID());
 					info.setOptionCode(r.getOptionCode());
 					info.setIsQuantified(r.getIsQuantified());
@@ -432,6 +434,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					info.setOrganizationEvaluationId(organizationEvaluation.getId());
 					info.setOrganizationEvaluationRuleId(ruleId);
 					info.setIndicatorId(r.getId());
+					info.setChildCode(r.getChildCode());
 					info.setIndicatorDictionaryId(r.getIndicatorDictionaryID());
 					info.setOptionCode(r.getOptionCode());
 					info.setIsQuantified(r.getIsQuantified());

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

@@ -1,6 +1,7 @@
 package com.ims.eval.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ims.common.utils.StringUtils;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.DataDictionary;
 import com.ims.eval.entity.Myuser;
@@ -38,12 +39,20 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 	private IUserService userService;
 
 	@Override
-	public Map<String  ,List<ResponsibilityIndicatorInfoResDTO>> planValueList(List<String> deptResponsibilityIds, String dept, HttpServletRequest request) {
+	public Map<String ,List<ResponsibilityIndicatorInfoResDTO>> planValueList(List<String> deptResponsibilityIds, String dept, HttpServletRequest request) {
 
 		Myuser myuser = userService.getSysUser(request);
 		if(null == myuser){
 			throw new CustomException("暂无权限");
 		}
+		if(null != myuser.getUnitOrg() && null != myuser.getUnitOrg().getParentIds()){
+			String strparentIds = myuser.getUnitOrg().getParentIds();
+			strparentIds = StringUtils.trimstart(strparentIds,",");
+			strparentIds = StringUtils.trimend(strparentIds,",");
+			List<String> parentIds = Arrays.asList(strparentIds.split(","));
+			parentIds.size();
+
+		}
 		List<ResponsibilityIndicatorInfoResDTO> list = baseMapper.listByresponsibilityId(deptResponsibilityIds,dept,"ZRMB");//默认获取指定的怎目标
 		list.stream().forEach(i->{
 			i.setUpdateMark(i.getDeptName().equals(myuser.getDeptName()));

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

@@ -94,7 +94,8 @@
         i.is_quantified isQuantified,
         d.id indicatorDictionaryID,
         d.option_code optionCode,
-        d.option_name optionName
+        d.option_name optionName,
+        d.child_code
         FROM
         INDICATOR i
         LEFT JOIN indicator_dictionary d ON i.ID = d.indicator_id