add:巡查养护改造

shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfTaskV2Controller.java

@@ -40,11 +40,11 @@ public class DfTaskV2Controller {
         return Response.ok(dfTaskV2Service.getInfo(id));
     }
 
-    @Log(title = "新增", businessType = BusinessType.INSERT)
+    @Log(title = "任务保存或提交", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    @ApiOperation("新增")
-    public Response<DfTaskInfoV2Dto> add(@RequestBody DfTaskInfoV2Dto dto) {
-        return Response.ok(dfTaskV2Service.add(dto));
+    @ApiOperation("任务保存或提交")
+    public Response<DfTaskInfoV2Dto> add(@RequestBody DfTaskInfoV2Dto dto, @PathVariable("commit") Boolean commit) {
+        return Response.ok(dfTaskV2Service.add(dto, commit));
     }
 
     @ApiOperation("删除")
@@ -53,4 +53,11 @@ public class DfTaskV2Controller {
     public Response<Boolean> remove(@PathVariable("ids") String[] ids) {
         return Response.ok(dfTaskV2Service.myRemove(ids));
     }
+
+    @ApiOperation("修改")
+    @Log(title = "修改", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public Response<DfTaskInfoV2Dto> edit(@RequestBody DfTaskInfoV2Dto dto) {
+        return Response.ok(dfTaskV2Service.edit(dto));
+    }
 }

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

@@ -21,9 +21,10 @@ import java.util.Date;
 @ApiModel("任务管理")
 public class DfTaskV2Manage extends SyBaseEntity {
     private static final long serialVersionUID = 1L;
+    @ApiModelProperty("提交状态 1是0否")
+    private String commitStatus;
     @ApiModelProperty("巡查项目ID")
     private String checkingId;
-
     @ApiModelProperty("任务名称")
     private String taskName;
     @ApiModelProperty("巡检负责单位")

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

@@ -1,12 +1,14 @@
 package com.kms.yxgh.df.dto.v2;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.df.dto.DfCheckingDetailDto;
 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;
 
 @Data
 @ApiModel("堤防任务详情v2")
@@ -63,4 +65,7 @@ public class DfTaskInfoV2Dto {
 
     @ApiModelProperty("创建者名称")
     private String createName;
+
+    @ApiModelProperty("检查项")
+    private List<DfCheckingDetailDto.DfCheckingItemDto> items;
 }

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

@@ -10,8 +10,8 @@ import java.util.Date;
 @Data
 @ApiModel("堤防任务列表v2")
 public class DfTaskListV2Dto {
-
-
+    @ApiModelProperty("提交状态 1是0否")
+    private String commitStatus;
     @ApiModelProperty("任务id")
     private String id;
     @ApiModelProperty("巡查项目ID")

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

@@ -1,5 +1,4 @@
 package com.kms.yxgh.df.service;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -8,6 +7,7 @@ import com.kms.yxgh.common.domain.ApprovalTask;
 import com.kms.yxgh.common.mapper.ApprovalTaskMapper;
 import com.kms.yxgh.df.domain.DfCheckingProblemV2;
 import com.kms.yxgh.df.domain.DfCheckingRecord;
+import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem;
 import com.kms.yxgh.df.domain.DfTaskV2Manage;
 import com.kms.yxgh.df.domain.DfYhV2;
 import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto;
@@ -46,6 +46,10 @@ public class DfTaskV2Service extends BaseService<DfTaskV2Mapper, DfTaskV2Manage>
 
     private final ApprovalTaskMapper approvalTaskMapper;
 
+    private final DfCheckingV2ProjectItemV2Service dfCheckingV2ProjectItemV2Service;
+
+
+
     public IPage<DfTaskListV2Dto> list(SearchParam<DfRecordSearchV2Dto> sp) {
         // 分页参数
         Page<DfTaskV2Manage> page = new Page<>(sp.getPageNum(), sp.getPageSize());
@@ -69,8 +73,11 @@ public class DfTaskV2Service extends BaseService<DfTaskV2Mapper, DfTaskV2Manage>
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public DfTaskInfoV2Dto add(DfTaskInfoV2Dto dto) {
+    public DfTaskInfoV2Dto add(DfTaskInfoV2Dto dto, Boolean commit) {
         DfTaskV2Manage manage = BeanCopyUtils.copy(dto, DfTaskV2Manage.class);
+        if (commit) {
+            manage.setCommitStatus("1");
+        }
         if (save(manage)) {
             throw new RuntimeException("任务详情新增失败！");
         }
@@ -112,6 +119,33 @@ public class DfTaskV2Service extends BaseService<DfTaskV2Mapper, DfTaskV2Manage>
         return Boolean.FALSE;
     }
 
+    public DfTaskInfoV2Dto edit(DfTaskInfoV2Dto dto) {
+        DfTaskV2Manage manage = BeanCopyUtils.copy(dto, DfTaskV2Manage.class);
+        if (!updateById(manage)) {
+            throw new RuntimeException("修改失败");
+        }
+        DfTaskV2Manage dfTaskV2Manage = getById(dto.getId());
+        if (dfTaskV2Manage == null) {
+            return null;
+        }
+        dfCheckingV2ProjectItemV2Service
+                .remove(new LambdaQueryWrapper<DfCheckingV2ProjectItem>()
+                        .eq(DfCheckingV2ProjectItem::getCheckingId, dto.getCheckingId()));
+        List<DfCheckingV2ProjectItem> items = dto.getItems().stream()
+                .map(item -> {
+                    DfCheckingV2ProjectItem projectItem = new DfCheckingV2ProjectItem();
+                    projectItem.setId(item.getId());
+                    projectItem.setCheckingId(dfTaskV2Manage.getCheckingId());
+                    projectItem.setContent(item.getContent());
+                    projectItem.setParts(String.join(",", item.getParts()));
+                    return projectItem;
+                })
+                .collect(Collectors.toList());
+        if (!dfCheckingV2ProjectItemV2Service.saveOrUpdateBatch(items)) {
+            throw new RuntimeException("项目子项修改失败");
+        }
+        return dto;
+    }
 }
 
 

shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwTaskV2Controller.java

@@ -40,11 +40,11 @@ public class DwTaskV2Controller {
         return Response.ok(dwTaskV2Service.getInfo(id));
     }
 
-    @Log(title = "新增", businessType = BusinessType.INSERT)
+    @Log(title = "任务保存或提交", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    @ApiOperation("新增")
-    public Response<DwTaskInfoV2Dto> add(@RequestBody DwTaskInfoV2Dto dto) {
-        return Response.ok(dwTaskV2Service.add(dto));
+    @ApiOperation("任务保存或提交")
+    public Response<DwTaskInfoV2Dto> add(@RequestBody DwTaskInfoV2Dto dto, @PathVariable("commit") Boolean commit) {
+        return Response.ok(dwTaskV2Service.add(dto, commit));
     }
 
     @ApiOperation("删除")
@@ -53,4 +53,11 @@ public class DwTaskV2Controller {
     public Response<Boolean> remove(@PathVariable("ids") String[] ids) {
         return Response.ok(dwTaskV2Service.myRemove(ids));
     }
+
+    @ApiOperation("修改")
+    @Log(title = "修改", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public Response<DwTaskInfoV2Dto> edit(@RequestBody DwTaskInfoV2Dto dto) {
+        return Response.ok(dwTaskV2Service.edit(dto));
+    }
 }

shuili-system/src/main/java/com/kms/yxgh/dw/domain/DwTaskV2Manage.java

@@ -23,7 +23,8 @@ public class DwTaskV2Manage extends SyBaseEntity {
     private static final long serialVersionUID = 1L;
     @ApiModelProperty("巡查项目ID")
     private String checkingId;
-
+    @ApiModelProperty("提交状态 1是0否")
+    private String commitStatus;
     @ApiModelProperty("任务名称")
     private String taskName;
     @ApiModelProperty("巡检负责单位")

shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwTaskInfoV2Dto.java

@@ -1,12 +1,14 @@
 package com.kms.yxgh.dw.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.df.dto.DfCheckingDetailDto;
 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;
 
 @Data
 @ApiModel("动物任务详情v2")
@@ -63,4 +65,7 @@ public class DwTaskInfoV2Dto {
 
     @ApiModelProperty("创建者名称")
     private String createName;
+
+    @ApiModelProperty("检查项")
+    private List<DfCheckingDetailDto.DfCheckingItemDto> items;
 }

shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwTaskListV2Dto.java

@@ -10,7 +10,8 @@ import java.util.Date;
 @Data
 @ApiModel("动物任务列表v2")
 public class DwTaskListV2Dto {
-
+    @ApiModelProperty("提交状态 1是0否")
+    private String commitStatus;
     @ApiModelProperty("任务id")
     private String id;
     @ApiModelProperty("巡查项目ID")

shuili-system/src/main/java/com/kms/yxgh/dw/service/DwTaskV2Service.java

@@ -8,6 +8,7 @@ import com.kms.yxgh.common.domain.ApprovalTask;
 import com.kms.yxgh.common.mapper.ApprovalTaskMapper;
 import com.kms.yxgh.dw.domain.DwCheckingProblemV2;
 import com.kms.yxgh.dw.domain.DwCheckingRecord;
+import com.kms.yxgh.dw.domain.DwCheckingV2ProjectItem;
 import com.kms.yxgh.dw.domain.DwTaskV2Manage;
 import com.kms.yxgh.dw.domain.DwYhV2;
 import com.kms.yxgh.dw.dto.DwRecordSearchV2Dto;
@@ -46,6 +47,10 @@ public class DwTaskV2Service extends BaseService<DwTaskV2Mapper, DwTaskV2Manage>
 
     private final ApprovalTaskMapper approvalTaskMapper;
 
+    private final DwCheckingV2ProjectItemV2Service dwCheckingV2ProjectItemV2Service;
+
+
+
 
     public IPage<DwTaskListV2Dto> list(SearchParam<DwRecordSearchV2Dto> sp) {
         // 分页参数
@@ -70,8 +75,11 @@ public class DwTaskV2Service extends BaseService<DwTaskV2Mapper, DwTaskV2Manage>
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public DwTaskInfoV2Dto add(DwTaskInfoV2Dto dto) {
+    public DwTaskInfoV2Dto add(DwTaskInfoV2Dto dto, Boolean commit) {
         DwTaskV2Manage manage = BeanCopyUtils.copy(dto, DwTaskV2Manage.class);
+        if (commit) {
+            manage.setCommitStatus("1");
+        }
         if (save(manage)) {
             throw new RuntimeException("任务详情新增失败！");
         }
@@ -113,6 +121,33 @@ public class DwTaskV2Service extends BaseService<DwTaskV2Mapper, DwTaskV2Manage>
         return Boolean.FALSE;
     }
 
+    public DwTaskInfoV2Dto edit(DwTaskInfoV2Dto dto) {
+        DwTaskV2Manage manage = BeanCopyUtils.copy(dto, DwTaskV2Manage.class);
+        if (!updateById(manage)) {
+            throw new RuntimeException("修改失败");
+        }
+        DwTaskV2Manage dfTaskV2Manage = getById(dto.getId());
+        if (dfTaskV2Manage == null) {
+            return null;
+        }
+        dwCheckingV2ProjectItemV2Service
+                .remove(new LambdaQueryWrapper<DwCheckingV2ProjectItem>()
+                        .eq(DwCheckingV2ProjectItem::getCheckingId, dto.getCheckingId()));
+        List<DwCheckingV2ProjectItem> items = dto.getItems().stream()
+                .map(item -> {
+                    DwCheckingV2ProjectItem projectItem = new DwCheckingV2ProjectItem();
+                    projectItem.setId(item.getId());
+                    projectItem.setCheckingId(dfTaskV2Manage.getCheckingId());
+                    projectItem.setContent(item.getContent());
+                    projectItem.setParts(String.join(",", item.getParts()));
+                    return projectItem;
+                })
+                .collect(Collectors.toList());
+        if (!dwCheckingV2ProjectItemV2Service.saveOrUpdateBatch(items)) {
+            throw new RuntimeException("项目子项修改失败");
+        }
+        return dto;
+    }
 }
 
 

shuili-system/src/main/java/com/kms/yxgh/sz/controller/v2/SzTaskV2Controller.java

@@ -40,11 +40,11 @@ public class SzTaskV2Controller {
         return Response.ok(szTaskV2Service.getInfo(id));
     }
 
-    @Log(title = "新增", businessType = BusinessType.INSERT)
+    @Log(title = "任务保存或提交", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    @ApiOperation("新增")
-    public Response<SzTaskInfoV2Dto> add(@RequestBody SzTaskInfoV2Dto dto) {
-        return Response.ok(szTaskV2Service.add(dto));
+    @ApiOperation("任务保存或提交")
+    public Response<SzTaskInfoV2Dto> add(@RequestBody SzTaskInfoV2Dto dto, @PathVariable("commit") Boolean commit) {
+        return Response.ok(szTaskV2Service.add(dto, commit));
     }
 
     @ApiOperation("删除")
@@ -53,4 +53,11 @@ public class SzTaskV2Controller {
     public Response<Boolean> remove(@PathVariable("ids") String[] ids) {
         return Response.ok(szTaskV2Service.myRemove(ids));
     }
+
+    @ApiOperation("修改")
+    @Log(title = "修改", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public Response<SzTaskInfoV2Dto> edit(@RequestBody SzTaskInfoV2Dto dto) {
+        return Response.ok(szTaskV2Service.edit(dto));
+    }
 }

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

@@ -21,7 +21,8 @@ import java.util.Date;
 @ApiModel("任务管理")
 public class SzTaskV2Manage extends SyBaseEntity {
     private static final long serialVersionUID = 1L;
-
+    @ApiModelProperty("提交状态 1是0否")
+    private String commitStatus;
     @ApiModelProperty("水闸巡查项目ID")
     private String checkingId;
     @ApiModelProperty("任务名称")

shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzTaskListV2Dto.java

@@ -11,7 +11,8 @@ import java.util.List;
 @ApiModel(value = "任务列表v2")
 @Data
 public class SzTaskListV2Dto {
-
+    @ApiModelProperty("提交状态 1是0否")
+    private String commitStatus;
     @ApiModelProperty("任务id")
     private String id;
     @ApiModelProperty("巡查项目ID")

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

@@ -8,6 +8,7 @@ import com.kms.yxgh.common.domain.ApprovalTask;
 import com.kms.yxgh.common.service.ApprovalTaskService;
 import com.kms.yxgh.sz.domain.SzCheckingProblemV2;
 import com.kms.yxgh.sz.domain.SzCheckingRecord;
+import com.kms.yxgh.sz.domain.SzCheckingV2ProjectItem;
 import com.kms.yxgh.sz.domain.SzTaskV2Manage;
 import com.kms.yxgh.sz.domain.SzYhV2;
 import com.kms.yxgh.sz.dto.v2.SzRecordSearchV2Dto;
@@ -46,6 +47,8 @@ public class SzTaskV2Service extends BaseService<SzTaskV2Mapper, SzTaskV2Manage>
 
     private final ApprovalTaskService approvalTaskService;
 
+    private final SzCheckingV2ProjectItemV2Service szCheckingV2ProjectItemV2Service;
+
     public IPage<SzTaskListV2Dto> list(SearchParam<SzRecordSearchV2Dto> sp) {
         // 分页参数
         Page<SzTaskV2Manage> page = new Page<>(sp.getPageNum(), sp.getPageSize());
@@ -69,8 +72,11 @@ public class SzTaskV2Service extends BaseService<SzTaskV2Mapper, SzTaskV2Manage>
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public SzTaskInfoV2Dto add(SzTaskInfoV2Dto dto) {
+    public SzTaskInfoV2Dto add(SzTaskInfoV2Dto dto, Boolean commit) {
         SzTaskV2Manage manage = BeanCopyUtils.copy(dto, SzTaskV2Manage.class);
+        if (commit) {
+            manage.setCommitStatus("1");
+        }
         if (save(manage)) {
             throw new RuntimeException("任务详情新增失败！");
         }
@@ -111,6 +117,34 @@ public class SzTaskV2Service extends BaseService<SzTaskV2Mapper, SzTaskV2Manage>
         }
         return Boolean.FALSE;
     }
+
+    public SzTaskInfoV2Dto edit(SzTaskInfoV2Dto dto) {
+        SzTaskV2Manage manage = BeanCopyUtils.copy(dto, SzTaskV2Manage.class);
+        if (!updateById(manage)) {
+            throw new RuntimeException("修改失败");
+        }
+        SzTaskV2Manage dfTaskV2Manage = getById(dto.getId());
+        if (dfTaskV2Manage == null) {
+            return null;
+        }
+        szCheckingV2ProjectItemV2Service
+                .remove(new LambdaQueryWrapper<SzCheckingV2ProjectItem>()
+                        .eq(SzCheckingV2ProjectItem::getCheckingId, dto.getCheckingId()));
+        List<SzCheckingV2ProjectItem> items = dto.getItems().stream()
+                .map(item -> {
+                    SzCheckingV2ProjectItem projectItem = new SzCheckingV2ProjectItem();
+                    projectItem.setId(item.getId());
+                    projectItem.setCheckingId(dfTaskV2Manage.getCheckingId());
+                    projectItem.setContent(item.getContent());
+                    projectItem.setParts(String.join(",", item.getParts()));
+                    return projectItem;
+                })
+                .collect(Collectors.toList());
+        if (!szCheckingV2ProjectItemV2Service.saveOrUpdateBatch(items)) {
+            throw new RuntimeException("项目子项修改失败");
+        }
+        return dto;
+    }
 }