Browse Source

Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

master_tdsql
hxh 1 year ago
parent
commit
d79d479ac8
  1. 83
      shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousGroupingController.java
  2. 4
      shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousProjectController.java
  3. 32
      shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousGrouping.java
  4. 45
      shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousGroupingRel.java
  5. 56
      shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingDto.java
  6. 52
      shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingRelDto.java
  7. 13
      shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseProblemDto.java
  8. 29
      shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayProjectDto.java
  9. 26
      shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java
  10. 36
      shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingRelMapper.java
  11. 4
      shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousProjectMapper.java
  12. 28
      shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseProblemMapper.java
  13. 2
      shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseTaskMapper.java
  14. 84
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousGroupingService.java
  15. 16
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousProjectService.java
  16. 9
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java
  17. 123
      shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousProjectController.java
  18. 27
      shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousProject.java
  19. 32
      shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousProjectItem.java
  20. 28
      shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousProjectDto.java
  21. 33
      shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousProjectItemDto.java
  22. 12
      shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemDto.java
  23. 2
      shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemListDto.java
  24. 29
      shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseWayProjectDto.java
  25. 14
      shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousProjectItemMapper.java
  26. 14
      shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousProjectMapper.java
  27. 32
      shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseProblemMapper.java
  28. 4
      shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseTaskMapper.java
  29. 88
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousProjectService.java
  30. 10
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseEngineeringService.java

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

