diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java
index b090d2f..37f97e3 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java
@@ -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;
}
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/UserVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/UserVo.java
index 4e37af9..c6801bc 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/UserVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/UserVo.java
@@ -13,7 +13,7 @@ public class UserVo {
*/
private String userId;
- private Boolean isSelected=true;
+ private Boolean isSelected=false;
/**
* 用户部门
*/
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
index d871d38..7959296 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
@@ -131,7 +131,6 @@
and del_flag = 'normal'
-
and evaluate_task_id = #{evaluateTaskId}
@@ -298,7 +297,7 @@
- update cosco_evaluate_task_supplier_user
+ update cosco_evaluate_task_supplier
set del_flag = 'deleted'
where evaluate_task_id = #{taskId}
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java
index 9fded9a..8613860 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java
@@ -135,7 +135,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
vos.add(vo);
});
List supplierIds = list.stream().map(TaskSupplierVo::getId).collect(Collectors.toList());
- Map> suppMap = list.stream().collect(Collectors.toMap(TaskSupplierVo::getId, TaskSupplierVo::getUserIds));
+ Map> suppMap = list.stream().collect(Collectors.toMap(TaskSupplierVo::getId, TaskSupplierVo::getUserIds,(existing, replacement) -> existing));
Map userMap = userService.getUser(new ArrayList<>()).stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo));
List 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 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) {
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java
index 288af59..b579547 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java
@@ -27,6 +27,6 @@ public class TaskUserVo {
/**
* 是否被选中(用于UI显示)
*/
- private Boolean selected;
+ private Boolean selected=true;
}