app，增加检验结论录入接口

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerOrderItemReportVO.java

@@ -113,6 +113,9 @@ public class    BoilerOrderItemReportVO {
     @Schema(description = "当前报告结论")
     private String reportConclusion;
 
+    @Schema(description = "检验结果")
+    private String reportResult;
+
     private Integer status;
 
     @Schema(description = "图片")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeOrderItemReportVO.java

@@ -113,6 +113,8 @@ public class PipeOrderItemReportVO {
     @Schema(description = "当前报告结论")
     private String reportConclusion;
 
+    private String reportResult;
+
     private Integer status;
 
     @Schema(description = "图片")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/boilertaskorderitemreport/AppApiBoilerTaskOrderItemReportController.java

@@ -9,6 +9,7 @@ import cn.start.tz.framework.excel.core.util.ExcelUtils;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemreport.vo.BoilerTaskOrderItemReportPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemreport.vo.BoilerTaskOrderItemReportRespVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemreport.vo.BoilerTaskOrderItemReportSaveReqVO;
+import cn.start.tz.module.pressure2.controller.appapi.boilertaskorderitemreport.dto.BoilerTaskOrderItemReportConclusionReq;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.service.boilertaskorderitemreport.BoilerTaskOrderItemReportService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -50,6 +51,13 @@ public class AppApiBoilerTaskOrderItemReportController {
         return success(true);
     }
 
+    @PutMapping("/conclusion")
+    @Operation(summary = "录入检验结论、检验结果")
+    public CommonResult<Boolean> updateBoilerReportConclusion(@Valid @RequestBody BoilerTaskOrderItemReportConclusionReq updateReqVO) {
+        boilerTaskOrderItemReportService.updateBoilerReportConclusion(updateReqVO);
+        return success(true);
+    }
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除锅炉任务单设备关联报告")
     @Parameter(name = "id", description = "编号", required = true)

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/boilertaskorderitemreport/dto/BoilerTaskOrderItemReportConclusionReq.java

@@ -0,0 +1,24 @@
+package cn.start.tz.module.pressure2.controller.appapi.boilertaskorderitemreport.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+public class BoilerTaskOrderItemReportConclusionReq {
+
+    private String id;
+
+    @Schema(description = "检验结论")
+    private String reportConclusion;
+
+    @Schema(description = "检验结果")
+    private String reportResult;
+
+    @Schema(description = "费用")
+    private BigDecimal fee;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/pipetaskorderitemreport/AppApiPipeTaskOrderItemReportController.java

@@ -9,6 +9,7 @@ import cn.start.tz.framework.excel.core.util.ExcelUtils;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.PipeTaskOrderItemReportPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.PipeTaskOrderItemReportRespVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.PipeTaskOrderItemReportSaveReqVO;
+import cn.start.tz.module.pressure2.controller.appapi.pipetaskorderitemreport.dto.PipeTaskOrderItemReportConclusionReq;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.service.pipetaskorderitemreport.PipeTaskOrderItemReportService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -50,6 +51,13 @@ public class AppApiPipeTaskOrderItemReportController {
         return success(true);
     }
 
+    @PutMapping("/conclusion")
+    @Operation(summary = "检验结论、结果、费用")
+    public CommonResult<Boolean> updatePipeTaskOrderItemReportConclusion(@Valid @RequestBody PipeTaskOrderItemReportConclusionReq updateReqVO) {
+        pipeTaskOrderItemReportService.updatePipeTaskOrderItemReportConclusion(updateReqVO);
+        return success(true);
+    }
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除管道任务单设备关联报告")
     @Parameter(name = "id", description = "编号", required = true)

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/pipetaskorderitemreport/dto/PipeTaskOrderItemReportConclusionReq.java

@@ -0,0 +1,24 @@
+package cn.start.tz.module.pressure2.controller.appapi.pipetaskorderitemreport.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+public class PipeTaskOrderItemReportConclusionReq {
+
+    private String id;
+
+    @Schema(description = "检验结论")
+    private String reportConclusion;
+
+    @Schema(description = "检验结果")
+    private String reportResult;
+
+    @Schema(description = "费用")
+    private BigDecimal fee;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemreport/BoilerTaskOrderItemReportService.java

@@ -6,6 +6,7 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BatchRec
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.InspectionOpinionApprovalVo;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.ReportUploadVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.TaskOrderMainCheckVO;
+import cn.start.tz.module.pressure2.controller.appapi.boilertaskorderitemreport.dto.BoilerTaskOrderItemReportConclusionReq;
 import jakarta.validation.*;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemreport.vo.*;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
@@ -108,4 +109,6 @@ public interface BoilerTaskOrderItemReportService extends IService<BoilerTaskOrd
      * @param id
      */
     void handleCompletion(String id);
+
+    void updateBoilerReportConclusion(BoilerTaskOrderItemReportConclusionReq updateReqVO);
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemreport/BoilerTaskOrderItemReportServiceImpl.java

@@ -8,12 +8,12 @@ import cn.start.tz.framework.common.util.date.DateUtils;
 import cn.start.tz.framework.env.core.enums.EnvEnum;
 import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.start.tz.module.infra.api.file.FileApi;
-import cn.start.tz.module.pressure.enums.EquipmentCheckTypeEnum;
 import cn.start.tz.module.pressure.enums.TaskOrderItemReportTypeEnum;
 import cn.start.tz.module.pressure.enums.TaskOrderStatusEnum;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderSyncReportVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.InspectionOpinionApprovalVo;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.ReportUploadVO;
+import cn.start.tz.module.pressure2.controller.appapi.boilertaskorderitemreport.dto.BoilerTaskOrderItemReportConclusionReq;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreportrecord.BoilerTaskOrderItemReportRecordDO;
@@ -69,7 +69,6 @@ import cn.start.tz.framework.common.util.object.BeanUtils;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitemreport.BoilerTaskOrderItemReportMapper;
 
 import static cn.start.tz.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.start.tz.framework.common.exception.util.ServiceExceptionUtil.exception0;
 import static cn.start.tz.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.start.tz.module.pressure.enums.ErrorCodeConstants.REPORT_INSPECTION_OPINION_RECTIFY;
 import static cn.start.tz.module.pressure2.enums.ErrorCodeConstants.*;
@@ -360,6 +359,19 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
         taskOrderItemReportMapper.updateById(taskOrderItemReport);
     }
 
+    @Override
+    public void updateBoilerReportConclusion(BoilerTaskOrderItemReportConclusionReq updateReqVO) {
+        // 校验存在
+        validateBoilerTaskOrderItemReportExists(updateReqVO.getId());
+        // 更新
+        BoilerTaskOrderItemReportDO boilerTaskOrderItemReportDO = new BoilerTaskOrderItemReportDO();
+        boilerTaskOrderItemReportDO.setId(updateReqVO.getId());
+        boilerTaskOrderItemReportDO.setReportConclusion(updateReqVO.getReportConclusion());
+        boilerTaskOrderItemReportDO.setReportResult(updateReqVO.getReportResult());
+        boilerTaskOrderItemReportDO.setFee(updateReqVO.getFee());
+        boilerTaskOrderItemReportMapper.updateById(boilerTaskOrderItemReportDO);
+    }
+
     @Override
     public boolean handleOACancelFlow(String summaryId) {
         BoilerTaskOrderItemReportDO report = taskOrderItemReportMapper.selectOne(

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeTaskOrderItemReportService.java

@@ -5,6 +5,7 @@ import java.util.*;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.InspectionOpinionApprovalVo;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.ReportUploadVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemreport.vo.BoilerTaskOrderItemReportSaveReqVO;
+import cn.start.tz.module.pressure2.controller.appapi.pipetaskorderitemreport.dto.PipeTaskOrderItemReportConclusionReq;
 import jakarta.validation.*;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.*;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
@@ -103,4 +104,9 @@ public interface PipeTaskOrderItemReportService extends IService<PipeTaskOrderIt
      * @param id
      */
     void handleCompletion(String id);
+
+    /**
+     * 录入检验结论、结果、费用
+     * */
+    void updatePipeTaskOrderItemReportConclusion(PipeTaskOrderItemReportConclusionReq updateReqVO);
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeTaskOrderItemReportServiceImpl.java

@@ -14,6 +14,7 @@ import cn.start.tz.module.pressure.enums.TaskOrderStatusEnum;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.InspectionOpinionApprovalVo;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.ReportUploadVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderSyncReportVO;
+import cn.start.tz.module.pressure2.controller.appapi.pipetaskorderitemreport.dto.PipeTaskOrderItemReportConclusionReq;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipecheckhistory.EquipPipeCheckHistoryDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipedetail.EquipPipeDetailDO;
@@ -356,6 +357,17 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
         taskOrderItemReportMapper.updateById(taskOrderItemReport);
     }
 
+    @Override
+    public void updatePipeTaskOrderItemReportConclusion(PipeTaskOrderItemReportConclusionReq updateReqVO) {
+        validatePipeTaskOrderItemReportExists(updateReqVO.getId());
+        PipeTaskOrderItemReportDO pipeTaskOrderItemReportDO = new PipeTaskOrderItemReportDO();
+        pipeTaskOrderItemReportDO.setId(updateReqVO.getId());
+        pipeTaskOrderItemReportDO.setReportConclusion(updateReqVO.getReportConclusion());
+        pipeTaskOrderItemReportDO.setReportResult(updateReqVO.getReportResult());
+        pipeTaskOrderItemReportDO.setFee(updateReqVO.getFee());
+        taskOrderItemReportMapper.updateById(pipeTaskOrderItemReportDO);
+    }
+
     @Override
     public boolean handleOAReturnFlow(String summaryId, String returnReason) {
         PipeTaskOrderItemReportDO report = taskOrderItemReportMapper.selectOne(