diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java index fb7e386b..47355db9 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java @@ -104,6 +104,9 @@ public class TeamSet extends BaseEntity { */ @Schema(description = "调度员") private Long dispatcher; + +// @TableField(exist = false) + private String dispatcherRealName; /** * 班组长;外键（人员） */ diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java index d2695ce8..e3fed4ee 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java @@ -80,7 +80,7 @@ public class CraftAbilityEntity extends BaseEntity { private BigDecimal area; @Schema(description = "数量") - private int quality; + private Integer quality; @Schema(description = "批次") private String batch; @Schema(description = "饱和度") diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java index bd099856..8f630f04 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java @@ -64,7 +64,7 @@ public interface IUserClient { String REMOVE_USER = API_PREFIX + "/remove-user"; String USER_LIST = API_PREFIX + "/user-list"; String UN_SELECTUSER_LIST = API_PREFIX + "/unuser-list"; - + String SELECTUSER_LIST = API_PREFIX + "/unuser-listByName"; @GetMapping(USER_LIST) List userListByIds(@RequestParam("userIds") String userIds); @@ -72,6 +72,9 @@ public interface IUserClient { @GetMapping(UN_SELECTUSER_LIST) List userUNListByIds(@RequestParam("userIds") String userIds); + @GetMapping(SELECTUSER_LIST) + List userListByName(@RequestParam("name") String name); + /** * 获取用户信息 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java index b0ab1644..dd6495b6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java @@ -56,6 +56,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -114,6 +115,12 @@ public class CraftAbilityController extends BladeController { @ApiOperationSupport(order = 2) @Operation(summary = "分页", description = "传入CraftAbility") public R> list(@Parameter(hidden = true) @RequestParam Map craftAbility, Query query) { + Date startTime = null; + Date endTime = null; + if(craftAbility.containsKey("startTime")){ + startTime = DateUtil.parse(Func.toStr(craftAbility.get("startTime")),"yyyy-MM-dd HH:mm:ss"); + endTime = DateUtil.parse(Func.toStr(craftAbility.get("endTime")),"yyyy-MM-dd HH:mm:ss"); + } QueryWrapper qw = Condition.getQueryWrapper(craftAbility, CraftAbilityEntity.class); @@ -121,9 +128,10 @@ public class CraftAbilityController extends BladeController { qw.like(craftAbility.containsKey("caName"), "CA_NAME", Func.toStr(craftAbility.get("caName"))); qw.eq(craftAbility.containsKey("caCode"), "CA_CODE", Func.toStr(craftAbility.get("caCode"))); qw.eq(craftAbility.containsKey("wtId"), "WT_ID", Func.toInt(craftAbility.get("wtId"))); - qw.eq(craftAbility.containsKey("platingSmall"), "plating_small", Func.toStr(craftAbility.get("platingSmall"))); - - +// qw.eq(craftAbility.containsKey("platingSmall"), "plating_small", Func.toStr(craftAbility.get("platingSmall"))); + if(null != startTime && null != endTime){ + qw.between("UPDATE_TIME", startTime,endTime); + } IPage pages = craftAbilityService.page(Condition.getPage(query), qw); IPage pagesVO = CraftAbilityWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index e773bdf2..7a08ed42 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -192,11 +192,28 @@ public class TeamSetController extends BladeController { @Operation(summary = "list分页", description = "传入TeamSet Obj") public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { + + +// List ids = new ArrayList<>(); +// if(map.containsKey("dispatcherRealName")){ +// List users = iUserClient.userListByName(Func.toStr(map.get("dispatcherRealName"))); +// if(null != users){ +// ids = users.stream().map(User::getId).collect(Collectors.toList()); +// } +// } + // build QueryWrapper QueryWrapper qw = Condition.getQueryWrapper(map, TeamSet.class); qw.like(map.containsKey(TeamSet.COL_TS_CODE), TeamSet.COL_TS_CODE, (Func.toStr(map.get(TeamSet.COL_TS_CODE)))); qw.like(map.containsKey(TeamSet.COL_TS_NAME), TeamSet.COL_TS_NAME, (Func.toStr(map.get(TeamSet.COL_TS_NAME)))); + qw.like(map.containsKey("dispatcherRealName"), "DISPATCHER_REAL_NAME", (Func.toStr(map.get("dispatcherRealName")))); + +// if(null != ids && ids.size() > 0){ +// qw.in(TeamSet.COL_DISPATCHER, ids); +// } + qw.eq(map.containsKey(TeamSet.COL_DISPATCHER), TeamSet.COL_DISPATCHER, (Func.toLong(map.get(TeamSet.COL_DISPATCHER)))); + // page IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = TeamSetWrapper.build().pageVO(pages); @@ -214,6 +231,50 @@ public class TeamSetController extends BladeController { if(null != userleader && null != userleader.getData()){ teamSetVO.setTeamLeaderRealName(userleader.getData().getRealName()); } + + List dayPutDueTimes = new ArrayList<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("ts_id",teamSetVO.getId()); + queryWrapper.in("special",0); + List teamTimes = teamTimeService.list(queryWrapper); + for(TeamTime teamTime:teamTimes){ + dayPutDueTimes.add(teamTime.getStartTime()+"~"+teamTime.getEndTime()); + } + String dayPutDueTime = dayPutDueTimes.stream() + .map(Object::toString) // 或者直接使用String::valueOf，效果相同 + .collect(Collectors.joining(",")); + teamSetVO.setDayPutDueTime(dayPutDueTime); + + + List specDayPutDueTimes = new ArrayList<>(); + QueryWrapper queryWrapperspec = new QueryWrapper<>(); + queryWrapperspec.in("ts_id",teamSetVO.getId()); + queryWrapperspec.in("special",1); + List teamTimespecs = teamTimeService.list(queryWrapperspec); + for(TeamTime teamTime:teamTimespecs){ + specDayPutDueTimes.add(teamTime.getStartTime()+"~"+teamTime.getEndTime()); + } + String specDayPutDueTime = specDayPutDueTimes.stream() + .map(Object::toString) // 或者直接使用String::valueOf，效果相同 + .collect(Collectors.joining(",")); + teamSetVO.setSpecDayPutDueTime(specDayPutDueTime); + + List exChangeTimes = new ArrayList<>(); + QueryWrapper queryWrapperchange = new QueryWrapper<>(); + queryWrapperchange.in("ts_id",teamSetVO.getId()); + queryWrapperchange.in("special",2); + List teamTimeexchanges = teamTimeService.list(queryWrapperchange); + for(TeamTime teamTime:teamTimeexchanges){ + exChangeTimes.add(teamTime.getStartTime()+"~"+teamTime.getEndTime()); + } + String changeDayPutDueTime = exChangeTimes.stream() + .map(Object::toString) // 或者直接使用String::valueOf，效果相同 + .collect(Collectors.joining(",")); + teamSetVO.setExChangeTime(changeDayPutDueTime); + + + + } return R.data(pagesVO); } @@ -295,6 +356,8 @@ public class TeamSetController extends BladeController { @Operation(summary = "新增一条", description = "传入TeamSet Obj") public R save(@Valid @RequestBody TeamSet addOne) { addOne.setId(null); + R user= iUserClient.userInfoById(addOne.getDispatcher()); + addOne.setDispatcherRealName(user.getData().getRealName()); return R.status(service.save(addOne)); } @@ -307,6 +370,8 @@ public class TeamSetController extends BladeController { public R saveBat(@Valid @RequestBody List addList) { addList.forEach(one -> { one.setId(null); + R user= iUserClient.userInfoById(one.getDispatcher()); + one.setDispatcherRealName(user.getData().getRealName()); }); return R.status(service.saveBatch(addList)); } @@ -318,6 +383,8 @@ public class TeamSetController extends BladeController { @ApiOperationSupport(order = 40) @Operation(summary = "修改一条", description = "传入TeamSet Obj") public R update(@Valid @RequestBody TeamSet updateOne) { + R user= iUserClient.userInfoById(updateOne.getDispatcher()); + updateOne.setDispatcherRealName(user.getData().getRealName()); return R.status(service.updateById(updateOne)); } @@ -328,6 +395,11 @@ public class TeamSetController extends BladeController { @ApiOperationSupport(order = 41) @Operation(summary = "修改批量", description = "传入TeamSet List") public R updateBat(@Valid @RequestBody List updateList) { + + for(TeamSet updateOne:updateList){ + R user= iUserClient.userInfoById(updateOne.getDispatcher()); + updateOne.setDispatcherRealName(user.getData().getRealName()); + } return R.status(service.updateBatchById(updateList)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java index 69694d08..ab22d493 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java @@ -89,8 +89,11 @@ public class WorkTankController extends BladeController { IPage pagesVO = WorkTankWrapper.build().pageVO(pages); List listVO = pagesVO.getRecords(); for(WorkTankVO one : listVO){ - R userplan= iUserClient.userInfoById(one.getOpUserId()); - one.setOpUserRealName(userplan.getData().getRealName()); + if(null != one.getOpUserId()){ + R userplan= iUserClient.userInfoById(one.getOpUserId()); + one.setOpUserRealName(userplan.getData().getRealName()); + } + } return R.data(pagesVO); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java index ef856531..ccd1cc8c 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java @@ -78,6 +78,14 @@ public class UserClient implements IUserClient { } } + @Override + public List userListByName(String name) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like("real_name",name); + List users = service.list(queryWrapper); + return users; + } + @Override @GetMapping(USER_BY_ID) public R userInfoById(Long userId) {