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

feat：病险工程-水闸/堤防-添加关联查询工程安全鉴定列表

master_tdsql
huangrenya 1 year ago
parent
0c861b87e7
commit
f07c3c091e
8 changed files with 162 additions and 4 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/controller/DfDangerousTaskController.java
  2. 29
      shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAqjdProjecDto.java
  3. 35
      shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java
  4. 5
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java
  5. 13
      shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java
  6. 31
      shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java
  7. 37
      shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java
  8. 5
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java

11
shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousTaskController.java
View File

@ -36,6 +36,17 @@ public class DfDangerousTaskController {
return Response.ok(dangerousTaskService.getListByPage(sp));
}
/**
* 查询堤防关联的安全鉴定列表
* @param sp
* @return
*/
@ApiOperation("堤防关联的安全鉴定列表")
@PostMapping("/salePage")
public Response<IPage<DfAqjdProjecDto>> salePage(@RequestBody SearchParam<DfAqjdProjecDto> sp) {
return Response.ok(dangerousTaskService.getAqjdListByPage(sp));
}
/**
* 查询堤防病险工程核查任务详情
* @param id

29
shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAqjdProjecDto.java
View File

@ -0,0 +1,29 @@
package com.kms.yxgh.df.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.shuili.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 包含安全鉴定检测等属性。
*/
@Data
public class DfAqjdProjecDto extends DfProjectListDto {
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty("鉴定日期")
private Date identifyTime;
/** 安全类别 */
@Excel(name = "安全类别")
@ApiModelProperty("安全类别")
private String securityCategory;
/** 安全鉴定意见 */
@ApiModelProperty("安全鉴定意见")
private String safetyAppraisalOpinion;
}

35
shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java
View File

@ -4,13 +4,14 @@ 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.DfDangerousTask;
import com.kms.yxgh.df.dto.DfAqjdProjecDto;
import com.kms.yxgh.df.dto.DfDangerousTaskDto;
import com.kms.yxgh.df.dto.DfDangerousTaskSearchDto;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
import java.io.Serializable;
import java.util.Date;
/**
* 堤防病险工程任务Mapper接口
@ -70,4 +71,34 @@ public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> {
"</if>" +
"</script>")
DfDangerousTaskDto selectByIdDetail(Serializable id);
@Select({
"<script>",
"select df.dike_code dike_code, df.dike_name dike_name, df.dike_grad, df.dike_type, df.dike_len, df.adcd_start, df.adcd_end, pj.engineering_management_unit engineering_management_unit, pj.water_administrative_department water_administrative_department ",
"from bs_sgc_df_gcda df ",
"left join bs_sgc_df_gcgl pj on pj.dike_code = df.dike_code and pj.expr_date is null ",
"left join bs_sgc_df_aqjdxx pj aqjd on aqjd.dfrw_id = df.id ",
"where 1=1 ",
"and df.expr_date is null ",
"<if test='dto.dikeName != null and dto.dikeName != \"\"'>",
"and dike_name like concat('%', #{dto.dikeName}, '%') ",
"</if>",
"<if test='dto.dikeType != null and dto.dikeType != \"\"'>",
"and dike_type = #{dto.dikeType} ",
"</if>",
"</script>"
})
@Results({
@Result(property = "dikeCode", column = "dike_code"),
@Result(property = "dikeName", column = "dike_name"),
@Result(property = "engineeringManagementUnit", column = "engineering_management_unit"),
@Result(property = "waterAdministrativeDepartment", column = "water_administrative_department"),
@Result(property = "identifyTime", column = "identify_time"),
@Result(property = "securityCategory", column = "security_category"),
@Result(property = "safetyAppraisalOpinion", column = "safety_appraisal_opinion"),
@Result(property = "lastTime", column = "dike_code", javaType = Date.class, one = @One(select = "com.kms.yxgh.df.mapper.DfRecordMapper.getLastInsertTimeByDikeCode"))
})
IPage<DfAqjdProjecDto> selectByAqjdPage(Page<DfAqjdProjecDto> page, @Param("dto") DfAqjdProjecDto dfProject);
}

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

@ -37,6 +37,11 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
return this.getBaseMapper().selectByPage(page, sp.getData());
}
public IPage<DfAqjdProjecDto> getAqjdListByPage(SearchParam<DfAqjdProjecDto> sp) {
Page<DfAqjdProjecDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
return this.getBaseMapper().selectByAqjdPage(page, sp.getData());
}
@Transactional(rollbackFor = Exception.class)
public DfDangerousTaskDto add(DfDangerousTaskDto dto) {
DfDangerousTask dfDangerousTask = BeanCopyUtils.copy(dto, DfDangerousTask.class);

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

@ -36,6 +36,19 @@ public class SzDangerousTaskController {
return Response.ok(dangerousTaskService.getListByPage(sp));
}
/**
* 查询水闸关联的安全鉴定列表
* @param sp
* @return
*/
@ApiOperation("水闸关联的安全鉴定列表")
@PostMapping("/salePage")
public Response<IPage<SzAqjdProjecDto>> salePage(@RequestBody SearchParam<SzAqjdProjecDto> sp) {
return Response.ok(dangerousTaskService.getAqjdListByPage(sp));
}
/**
* 查询水闸病险工程核查任务详情
* @param id

31
shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java
View File

@ -0,0 +1,31 @@
package com.kms.yxgh.sz.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.kms.yxgh.df.dto.DfProjectListDto;
import com.shuili.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 包含安全鉴定检测等属性。
*/
@Data
public class SzAqjdProjecDto extends DfProjectListDto {
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty("鉴定日期")
private Date identifyTime;
/** 安全类别 */
@Excel(name = "安全类别")
@ApiModelProperty("安全类别")
private String securityCategory;
/** 安全鉴定意见 */
@ApiModelProperty("安全鉴定意见")
private String safetyAppraisalOpinion;
}

