ljf
/
shuili
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix：病险工程-水闸/堤防-修改核查填报结构

master_tdsql
huangrenya 1 year ago
parent
9e8088b7c6
commit
628af1bc11
16 changed files with 113 additions and 220 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskItemRel.java
  2. 50
      shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskProjectRel.java
  3. 2
      shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskItemRelMapper.java
  4. 9
      shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskProjectRelMapper.java
  5. 22
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java
  6. 7
      shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java
  7. 1
      shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTask.java
  8. 12
      shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTaskItemRel.java
  9. 50
      shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTaskProjectRel.java
  10. 72
      shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousFillingParamDto.java
  11. 6
      shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskDetailDto.java
  12. 12
      shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskItemRelDto.java
  13. 44
      shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskProjectRelDto.java
  14. 2
      shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskItemRelMapper.java
  15. 9
      shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskProjectRelMapper.java
  16. 24
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java

11
shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskItemRel.java
View File

@ -43,6 +43,17 @@ public class DfDangerousTaskItemRel extends SyBaseEntity {
@ApiModelProperty("问题等级")
private String level;
/**
* 问题描述
*/
@ApiModelProperty(value = "问题描述")
private String problemDescribe;
/**
* 现场记录情况
*/
@ApiModelProperty(value = "现场记录情况")
private String siteSituationRecords;
@TableField(exist = false)
private String remark;

50
shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskProjectRel.java
View File

@ -1,50 +0,0 @@
package com.kms.yxgh.df.domain;
import com.baomidou.mybatisplus.annotation.TableField;
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_jdjcgc
* @author hry
* @date 2024/2/29 13:57
*/
@TableName("bs_sgc_df_bxgcxmgl")
@Data
@ApiModel("堤防病险工程任务项目关联")
public class DfDangerousTaskProjectRel extends SyBaseEntity {
private static final long serialVersionUID = 1L;
/**
* 任务ID
*/
@ApiModelProperty(value = "任务ID")
private String taskId;
/**
* 项目ID
*/
@ApiModelProperty(value = "项目ID")
private String projectId;
/**
* 问题描述
*/
@ApiModelProperty(value = "问题描述")
private String problemDescribe;
/**
* 现场记录情况
*/
@ApiModelProperty(value = "现场记录情况")
private String siteSituationRecords;
@TableField(exist = false)
private String remark;
}

2
shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskItemRelMapper.java
View File

@ -26,7 +26,7 @@ public interface DfDangerousTaskItemRelMapper extends BaseMapper<DfDangerousTask
@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.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level, wt.PROBLEM_DESCRIBE as problemDescribe, wt.SITE_SITUATION_RECORDS as siteSituationRecords "+
"FROM bs_sgc_df_bxgcglxm wt " +
"LEFT JOIN bs_sgc_df_bxgcxm xm on wt.project_id = xm.id " +
"LEFT JOIN bs_sgc_df_bxgcxmnr nr on wt.project_item_id = nr.id " +

9
shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskProjectRelMapper.java
View File

@ -1,9 +0,0 @@
package com.kms.yxgh.df.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yxgh.df.domain.DfDangerousTaskProjectRel;
import org.springframework.stereotype.Repository;
@Repository
public interface DfDangerousTaskProjectRelMapper extends BaseMapper<DfDangerousTaskProjectRel> {
}

22
shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java
View File

@ -2,16 +2,13 @@ package com.kms.yxgh.df.service;
import cn.hutool.core.collection.CollectionUtil;
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.base.SzException;
import com.kms.yxgh.df.domain.DfDangerousTask;
import com.kms.yxgh.df.domain.DfDangerousTaskItemRel;
import com.kms.yxgh.df.domain.DfDangerousTaskProjectRel;
import com.kms.yxgh.df.dto.*;
import com.kms.yxgh.df.mapper.DfDangerousTaskItemRelMapper;
import com.kms.yxgh.df.mapper.DfDangerousTaskMapper;
import com.kms.yxgh.df.mapper.DfDangerousTaskProjectRelMapper;
import com.kms.yxgh.util.BeanCopyUtils;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
@ -33,7 +30,6 @@ import java.util.stream.Collectors;
@AllArgsConstructor
public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, DfDangerousTask> {
private final DfDangerousTaskProjectRelMapper projectRelMapper;
private final DfDangerousTaskItemRelMapper taskItemRelMapper;
public IPage<DfDangerousTaskDto> getListByPage(SearchParam<DfDangerousTaskSearchDto> sp) {
@ -86,12 +82,6 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
if (CollectionUtil.isEmpty(dto.getProblemList())) {
return dto;
}
// 批量删除
List<String> ids = dto.getProblemList().stream().filter(level -> StringUtils.isNotBlank(level.getId())).map(DfDangerousParamDto.ProblemParam::getId).collect(Collectors.toList());
if(!ids.isEmpty()){
projectRelMapper.deleteBatchIds(ids);
}
// 2. 新增填报内容
List<DfDangerousTaskItemRel> itemRel = dto.getProblemList().stream().flatMap(v -> {
// 2.1 删除关联数据
@ -99,12 +89,6 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
if (!problemIds.isEmpty()) {
taskItemRelMapper.deleteBatchIds(problemIds);
}
DfDangerousTaskProjectRel engineering = new DfDangerousTaskProjectRel();
BeanCopyUtils.copy(v, engineering);
engineering.setId(null);
engineering.setTaskId(task.getId());
projectRelMapper.insert(engineering);
return v.getLevelList().stream().map(level -> {
DfDangerousTaskItemRel problem = new DfDangerousTaskItemRel();
BeanCopyUtils.copy(level, problem);
@ -128,12 +112,6 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
public DfDangerousTaskDetailDto getDetailByTaskId(String taskId){
DfDangerousTaskDetailDto dto = BeanCopyUtils.copy(getDetailById(taskId), DfDangerousTaskDetailDto.class);
// 1.1 获取堤防任务问题描述列表
List<DfDangerousTaskProjectRel> relList = projectRelMapper.selectList(Wrappers.<DfDangerousTaskProjectRel>lambdaQuery()
.eq(DfDangerousTaskProjectRel::getTaskId, taskId));
dto.setEngineeringList(BeanCopyUtils.copyList(relList, DfDangerousTaskProjectRelDto.class));
DfDangerousTaskItemRelDto relDto= new DfDangerousTaskItemRelDto();
relDto.setTaskId(taskId);
dto.setProblemList(taskItemRelMapper.selectByListParam(relDto));

7
shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java
View File

@ -2,10 +2,7 @@ package com.kms.yxgh.sz.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.kms.yxgh.base.Response;
import com.kms.yxgh.sz.dto.SzDangerousParamDto;
import com.kms.yxgh.sz.dto.SzDangerousTaskDetailDto;
import com.kms.yxgh.sz.dto.SzDangerousTaskDto;
import com.kms.yxgh.sz.dto.SzDangerousTaskSearchDto;
import com.kms.yxgh.sz.dto.*;
import com.kms.yxgh.sz.service.SzDangerousTaskService;
import com.shuili.common.annotation.Log;
import com.shuili.common.core.domain.SearchParam;
@ -85,7 +82,7 @@ public class SzDangerousTaskController {
/**
* 保存或提交 水闸工程核查
* 水闸工程核查填报保存或提交
*/
@ApiOperation("水闸工程核查保存或提交")
@Log(title = "水闸工程核查保存或提交", businessType = BusinessType.INSERT)

1
shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTask.java
View File

@ -21,7 +21,6 @@ public class SzDangerousTask extends SyBaseEntity {
private static final long serialVersionUID = 1L;
/**
* 名称
*/

12
shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTaskItemRel.java
View File

@ -43,6 +43,18 @@ public class SzDangerousTaskItemRel extends SyBaseEntity {
@ApiModelProperty("问题等级")
private String level;
/**
* 问题描述
*/
@ApiModelProperty(value = "问题描述")
private String problemDescribe;
/**
* 现场记录情况
*/
@ApiModelProperty(value = "现场记录情况")
private String siteSituationRecords;
@TableField(exist = false)
private String remark;

50
shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTaskProjectRel.java
View File

@ -1,50 +0,0 @@
package com.kms.yxgh.sz.domain;
import com.baomidou.mybatisplus.annotation.TableField;
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_jdjcgc
* @author hry
* @date 2024/2/29 13:57
*/
@TableName("bs_sgc_sz_bxgcxmgl")
@Data
@ApiModel("水闸病险工程任务项目关联")
public class SzDangerousTaskProjectRel extends SyBaseEntity {
private static final long serialVersionUID = 1L;
/**
* 监督检查任务ID
*/
@ApiModelProperty(value = "任务ID")
private String taskId;
/**
* 项目ID
*/
@ApiModelProperty(value = "项目ID")
private String projectId;
/**
* 问题描述
*/
@ApiModelProperty(value = "问题描述")
private String problemDescribe;
/**
* 现场记录情况
*/
@ApiModelProperty(value = "现场记录情况")
private String siteSituationRecords;
@TableField(exist = false)
private String remark;
}

72
shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousFillingParamDto.java
View File

@ -0,0 +1,72 @@
package com.kms.yxgh.sz.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author hry
* @date 2024/3/2 16:57
*/
@Data
@ApiModel("水闸病险工程参数对象")
public class SzDangerousFillingParamDto {
/**
* 任务ID
*/
@ApiModelProperty(value = "任务ID")
private String taskId;
/**
* 状态（保存、提交）
*/
@ApiModelProperty(value = "状态")
private String state;
/**
* 项目问题列表
*/
private List<ProblemParam> problemList;
@Data
public static class ProblemParam {
@ApiModelProperty("主键")
private String id;
/**
* 项目ID
*/
@ApiModelProperty("项目ID")
private String projectId;
/**
* 项目内容ID
*/
@ApiModelProperty("项目内容ID")
private String projectItemId;
/**
* 问题等级
*/
@ApiModelProperty("等级")
private String level;
/**
* 问题描述
*/
@ApiModelProperty(value = "问题描述")
private String problemDescribe;
/**
* 现场记录情况
*/
@ApiModelProperty(value = "现场记录情况")
private String siteSituationRecords;
}
}

6
shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskDetailDto.java
View File

@ -10,12 +10,6 @@ import java.util.List;
@ApiModel("堤防病险工程任务详情")
public class SzDangerousTaskDetailDto extends SzDangerousTaskDto {
/**
* 问题描述列表
*/
@ApiModelProperty(value = "问题描述列表")
private List<SzDangerousTaskProjectRelDto> engineeringList;
/**
* 问题列表
*/

12
shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskItemRelDto.java
View File

@ -39,6 +39,18 @@ public class SzDangerousTaskItemRelDto {
@ApiModelProperty("问题等级")
private String level;
/**
* 问题描述
*/
@ApiModelProperty(value = "问题描述")
private String problemDescribe;
/**
* 现场记录情况
*/
@ApiModelProperty(value = "现场记录情况")
private String siteSituationRecords;
/**
* 核查内容
*/

44
shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskProjectRelDto.java
View File

@ -1,44 +0,0 @@
package com.kms.yxgh.sz.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 水闸病险工程任务项目关联管理
* @author hry
* @date 2024/2/29 13:57
*/
@Data
@ApiModel("水闸病险工程任务项目关联管理")
public class SzDangerousTaskProjectRelDto {
@ApiModelProperty(value = "id")
private String id;
/**
* 任务ID
*/
@ApiModelProperty(value = "任务ID")
private String taskId;
/**
* 项目ID
*/
@ApiModelProperty(value = "项目ID")
private String projectId;
/**
* 问题描述
*/
@ApiModelProperty(value = "问题描述")
private String problemDescribe;
/**
* 现场记录情况
*/
@ApiModelProperty(value = "现场记录情况")
private String siteSituationRecords;
}

2
shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskItemRelMapper.java
View File

@ -26,7 +26,7 @@ public interface SzDangerousTaskItemRelMapper extends BaseMapper<SzDangerousTask
@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.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level, wt.PROBLEM_DESCRIBE as problemDescribe, wt.SITE_SITUATION_RECORDS as siteSituationRecords "+
"FROM bs_sgc_sz_bxgcglxm wt " +
"LEFT JOIN bs_sgc_sz_bxgcxm xm on wt.project_id = xm.id " +
"LEFT JOIN bs_sgc_sz_bxgcxmnr nr on wt.project_item_id = nr.id " +

9
shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskProjectRelMapper.java
View File

@ -1,9 +0,0 @@
package com.kms.yxgh.sz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yxgh.sz.domain.SzDangerousTaskProjectRel;
import org.springframework.stereotype.Repository;
@Repository
public interface SzDangerousTaskProjectRelMapper extends BaseMapper<SzDangerousTaskProjectRel> {
}

24
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java
View File

@ -2,16 +2,13 @@ package com.kms.yxgh.sz.service;
import cn.hutool.core.collection.CollectionUtil;
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.base.SzException;
import com.kms.yxgh.sz.domain.SzDangerousTask;
import com.kms.yxgh.sz.domain.SzDangerousTaskItemRel;
import com.kms.yxgh.sz.domain.SzDangerousTaskProjectRel;
import com.kms.yxgh.sz.dto.*;
import com.kms.yxgh.sz.mapper.SzDangerousTaskItemRelMapper;
import com.kms.yxgh.sz.mapper.SzDangerousTaskMapper;
import com.kms.yxgh.sz.mapper.SzDangerousTaskProjectRelMapper;
import com.kms.yxgh.util.BeanCopyUtils;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
@ -33,7 +30,6 @@ import java.util.stream.Collectors;
@AllArgsConstructor
public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, SzDangerousTask> {
private final SzDangerousTaskProjectRelMapper projectRelMapper;
private final SzDangerousTaskItemRelMapper taskItemRelMapper;
public IPage<SzDangerousTaskDto> getListByPage(SearchParam<SzDangerousTaskSearchDto> sp) {
@ -86,11 +82,6 @@ public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, S
if (CollectionUtil.isEmpty(dto.getProblemList())) {
return dto;
}
// 批量删除
List<String> ids = dto.getProblemList().stream().filter(level -> StringUtils.isNotBlank(level.getId())).map(SzDangerousParamDto.ProblemParam::getId).collect(Collectors.toList());
if(!ids.isEmpty()){
projectRelMapper.deleteBatchIds(ids);
}
// 2. 新增填报内容
List<SzDangerousTaskItemRel> itemRel = dto.getProblemList().stream().flatMap(v -> {
@ -99,12 +90,6 @@ public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, S
if (!problemIds.isEmpty()) {
taskItemRelMapper.deleteBatchIds(problemIds);
}
SzDangerousTaskProjectRel engineering = new SzDangerousTaskProjectRel();
BeanCopyUtils.copy(v, engineering);
engineering.setId(null);
engineering.setTaskId(task.getId());
projectRelMapper.insert(engineering);
return v.getLevelList().stream().map(level -> {
SzDangerousTaskItemRel problem = new SzDangerousTaskItemRel();
BeanCopyUtils.copy(level, problem);
@ -128,16 +113,11 @@ public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, S
public SzDangerousTaskDetailDto getDetailByTaskId(String taskId){
SzDangerousTaskDetailDto dto = BeanCopyUtils.copy(getDetailById(taskId), SzDangerousTaskDetailDto.class);
// 1.1 获取水闸任务问题描述列表
List<SzDangerousTaskProjectRel> relList = projectRelMapper.selectList(Wrappers.<SzDangerousTaskProjectRel>lambdaQuery()
.eq(SzDangerousTaskProjectRel::getTaskId, taskId));
dto.setEngineeringList(BeanCopyUtils.copyList(relList, SzDangerousTaskProjectRelDto.class));
SzDangerousTaskItemRelDto relDto= new SzDangerousTaskItemRelDto();
relDto.setTaskId(taskId);
dto.setProblemList(taskItemRelMapper.selectByListParam(relDto));
return dto;
}
}

Write Preview
Loading…
Cancel
Save