From a95fcb7a069601671814a913fef5d54366a5d2a0 Mon Sep 17 00:00:00 2001 From: huangrenya Date: Tue, 19 Mar 2024 15:54:05 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=97=85=E9=99=A9=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B-=E6=B0=B4=E9=97=B8/=E5=A0=A4=E9=98=B2-=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=88=9B=E5=BB=BA=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?&=E4=BF=AE=E5=A4=8Dsql=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DfDangerousGroupingController.java | 4 ++-- .../kms/yxgh/df/dto/DfDangerousGroupingDto.java | 16 +++++++++++++++- .../df/mapper/DfDangerousGroupingMapper.java | 6 +++--- .../df/mapper/DfDangerousGroupingRelMapper.java | 2 +- .../df/service/DfDangerousGroupingService.java | 5 +++++ .../SzDangerousGroupingController.java | 4 ++-- .../kms/yxgh/sz/dto/SzDangerousGroupingDto.java | 15 +++++++++++++++ .../sz/mapper/SzDangerousGroupingMapper.java | 9 ++++----- .../sz/mapper/SzDangerousGroupingRelMapper.java | 2 +- .../sz/service/SzDangerousGroupingService.java | 7 ++++++- 10 files changed, 54 insertions(+), 16 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousGroupingController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousGroupingController.java index e6fb644d..46be7dcf 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousGroupingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousGroupingController.java @@ -32,8 +32,8 @@ public class DfDangerousGroupingController { */ @ApiOperation("堤防病险工程分组列表") @PostMapping("/page") - public Response> page(@RequestBody SearchParam sp) { - return Response.ok(groupingService.getListByPage(sp)); + public IPage page(@RequestBody SearchParam sp) { + return groupingService.getListByPage(sp); } /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingDto.java index b0a74b37..7a1e71c5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingDto.java @@ -1,10 +1,11 @@ package com.kms.yxgh.df.dto; -import com.kms.yxgh.df.domain.DfDangerousGroupingRel; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -46,6 +47,19 @@ public class DfDangerousGroupingDto { @ApiModelProperty("小组成员") private String groupNames; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("创建时间") + private Date createTime; + + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最近修改时间") + private Date updateTime; /** * 小组成员列表 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java index 34f26a47..93a23cea 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java @@ -17,10 +17,10 @@ import org.springframework.stereotype.Repository; @Repository public interface DfDangerousGroupingMapper extends BaseMapper { - @Select("SELECT b.dept_name as deptName,a.id, a.name, a.dept_id as deptId, a.create_time as createTime, a.update_time as updateTime,GROUP_CONCAT(c.groupName) as groupNames" + + @Select("SELECT b.dept_name as deptName,a.id, a.name, a.dept_id as deptId, a.create_time as createTime, a.update_time as updateTime," + + "(select GROUP_CONCAT(DISTINCT c.GROUP_NAME ) from bs_sgc_sz_bxgcfzcy c where c.GROUP_ID = a.id ) as groupNames " + " FROM bs_sgc_df_bxgcfz a " + - " LEFT JOIN bs_sgc_df_bxgcfzcy c ON c.groupId = g.id "+ - " LEFT JOIN sys_dept b ON a.dept_id = b.dept_id" + + " LEFT JOIN sys_dept b ON a.dept_id = b.id " + "") IPage selectByPage(Page page, @Param("dto") DfDangerousGroupingDto dto); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingRelMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingRelMapper.java index 10a4c87b..a169d521 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingRelMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingRelMapper.java @@ -31,6 +31,6 @@ public interface DfDangerousGroupingRelMapper extends BaseMapper selectByGroupId(@Param("groupId") String groupId); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousGroupingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousGroupingService.java index 94f2f03c..dd0019d6 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousGroupingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousGroupingService.java @@ -3,6 +3,7 @@ package com.kms.yxgh.df.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.common.utils.UserUtils; import com.kms.yxgh.df.domain.DfDangerousGrouping; import com.kms.yxgh.df.domain.DfDangerousGroupingRel; import com.kms.yxgh.df.dto.DfDangerousGroupingDto; @@ -11,6 +12,7 @@ import com.kms.yxgh.df.mapper.DfDangerousGroupingMapper; import com.kms.yxgh.df.mapper.DfDangerousGroupingRelMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.service.BaseService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -44,6 +46,9 @@ public class DfDangerousGroupingService extends BaseService> page(@RequestBody SearchParam sp) { - return Response.ok(groupingService.getListByPage(sp)); + public IPage page(@RequestBody SearchParam sp) { + return groupingService.getListByPage(sp); } /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousGroupingDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousGroupingDto.java index c3c0cc8c..5416ddd5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousGroupingDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousGroupingDto.java @@ -1,9 +1,11 @@ package com.kms.yxgh.sz.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -45,6 +47,19 @@ public class SzDangerousGroupingDto { @ApiModelProperty("小组成员") private String groupNames; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("创建时间") + private Date createTime; + + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最近修改时间") + private Date updateTime; /** * 小组成员列表 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingMapper.java index fe73447a..dbd65ff5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingMapper.java @@ -17,10 +17,9 @@ import org.springframework.stereotype.Repository; @Repository public interface SzDangerousGroupingMapper extends BaseMapper { - @Select("SELECT b.dept_name as deptName,a.id, a.name, a.dept_id as deptId, a.create_time as createTime, a.update_time as updateTime,GROUP_CONCAT(c.groupName) as groupNames" + + @Select("SELECT b.dept_name as deptName,a.id, a.name, a.dept_id as deptId, a.create_time as createTime, a.update_time as updateTime," + + "(select GROUP_CONCAT(DISTINCT c.GROUP_NAME ) from bs_sgc_sz_bxgcfzcy c where c.GROUP_ID = a.id ) as groupNames " + " FROM bs_sgc_sz_bxgcfz a " + - " LEFT JOIN bs_sgc_sz_bxgcfzcy c ON c.groupId = g.id "+ - " LEFT JOIN sys_dept b ON a.dept_id = b.dept_id" + - "") - IPage selectByPage(Page page, @Param("dto") SzDangerousGroupingDto dto); + " LEFT JOIN sys_dept b ON a.dept_id = b.id " ) + IPage searchPage(Page page, @Param("dto") SzDangerousGroupingDto dto); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingRelMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingRelMapper.java index d1799a1b..97f9b39b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingRelMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingRelMapper.java @@ -31,6 +31,6 @@ public interface SzDangerousGroupingRelMapper extends BaseMapper selectByGroupId(@Param("groupId") String groupId); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousGroupingService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousGroupingService.java index bc0fbf4c..c06c4c29 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousGroupingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousGroupingService.java @@ -3,6 +3,7 @@ package com.kms.yxgh.sz.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.common.utils.UserUtils; import com.kms.yxgh.sz.domain.SzDangerousGrouping; import com.kms.yxgh.sz.domain.SzDangerousGroupingRel; import com.kms.yxgh.sz.dto.SzDangerousGroupingDto; @@ -11,6 +12,7 @@ import com.kms.yxgh.sz.mapper.SzDangerousGroupingMapper; import com.kms.yxgh.sz.mapper.SzDangerousGroupingRelMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.service.BaseService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -30,7 +32,7 @@ public class SzDangerousGroupingService extends BaseService getListByPage(SearchParam sp) { Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); - return this.getBaseMapper().selectByPage(page, sp.getData()); + return this.getBaseMapper().searchPage(page, sp.getData()); } public SzDangerousGroupingDto getDetailById(String id) { @@ -44,6 +46,9 @@ public class SzDangerousGroupingService extends BaseService