37
shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java
View File

@ -4,13 +4,14 @@ 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.SzDangerousTask;
import com.kms.yxgh.sz.dto.SzAqjdProjecDto;
import com.kms.yxgh.sz.dto.SzDangerousTaskDto;
import com.kms.yxgh.sz.dto.SzDangerousTaskSearchDto;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
import java.io.Serializable;
import java.util.Date;
/**
* 水闸病险工程任务Mapper接口
@ -67,4 +68,36 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
"</if>" +
"</script>")
SzDangerousTaskDto selectByIdDetail(Serializable id);
@Select({
"<script>",
"select df.waga_code waga_code, df.waga_name waga_name, df.waga_type, df.adcd, df.eng_scal, pj.engineering_management_unit engineering_management_unit, pj.water_administrative_department water_administrative_department, ",
"aqjd.identify_time ,aqjd.security_category, aqjd.safety_appraisal_opinion ",
"from bs_sgc_sz_jbxx df ",
"left join bs_sgc_sz_gcgl pj on pj.waga_code = df.waga_code and pj.expr_date is null ",
"left join bs_sgc_sz_aqjdxx aqjd on aqjd.szrw_id = df.id ",
"where 1=1 ",
"and df.expr_date is null ",
"<if test='dto.wagaName != null and dto.wagaName != \"\"'>",
"and waga_name like concat('%', #{dto.wagaName}, '%') ",
"</if>",
"<if test='dto.wagaType != null and dto.wagaType != \"\"'>",
"and waga_type = #{dto.wagaType} ",
"</if>",
"<if test='dto.adcd!= null and dto.adcd != \"\"'>",
"and adcd = #{dto.adcd} ",
"</if>",
"</script>"
})
@Results({
@Result(property = "wagaCode", column = "waga_code"),
@Result(property = "wagaName", column = "waga_name"),
@Result(property = "engineeringManagementUnit", column = "engineering_management_unit"),
@Result(property = "waterAdministrativeDepartment", column = "water_administrative_department"),
@Result(property = "identifyTime", column = "identify_time"),
@Result(property = "securityCategory", column = "security_category"),
@Result(property = "safetyAppraisalOpinion", column = "safety_appraisal_opinion"),
@Result(property = "lastTime", column = "waga_code", javaType = Date.class, one = @One(select = "com.kms.yxgh.sz.mapper.SzRecordMapper.getLastInsertTimeByWagaCodeAndPlanId"))
})
IPage<SzAqjdProjecDto> selectByAqjdPage(Page<SzAqjdProjecDto> page, @Param("dto") SzAqjdProjecDto dto);
}

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

@ -37,6 +37,11 @@ public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, S
return this.getBaseMapper().selectByPage(page, sp.getData());
}
public IPage<SzAqjdProjecDto> getAqjdListByPage(SearchParam<SzAqjdProjecDto> sp) {
Page<SzAqjdProjecDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
return this.getBaseMapper().selectByAqjdPage(page, sp.getData());
}
@Transactional(rollbackFor = Exception.class)
public SzDangerousTaskDto add(SzDangerousTaskDto dto) {
SzDangerousTask dangerousTask = BeanCopyUtils.copy(dto, SzDangerousTask.class);

Write Preview
Loading…
Cancel
Save