diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java index c34acdf9..0dab4e98 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java @@ -77,10 +77,6 @@ public class DfCheckingProblemV2Service extends BaseService queryWrapper.eq(DfCheckingProblemV2::getProblemLevel, recordId)); } - - - - queryWrapper.ne(DfCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); // 查询分页数据 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java index 251fa677..a18a74b3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java @@ -34,7 +34,6 @@ import java.util.stream.Collectors; public class DfCheckingV2Service extends BaseService { private final DfCheckingV2ProjectItemV2Service dfCheckingV2ProjectItemV2Service; - private final DfCheckingRecordV2Service dfCheckingRecordV2Service; public IPage list(SearchParam sp) { // 分页参数 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java index b046af9d..46485c65 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java @@ -16,12 +16,13 @@ import com.kms.yxgh.common.dto.DocV2Dto; import com.kms.yxgh.common.enums.DfYhV2StatusEnum; import com.kms.yxgh.common.service.ApprovalService; import com.kms.yxgh.common.service.DefaultApprovalBusinessService; -import com.kms.yxgh.df.domain.DfCheckingProblemV2; +import com.kms.yxgh.df.domain.DfCheckingRecord; import com.kms.yxgh.df.domain.DfYhV2; import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; import com.kms.yxgh.df.dto.v2.DfYhApproveDto; import com.kms.yxgh.df.dto.v2.DfYhDetailV2Dto; import com.kms.yxgh.df.dto.v2.DfYhListV2Dto; +import com.kms.yxgh.df.mapper.DfCheckingRecordV2Mapper; import com.kms.yxgh.df.mapper.DfYhV2Mapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.utils.BeanUtils; @@ -45,6 +46,8 @@ public class DfYhV2Service extends DefaultApprovalBusinessService list(SearchParam sp) { // 分页参数 Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); @@ -177,6 +180,8 @@ public class DfYhV2Service extends DefaultApprovalBusinessService wp = Wrappers.lambdaUpdate() + .eq(DfCheckingRecord::getId, byId.getRecordId()) + .set(DfCheckingRecord::getStatus, status); + dfCheckingRecordV2Mapper.update(null,wp); + } + @Override public String formStatus(String formId) { return ApprovalStatusEnum.SUBMITTING.getValue(); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/v2/SzCheckingProblemV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/v2/SzCheckingProblemV2Controller.java new file mode 100644 index 00000000..0641ddb0 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/v2/SzCheckingProblemV2Controller.java @@ -0,0 +1,33 @@ +package com.kms.yxgh.sz.controller.v2; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.sz.dto.v2.SzProblemV2Dto; +import com.kms.yxgh.sz.dto.v2.SzRecordSearchV2Dto; +import com.shuili.common.core.domain.SearchParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@AllArgsConstructor +@RequestMapping("/run/sz/v2/problem") +@Api(tags = "水闸巡查缺陷v2") +public class SzCheckingProblemV2Controller { + + + + /** + * 查询水闸巡视检查记录列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡查缺陷列表v2") + public IPage list(@RequestBody SearchParam sp) { + return new Page<>(); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/v2/SzCheckingRecordV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/v2/SzCheckingRecordV2Controller.java new file mode 100644 index 00000000..50bb6e52 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/v2/SzCheckingRecordV2Controller.java @@ -0,0 +1,57 @@ +package com.kms.yxgh.sz.controller.v2; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.base.UpdateGroup; +import com.kms.yxgh.sz.dto.v2.SzRecordDetailV2Dto; +import com.kms.yxgh.sz.dto.v2.SzRecordSearchV2Dto; +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.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + + +@RestController +@AllArgsConstructor +@RequestMapping("/run/sz/v2/record") +@Api(tags = "水闸巡视检查记录v2") +public class SzCheckingRecordV2Controller { + + + /** + * 查询堤防巡视检查记录列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡视检查记录列表v2") + public IPage list(@RequestBody SearchParam sp) { + return new Page<>(); + } + + @ApiOperation("水闸巡视检查记录详情v2") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(); + } + + @ApiOperation("水闸巡视检查记录新增或修改v2") + @Log(title = "堤防巡视检查记录新增或修改v2", businessType = BusinessType.UPDATE) + @PostMapping("/{commit}") + public Response edit(@Validated(UpdateGroup.class) + @RequestBody SzRecordDetailV2Dto szRecord, + @PathVariable("commit") Boolean commit) { + return Response.ok(); + } + + @ApiOperation("水闸巡视检查记录删除v2") + @Log(title = "堤防巡视检查记录删除v2", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Response myRemove(@PathVariable("ids") String[] ids) { + return Response.ok(); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/v2/SzCheckingV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/v2/SzCheckingV2Controller.java new file mode 100644 index 00000000..8ed7028e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/v2/SzCheckingV2Controller.java @@ -0,0 +1,60 @@ +package com.kms.yxgh.sz.controller.v2; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.sz.dto.v2.SzV2CheckingDto; +import com.kms.yxgh.sz.dto.v2.SzV2CheckingSearchDto; +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.*; +/** + * 水闸巡视检查计划Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/run/sz/v2/checking") +@Api(tags = "水闸巡查项目v2") +public class SzCheckingV2Controller { + + + @PostMapping("/list") + @ApiOperation("水闸项目列表") + public IPage list(@RequestBody SearchParam sp) { + return new Page<>(); + } + + @ApiOperation("水闸巡查项目详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(); + } + + @Log(title = "水闸巡查项目新增", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ApiOperation("水闸巡查项目新增") + public Response add(@RequestBody SzV2CheckingDto szV2Ck) { + return Response.ok(); + } + + @ApiOperation("水闸巡查项目修改") + @Log(title = "水闸巡查项目修改", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + public Response edit(@RequestBody SzV2CheckingDto szV2Ck) { + return Response.ok(); + } + + @ApiOperation("水闸巡查项目删除") + @Log(title = "水闸巡查项目删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Response remove(@PathVariable("ids") String[] ids) { + return Response.ok(); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/v2/SzYhV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/v2/SzYhV2Controller.java new file mode 100644 index 00000000..313773d1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/v2/SzYhV2Controller.java @@ -0,0 +1,61 @@ +package com.kms.yxgh.sz.controller.v2; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.base.UpdateGroup; +import com.kms.yxgh.common.ApprovalTypeEnum; +import com.kms.yxgh.common.controller.ApprovalAbstractController; +import com.kms.yxgh.df.dto.v2.*; +import com.kms.yxgh.sz.dto.v2.SzRecordSearchV2Dto; +import com.kms.yxgh.sz.dto.v2.SzYhDetailV2Dto; +import com.kms.yxgh.sz.dto.v2.SzYhListV2Dto; +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.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import static com.kms.yxgh.common.ApprovalTypeEnum.YH_V2_RECORD; +@RestController +@AllArgsConstructor +@RequestMapping("/run/sz/v2/yh") +@Api(tags = "水闸养护v2") +public class SzYhV2Controller extends ApprovalAbstractController { + + + @PostMapping("/list") + @ApiOperation("水闸养护列表v2") + public IPage list(@RequestBody SearchParam sp) { + return new Page<>(); + } + + + @ApiOperation("水闸养护详情v2") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(); + } + + @ApiOperation("水闸养护新增或修改v2") + @Log(title = "水闸养护新增或修改v2", businessType = BusinessType.UPDATE) + @PostMapping("/{commit}") + public Response edit(@Validated(UpdateGroup.class) + @RequestBody SzYhDetailV2Dto szYh, + @PathVariable("commit") Boolean commit) { + return Response.ok(); + } + + @ApiOperation("水闸养护删除v2") + @Log(title = "水闸养护删除v2", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Response myRemove(@PathVariable("ids") String[] ids) { + return Response.ok(); + } + + @Override + public ApprovalTypeEnum getApprovalType() { + return YH_V2_RECORD; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java index 5c0fe88f..e7a4a183 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java @@ -7,7 +7,7 @@ import lombok.Data; import java.util.List; /** - * @ClassName: CheckingVo + * @ClassName: SzCheckingDetailDto * @Description: TODO * @Date: 2023/11/10 上午11:56 * * @author: hxh diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzCheckingDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzCheckingDetailDto.java new file mode 100644 index 00000000..3c1ff4f1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzCheckingDetailDto.java @@ -0,0 +1,46 @@ +package com.kms.yxgh.sz.dto.v2; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @ClassName: SzCheckingDetailDto + * @Description: TODO + * @Date: 2023/11/10 上午11:56 * + * @author: hxh + * @version: 1.0 + */ +@Data +@ApiModel("水闸巡视检查详情") +public class SzCheckingDetailDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("名称") + private String name; + + @ApiModelProperty("类型") + private String type; + + @ApiModelProperty("检查项") + private List items; + + + @Data + public static class SzCheckingItemDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("检查部位") + private List parts; + + @ApiModelProperty("检查内容") + private String content; + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzProblemV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzProblemV2Dto.java new file mode 100644 index 00000000..9e644924 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzProblemV2Dto.java @@ -0,0 +1,85 @@ +package com.kms.yxgh.sz.dto.v2; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.AddGroup; +import com.kms.yxgh.base.UpdateGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Data +@ApiModel("水闸巡查问题v2") +public class SzProblemV2Dto { + + /** + * id + */ + @ApiModelProperty("id") + private String id; + + /** + * 问题位置 + */ + @ApiModelProperty("问题位置") + private String position; + + /** + * 文档 + */ + @ApiModelProperty("文档") + private String doc; + + /** + * 问题位置 + */ + @ApiModelProperty("部位") + private String parts; + + + @ApiModelProperty("问题等级") + private String problemLevel; + + @ApiModelProperty("问题Id") + private String problemId; + + @ApiModelProperty("检查内容") + private String content; + + @ApiModelProperty("巡查项目ID") + private String checkingId; + + @ApiModelProperty("记录id") + private String recordId; + + @ApiModelProperty("巡查项目名称") + private String checkingName; + + @ApiModelProperty("状态") + private String status; + + @ApiModelProperty("巡查类型") + private String type; + + @ApiModelProperty("巡查类别") + private String category; + + @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("开始时间") + private Date startDate; + + @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private Date endDate; + + @ApiModelProperty("巡查责任人") + private String dutyHolderId; + + @ApiModelProperty("巡查责任人名称") + private String dutyHolderName; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordDetailV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordDetailV2Dto.java new file mode 100644 index 00000000..acb98da3 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordDetailV2Dto.java @@ -0,0 +1,118 @@ +package com.kms.yxgh.sz.dto.v2; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.AddGroup; +import com.kms.yxgh.base.UpdateGroup; +import com.kms.yxgh.common.dto.DocV2Dto; +import com.kms.yxgh.sz.dto.SzCheckingDetailDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel("水闸巡视检查记录详情v2") +public class SzRecordDetailV2Dto { + + + @ApiModelProperty("文档") + private DocV2Dto doc; + + @NotBlank(message = "水闸巡查记录ID不能为空") + @ApiModelProperty("水闸巡查记录") + private String id; + + @NotBlank(message = "水闸巡查项目ID不能为空", groups = {UpdateGroup.class}) + @ApiModelProperty("水闸巡查项目ID") + private String checkingId; + + @ApiModelProperty("水闸巡查项目名称") + private String checkingName; + + @NotBlank(message = "水闸编码不能为空", groups = {UpdateGroup.class}) + @ApiModelProperty("水闸编码") + private String wagaCode; + + @NotBlank(message = "水闸名称不能为空", groups = {UpdateGroup.class}) + @ApiModelProperty("水闸名称") + private String wagaName; + + @ApiModelProperty("类型") + private String wagaType; + + @ApiModelProperty("状态") + private String status; + + @ApiModelProperty("水闸巡查类型") + private String type; + + @ApiModelProperty("类别") + private String category; + + @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("开始时间") + private Date startDate; + + @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private Date endDate; + + @ApiModelProperty("巡查范围") + private String scope; + + @ApiModelProperty("创建者") + private String createUid; + + @ApiModelProperty("创建者名称") + private String createName; + + @ApiModelProperty("记录id") + private String recordId; + + + + @ApiModelProperty("巡查详情") + private List problems = Collections.emptyList(); + + + @Data + public static class SzRecordItemDetailV2Dto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("检查项ID") + private String itemId; + + @ApiModelProperty("检查部位") + private List parts = Collections.emptyList(); + + @ApiModelProperty("位置") + private String position; + + @ApiModelProperty("检查内容") + private String content; + + @ApiModelProperty("问题等级") + private String problemLevel; + + @ApiModelProperty("状态") + private String status; + // + @ApiModelProperty("问题图片") + private List problemImages = Collections.emptyList(); + + } + + @ApiModelProperty("检查项") + private List items = Collections.emptyList(); + ; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java new file mode 100644 index 00000000..5507d792 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java @@ -0,0 +1,51 @@ +package com.kms.yxgh.sz.dto.v2; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel("水闸巡视检查记录检索条件v2") +public class SzRecordSearchV2Dto { + + @ApiModelProperty("水闸名称") + private String wagaName; + @ApiModelProperty("水闸类型") + private String wagaType; + @ApiModelProperty("巡查责任人") + private String dutyHolder; + @ApiModelProperty(value = "名称") + private String name; + @ApiModelProperty("巡查类型") + private String type; + @ApiModelProperty("巡查类别") + private String category; + @ApiModelProperty("问题级别") + private String problemLevel; + @ApiModelProperty("状态") + private String status; + + + @ApiModelProperty("记录详情列表标识查询 巡查中的数据 1是 0否") + private int recordDetailsFlag; + + /** + * 问题位置 + */ + @ApiModelProperty("部位") + private String parts; + + @ApiModelProperty("记录id") + private String recordId; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "开始时间") + private Date startDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "结束时间") + private Date endDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzV2CheckingDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzV2CheckingDto.java new file mode 100644 index 00000000..99a92336 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzV2CheckingDto.java @@ -0,0 +1,53 @@ +package com.kms.yxgh.sz.dto.v2; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Date; +import java.util.List; + +@ApiModel(value = "水闸巡查项目信息v2") +@Data +public class SzV2CheckingDto { + + @ApiModelProperty("水闸编码") + private String wagaCode; + @ApiModelProperty("水闸名称") + private String wageName; + @ApiModelProperty("类型") + private String wageType; + + @NotNull + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("名称") + private String name; + + @ApiModelProperty("类型") + private String type; + + @ApiModelProperty("类别") + private String category; + + @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + + @ApiModelProperty("创建者") + private String createUid; + + @ApiModelProperty("创建者名称") + private String createName; + + + @ApiModelProperty("是否领取") + private Boolean isReceive; + + @ApiModelProperty("检查项") + private List items; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzV2CheckingSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzV2CheckingSearchDto.java new file mode 100644 index 00000000..45b94501 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzV2CheckingSearchDto.java @@ -0,0 +1,19 @@ +package com.kms.yxgh.sz.dto.v2; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "水闸巡查项目查询v2") +public class SzV2CheckingSearchDto { + + @ApiModelProperty(value = "水闸编号") + private String wagaCode; + @ApiModelProperty(value = "名称") + private String name; + @ApiModelProperty("类型") + private String type; + @ApiModelProperty("类别") + private String category; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzYhDetailV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzYhDetailV2Dto.java new file mode 100644 index 00000000..80063ebd --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzYhDetailV2Dto.java @@ -0,0 +1,88 @@ +package com.kms.yxgh.sz.dto.v2; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.UpdateGroup; +import com.kms.yxgh.common.dto.DocV2Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Data +@ApiModel("堤防巡视检查维养记录详情v2") +public class SzYhDetailV2Dto { + + @ApiModelProperty("巡查维养记录") + private String id; + + @ApiModelProperty("巡查名称") + private String name; + + @ApiModelProperty("问题id") + private String problemId; + + @ApiModelProperty("巡查记录id") + private String recordId; + + @NotBlank(message = "巡查项目ID不能为空", groups = {UpdateGroup.class}) + @ApiModelProperty("巡查项目ID") + private String checkingId; + + @NotNull(message = "开始时间", groups = {UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("开始时间") + private Date startDate; + + @NotNull(message = "结束时间", groups = {UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private Date endDate; + + @ApiModelProperty("维养详情") + private String content; + + @ApiModelProperty("文档") + private DocV2Dto doc; + + @ApiModelProperty("巡查责任人") + private String dutyHolderId; + + @ApiModelProperty("巡查责任人名称") + private String dutyHolderName; + + /** + * 问题等级 + */ + @ApiModelProperty("问题等级") + private String problemLevel; + + /** + * 巡查类型 字典：patrol_maintenance_type + */ + @ApiModelProperty("巡查类型 字典：patrol_maintenance_type") + private String type; + + /** + * 巡查类别字典：key_jf_patrol_category + */ + @ApiModelProperty("巡查类别字典：patrol_maintenance_category") + private String category; + + /** + * 堤防代码 + */ + @ApiModelProperty("水闸代码") + private String wagaCode; + + + /** + * 堤防代码名称 + */ + @ApiModelProperty("水闸代码名称") + private String wagaName; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzYhListV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzYhListV2Dto.java new file mode 100644 index 00000000..87a1a663 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzYhListV2Dto.java @@ -0,0 +1,66 @@ +package com.kms.yxgh.sz.dto.v2; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.AddGroup; +import com.kms.yxgh.base.UpdateGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Data +@ApiModel("水闸巡查养护列表v2") +public class SzYhListV2Dto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("问题Id") + private String problemId; + + @ApiModelProperty("巡查项目ID") + private String checkingId; + + @ApiModelProperty("记录id") + private String recordId; + + @ApiModelProperty("巡查项目名称") + private String checkingName; + + @ApiModelProperty("状态") + private String status; + + @ApiModelProperty("巡查类型") + private String type; + + @ApiModelProperty("巡查类别") + private String category; + + @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("开始时间") + private Date startDate; + + @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private Date endDate; + + @ApiModelProperty("巡查责任人") + private String dutyHolderId; + + @ApiModelProperty("巡查责任人名称") + private String dutyHolderName; + + @ApiModelProperty("审批id") + private String approvalId; + + @ApiModelProperty("问题等级") + private String problemLevel; + + @ApiModelProperty("巡查名称") + private String name; + +} diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml index 7cb54a29..1187c15c 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml @@ -50,7 +50,7 @@ AND jl.category = #{dto.condition.category} - AND jl.issue_level = #{dto.condition.problemLevel} + AND jl.problem_level = #{dto.condition.problemLevel} AND jl.status = #{dto.condition.status}