bonus
/
sh_real_name_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改下发班组任务信息

This commit is contained in:
haozq 2025-12-02 10:42:33 +08:00
parent 9cf4bb107d
commit e99a28c1f5
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/KqCmdBean.java
View File

@ -113,4 +113,13 @@ public class KqCmdBean {
this.subId = subId;
this.teamId = teamId;
}
public KqCmdBean(String deviceCode, String subName, String teamName, Integer proId, Integer subId, Integer teamId,String onLine) {
this.deviceCode = deviceCode;
this.subName = subName;
this.teamName = teamName;
this.proId = proId;
this.subId = subId;
this.teamId = teamId;
this.onLine = onLine;
}
}

2
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/KqCmdServiceImpl.java
View File

@ -112,7 +112,7 @@ public class KqCmdServiceImpl implements KqCmdService {
// 遍历数据，建立映射关系
for (KqCmdBean item : data) {
String proName = item.getProName();
proToDeviceMap.computeIfAbsent(proName, k -> new ArrayList<>()).add(new KqCmdBean(item.getDeviceCode(), item.getSubName(), item.getTeamName(), item.getProId(), item.getSubId(), item.getTeamId()));
proToDeviceMap.computeIfAbsent(proName, k -> new ArrayList<>()).add(new KqCmdBean(item.getDeviceCode(), item.getSubName(), item.getTeamName(), item.getProId(), item.getSubId(), item.getTeamId(), item.getOnLine()));
}
// 构建树形结构
List<TreeNode> result = new ArrayList<>();

9
bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/TaskService.java
View File

@ -352,7 +352,7 @@ public class TaskService {
return;
}
List<TaskUserVo> userSends = mapper.getTaskUserInfoList(task.getId());
if(CollectionUtil.isEmpty(userSends)) {
if(CollUtil.isEmpty(userSends)) {
String msg = "待新增用户为空，自动取消处理";
log.error(msg);
task.setTransStatus(TaskStatusEnum.CANCEL.ordinal());
@ -361,6 +361,7 @@ public class TaskService {
return;
}
List<DeviceUserDto> userList = new ArrayList<>();
boolean noZip= userSends.size() != 1;
for(TaskUserVo userVo: userSends) {
DeviceUserDto user = new DeviceUserDto();
user.setUserId(userVo.getUserId());
@ -379,7 +380,11 @@ public class TaskService {
if(fileList!=null && !fileList.isEmpty()) {
String bast64=fileList.get(0).getBast64();
if(StringUtils.isNotBlank(bast64)) {
user.setPhoto_base64(ImageResizer.transImageByJpg(bast64));
if(noZip){
user.setPhoto_base64(ImageResizer.transImageByJpg(bast64));
}else{
user.setPhoto_base64(bast64);
}
user.setPhotoEnroll(1);
}
}