diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/dto/SelectDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/dto/SelectDto.java index a3c913c..3b23692 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/dto/SelectDto.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/dto/SelectDto.java @@ -17,4 +17,5 @@ public class SelectDto { @ApiModelProperty(value = "1.变电 2线路") private String proType; + } diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/SelectVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/SelectVo.java index 88caf4b..8c104a5 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/SelectVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/SelectVo.java @@ -24,4 +24,12 @@ public class SelectVo { @ApiModelProperty(value = "建管单位orgId") @JsonInclude(JsonInclude.Include.NON_EMPTY) private String orgId; + + @ApiModelProperty(value = "班组长") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private String teamLeader; + + @ApiModelProperty(value = "班组长手机号") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private String teamLeaderPhone; } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java index 0bc8eb1..d48b22d 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java @@ -67,4 +67,10 @@ public class SelectController extends BaseController { public AjaxResult getTowerLists(SelectDto dto){ return service.getTowerLists(dto); } + + @ApiOperation(value = "班组下拉选") + @GetMapping("getTeamLists") + public AjaxResult getTeamLists(SelectDto dto){ + return service.getTeamLists(dto); + } } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java index a7f7703..871dd7c 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java @@ -79,6 +79,7 @@ public interface ISelectMapper { /** * 杆塔下拉选 + * * @param dto * @return List * @description @@ -86,4 +87,14 @@ public interface ISelectMapper { * @date 2024/3/15 17:01 */ List getTowerLists(SelectDto dto); + + /** + * 班组下拉选 + * @param dto + * @return List + * @description + * @author cwchen + * @date 2024/3/18 13:26 + */ + List getTeamLists(SelectDto dto); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java index 7070d4f..8d9c72e 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java @@ -75,6 +75,7 @@ public interface ISelectService { /** * 杆塔下拉选 + * * @param dto * @return AjaxResult * @description @@ -82,4 +83,14 @@ public interface ISelectService { * @date 2024/3/15 17:00 */ AjaxResult getTowerLists(SelectDto dto); + + /** + * 班组下拉选 + * @param dto + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/3/18 13:26 + */ + AjaxResult getTeamLists(SelectDto dto); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java index 02f1935..13d4001 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java @@ -117,4 +117,11 @@ public class SelectServiceImpl implements ISelectService { list = mapper.getTowerLists(dto); return AjaxResult.success(list); } + + @Override + public AjaxResult getTeamLists(SelectDto dto) { + List list = new ArrayList<>(); + list = mapper.getTeamLists(dto); + return AjaxResult.success(list); + } } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/TeamQuEvalServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/TeamQuEvalServiceImpl.java index 2ae2278..a1d2a01 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/TeamQuEvalServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/TeamQuEvalServiceImpl.java @@ -49,7 +49,7 @@ public class TeamQuEvalServiceImpl implements ITeamQuEvalService { String evalId = UUID.randomUUID().toString().replace("-", ""); vo.setEvalId(evalId); vo.setType(1); - vo.setEvalTime(DateTimeHelper.getNowDate()); + vo.setEvalTime(DateTimeHelper.getNowTime()); } else { vo.setType(2); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml index 26548bf..77a95e5 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml @@ -69,4 +69,15 @@ + + \ No newline at end of file