添加搜索条件

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

@@ -74,7 +74,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 		List<OrganizationEvaluationInfoResDTO> list = baseMapper.selectListEvaluationInfoId(organizationEvaluationId,dept,"",organizationId);//默认获取指定的怎目标
 		boolean finalUpdateMark = updateMark;
 		list.stream().forEach(i->{
-			i.setUpdateMark(i.getDeptName().equals(myuser.getDeptOrg().getShortName()));
+			i.setUpdateMark(true);
 		});
 		Map<String  ,List<OrganizationEvaluationInfoResDTO>> map  = list.stream().collect(Collectors.groupingBy(OrganizationEvaluationInfoResDTO::getIsQuantified));
 		map.put("quantifiedList", map.remove("是"));
@@ -96,6 +96,13 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 						info.setQuantifiedValue(Double.valueOf(entity.getNonQuantifiedValue()));
 					}
 				}
+
+				if("JCF".equals(info.getOptionCode())){//基础分
+					if(StringUtils.isNumber(entity.getNonQuantifiedValue())){
+						info.setQuantifiedValue(Double.valueOf(entity.getNonQuantifiedValue()));
+					}
+				}
+
 				info.setNonQuantifiedValue(entity.getNonQuantifiedValue());//非量化值
 				info.setUpdateTime(new Date());//更新时间
 				info.setUpdateBy(entity.getUpdateBy());//更新者
@@ -153,6 +160,33 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 		return true;
 	}
 
+	@Override
+	public List<OrganizationEvaluationInfoResDTO> finishValueList(String organizationEvaluationId, String dept, String organizationShortName, String indicatorName, String binSection,String isQuantified, 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<OrganizationEvaluationInfoResDTO> list = baseMapper.selectListEvaluationInfoId2(organizationEvaluationId,dept,organizationShortName,indicatorName,binSection,isQuantified,"",organizationId);//默认获取指定的怎目标
+
+		return list;
+	}
+
 
 	//todo  后续添加需要计算的指标项
 	public boolean calculateIdicatorItem(List<OrganizationEvaluationInfo> organizationEvaluationInfos){