liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

评价返回修改

Browse Source
This commit is contained in:
YY
2025-06-27 08:30:34 +08:00
parent 7083a081db
commit d2766d2eff
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java
View File

@ -39,9 +39,10 @@ public class UserService {
user.setUserDept("部门" + ((i % 3) + 1)); // 部门1、部门2、部门3轮换
user.setUserDeptId("D" + ((i % 3) + 1));
String s = map.get(user.getUserId());
if(s==null){
userList.add(user);
if(s!=null){
user.setIsSelected(true);
}
userList.add(user);
}
return userList;
}

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/UserVo.java
View File

@ -13,7 +13,7 @@ public class UserVo {
*/
private String userId;
private Boolean isSelected=true;
private Boolean isSelected=false;
/**
* 用户部门
*/

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
View File

@ -131,7 +131,6 @@
<include refid="selectCoscoEvaluateTaskSupplierVo"/>
<where>
and del_flag = 'normal'
<if test="evaluateTaskId != null and evaluateTaskId != ''">
and evaluate_task_id = #{evaluateTaskId}
</if>
@ -298,7 +297,7 @@
</select>
<update id="deleteByTaskId" parameterType="string">
update cosco_evaluate_task_supplier_user
update cosco_evaluate_task_supplier
set del_flag = 'deleted'
where evaluate_task_id = #{taskId}
</update>

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java
View File

@ -135,7 +135,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
vos.add(vo);
});
List<String> supplierIds = list.stream().map(TaskSupplierVo::getId).collect(Collectors.toList());
Map<String, List<String>> suppMap = list.stream().collect(Collectors.toMap(TaskSupplierVo::getId, TaskSupplierVo::getUserIds));
Map<String, List<String>> suppMap = list.stream().collect(Collectors.toMap(TaskSupplierVo::getId, TaskSupplierVo::getUserIds,(existing, replacement) -> existing));
Map<String, UserVo> userMap = userService.getUser(new ArrayList<>()).stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo));
List<BlackSupplierVo> blackSupplierVos = coscoSupplierBaseMapper.selectSupplierByIds(supplierIds);
blackSupplierVos.forEach(blackSupplierVo -> {
@ -147,6 +147,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
vo.setName(userMap.get(userId).getUserName());
vo.setUserDept(userMap.get(userId).getUserDept());
vo.setUserDeptId(userMap.get(userId).getUserDeptId());
vo.setSelected( true);
taskUserVos.add(vo);
});
blackSupplierVo.setUserList(taskUserVos);
@ -171,7 +172,9 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
));
Map<String, UserVo> userMap = new HashMap<>();
suUser.keySet().forEach(usa -> {
userMap.put(usa, map.get(usa));
UserVo userVo = map.get(usa);
userVo.setIsSelected(true);
userMap.put(usa, userVo);
});
return userMap.values().stream().collect(Collectors.toList());
@ -357,6 +360,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
coscoEvaluateTaskSupplierUserMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId());
coscoEvaluateScoringMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId());
coscoEvaluateTaskUserIndicatorMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId());
coscoEvaluateTaskDeptWeightMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId());
}
private void addEvalTaskInfo(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java
View File

@ -27,6 +27,6 @@ public class TaskUserVo {
/**
* 是否被选中（用于UI显示）
*/
private Boolean selected;
private Boolean selected=true;
}