From f100ff9cc407d0e422fc331e29e00ee7de47c87c Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 24 May 2024 22:56:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=B7=AF=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CheckingPointController.java | 41 +++++--- .../CheckingPointInfoController.java | 18 ++-- .../checking/entity/CheckingPoint.java | 14 +-- .../checking/entity/CheckingPointInfo.java | 5 +- .../entity/dto/CheckingPointInfoPageDto.java | 6 ++ .../checking/entity/qo/ProjectSnQO.java | 4 +- .../mapper/CheckingPointInfoMapper.java | 5 +- .../checking/mapper/CheckingPointMapper.java | 5 +- .../mapper/xml/CheckingPointInfoMapper.xml | 27 ++++-- .../mapper/xml/CheckingPointMapper.xml | 30 ++++-- .../service/CheckingPointInfoService.java | 5 +- .../service/CheckingPointService.java | 4 + .../impl/CheckingPointInfoServiceImpl.java | 69 ++++++++++++-- .../impl/CheckingPointServiceImpl.java | 7 +- .../modules/x/entity/XzCheckingRouteTask.java | 51 +++++++++- .../XzCheckingRouteTaskToInspectUser.java | 81 ---------------- .../x/mapper/XzCheckingRouteMapper.java | 2 + .../x/mapper/XzCheckingRouteTaskMapper.java | 5 +- ...zCheckingRouteTaskToInspectUserMapper.java | 19 ---- .../x/mapper/xml/XzCheckingRouteMapper.xml | 24 +++-- .../mapper/xml/XzCheckingRouteTaskMapper.xml | 2 + ...XzCheckingRouteTaskToInspectUserMapper.xml | 4 - ...CheckingRouteTaskToInspectUserService.java | 30 ------ .../impl/XzCheckingRouteServiceImpl.java | 19 +++- .../impl/XzCheckingRouteTaskServiceImpl.java | 33 ++++--- ...kingRouteTaskToInspectUserServiceImpl.java | 93 ------------------- 26 files changed, 282 insertions(+), 321 deletions(-) delete mode 100644 src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTaskToInspectUser.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskToInspectUserMapper.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskToInspectUserMapper.xml delete mode 100644 src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskToInspectUserService.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskToInspectUserServiceImpl.java diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java b/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java index eeaacd8e7..8b1a0e3aa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java @@ -16,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @Title: CheckingPointController @@ -39,6 +41,30 @@ public class CheckingPointController { @Value("${basePath}") String basePath; + + @ApiOperation(value = "分页查询巡检点列表", notes = "分页查询巡检点列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "xzCheckingRouteTaskId", value = "星纵-巡检路线的任务Id", paramType = "query", required = false, dataType = "String"), + }) + @PostMapping(value = "/selectPage") + public Result> selectCheckingPointPage(@RequestBody ProjectSnQO projectSnQO) { + Result> result = new Result<>(); + result.setResult(checkingPointService.selectCheckingPointPage(projectSnQO)); + result.setSuccess(true); + return result; + } + + @ApiOperation(value = "查询巡检点列表", notes = "查询巡检点列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "xzCheckingRouteTaskId", value = "星纵-巡检路线的任务Id", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "checkingPointUserId", value = "巡检人员id", paramType = "query", required = false, dataType = "String"), + + }) + @PostMapping(value = "/list") + public Result> selectCheckingPointList(@RequestBody ProjectSnQO projectSnQO) { + return Result.success(checkingPointService.selectCheckingPointList(projectSnQO)); + } + @ApiOperation(value = "新建巡检点", notes = "新建巡检点") @PostMapping(value = "/add") public Result add(@RequestBody CheckingPoint checkingPoint) { @@ -52,21 +78,6 @@ public class CheckingPointController { checkingPointService.edit(checkingPoint); return Result.ok(); } - - @ApiOperation(value = "分页查询巡检点列表", notes = "分页查询巡检点列表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "xzCheckingRouteTaskId", value = "星纵-巡检路线的任务Id", paramType = "query", required = false, dataType = "String"), - @ApiImplicitParam(name = "checkingPointUserId", value = "巡检人员id", paramType = "query", required = false, dataType = "String"), - - }) - @PostMapping(value = "/selectPage") - public Result> selectCheckingPointPage(@RequestBody ProjectSnQO projectSnQO) { - Result> result = new Result<>(); - result.setResult(checkingPointService.selectCheckingPointPage(projectSnQO)); - result.setSuccess(true); - return result; - } - /** * 删除巡检点 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointInfoController.java b/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointInfoController.java index 56a8e8439..7e5183f65 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointInfoController.java @@ -39,23 +39,21 @@ public class CheckingPointInfoController { CheckingPointService checkingPointService; - @ApiOperation(value = "分页查询巡检记录列表 from data", notes = "分页查询巡检记录列表 from data") + @ApiOperation(value = "分页查询巡检记录列表", notes = "分页查询巡检记录列表") @PostMapping(value = "/selectPage") - @ApiImplicitParams({ - @ApiImplicitParam(name = "projectSn", value = "项目sn", required = true, paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "queryStr", value = "查询条件、多条件（巡检点、巡检位置、巡检人、巡检时间）", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "pageNo", value = "当前页", paramType = "query", dataType = "int"), - @ApiImplicitParam(name = "pageSize", value = "页大小", paramType = "query", required = true, dataType = "int"), - @ApiImplicitParam(name = "xzCheckingRouteTaskId", value = "星纵-巡检路线的任务Id", paramType = "query", required = false, dataType = "String"), - @ApiImplicitParam(name = "checkingPointUserId", value = "巡检人员id", paramType = "query", required = false, dataType = "String"), - }) - public Result> selectCheckingPointInfoPage(CheckingPointInfoPageDto dto) { + public Result> selectCheckingPointInfoPage(@RequestBody CheckingPointInfoPageDto dto) { Result> result = new Result<>(); result.setResult(checkingPointInfoService.selectCheckingPointInfoPage(dto)); result.setSuccess(true); return result; } + @ApiOperation(value = "查询巡检记录列表", notes = "查询巡检记录列表") + @PostMapping(value = "/list") + public Result> selectCheckingPointInfoList(@RequestBody CheckingPointInfoPageDto dto) { + return Result.success(checkingPointInfoService.selectCheckingPointInfoList(dto)); + } + @ApiOperation(value = "分页查询巡检记录列表", notes = "分页查询巡检记录列表") @PostMapping(value = "/selectAllList") public Result> selectAllList() { diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPoint.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPoint.java index 4e801ba1b..27e060be4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPoint.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPoint.java @@ -179,15 +179,15 @@ public class CheckingPoint implements Serializable { /** * 创建人名称 */ + @TableField(exist = false) @ApiModelProperty("创建人名称") - @TableField(exist = false) private String createUserName; - @ApiModelProperty("检查人名称") @TableField(exist = false) + @ApiModelProperty("检查人名称") @Deprecated private String inspectUserNames; - @ApiModelProperty("通知人名称") @TableField(exist = false) + @ApiModelProperty("通知人名称") private String noticeUserNames; @TableField(exist = false) @ApiModelProperty(value = "区域名称") @@ -196,9 +196,11 @@ public class CheckingPoint implements Serializable { @ApiModelProperty(value = "企业名称") @Deprecated private String enterpriseName; - - @ApiModelProperty("巡检任务的巡检人是否巡检该巡检点") @TableField(exist = false) - private String isInspectFromTask; + @ApiModelProperty("巡检任务的巡检人的巡检状态 0：未巡检 1：正常 2：异常") + private Integer inspectStatus; + @TableField(exist = false) + @ApiModelProperty(value = "排序") + private Integer sort; } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPointInfo.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPointInfo.java index 95e738f6c..f90979751 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPointInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPointInfo.java @@ -164,7 +164,6 @@ public class CheckingPointInfo implements Serializable { @TableField(exist = false) private String checkingPointUserName; - @ApiModelProperty("通知人名称") @TableField(exist = false) private String noticeUserNames; @@ -183,8 +182,12 @@ public class CheckingPointInfo implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "路线名称") private java.lang.String routeName; + @TableField(exist = false) @ApiModelProperty(value = "任务名称") private java.lang.String itemName; + @TableField(exist = false) + @ApiModelProperty(value = "合作单位") + private java.lang.String enterpriseName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/entity/dto/CheckingPointInfoPageDto.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/dto/CheckingPointInfoPageDto.java index b63860e2a..4721757f7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/entity/dto/CheckingPointInfoPageDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/dto/CheckingPointInfoPageDto.java @@ -10,10 +10,13 @@ import java.util.Date; @Data public class CheckingPointInfoPageDto { + @ApiModelProperty(value = "项目编号", required = true) String projectSn; @ApiModelProperty("查询条件、多条件（巡检点、巡检位置、巡检人、巡检时间）") String queryStr; + @ApiModelProperty(value = "pageNo", required = true) Integer pageNo = 1; + @ApiModelProperty(value = "pageSize", required = true) Integer pageSize = 10; @ApiModelProperty(value = "查询开始时间，格式：2023-05-22") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @@ -31,4 +34,7 @@ public class CheckingPointInfoPageDto { private String xzCheckingRouteTaskId; @ApiModelProperty("巡检人id") private String checkingPointUserId; + @ApiModelProperty("巡检点id") + private String checkingPointId; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java index 1194ff8e2..bcbecdd77 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java @@ -22,7 +22,7 @@ public class ProjectSnQO extends PageQO { private String checkingPointName; @ApiModelProperty("星纵-巡检路线的任务Id") private String xzCheckingRouteTaskId; - @ApiModelProperty("巡检人id") - private String checkingPointUserId; + @ApiModelProperty("巡检点id") + private String checkingPointId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointInfoMapper.java index 765a11ad9..f7573d7ed 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointInfoMapper.java @@ -20,8 +20,11 @@ import java.util.Set; * @Version 1.0 */ @Mapper +@DataScope(includeTable = "enterprise_info") public interface CheckingPointInfoMapper extends BaseMapper { - IPage selectCheckingPointInfoPage(@Param("param") CheckingPointInfoPageDto dto, Page objectPage); + IPage selectCheckingPointInfoList(@Param("param") CheckingPointInfoPageDto dto, Page objectPage); + + List selectCheckingPointInfoList(@Param("param") CheckingPointInfoPageDto dto); List selectAllList(); diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointMapper.java b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointMapper.java index 21dbde27e..e85c3eb30 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointMapper.java @@ -18,8 +18,11 @@ import java.util.List; * @Version 1.0 */ @Mapper +@DataScope(includeTable = "enterprise_info") public interface CheckingPointMapper extends BaseMapper { - IPage selectCheckingPointPage(@Param("param") ProjectSnQO projectSnQO, Page objectPage); + IPage selectCheckingPointList(@Param("param") ProjectSnQO projectSnQO, Page objectPage); + + List selectCheckingPointList(@Param("param") ProjectSnQO projectSnQO); List getStartingListByFrequencyType(int type); diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointInfoMapper.xml index daca55763..a85f378b4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointInfoMapper.xml @@ -1,30 +1,39 @@ - select t.*, - cp.checking_point_name checkingPointName, + cp.checking_point_name as checkingPointName, cp.position, - su.real_name checkingPointUserName, + su.real_name as checkingPointUserName, (SELECT group_concat(nu.real_name) FROM system_user nu - WHERE find_in_set(nu.user_id, cp.notice_user_ids)) noticeUserNames, - uo.real_name operate_name, + WHERE find_in_set(nu.user_id, xcr.notice_user_ids)) noticeUserNames, + uo.real_name as operate_name, cp.min_inspect_time, qr.region_name, xcr.route_name, - xcrt.item_name + xcrt.item_name, + (SELECT group_concat(nu.enterprise_name) + FROM enterprise_info nu + WHERE find_in_set(nu.id, cp.enterprise_id)) as enterprise_name from checking_point_info t - inner join checking_point cp on t.checking_point_id = cp.id + join checking_point cp on t.checking_point_id = cp.id + left join system_user su on t.checking_point_user_id = su.user_id left join enterprise_info ei on find_in_set(ei.id,cp.enterprise_id) - inner join system_user su on t.checking_point_user_id = su.user_id left join system_user uo on t.operate_id = uo.user_id left join quality_region qr on qr.id = cp.quality_region_id left join xz_checking_route_task xcrt on t.xz_checking_route_task_id = xcrt.id left join xz_checking_route xcr on xcrt.xz_checking_route_id = xcr.id left join xz_checking_route_to_point xcrtp on cp.id = xcrtp.checking_point_id and xcrtp.xz_checking_route_id = xcr.id - where cp.project_sn = #{param.projectSn} + where 1=1 + + and cp.project_sn = #{param.projectSn} + + + and cp.id = #{param.checkingPointId} + and (cp.checking_point_name like concat('%', #{param.queryStr}, '%') or cp.position like concat('%', #{param.queryStr}, '%') diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml index 57604e47e..0ccdefb75 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml @@ -1,34 +1,46 @@ - select t.*, - su.real_name createUserName, (SELECT group_concat( iu.real_name ) FROM system_user iu WHERE find_in_set( iu.user_id, t.inspect_user_ids )) inspectUserNames, (SELECT group_concat( nu.real_name ) FROM system_user nu WHERE find_in_set( nu.user_id, t.notice_user_ids ) ) noticeUserNames, group_concat( ei.enterprise_name ) as enterprise_name, - (select if(count(*) > 0,1,0) from checking_point_info where - xz_checking_route_task_id=#{param.xzCheckingRouteTaskId} and checking_point_user_id = - #{param.checkingPointUserId}) as isInspectFromTask, + ifnull(t1.inspectStatus,0) as inspectStatus, + xcrtp.sort, - qr.region_name + qr.region_name, + su.real_name as createUserName from checking_point t - inner join system_user su on t.create_user_id = su.user_id - join enterprise_info ei on find_in_set(ei.id,t.enterprise_id) - join quality_region qr on qr.id=t.quality_region_id + left join system_user su on su.user_id=t.create_user_id + left join enterprise_info ei on find_in_set(ei.id,t.enterprise_id) + left join quality_region qr on qr.id=t.quality_region_id join xz_checking_route_task xcrt on xcrt.id = #{param.xzCheckingRouteTaskId} join xz_checking_route xcr on xcr.id=xcrt.xz_checking_route_id join xz_checking_route_to_point xcrtp on xcrtp.xz_checking_route_id=xcrt.xz_checking_route_id and t.id=xcrtp.checking_point_id + + left join ( + select + (CASE WHEN count(*)=0 THEN 0 WHEN ifnull(sum(if(status = 2,1,0)),0) THEN 2 ELSE 1 END) as inspectStatus, + checking_point_id + from checking_point_info + where xz_checking_route_task_id=#{param.xzCheckingRouteTaskId} + group by checking_point_id + ) as t1 on t1.checking_point_id=t.id + and t.project_sn = #{param.projectSn} + + and t.id = #{param.checkingPointId} + and t.checking_point_name like CONCAT(CONCAT('%', #{param.checkingPointName}), '%') diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/service/CheckingPointInfoService.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/CheckingPointInfoService.java index 27e192b22..1b8fd5b4f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/service/CheckingPointInfoService.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/CheckingPointInfoService.java @@ -15,11 +15,10 @@ import java.util.List; */ public interface CheckingPointInfoService extends IService { - /** - * @return - */ IPage selectCheckingPointInfoPage(CheckingPointInfoPageDto dto); + List selectCheckingPointInfoList(CheckingPointInfoPageDto dto); + List selectAllList(); void add(CheckingPointInfo checkingPointInfo); diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/service/CheckingPointService.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/CheckingPointService.java index e61db3fd8..d8eef9371 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/service/CheckingPointService.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/CheckingPointService.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.checking.entity.CheckingPoint; import com.zhgd.xmgl.modules.checking.entity.qo.ProjectSnQO; +import java.util.List; + /** * @author 邱平毅 * @ClassName CheckingPointService @@ -14,6 +16,8 @@ import com.zhgd.xmgl.modules.checking.entity.qo.ProjectSnQO; public interface CheckingPointService extends IService { IPage selectCheckingPointPage(ProjectSnQO projectSnQO); + List selectCheckingPointList(ProjectSnQO projectSnQO); + /** * @param id 巡检点id * @param userId 用户id diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java index a0a74e1ce..987df564f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java @@ -1,19 +1,23 @@ package com.zhgd.xmgl.modules.checking.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.basicdata.service.INoticeService; -import com.zhgd.xmgl.modules.checking.entity.dto.CheckingPointInfoPageDto; import com.zhgd.xmgl.modules.checking.entity.CheckingPoint; import com.zhgd.xmgl.modules.checking.entity.CheckingPointAlarm; import com.zhgd.xmgl.modules.checking.entity.CheckingPointInfo; +import com.zhgd.xmgl.modules.checking.entity.dto.CheckingPointInfoPageDto; +import com.zhgd.xmgl.modules.checking.entity.qo.ProjectSnQO; import com.zhgd.xmgl.modules.checking.enums.PointStatusEnum; import com.zhgd.xmgl.modules.checking.mapper.CheckingPointInfoMapper; import com.zhgd.xmgl.modules.checking.mapper.CheckingPointMapper; @@ -21,9 +25,12 @@ import com.zhgd.xmgl.modules.checking.service.CheckingPointAlarmService; import com.zhgd.xmgl.modules.checking.service.CheckingPointInfoService; import com.zhgd.xmgl.modules.checking.service.CheckingPointService; import com.zhgd.xmgl.modules.project.service.IProjectService; +import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask; +import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteTaskMapper; +import com.zhgd.xmgl.modules.x.service.impl.XzCheckingRouteTaskServiceImpl; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; -import com.zhgd.xmgl.util.DateUtils; +import com.zhgd.xmgl.util.MapBuilder; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * @author 邱平毅 @@ -43,9 +51,13 @@ import java.util.Objects; @Slf4j @Transactional(rollbackFor = Exception.class) public class CheckingPointInfoServiceImpl extends ServiceImpl implements CheckingPointInfoService { + @Autowired + XzCheckingRouteTaskServiceImpl xzCheckingRouteTaskService; @Autowired SystemUserMapper systemUserMapper; @Autowired + CheckingPointInfoServiceImpl checkingPointInfoService; + @Autowired INoticeService noticeService; @Autowired CheckingPointMapper checkingPointMapper; @@ -57,10 +69,17 @@ public class CheckingPointInfoServiceImpl extends ServiceImpl selectCheckingPointInfoPage(CheckingPointInfoPageDto dto) { - return checkingPointInfoMapper.selectCheckingPointInfoPage(dto, new Page<>(dto.getPageNo(), dto.getPageSize())); + return checkingPointInfoMapper.selectCheckingPointInfoList(dto, new Page<>(dto.getPageNo(), dto.getPageSize())); + } + + @Override + public List selectCheckingPointInfoList(CheckingPointInfoPageDto dto) { + return checkingPointInfoMapper.selectCheckingPointInfoList(dto); } @Override @@ -72,18 +91,38 @@ public class CheckingPointInfoServiceImpl extends ServiceImpl checkingPoints = checkingPointService.selectCheckingPointList(qo); + xzCheckingRouteTaskMapper.update(null, new LambdaUpdateWrapper() + .set(XzCheckingRouteTask::getIsInspect, 1) + .set(XzCheckingRouteTask::getCheckingPointNum, checkingPoints.size()) + .set(XzCheckingRouteTask::getNormalCheckingPointNum, checkingPoints.stream().filter(checkingPoint1 -> checkingPoint1.getInspectStatus() == 1).collect(Collectors.toList()).size()) + .set(XzCheckingRouteTask::getAbnormalCheckingPointNum, checkingPoints.stream().filter(checkingPoint1 -> checkingPoint1.getInspectStatus() == 2).collect(Collectors.toList()).size()) + .eq(XzCheckingRouteTask::getId, xzCheckingRouteTaskId) + ); + } else { + checkingPointInfoMapper.insert(checkingPointInfo); + } + //通知 List userIds = StrUtil.split(checkingPoint.getInspectUserIds(), ","); for (String userId : userIds) { @@ -95,6 +134,24 @@ public class CheckingPointInfoServiceImpl extends ServiceImpl checkingPointInfos = checkingPointInfoService.selectCheckingPointInfoList(dto1); + if (CollUtil.isNotEmpty(checkingPointInfos)) { + throw new OpenAlertException("该次任务的巡检点已提交巡检记录，请勿重复添加"); + } + + ProjectSnQO qo = new ProjectSnQO(); + qo.setXzCheckingRouteTaskId(String.valueOf(checkingPointInfo.getXzCheckingRouteTaskId())); + qo.setCheckingPointId(String.valueOf(checkingPointInfo.getCheckingPointId())); + List points = checkingPointService.selectCheckingPointList(qo); + if (CollUtil.isEmpty(points)) { + throw new OpenAlertException("该次任务不包含该巡检点，请检查后重试"); + } + } + @Override public void edit(CheckingPointInfo checkingPointInfo) { if (Objects.equals(checkingPointInfo.getHandleDone(), 1)) { diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointServiceImpl.java index 0b306c997..7d3c1014b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointServiceImpl.java @@ -51,7 +51,12 @@ public class CheckingPointServiceImpl extends ServiceImpl selectCheckingPointPage(ProjectSnQO projectSnQO) { - return checkingPointMapper.selectCheckingPointPage(projectSnQO, new Page<>(projectSnQO.getPageNo(), projectSnQO.getPageSize())); + return checkingPointMapper.selectCheckingPointList(projectSnQO, new Page<>(projectSnQO.getPageNo(), projectSnQO.getPageSize())); + } + + @Override + public List selectCheckingPointList(ProjectSnQO projectSnQO) { + return checkingPointMapper.selectCheckingPointList(projectSnQO); } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTask.java b/src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTask.java index e1554c83c..f901a3815 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTask.java +++ b/src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTask.java @@ -62,12 +62,59 @@ public class XzCheckingRouteTask implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") private java.util.Date addTime; + /** + * 是否巡检 + */ + @Excel(name = "是否巡检", width = 15) + @ApiModelProperty(value = "是否巡检") + private java.lang.Integer isInspect; + /** + * 巡检点数量 + */ + @Excel(name = "巡检点数量", width = 15) + @ApiModelProperty(value = "巡检点数量") + private java.lang.Integer checkingPointNum; + + /** + * 正常巡检点数量 + */ + @Excel(name = "正常巡检点数量", width = 15) + @ApiModelProperty(value = "正常巡检点数量") + private java.lang.Integer normalCheckingPointNum; + /** + * 异常巡检点数量 + */ + @Excel(name = "异常巡检点数量", width = 15) + @ApiModelProperty(value = "异常巡检点数量") + private java.lang.Integer abnormalCheckingPointNum; + + /** + * 检查开始时间 + */ + @Excel(name = "检查开始时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "检查开始时间") + private java.util.Date startTime; + /** + * 检查结束时间 + */ + @Excel(name = "检查结束时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "检查结束时间") + private java.util.Date endTime; @TableField(exist = false) @ApiModelProperty(value = "星纵-巡检路线") XzCheckingRoute xzCheckingRoute; + @TableField(exist = false) - @ApiModelProperty(value = "某个巡检人信息") - XzCheckingRouteTaskToInspectUser taskToInspectUser; + @ApiModelProperty(value = "巡检人名称") + private java.lang.Integer inspectUserName; + + @TableField(exist = false) + @ApiModelProperty(value = "巡检状态：1未开始2进行中3已完成4已逾期") + private java.lang.Integer inspectStatus; } diff --git a/src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTaskToInspectUser.java b/src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTaskToInspectUser.java deleted file mode 100644 index 12eb2420c..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTaskToInspectUser.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.zhgd.xmgl.modules.x.entity; - -import java.io.Serializable; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @Description: 星纵-巡检任务和巡检人中间表 - * @author： pds - * @date： 2024-05-23 - * @version： V1.0 - */ -@Data -@TableName("xz_checking_route_task_to_inspect_user") -@ApiModel(value = "XzCheckingRouteTaskToInspectUser实体类", description = "XzCheckingRouteTaskToInspectUser") -public class XzCheckingRouteTaskToInspectUser implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * id - */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") - private java.lang.Long id; - /** - * 星纵-巡检路线的任务id - */ - @Excel(name = "星纵-巡检路线的任务id", width = 15) - @ApiModelProperty(value = "星纵-巡检路线的任务id") - private java.lang.Long xzCheckingRouteTaskId; - /** - * 巡检人id - */ - @Excel(name = "巡检人id", width = 15) - @ApiModelProperty(value = "巡检人id") - private java.lang.Long inspectUserId; - /** - * 是否巡检 - */ - @Excel(name = "是否巡检", width = 15) - @ApiModelProperty(value = "是否巡检") - private java.lang.Integer isInspect; - /** - * 正常巡检点数量 - */ - @Excel(name = "正常巡检点数量", width = 15) - @ApiModelProperty(value = "正常巡检点数量") - private java.lang.Integer normalCheckingPointNum; - /** - * 异常巡检点数量 - */ - @Excel(name = "异常巡检点数量", width = 15) - @ApiModelProperty(value = "异常巡检点数量") - private java.lang.Integer abnormalCheckingPointNum; - /** - * 巡检点数量 - */ - @Excel(name = "巡检点数量", width = 15) - @ApiModelProperty(value = "巡检点数量") - private java.lang.Integer checkingPointNum; - - @TableField(exist = false) - @ApiModelProperty(value = "巡检人名称") - private java.lang.Integer inspectUserName; - - @TableField(exist = false) - @ApiModelProperty(value = "巡检状态：1未开始2进行中3已完成4已逾期") - private java.lang.Integer inspectStatus; - - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteMapper.java b/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteMapper.java index 66552db59..23abd2bfa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.x.entity.XzCheckingRoute; @@ -18,6 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope(includeTable = "enterprise_info") public interface XzCheckingRouteMapper extends BaseMapper { List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskMapper.java b/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskMapper.java index b4242bc52..43bcc9106 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskMapper.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.x.mapper; +import java.util.HashMap; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface XzCheckingRouteTaskMapper extends BaseMapper { - List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap paramMap); - IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskToInspectUserMapper.java b/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskToInspectUserMapper.java deleted file mode 100644 index d935db3e6..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskToInspectUserMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.zhgd.xmgl.modules.x.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTaskToInspectUser; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 星纵-巡检任务和巡检人中间表 - * @author： pds - * @date： 2024-05-23 - * @version： V1.0 - */ -@Mapper -public interface XzCheckingRouteTaskToInspectUserMapper extends BaseMapper { - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteMapper.xml b/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteMapper.xml index 452e7e594..f7f12aa5a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteMapper.xml @@ -2,16 +2,20 @@ - select t.*, - (SELECT group_concat(iu.real_name) FROM system_user iu WHERE find_in_set(iu.user_id, t.inspect_user_ids)) - inspectUserNames, - (SELECT group_concat(nu.real_name) FROM system_user nu WHERE find_in_set(nu.user_id, t.notice_user_ids)) - noticeUserNames, - group_concat(ei.enterprise_name) as enterprise_name, - qr.region_name - from xz_checking_route as t - join enterprise_info ei on find_in_set(ei.id, t.enterprise_id) - join quality_region qr on qr.id = t.quality_region_id + select t.* + from (select t.*, + (SELECT group_concat(iu.real_name) + FROM system_user iu + WHERE find_in_set(iu.user_id, t.inspect_user_ids)) + inspectUserNames, + (SELECT group_concat(nu.real_name) + FROM system_user nu + WHERE find_in_set(nu.user_id, t.notice_user_ids)) + noticeUserNames, + group_concat(ei.enterprise_name) as enterprise_name + from xz_checking_route as t + join enterprise_info ei on find_in_set(ei.id, t.enterprise_id) + group by t.id) as t select t.*, + CASE WHEN t.is_inspect = 1 THEN 3 WHEN t.start_time > current_date THEN 1 WHEN t.end_time < current_date THEN + 4 ELSE 2 END as inspectStatus, xcr.id as xcr_id, xcr.route_name as xcr_route_name, xcr.project_sn as xcr_project_sn, diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskToInspectUserMapper.xml b/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskToInspectUserMapper.xml deleted file mode 100644 index 630438af6..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskToInspectUserMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskToInspectUserService.java b/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskToInspectUserService.java deleted file mode 100644 index 725db4cba..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskToInspectUserService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zhgd.xmgl.modules.x.service; - -import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTaskToInspectUser; -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.core.metadata.IPage; - -import java.util.HashMap; -import java.util.List; - -/** - * @Description: 星纵-巡检任务和巡检人中间表 - * @author： pds - * @date： 2024-05-23 - * @version： V1.0 - */ -public interface IXzCheckingRouteTaskToInspectUserService extends IService { - - IPage queryPageList(HashMap paramMap); - - List queryList(HashMap paramMap); - - void add(XzCheckingRouteTaskToInspectUser xzCheckingRouteTaskToInspectUser); - - void edit(XzCheckingRouteTaskToInspectUser xzCheckingRouteTaskToInspectUser); - - void delete(String id); - - XzCheckingRouteTaskToInspectUser queryById(String id); - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteServiceImpl.java index 7a2943760..524f364e5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteServiceImpl.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.x.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -27,6 +28,8 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.HashMap; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** * @Description: 星纵-巡检路线 @@ -62,7 +65,6 @@ public class XzCheckingRouteServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzCheckingRoute.class, paramMap, alias); - queryWrapper.groupBy("t.id"); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzCheckingRoute::getCreateDate)); return queryWrapper; } @@ -124,8 +126,19 @@ public class XzCheckingRouteServiceImpl extends ServiceImpl dateSplit = StrUtil.split(title, "/"); + itemRecord.setStartTime(DateUtil.parseDate(dateSplit.get(0))); + itemRecord.setEndTime(DateUtil.parseDate(dateSplit.get(1))); + } else { + itemRecord.setStartTime(DateUtil.parseDate(title)); + itemRecord.setEndTime(DateUtil.parseDate(title)); + } } else { itemRecord.setItemName("第" + (i + 1) + "次"); + itemRecord.setStartTime(route.getStartTime()); + itemRecord.setEndTime(route.getEndTime()); } itemRecord.setInspectOrder(i); itemRecord.setAddTime(new Date()); @@ -138,6 +151,10 @@ public class XzCheckingRouteServiceImpl extends ServiceImpl routeToPointList = xzCheckingRoute.getRouteToPointList(); if (CollUtil.isNotEmpty(routeToPointList)) { + Set sortSet = routeToPointList.stream().map(XzCheckingRouteToPoint::getSort).collect(Collectors.toSet()); + if (sortSet.size() != routeToPointList.size()) { + throw new OpenAlertException("巡检路线中存在重复的排序号，请检查！"); + } for (XzCheckingRouteToPoint to : routeToPointList) { to.setId(null); to.setXzCheckingRouteId(xzCheckingRoute.getId()); diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskServiceImpl.java index 92a325817..e1fb31fa4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskServiceImpl.java @@ -1,27 +1,25 @@ package com.zhgd.xmgl.modules.x.service.impl; import cn.hutool.core.util.StrUtil; -import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask; -import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteTaskMapper; -import com.zhgd.xmgl.modules.x.service.IXzCheckingRouteTaskService; -import com.zhgd.xmgl.util.MapUtil; -import org.apache.commons.collections.MapUtils; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.util.PageUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask; +import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteTaskMapper; +import com.zhgd.xmgl.modules.x.service.IXzCheckingRouteTaskService; +import com.zhgd.xmgl.util.PageUtil; +import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.List; -import com.zhgd.xmgl.util.RefUtil; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - /** * @Description: 星纵-巡检路线的任务 * @author： pds @@ -38,7 +36,7 @@ public class XzCheckingRouteTaskServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); - IPage pageList = baseMapper.queryList(page, queryWrapper); + IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); pageList.setRecords(dealList(pageList.getRecords())); return pageList; } @@ -46,16 +44,21 @@ public class XzCheckingRouteTaskServiceImpl extends ServiceImpl queryList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); - return dealList(baseMapper.queryList(queryWrapper)); + return dealList(baseMapper.queryList(queryWrapper, paramMap)); } private QueryWrapper getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzCheckingRouteTask.class, paramMap, alias); String checkingPointUserId = MapUtils.getString(paramMap, "checkingPointUserId"); + String date = MapUtils.getString(paramMap, "date"); if (StrUtil.isNotBlank(checkingPointUserId)) { queryWrapper.apply("find_in_set({0},xcr.inspect_user_ids)", checkingPointUserId); } + if (StrUtil.isNotBlank(date)) { + queryWrapper.le("xcr.start_time", date); + queryWrapper.ge("xcr.end_time", date); + } queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzCheckingRouteTask::getId)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskToInspectUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskToInspectUserServiceImpl.java deleted file mode 100644 index 0d63d70f3..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskToInspectUserServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.zhgd.xmgl.modules.x.service.impl; - -import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTaskToInspectUser; -import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteTaskToInspectUserMapper; -import com.zhgd.xmgl.modules.x.service.IXzCheckingRouteTaskToInspectUserService; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.util.PageUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import java.util.HashMap; -import java.util.List; - -import com.zhgd.xmgl.util.RefUtil; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * @Description: 星纵-巡检任务和巡检人中间表 - * @author： pds - * @date： 2024-05-23 - * @version： V1.0 - */ -@Service -@Transactional(rollbackFor = Exception.class) -public class XzCheckingRouteTaskToInspectUserServiceImpl extends ServiceImpl implements IXzCheckingRouteTaskToInspectUserService { - @Autowired - private XzCheckingRouteTaskToInspectUserMapper xzCheckingRouteTaskToInspectUserMapper; - - @Override - public IPage queryPageList(HashMap paramMap) { - QueryWrapper queryWrapper = getQueryWrapper(paramMap); - Page page = PageUtil.getPage(paramMap); - IPage pageList = this.page(page, queryWrapper); - pageList.setRecords(dealList(pageList.getRecords())); - return pageList; - } - - @Override - public List queryList(HashMap paramMap) { - QueryWrapper queryWrapper = getQueryWrapper(paramMap); - return dealList(this.list(queryWrapper)); - } - - private QueryWrapper getQueryWrapper(HashMap paramMap) { - String alias = ""; - QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzCheckingRouteTaskToInspectUser.class, paramMap, alias); - queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzCheckingRouteTaskToInspectUser::getId)); - return queryWrapper; - } - - private List dealList(List list) { - return list; - } - - @Override - public void add(XzCheckingRouteTaskToInspectUser xzCheckingRouteTaskToInspectUser) { - xzCheckingRouteTaskToInspectUser.setId(null); - baseMapper.insert(xzCheckingRouteTaskToInspectUser); - } - - @Override - public void edit(XzCheckingRouteTaskToInspectUser xzCheckingRouteTaskToInspectUser) { - XzCheckingRouteTaskToInspectUser oldXzCheckingRouteTaskToInspectUser = baseMapper.selectById(xzCheckingRouteTaskToInspectUser.getId()); - if (oldXzCheckingRouteTaskToInspectUser == null) { - throw new OpenAlertException("未找到对应实体"); - } - baseMapper.updateById(xzCheckingRouteTaskToInspectUser); - } - - @Override - public void delete(String id) { - XzCheckingRouteTaskToInspectUser xzCheckingRouteTaskToInspectUser = baseMapper.selectById(id); - if (xzCheckingRouteTaskToInspectUser == null) { - throw new OpenAlertException("未找到对应实体"); - } - baseMapper.deleteById(id); - } - - @Override - public XzCheckingRouteTaskToInspectUser queryById(String id) { - XzCheckingRouteTaskToInspectUser entity = getById(id); - if (entity == null) { - throw new OpenAlertException("未找到对应实体"); - } - return entity; - } - -}