feat: 记录添加计划路线等

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

@@ -47,6 +47,18 @@ public class DfRecord extends SyBaseEntity {
     @ApiModelProperty("子计划名称")
     private String subPlanName;
 
+    @ApiModelProperty("子项开始时间")
+    private Date subPlanStartDate;
+
+    @ApiModelProperty("子项结束时间")
+    private Date subPlanSndDate;
+
+    /**
+     * 巡查路线点位
+     */
+    @ApiModelProperty("巡查路线点位")
+    private String entries;
+
     @ApiModelProperty("巡查路线ID")
     private String lineId;
 

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

@@ -58,6 +58,16 @@ public class DfRecordDetailDto {
     @ApiModelProperty("子计划名称")
     private String subPlanName;
 
+    @NotNull(message = "子项开始时间", groups = {AddGroup.class, UpdateGroup.class})
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("子项开始时间")
+    private Date subPlanStartDate;
+
+    @NotNull(message = "子项结束时间", groups = {AddGroup.class, UpdateGroup.class})
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("子项结束时间")
+    private Date subPlanSndDate;
+
     @NotBlank(message = "巡查路线ID不能为空", groups = {AddGroup.class, UpdateGroup.class})
     @ApiModelProperty("巡查路线ID")
     private String lineId;
@@ -65,6 +75,9 @@ public class DfRecordDetailDto {
     @ApiModelProperty("路线名称")
     private String lineName;
 
+    @ApiModelProperty("巡查路线点位")
+    private String entries;
+
     @NotBlank(message = "路线类型不能为空", groups = {AddGroup.class, UpdateGroup.class})
     @ApiModelProperty("路线类型")
     private String lineType;
@@ -78,7 +91,6 @@ public class DfRecordDetailDto {
     @ApiModelProperty("巡查开始时间")
     private Date startDate;
 
-    @NotNull(message = "巡查结束时间不能为空", groups = {AddGroup.class, UpdateGroup.class})
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("巡查结束时间")
     private Date endDate;
@@ -87,6 +99,7 @@ public class DfRecordDetailDto {
     @ApiModelProperty("巡查范围")
     private String scope;
 
+
     @ApiModelProperty("巡查项")
     private List<DfRecordItemDto> items = Collections.emptyList();
 

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

@@ -8,12 +8,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.system.service.SysUserService;
 import com.kms.yxgh.base.DfException;
 import com.kms.yxgh.base.enums.RecordStatus;
+import com.kms.yxgh.df.domain.DfCheckingLine;
 import com.kms.yxgh.df.domain.DfRecord;
 import com.kms.yxgh.df.domain.DfRecordItem;
 import com.kms.yxgh.df.dto.DfRecordDetailDto;
 import com.kms.yxgh.df.dto.DfRecordDetailDto.DfRecordItemDto;
 import com.kms.yxgh.df.dto.DfRecordSearchDto;
 import com.kms.yxgh.df.dto.DfRecordSimpleDto;
+import com.kms.yxgh.df.mapper.DfCheckingLineMapper;
 import com.kms.yxgh.df.mapper.DfRecordMapper;
 import com.kms.yxgh.util.BeanCopyUtils;
 import com.kms.yxgh.util.StreamUtils;
@@ -27,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -43,6 +46,7 @@ import static com.kms.yxgh.df.service.DfCheckingService.PART_SEPARATOR;
 public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
 
     private final DfRecordItemService recordItemService;
+    private final DfCheckingLineMapper checkingLineMapper;
     private final SysUserService userService;
 
     public IPage<DfRecordSimpleDto> search(SearchParam<DfRecordSearchDto> sp) {
@@ -125,10 +129,13 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
         DfRecord record = this.getBaseMapper().selectById(id);
         if (record != null) {
             DfRecordDetailDto dto = BeanCopyUtils.copy(record, DfRecordDetailDto.class);
+
             Wrapper<DfRecordItem> wp = Wrappers.<DfRecordItem>lambdaQuery()
                     .eq(DfRecordItem::getRecordId, id);
             List<DfRecordItem> items = recordItemService.list(wp);
             if (CollectionUtil.isNotEmpty(items) && dto != null) {
+                DfCheckingLine line = checkingLineMapper.selectById(record.getLineId());
+                dto.setEntries(Optional.ofNullable(line).map(DfCheckingLine::getPoints).orElse(""));
                 dto.setItems(StreamUtils.toList(items, r -> {
                     DfRecordItemDto itemDto = BeanCopyUtils.copy(r, DfRecordItemDto.class);
                     if (itemDto != null) {

sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql

@@ -39,6 +39,8 @@ CREATE TABLE `bs_sgc_df_xsx` (
 CREATE TABLE `bs_sgc_df_xsjh` (
   `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查计划编号',
   `DIKE_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码',
+  `DIKE_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '堤防名称',
+  `DIKE_TYPE` int  COMMENT '堤防类型',
   `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查计划名称',
   `TYPE` int DEFAULT NULL COMMENT '巡查计划类型',
   `STATUS` int NOT NULL COMMENT '状态',
@@ -78,12 +80,14 @@ CREATE TABLE `bs_sgc_df_xsjhjl` (
   `PLAN_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '计划名称',
   `SUB_PLAN_ID` int  COMMENT '子计划ID',
   `SUB_PLAN_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '子计划名称',
+  `SUB_PLAN_START_DATE` datetime DEFAULT NULL COMMENT '子计划开始时间',
+  `SUB_PLAN_END_DATE` datetime DEFAULT NULL COMMENT '子计划结束时间',
   `LINE_ID` int  COMMENT '巡查路线ID',
   `LINE_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '路线名称',
   `LINE_TYPE` int  COMMENT '路线类型',
   `DUTY_HOLDER_TYPE` int DEFAULT NULL COMMENT '巡查责任人类型',
-  `START_DATE` datetime DEFAULT NULL COMMENT '计划开始时间',
+  `START_DATE` datetime DEFAULT NULL COMMENT '巡查开始时间',
-  `END_DATE` datetime DEFAULT NULL COMMENT '计划结束时间',
+  `END_DATE` datetime DEFAULT NULL COMMENT '巡查结束时间',
   `DIKE_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码',
   `DIKE_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '堤防名称',
   `DIKE_TYPE` int  COMMENT '堤防类型',

sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql

@@ -1,6 +1,9 @@
 SET NAMES utf8mb4;
 ALTER TABLE `bs_sgc_df_xsjh` MODIFY COLUMN XC_ID int NULL COMMENT '巡查ID';
 
+ALTER TABLE `bs_sgc_df_xsjh` ADD `DIKE_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '堤防名称';
+ALTER TABLE `bs_sgc_df_xsjh` ADD `DIKE_TYPE` int  COMMENT '堤防类型';
+
 CREATE TABLE `bs_sgc_df_xslx` (
   `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查路线查编号',
   `DIKE_CODE` varchar(255) COLLATE utf8mb4_general_ci  COMMENT '堤防代码',
@@ -29,8 +32,10 @@ ALTER TABLE `bs_sgc_df_xsjhjl` ADD `LINE_ID` int  COMMENT '巡查路线ID';
 ALTER TABLE `bs_sgc_df_xsjhjl` ADD `LINE_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '路线名称';
 ALTER TABLE `bs_sgc_df_xsjhjl` ADD `LINE_TYPE` int  COMMENT '路线类型';
 ALTER TABLE `bs_sgc_df_xsjhjl` ADD `DUTY_HOLDER_TYPE` int DEFAULT NULL COMMENT '巡查责任人类型';
-ALTER TABLE `bs_sgc_df_xsjhjl` ADD `START_DATE` datetime DEFAULT NULL COMMENT '计划开始时间';
+ALTER TABLE `bs_sgc_df_xsjhjl` ADD `START_DATE` datetime DEFAULT NULL COMMENT '巡查开始时间';
-ALTER TABLE `bs_sgc_df_xsjhjl` ADD `END_DATE` datetime DEFAULT NULL COMMENT '计划结束时间';
+ALTER TABLE `bs_sgc_df_xsjhjl` ADD `END_DATE` datetime DEFAULT NULL COMMENT '巡查结束时间';
+ALTER TABLE `bs_sgc_df_xsjhjl` ADD  `SUB_PLAN_START_DATE` datetime DEFAULT NULL COMMENT '子计划开始时间';
+ALTER TABLE `bs_sgc_df_xsjhjl` ADD  `SUB_PLAN_END_DATE` datetime DEFAULT NULL COMMENT '子计划结束时间';
 ALTER TABLE `bs_sgc_df_xsjhjl` ADD `SCOPE` varchar(50) COLLATE utf8mb4_general_ci COMMENT '巡查范围';
 ALTER TABLE `bs_sgc_df_xsjhjl` ADD `DIKE_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '堤防名称';
 ALTER TABLE `bs_sgc_df_xsjhjl` ADD `DIKE_TYPE` int  COMMENT '堤防类型';