@ -0,0 +1,83 @@
package com.kms.yxgh.df.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.kms.yxgh.base.Response;
import com.kms.yxgh.df.dto.DfDangerousGroupingDto;
import com.kms.yxgh.df.service.DfDangerousGroupingService;
import com.shuili.common.annotation.Log;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.enums.BusinessType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
/**
* 堤防病险工程分组
* @author hry
* @date 2024/3/12 14:44
*/
@RestController
@AllArgsConstructor
@RequestMapping("/run/df/dangerousGrouping")
@Api(tags = "堤防病险工程分组")
public class DfDangerousGroupingController {
private final DfDangerousGroupingService groupingService;
/**
* 查询堤防病险工程分组列表
* @param sp
* @return
*/
@ApiOperation("堤防病险工程分组列表")
@PostMapping("/page")
public Response<IPage<DfDangerousGroupingDto>> page(@RequestBody SearchParam<DfDangerousGroupingDto> sp) {
return Response.ok(groupingService.getListByPage(sp));
}
/**
* 查询堤防病险工程分组详情
* @param id
* @return
*/
@ApiOperation("堤防病险工程分组详情")
@GetMapping("/{id}")
public Response<DfDangerousGroupingDto> detail(@PathVariable String id) {
return Response.ok(groupingService.getDetailById(id));
}
/**
* 新增堤防病险工程分组
*/
@ApiOperation("堤防病险工程分组新增")
@Log(title = "堤防病险工程分组新增", businessType = BusinessType.INSERT)
@PostMapping()
public Response<DfDangerousGroupingDto> add(@RequestBody DfDangerousGroupingDto dto) {
return Response.ok(groupingService.add(dto));
}
/**
* 修改堤防病险工程分组
*/
@ApiOperation("堤防病险工程分组修改")
@Log(title = "堤防病险工程分组修改", businessType = BusinessType.UPDATE)
@PutMapping()
public Response<DfDangerousGroupingDto> update(@RequestBody DfDangerousGroupingDto dto) {
return Response.ok(groupingService.modify(dto));
}
/**
* 删除堤防病险工程分组
* @param id
* @return
*/
@ApiOperation("堤防病险工程分组删除")
@Log(title = "堤防病险工程分组删除", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public Response<Boolean> deleteData(@PathVariable String id) {
return Response.ok(groupingService.deleteById(id));
}
}

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

@ -106,7 +106,7 @@ public class DfDangerousProjectController {
*/
@ApiOperation("堤防病险工程核查项目内容列表")
@GetMapping("/itemList/{projectId}")
public Response<List<DfDangerousProjectItem>> getItemList(@PathVariable String projectId) {
public Response<List<DfDangerousProjectItemDto>> getItemList(@PathVariable String projectId) {
return Response.ok(dfDangerousProjectService.getItemList(projectId));
}
@ -117,7 +117,7 @@ public class DfDangerousProjectController {
*/
@ApiOperation("堤防病险工程核查项目内容详情")
@GetMapping("/itemDetail/{id}")
public Response<DfDangerousProjectItem> getItemDetailById(@PathVariable String id) {
public Response<DfDangerousProjectItemDto> getItemDetailById(@PathVariable String id) {
return Response.ok(dfDangerousProjectService.getItemDetailById(id));
}

32
shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousGrouping.java

@ -0,0 +1,32 @@
package com.kms.yxgh.df.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.kms.yxgh.base.SyBaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 堤防病险工程核查分组表 bs_sgc_df_bxgcfz
* @author hry
* @date 2024/2/29 13:57
*/
@TableName("bs_sgc_df_bxgcfz")
@Data
@ApiModel("堤防病险工程核查分组")
public class DfDangerousGrouping extends SyBaseEntity {
private static final long serialVersionUID = 1L;
/**
* 小组名称
*/
@ApiModelProperty("小组名称")
private String name;
/**
* 单位id
*/
@ApiModelProperty("单位id")
private String deptId;
}

45
shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousGroupingRel.java

@ -0,0 +1,45 @@
package com.kms.yxgh.df.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.kms.yxgh.base.SyBaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 堤防病险工程核查分组成员关系表 bs_sgc_df_bxgcfzcy
*
* @author hry
* @date 2024/2/29 13:57
*/
@TableName("bs_sgc_df_bxgcfzcy")
@Data
@ApiModel("堤防病险工程核查分组成员关联")
public class DfDangerousGroupingRel extends SyBaseEntity {
private static final long serialVersionUID = 1L;
/**
* 病险工程核查分组ID
*/
@ApiModelProperty("病险工程核查分组ID")
private String groupId;
/**
* 小组成员ID
*/
@ApiModelProperty("小组成员ID")
private String groupUid;
/**
* 小组成员名称
*/
@ApiModelProperty("小组成员名称")
private String groupName;
/**
* 所属单位ID
*/
@ApiModelProperty("所属单位ID")
private String deptId;
}

56
shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingDto.java

@ -0,0 +1,56 @@
package com.kms.yxgh.df.dto;
import com.kms.yxgh.df.domain.DfDangerousGroupingRel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* 堤防病险工程核查分组dto对象
* @author hry
* @date 2024/2/29 13:57
*/
@Data
@ApiModel("堤防病险工程核查分组")
public class DfDangerousGroupingDto {
/**
* id
*/
@ApiModelProperty("id")
private String id;
/**
* 小组名称
*/
@ApiModelProperty("小组名称")
private String name;
/**
* 单位id
*/
@ApiModelProperty("单位id")
private String deptId;
/**
* 创建单位
*/
@ApiModelProperty("创建单位")
private String deptName;
/**
* 小组成员
*/
@ApiModelProperty("小组成员")
private String groupNames;
/**
* 小组成员列表
*/
@ApiModelProperty("小组成员列表")
private List<DfDangerousGroupingRelDto> itemList;
}

52
shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingRelDto.java

@ -0,0 +1,52 @@
package com.kms.yxgh.df.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 堤防病险工程核查分组成员关系dto对象
*
* @author hry
* @date 2024/2/29 13:57
*/
@Data
@ApiModel("堤防病险工程核查分组成员关联")
public class DfDangerousGroupingRelDto{
/**
* id
*/
@ApiModelProperty("id")
private String id;
/**
* 病险工程核查分组ID
*/
@ApiModelProperty("病险工程核查分组ID")
private String groupId;
/**
* 小组成员ID
*/
@ApiModelProperty("小组成员ID")
private String groupUid;
/**
* 小组成员名称
*/
@ApiModelProperty("小组成员名称")
private String groupName;
/**
* 所属单位ID
*/
@ApiModelProperty("所属单位ID")
private String deptId;
/**
* 所属单位名称
*/
@ApiModelProperty("所属单位名称")
private String deptName;
}

13
shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseProblemDto.java

@ -31,12 +31,25 @@ public class DfSuperviseProblemDto {
@ApiModelProperty("监督检查办法项目ID")
private String projectId;
/**
* 监督检查办法项目名称
*/
@ApiModelProperty("监督检查办法项目名称")
private String projectName;
/**
* 监督检查办法项目内容ID
*/
@ApiModelProperty("监督检查办法项目内容ID")
private String projectItemId;
/**
* 检查内容
*/
@ApiModelProperty("检查内容")
private String content;
/**
* 问题等级
*/

29
shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayProjectDto.java

@ -1,10 +1,12 @@
package com.kms.yxgh.df.dto;
import com.kms.yxgh.base.SyBaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 堤防监督检查办法项目dto对象
* @author hry
@ -29,4 +31,29 @@ public class DfSuperviseWayProjectDto{
@ApiModelProperty("监督检查办法ID")
private String wayId;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("修改时间")
private Date updateTime;
/**
* 创建人
*/
@ApiModelProperty("创建人")
private String createUid;
/**
* 修改人
*/
@ApiModelProperty("修改人")
private String updateUid;
}

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

@ -0,0 +1,26 @@
package com.kms.yxgh.df.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yxgh.df.domain.DfDangerousGrouping;
import com.kms.yxgh.df.dto.DfDangerousGroupingDto;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
/**
* 堤防病险工程分组Mapper接口
* @author hry
* @date 2024/3/12 14:44
*/
@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" +
" 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" +
"")
IPage<DfDangerousGroupingDto> selectByPage(Page<DfDangerousGroupingDto> page, @Param("dto") DfDangerousGroupingDto dto);
}

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

@ -0,0 +1,36 @@
package com.kms.yxgh.df.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yxgh.df.domain.DfDangerousGroupingRel;
import com.kms.yxgh.df.dto.DfDangerousGroupingRelDto;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 堤防病险工程分组关联Mapper接口
* @author hry
* @date 2024/3/12 14:44
*/
@Repository
public interface DfDangerousGroupingRelMapper extends BaseMapper<DfDangerousGroupingRel> {
/**
* 根据groupId删除
* @param groupId
* @return
*/
int deleteByGroupId(String groupId);
/**
* 根据groupId查询
* @param groupId
* @return
*/
@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}")
List<DfDangerousGroupingRelDto> selectByGroupId(@Param("groupId") String groupId);
}

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

@ -2,13 +2,13 @@ package com.kms.yxgh.df.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yxgh.df.domain.DfDangerousProject;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
/**
* 堤防病险工程Mapper接口
* @author hry
* @date 2024/3/12 14:44
*/
@Mapper
@Repository
public interface DfDangerousProjectMapper extends BaseMapper<DfDangerousProject> {
}

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

@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yxgh.df.domain.DfSuperviseProblem;
import com.kms.yxgh.df.dto.DfSuperviseProblemDto;
import com.kms.yxgh.df.dto.DfSuperviseProblemListDto;
import com.kms.yxgh.df.dto.DfSuperviseProblemTotalDto;
import com.shuili.common.utils.StringUtils;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.jdbc.SQL;
import org.springframework.stereotype.Repository;
@ -32,9 +34,9 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
*/
@Insert({
"<script>",
"insert into bs_sgc_df_jdjcgcwt(task_id, project_id, project_item_id, level) values ",
"insert into bs_sgc_df_jdjcgcwt(task_id, project_id, project_item_id, level, status) values ",
"<foreach collection='problemList' item='item' index='index' separator=','>",
"(#{item.taskId}, #{item.projectId}, #{item.projectItemId}, #{item.level} )",
"(#{item.taskId}, #{item.projectId}, #{item.projectItemId}, #{item.level}, #{item.status} )",
"</foreach>",
"</script>"
})
@ -53,16 +55,16 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
class DfSuperviseProblemProvider {
public String selectPage(final Map<String, Object> param) {
return new SQL() {{
SELECT("wt.id,xm.name as projectName,rw.name,nr.content,xx.adcd,xx.wageName,xx.engineeringManagementUnit,wt.level");
SELECT("wt.id,xm.name as projectName,rw.name,nr.content,xx.adcd,xx.dikeName,xx.engineeringManagementUnit,wt.level, wt.status");
FROM("bs_sgc_df_jdjcgcwt wt");
LEFT_OUTER_JOIN("bs_sgc_df_jdjcbfxm xm on wt.project_id = xm.id");
LEFT_OUTER_JOIN("bs_sgc_df_jdjcbfxmnr nr on wt.project_item_id = nr.id");
LEFT_OUTER_JOIN("bs_sgc_df_jdjcrw rw on wt.TASK_ID = rw.id");
LEFT_OUTER_JOIN("(SELECT DISTINCT xx.ID,xx.DIKE_CODE AS dikeCode,xx.DIKE_NAME AS dikeName,xx.adcd,gl.engineering_management_unit as engineeringManagementUnit\n" +
"\tFROM bs_sgc_df_gcda xx LEFT OUTER JOIN bs_sgc_df_gcgl gl ON xx.dike_code = gl.dike_code \n" +
"\tWHERE xx.EXPR_DATE IS NULL AND gl.EXPR_DATE IS NULL) xx ON rw.dike_code = xx.dike_code");
" FROM bs_sgc_df_gcda xx LEFT OUTER JOIN bs_sgc_df_gcgl gl ON xx.dike_code = gl.dike_code " +
" WHERE xx.EXPR_DATE IS NULL AND gl.EXPR_DATE IS NULL) xx ON rw.dike_code = xx.dikeCode");
WHERE("1=1");
WHERE("wt.status is not null");
WHERE("rw.state =1");
DfSuperviseProblemListDto dto = (DfSuperviseProblemListDto) param.get("dto");
if (dto != null) {
@ -137,4 +139,18 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
}
}
@Select("<script>" +
"SELECT xm.name as projectName, nr.project_id as projectId, nr.content, " +
"wt.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level, wt.status, wt.HANDLE_RECORD as handleRecord, wt.HANDLE_SITUATION_RECORDS as handleSituationRecords, wt.HANDLE_UID as handleUid, " +
"wt.HANDLE_NAME as handleName, wt.HANDLE_TIME as handleTime, wt.CONFIRM_UID as confirmUid, wt.CONFIRM_NAME as confirmName, wt.CONFIRM_TIME as confirmTime "+
"FROM bs_sgc_df_jdjcgcwt wt " +
"LEFT JOIN bs_sgc_df_jdjcbfxm xm on wt.project_id = xm.id " +
"LEFT JOIN bs_sgc_df_jdjcbfxmnr nr on wt.project_item_id = nr.id " +
"WHERE 1=1 " +
"<if test='dto.taskId != null and dto.taskId != \"\"'>" +
"AND wt.task_id = #{dto.taskId} " +
"</if>" +
"</script>")
List<DfSuperviseProblemDto> selectByListParam(@Param("dto") DfSuperviseProblemDto dto);
}

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

@ -43,7 +43,7 @@ public interface DfSuperviseTaskMapper extends BaseMapper<DfSuperviseTask> {
LEFT_OUTER_JOIN("bs_sgc_df_gcgl gl on pj.dike_code = df.dike_code ");
WHERE("gl.EXPR_DATE is null");
WHERE("xx.EXPR_DATE is null");
ORDER_BY("rw.create_time DESC");
ORDER_BY("rw.done_time asc", "rw.update_time DESC");
}}.toString();
}
}

84
shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousGroupingService.java

@ -0,0 +1,84 @@
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.yxgh.df.domain.DfDangerousGrouping;
import com.kms.yxgh.df.domain.DfDangerousGroupingRel;
import com.kms.yxgh.df.dto.DfDangerousGroupingDto;
import com.kms.yxgh.df.dto.DfDangerousGroupingRelDto;
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.service.BaseService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* 堤防病险工程核查分组实现类
*
* @author hry
* @date 2024/2/29 14:46
*/
@Service
@AllArgsConstructor
public class DfDangerousGroupingService extends BaseService<DfDangerousGroupingMapper, DfDangerousGrouping> {
private final DfDangerousGroupingRelMapper relMapper;
public IPage<DfDangerousGroupingDto> getListByPage(SearchParam<DfDangerousGroupingDto> sp) {
Page<DfDangerousGroupingDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
return this.getBaseMapper().selectByPage(page, sp.getData());
}
public DfDangerousGroupingDto getDetailById(String id) {
DfDangerousGrouping dfDangerousGrouping = this.getById(id);
DfDangerousGroupingDto dfDangerousGroupingDto = BeanCopyUtils.copy(dfDangerousGrouping, DfDangerousGroupingDto.class);
dfDangerousGroupingDto.setItemList(relMapper.selectByGroupId(id));
return dfDangerousGroupingDto;
}
@Transactional(rollbackFor = Exception.class)
public DfDangerousGroupingDto add(DfDangerousGroupingDto groupingDto) {
// 新增分组
DfDangerousGrouping dfDangerousGrouping = BeanCopyUtils.copy(groupingDto, DfDangerousGrouping.class);
this.save(dfDangerousGrouping);
// 新增小组成员列表
handleGroupingRel(groupingDto, dfDangerousGrouping);
return BeanCopyUtils.copy(dfDangerousGrouping, DfDangerousGroupingDto.class);
}
@Transactional(rollbackFor = Exception.class)
public DfDangerousGroupingDto modify(DfDangerousGroupingDto groupingDto) {
// 修改分组
DfDangerousGrouping dfDangerousGrouping = BeanCopyUtils.copy(groupingDto, DfDangerousGrouping.class);
this.updateById(dfDangerousGrouping);
// 批量删除小组成员列表 重新添加
relMapper.deleteByGroupId(dfDangerousGrouping.getId());
handleGroupingRel(groupingDto, dfDangerousGrouping);
return BeanCopyUtils.copy(dfDangerousGrouping, DfDangerousGroupingDto.class);
}
private void handleGroupingRel(DfDangerousGroupingDto groupingDto, DfDangerousGrouping dfDangerousGrouping) {
for (DfDangerousGroupingRelDto item : groupingDto.getItemList()) {
DfDangerousGroupingRel itemEntity = BeanCopyUtils.copy(item, DfDangerousGroupingRel.class);
itemEntity.setId(null);
itemEntity.setGroupId(dfDangerousGrouping.getId());
relMapper.insert(itemEntity);
}
}
@Transactional(rollbackFor = Exception.class)
public Boolean deleteById(String id) {
if (this.removeById(id)){
// 除掉所配置的数据项
relMapper.delete(Wrappers.<DfDangerousGroupingRel>lambdaQuery().eq(DfDangerousGroupingRel::getGroupId, id));
}
return true;
}
}

16
shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousProjectService.java

@ -42,9 +42,10 @@ public class DfDangerousProjectService extends BaseService<DfDangerousProjectMap
@Transactional(rollbackFor = Exception.class)
public Boolean deleteById(String id) {
this.removeById(id);
// 除掉所配置的数据项
projectItemMapper.delete(Wrappers.<DfDangerousProjectItem>lambdaQuery().eq(DfDangerousProjectItem::getProjectId, id));
if (this.removeById(id)) {
// 除掉所配置的数据项
projectItemMapper.delete(Wrappers.<DfDangerousProjectItem>lambdaQuery().eq(DfDangerousProjectItem::getProjectId, id));
}
return true;
}
@ -75,11 +76,12 @@ public class DfDangerousProjectService extends BaseService<DfDangerousProjectMap
return true;
}
public List<DfDangerousProjectItem> getItemList(String projectId) {
return projectItemMapper.selectList(Wrappers.<DfDangerousProjectItem>lambdaQuery().eq(DfDangerousProjectItem::getProjectId, projectId));
public List<DfDangerousProjectItemDto> getItemList(String projectId) {
List<DfDangerousProjectItem> itemList = projectItemMapper.selectList(Wrappers.<DfDangerousProjectItem>lambdaQuery().eq(DfDangerousProjectItem::getProjectId, projectId));
return BeanCopyUtils.copyList(itemList, DfDangerousProjectItemDto.class);
}
public DfDangerousProjectItem getItemDetailById(String id) {
return projectItemMapper.selectById(id);
public DfDangerousProjectItemDto getItemDetailById(String id) {
return BeanCopyUtils.copy(projectItemMapper.selectById(id), DfDangerousProjectItemDto.class);
}
}

9
shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java

@ -71,7 +71,7 @@ public class DfSuperviseEngineeringService extends BaseService<DfSuperviseEngine
problem.setLevel(level.getLevel());
// 监督检查工程填报提交后更新问题为下发
if (SuperviseEngineeringStatus.SUBMIT.getValue().equals(dto.getState())) {
problem.setStatus(SuperviseProblemStatus.HANDLE.getValue());
problem.setStatus(SuperviseProblemStatus.DISTRIBUTE.getValue());
}
problemList.add(problem);
});
@ -106,9 +106,10 @@ public class DfSuperviseEngineeringService extends BaseService<DfSuperviseEngine
dto.setEngineeringList(BeanCopyUtils.copyList(engineeringList, DfSuperviseEngineeringDto.class));
// 1.4 获取堤防任务问题列表
List<DfSuperviseProblem> problemList = problemMapper.selectList(Wrappers.<DfSuperviseProblem>lambdaQuery()
.eq(DfSuperviseProblem::getTaskId, taskId));
dto.setProblemList(BeanCopyUtils.copyList(problemList, DfSuperviseProblemDto.class));
DfSuperviseProblemDto dtoProblem = new DfSuperviseProblemDto();
dtoProblem.setTaskId(taskId);
List<DfSuperviseProblemDto> problemList = problemMapper.selectByListParam(dtoProblem);
dto.setProblemList(problemList);
return dto;
}

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

