fix：病险工程-水闸/堤防-返回创建修改时间&修复sql查询语句

shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousGroupingController.java

@@ -32,8 +32,8 @@ public class DfDangerousGroupingController {
      */
     @ApiOperation("堤防病险工程分组列表")
     @PostMapping("/page")
-    public Response<IPage<DfDangerousGroupingDto>> page(@RequestBody SearchParam<DfDangerousGroupingDto> sp) {
+    public IPage<DfDangerousGroupingDto> page(@RequestBody SearchParam<DfDangerousGroupingDto> sp) {
-        return Response.ok(groupingService.getListByPage(sp));
+        return groupingService.getListByPage(sp);
     }
 
     /**

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;
 
     /**
      * 小组成员列表

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<DfDangerousGrouping> {
 
-     @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.id " +
-             " LEFT JOIN sys_dept b ON a.dept_id = b.dept_id" +
              "")
      IPage<DfDangerousGroupingDto> selectByPage(Page<DfDangerousGroupingDto> page, @Param("dto") DfDangerousGroupingDto dto);
 }

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingRelMapper.java

@@ -31,6 +31,6 @@ public interface DfDangerousGroupingRelMapper extends BaseMapper<DfDangerousGrou
      */
     @Select("select dgr.id,dgr.group_id as groupId, dgr.GROUP_UID as groupUid, dgr.GROUP_NAME as groupName,dgr.dept_id as deptId,sd.dept_name as deptName" +
             " from bs_sgc_df_bxgcfzcy dgr " +
-            " left join sy_dept sd on dgr.dept_id = sd.dept_id where group_id = #{groupId}")
+            " left join sys_dept sd on dgr.dept_id = sd.id where group_id = #{groupId}")
     List<DfDangerousGroupingRelDto> selectByGroupId(@Param("groupId") String groupId);
 }

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<DfDangerousGrouping
     public DfDangerousGroupingDto add(DfDangerousGroupingDto groupingDto) {
         // 新增分组
         DfDangerousGrouping dfDangerousGrouping = BeanCopyUtils.copy(groupingDto, DfDangerousGrouping.class);
+        // 补充当前用户的创建单位
+        SysUser user = UserUtils.getUser();
+        dfDangerousGrouping.setDeptId(user.getDeptId());
         this.save(dfDangerousGrouping);
 
         // 新增小组成员列表

shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousGroupingController.java

@@ -32,8 +32,8 @@ public class SzDangerousGroupingController {
      */
     @ApiOperation("水闸病险工程分组列表")
     @PostMapping("/page")
-    public Response<IPage<SzDangerousGroupingDto>> page(@RequestBody SearchParam<SzDangerousGroupingDto> sp) {
+    public IPage<SzDangerousGroupingDto> page(@RequestBody SearchParam<SzDangerousGroupingDto> sp) {
-        return Response.ok(groupingService.getListByPage(sp));
+        return groupingService.getListByPage(sp);
     }
 
     /**

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;
 
     /**
      * 小组成员列表

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<SzDangerousGrouping> {
 
-     @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.id " )
-             " LEFT JOIN sys_dept b ON a.dept_id = b.dept_id" +
+     IPage<SzDangerousGroupingDto> searchPage(Page<SzDangerousGroupingDto> page, @Param("dto") SzDangerousGroupingDto dto);
-             "")
-     IPage<SzDangerousGroupingDto> selectByPage(Page<SzDangerousGroupingDto> page, @Param("dto") SzDangerousGroupingDto dto);
 }

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingRelMapper.java

@@ -31,6 +31,6 @@ public interface SzDangerousGroupingRelMapper extends BaseMapper<SzDangerousGrou
      */
     @Select("select dgr.id,dgr.group_id as groupId, dgr.GROUP_UID as groupUid, dgr.GROUP_NAME as groupName,dgr.dept_id as deptId,sd.dept_name as deptName" +
             " from bs_sgc_sz_bxgcfzcy dgr " +
-            " left join sy_dept sd on dgr.dept_id = sd.dept_id where group_id = #{groupId}")
+            " left join sys_dept sd on dgr.dept_id = sd.id where group_id = #{groupId}")
     List<SzDangerousGroupingRelDto> selectByGroupId(@Param("groupId") String groupId);
 }

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<SzDangerousGroupingM
 
     public IPage<SzDangerousGroupingDto> getListByPage(SearchParam<SzDangerousGroupingDto> sp) {
         Page<SzDangerousGroupingDto> 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<SzDangerousGroupingM
     public SzDangerousGroupingDto add(SzDangerousGroupingDto groupingDto) {
         // 新增分组
         SzDangerousGrouping dangerousGrouping = BeanCopyUtils.copy(groupingDto, SzDangerousGrouping.class);
+        // 补充当前用户的创建单位
+        SysUser user = UserUtils.getUser();
+        dangerousGrouping.setDeptId(user.getDeptId());
         this.save(dangerousGrouping);
 
         // 新增小组成员列表