@ -0,0 +1,123 @@
package com.kms.yxgh.sz.controller;
import com.kms.yxgh.base.Response;
import com.kms.yxgh.sz.dto.SzDangerousProjectDto;
import com.kms.yxgh.sz.dto.SzDangerousProjectItemDto;
import com.kms.yxgh.sz.service.SzDangerousProjectService;
import com.shuili.common.annotation.Log;
import com.shuili.common.enums.BusinessType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 水闸病险工程核查项目
* @author hry
* @date 2024/3/12 14:44
*/
@RestController
@AllArgsConstructor
@RequestMapping("/run/sz/dangerousProject")
@Api(tags = "水闸病险工程核查项目")
public class SzDangerousProjectController {
private final SzDangerousProjectService dangerousProjectService;
/**
* 查询水闸病险工程核查项目列表
* @param dto
* @return
*/
@ApiOperation("水闸病险工程核查项目列表")
@PostMapping("/list")
public Response<List<SzDangerousProjectDto>> list(@RequestBody SzDangerousProjectDto dto) {
return Response.ok(dangerousProjectService.getList(dto));
}
/**
* 查询水闸病险工程核查项目详情
* @param id
* @return
*/
@ApiOperation("水闸病险工程核查项目详情")
@GetMapping("/{id}")
public Response<SzDangerousProjectDto> detail(@PathVariable String id) {
return Response.ok(dangerousProjectService.getDetailById(id));
}
/**
* 新增/修改水闸病险工程核查项目
*/
@ApiOperation("水闸病险工程核查项目新增/修改")
@Log(title = "水闸病险工程核查项目新增/修改", businessType = BusinessType.INSERT)
@PostMapping()
public Response<SzDangerousProjectDto> addOrModify(@RequestBody SzDangerousProjectDto dto) {
return Response.ok(dangerousProjectService.addOrModify(dto));
}
/**
* 删除水闸病险工程核查项目
* @param id
* @return
*/
@ApiOperation("水闸病险工程核查项目删除")
@Log(title = "水闸病险工程核查项目删除", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public Response<Boolean> deleteData(@PathVariable String id) {
return Response.ok(dangerousProjectService.deleteById(id));
}
/**
* 新增/修改水闸病险工程核查项目内容
* @param item
* @return
*/
@ApiOperation("水闸病险工程核查项目内容新增/修改")
@Log(title = "水闸病险工程核查项目内容新增/修改", businessType = BusinessType.INSERT)
@PostMapping("/item")
public Response<SzDangerousProjectItemDto> addOrModifyItem(@RequestBody SzDangerousProjectItemDto item) {
return Response.ok(dangerousProjectService.addOrModifyItem(item));
}
/**
* 删除水闸病险工程核查项目内容
* @param id
* @return
*/
@ApiOperation("水闸病险工程核查项目内容删除")
@Log(title = "水闸病险工程核查项目内容删除", businessType = BusinessType.DELETE)
@DeleteMapping("/item/{id}")
public Response<Boolean> deleteItem(@PathVariable String id) {
return Response.ok(dangerousProjectService.deleteItemById(id));
}
/**
* 查询水闸病险工程核查项目内容列表
* @param projectId
* @return
*/
@ApiOperation("水闸病险工程核查项目内容列表")
@GetMapping("/itemList/{projectId}")
public Response<List<SzDangerousProjectItemDto>> getItemList(@PathVariable String projectId) {
return Response.ok(dangerousProjectService.getItemList(projectId));
}
/**
* 查询水闸病险工程核查项目内容详情
* @param id
* @return
*/
@ApiOperation("水闸病险工程核查项目内容详情")
@GetMapping("/itemDetail/{id}")
public Response<SzDangerousProjectItemDto> getItemDetailById(@PathVariable String id) {
return Response.ok(dangerousProjectService.getItemDetailById(id));
}
}

27
shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousProject.java

@ -0,0 +1,27 @@
package com.kms.yxgh.sz.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.kms.yxgh.base.SyBaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 水闸病险工程核查项目表 bs_sgc_sz_bxgcxm
* @author hry
* @date 2024/2/29 13:57
*/
@TableName("bs_sgc_sz_bxgcxm")
@Data
@ApiModel("水闸病险工程核查项目")
public class SzDangerousProject extends SyBaseEntity {
private static final long serialVersionUID = 1L;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
}

32
shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousProjectItem.java

@ -0,0 +1,32 @@
package com.kms.yxgh.sz.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.kms.yxgh.base.SyBaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 水闸病险工程核查项目内容表 bs_sgc_sz_bxgcxmnr
* @author hry
* @date 2024/2/29 13:57
*/
@TableName("bs_sgc_sz_bxgcxmnr")
@Data
@ApiModel("水闸病险工程核查项目内容")
public class SzDangerousProjectItem extends SyBaseEntity {
private static final long serialVersionUID = 1L;
/**
* 病险工程核查项目ID
*/
@ApiModelProperty("病险工程核查项目ID")
private String projectId;
/**
* 检查内容
*/
@ApiModelProperty("检查内容")
private String content;
}

28
shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousProjectDto.java

@ -0,0 +1,28 @@
package com.kms.yxgh.sz.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 水闸病险工程核查项目dto对象
* @author hry
* @date 2024/2/29 13:57
*/
@Data
@ApiModel("水闸病险工程核查项目")
public class SzDangerousProjectDto {
/**
* id
*/
@ApiModelProperty("id")
private String id;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
}

33
shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousProjectItemDto.java

@ -0,0 +1,33 @@
package com.kms.yxgh.sz.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 水闸病险工程核查项目内容dto对象
* @author hry
* @date 2024/2/29 13:57
*/
@Data
@ApiModel("水闸病险工程核查项目内容")
public class SzDangerousProjectItemDto {
/**
* id
*/
@ApiModelProperty("id")
private String id;
/**
* 病险工程核查项目ID
*/
@ApiModelProperty("病险工程核查项目ID")
private String projectId;
/**
* 检查内容
*/
@ApiModelProperty("检查内容")
private String content;
}

12
shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemDto.java

@ -31,12 +31,24 @@ public class SzSuperviseProblemDto {
@ApiModelProperty("监督检查办法项目ID")
private String projectId;
/**
* 监督检查办法项目名称
*/
@ApiModelProperty("监督检查办法项目名称")
private String projectName;
/**
* 监督检查办法项目内容ID
*/
@ApiModelProperty("监督检查办法项目内容ID")
private String projectItemId;
/**
* 检查内容
*/
@ApiModelProperty("检查内容")
private String content;
/**
* 问题等级
*/

2
shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemListDto.java

@ -45,7 +45,7 @@ public class SzSuperviseProblemListDto {
* 工程
*/
@ApiModelProperty(value = "工程")
private String wageName;
private String wagaName;
/**
* 工程管理单位

29
shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseWayProjectDto.java

@ -1,9 +1,12 @@
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;
/**
* 水闸监督检查办法项目TO对象
* @author hry
@ -27,4 +30,30 @@ public class SzSuperviseWayProjectDto {
*/
@ApiModelProperty("监督检查办法ID")
private String wayId;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("修改时间")
private Date updateTime;
/**
* 创建人
*/
@ApiModelProperty("创建人")
private String createUid;
/**
* 修改人
*/
@ApiModelProperty("修改人")
private String updateUid;
}

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

@ -0,0 +1,14 @@
package com.kms.yxgh.sz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yxgh.sz.domain.SzDangerousProjectItem;
import org.springframework.stereotype.Repository;
/**
* 水闸病险工程核查项目内容Mapper接口
* @author hry
* @date 2024/3/12 14:44
*/
@Repository
public interface SzDangerousProjectItemMapper extends BaseMapper<SzDangerousProjectItem> {
}

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

@ -0,0 +1,14 @@
package com.kms.yxgh.sz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yxgh.sz.domain.SzDangerousProject;
import org.springframework.stereotype.Repository;
/**
* 水闸病险工程Mapper接口
* @author hry
* @date 2024/3/12 14:44
*/
@Repository
public interface SzDangerousProjectMapper extends BaseMapper<SzDangerousProject> {
}

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

@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yxgh.sz.domain.SzSuperviseProblem;
import com.kms.yxgh.sz.dto.SzSuperviseProblemDto;
import com.kms.yxgh.sz.dto.SzSuperviseProblemListDto;
import com.kms.yxgh.sz.dto.SzSuperviseProblemTotalDto;
import com.shuili.common.utils.StringUtils;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.jdbc.SQL;
import org.springframework.stereotype.Repository;
@ -32,9 +34,9 @@ public interface SzSuperviseProblemMapper extends BaseMapper<SzSuperviseProblem>
*/
@Insert({
"<script>",
"insert into bs_sgc_sz_jdjcgcwt(task_id, project_id, project_item_id, level) values ",
"insert into bs_sgc_sz_jdjcgcwt(task_id, project_id, project_item_id, level, status) values ",
"<foreach collection='problemList' item='item' index='index' separator=','>",
"(#{item.taskId}, #{item.projectId}, #{item.projectItemId}, #{item.level} )",
"(#{item.taskId}, #{item.projectId}, #{item.projectItemId}, #{item.level}, #{item.status} )",
"</foreach>",
"</script>"
})
@ -53,16 +55,16 @@ public interface SzSuperviseProblemMapper extends BaseMapper<SzSuperviseProblem>
class SzSuperviseProblemProvider {
public String selectPage(final Map<String, Object> param) {
return new SQL() {{
SELECT("wt.id,xm.name as projectName,rw.name,nr.content,xx.adcd,xx.wageName,xx.engineeringManagementUnit,wt.level");
SELECT("wt.id,xm.name as projectName,rw.name,nr.content,xx.adcd,xx.wagaName,xx.engineeringManagementUnit,wt.level, wt.status");
FROM("bs_sgc_sz_jdjcgcwt wt");
LEFT_OUTER_JOIN("bs_sgc_sz_jdjcbfxm xm on wt.project_id = xm.id");
LEFT_OUTER_JOIN("bs_sgc_sz_jdjcbfxmnr nr on wt.project_item_id = nr.id");
LEFT_OUTER_JOIN("bs_sgc_sz_jdjcrw rw on wt.TASK_ID = rw.id");
LEFT_OUTER_JOIN("(SELECT DISTINCT xx.ID,xx.WAGA_CODE as wagaCode,xx.WAGA_NAME AS wageName,xx.adcd,gl.engineering_management_unit as engineeringManagementUnit\n" +
"\tFROM bs_sgc_sz_jbxx xx LEFT OUTER JOIN bs_sgc_sz_gcgl gl ON xx.WAGA_CODE = gl.WAGA_CODE \n" +
"\tWHERE xx.EXPR_DATE IS NULL AND gl.EXPR_DATE IS NULL) xx ON rw.WAGA_CODE = xx.WAGA_CODE");
LEFT_OUTER_JOIN("(SELECT DISTINCT xx.ID,xx.WAGA_CODE as wagaCode,xx.WAGA_NAME AS wagaName,xx.adcd,gl.engineering_management_unit as engineeringManagementUnit " +
" FROM bs_sgc_sz_jbxx xx LEFT OUTER JOIN bs_sgc_sz_gcgl gl ON xx.WAGA_CODE = gl.WAGA_CODE " +
" WHERE xx.EXPR_DATE IS NULL AND gl.EXPR_DATE IS NULL) xx ON rw.WAGA_CODE = xx.wagaCode");
WHERE("1=1");
WHERE("wt.status is not null");
WHERE("rw.state =1");
SzSuperviseProblemListDto dto = (SzSuperviseProblemListDto) param.get("dto");
if (dto != null) {
@ -75,7 +77,7 @@ public interface SzSuperviseProblemMapper extends BaseMapper<SzSuperviseProblem>
WHERE("gl.engineering_management_unit LIKE CONCAT('%', #{dto.engineeringManagementUnit}, '%')");
}
// 工程对象
if (StringUtils.isNotBlank(dto.getWageName())) {
if (StringUtils.isNotBlank(dto.getWagaName())) {
WHERE("xx.WAGA_NAME LIKE CONCAT('%', #{dto.wagaName}, '%')");
}
// 检查项目
@ -136,4 +138,18 @@ public interface SzSuperviseProblemMapper extends BaseMapper<SzSuperviseProblem>
}
}
@Select("<script>" +
"SELECT xm.name as projectName, nr.project_id as projectId, nr.content, " +
"wt.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level, wt.status, wt.HANDLE_RECORD as handleRecord, wt.HANDLE_SITUATION_RECORDS as handleSituationRecords, wt.HANDLE_UID as handleUid, " +
"wt.HANDLE_NAME as handleName, wt.HANDLE_TIME as handleTime, wt.CONFIRM_UID as confirmUid, wt.CONFIRM_NAME as confirmName, wt.CONFIRM_TIME as confirmTime "+
"FROM bs_sgc_sz_jdjcgcwt wt " +
"LEFT JOIN bs_sgc_sz_jdjcbfxm xm on wt.project_id = xm.id " +
"LEFT JOIN bs_sgc_sz_jdjcbfxmnr nr on wt.project_item_id = nr.id " +
"WHERE 1=1 " +
"<if test='dto.taskId != null and dto.taskId != \"\"'>" +
"AND wt.task_id = #{dto.taskId} " +
"</if>" +
"</script>")
List<SzSuperviseProblemDto> selectByListParam(@Param("dto") SzSuperviseProblemDto dto);
}

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

@ -37,13 +37,13 @@ public interface SzSuperviseTaskMapper extends BaseMapper<SzSuperviseTask> {
public String selectPage(final Map<String, Object> param) {
return new SQL() {{
SELECT("rw.id, rw.name, rw.CREATE_TIME as createTime, rw.UPDATE_TIME as updateTime,xx.WAGA_NAME as wagaName,gl.ENGINEERING_MANAGEMENT_UNIT as engineeringManagementUnit," +
"rw.WAGA_CODE as wagaCode, rw.TASK_TIME as taskTime, rw.INSPECTORS as inspectors, rw.WAY_ID as wayId, rw.START_TIME as startTime, rw.DONE_TIME as doneTime");
"rw.WAGA_CODE as wagaCode, rw.TASK_TIME as taskTime, rw.INSPECTORS as inspectors, rw.WAY_ID as wayId, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.state");
FROM("bs_sgc_sz_jdjcrw rw");
LEFT_OUTER_JOIN("bs_sgc_sz_jbxx xx ON xx.waga_code = rw.waga_code");
LEFT_OUTER_JOIN("bs_sgc_sz_gcgl gl ON rw.waga_code = gl.waga_code");
WHERE("gl.EXPR_DATE is null");
WHERE("xx.EXPR_DATE is null");
ORDER_BY("rw.create_time DESC");
ORDER_BY("rw.done_time asc", "rw.update_time DESC");
}}.toString();
}
}

88
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousProjectService.java

@ -0,0 +1,88 @@
package com.kms.yxgh.sz.service;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.kms.yxgh.sz.domain.SzDangerousProject;
import com.kms.yxgh.sz.domain.SzDangerousProjectItem;
import com.kms.yxgh.sz.dto.SzDangerousProjectDto;
import com.kms.yxgh.sz.dto.SzDangerousProjectItemDto;
import com.kms.yxgh.sz.mapper.SzDangerousProjectItemMapper;
import com.kms.yxgh.sz.mapper.SzDangerousProjectMapper;
import com.kms.yxgh.util.BeanCopyUtils;
import com.shuili.common.core.service.BaseService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 水闸病险工程核查项目实现类
*
* @author hry
* @date 2024/2/29 14:46
*/
@Service
@AllArgsConstructor
public class SzDangerousProjectService extends BaseService<SzDangerousProjectMapper, SzDangerousProject> {
private final SzDangerousProjectItemMapper projectItemMapper;
@Transactional(rollbackFor = Exception.class)
public SzDangerousProjectDto addOrModify(SzDangerousProjectDto dto) {
// 新增
SzDangerousProject dangerousProject = BeanCopyUtils.copy(dto, SzDangerousProject.class);
if (dto.getId() == null) {
this.save(dangerousProject);
} else {
// 修改
this.updateById(dangerousProject);
}
return BeanCopyUtils.copy(dangerousProject, SzDangerousProjectDto.class);
}
@Transactional(rollbackFor = Exception.class)
public Boolean deleteById(String id) {
if (this.removeById(id)) {
// 除掉所配置的数据项
projectItemMapper.delete(Wrappers.<SzDangerousProjectItem>lambdaQuery().eq(SzDangerousProjectItem::getProjectId, id));
}
return true;
}
public List<SzDangerousProjectDto> getList(SzDangerousProjectDto dto) {
List<SzDangerousProject> list = this.list();
return BeanCopyUtils.copyList(list, SzDangerousProjectDto.class);
}
public SzDangerousProjectDto getDetailById(String id) {
SzDangerousProject dangerousProject = this.getById(id);
return BeanCopyUtils.copy(dangerousProject, SzDangerousProjectDto.class);
}
@Transactional(rollbackFor = Exception.class)
public SzDangerousProjectItemDto addOrModifyItem(SzDangerousProjectItemDto item) {
SzDangerousProjectItem projectItem = BeanCopyUtils.copy(item, SzDangerousProjectItem.class);
if (item.getId() == null) {
projectItemMapper.insert(projectItem);
} else {
projectItemMapper.updateById(projectItem);
}
return BeanCopyUtils.copy(item, SzDangerousProjectItemDto.class);
}
@Transactional(rollbackFor = Exception.class)
public Boolean deleteItemById(String id) {
projectItemMapper.deleteById(id);
return true;
}
public List<SzDangerousProjectItemDto> getItemList(String projectId) {
List<SzDangerousProjectItem> itemList = projectItemMapper.selectList(Wrappers.<SzDangerousProjectItem>lambdaQuery().eq(SzDangerousProjectItem::getProjectId, projectId));
return BeanCopyUtils.copyList(itemList, SzDangerousProjectItemDto.class);
}
public SzDangerousProjectItemDto getItemDetailById(String id) {
return BeanCopyUtils.copy(projectItemMapper.selectById(id), SzDangerousProjectItemDto.class);
}
}

10
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseEngineeringService.java

@ -43,7 +43,6 @@ public class SzSuperviseEngineeringService extends BaseService<SzSuperviseEngine
private final SzSuperviseTaskMapper taskMapper;
private final SzSuperviseProblemMapper problemMapper;
private final SzSuperviseWayProjectItemMapper projectItemMapper;
private final SzSuperviseWayService wayService;
@Transactional(rollbackFor = Exception.class)
public SzSuperviseEngineeringParamDto add(SzSuperviseEngineeringParamDto dto) {
@ -72,7 +71,7 @@ public class SzSuperviseEngineeringService extends BaseService<SzSuperviseEngine
problem.setLevel(level.getLevel());
// 监督检查工程填报提交后更新问题为下发
if (SuperviseEngineeringStatus.SUBMIT.getValue().equals(dto.getState())) {
problem.setStatus(SuperviseProblemStatus.HANDLE.getValue());
problem.setStatus(SuperviseProblemStatus.DISTRIBUTE.getValue());
}
problemList.add(problem);
});
@ -107,9 +106,10 @@ public class SzSuperviseEngineeringService extends BaseService<SzSuperviseEngine
dto.setEngineeringList(BeanCopyUtils.copyList(engineeringList, SzSuperviseEngineeringDto.class));
// 1.4 获取水闸任务问题列表
List<SzSuperviseProblem> problemList = problemMapper.selectList(Wrappers.<SzSuperviseProblem>lambdaQuery()
.eq(SzSuperviseProblem::getTaskId, taskId));
dto.setProblemList(BeanCopyUtils.copyList(problemList, SzSuperviseProblemDto.class));
SzSuperviseProblemDto dtoProblem = new SzSuperviseProblemDto();
dtoProblem.setTaskId(taskId);
List<SzSuperviseProblemDto> problemList = problemMapper.selectByListParam(dtoProblem);
dto.setProblemList(problemList);
return dto;
}

Loading…
Cancel
Save