Merge remote-tracking branch 'origin/dev' into dev

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

@@ -309,6 +309,14 @@ public class BoilerTaskOrderController {
         Boolean result = boilerTaskOrderService.opinionNotice(majorIssuesSubmitVO);
         return success(result);
     }
+
+    @PutMapping("/order-item/initiateApproval/inspectionPlan/generate")
+    @Operation(summary = "任务单-通用检验方案不用审核，直接生成")
+    public CommonResult<Boolean> generateInspectionPlan(@RequestBody MajorIssuesSubmitVO majorIssuesSubmitVO) {
+        Boolean result = boilerTaskOrderService.generateInspectionPlan(majorIssuesSubmitVO);
+        return success(result);
+    }
+
     @PutMapping("/order-item/initiateApproval/approve")
     @Operation(summary = "任务单-检验意见通知书（重大事故）通过审批")
     public CommonResult<Boolean> opinionNoticeInitiateApprovalApprove(@RequestBody TaskOrderAuditVO reqVO) {

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

@@ -25,6 +25,10 @@ public class BoilerMajorIssuesPageRespVO {
 
     private Integer reportType;
 
+    private Integer pjType;
+
+    private Integer tbType;
+
     @Schema(description = "检查日期")
     private LocalDate checkDate;
 

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

@@ -245,6 +245,13 @@ public class PipeTaskOrderController {
         return success(true);
     }
 
+    @PutMapping("/order-item/initiateApproval/inspectionPlan/generate")
+    @Operation(summary = "任务单-通用检验方案不用审核，直接生成")
+    public CommonResult<Boolean> generateInspectionPlan(@RequestBody MajorIssuesSubmitVO majorIssuesSubmitVO) {
+        Boolean result = pipeTaskOrderService.generateInspectionPlan(majorIssuesSubmitVO);
+        return success(result);
+    }
+
     @PostMapping("/order-item/recheck/reject")
     @Operation(summary = "任务单-设备校核审批拒绝")
     public CommonResult<Boolean> recheckOrderItemReject(@RequestBody BoilerTaskOrderAuditSingleVO taskOrderAuditSingleVO) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorderreport/BoilerTaskOrderReportMapper.java

@@ -13,6 +13,7 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerMa
 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.boilertaskorderreport.BoilerTaskOrderReportDO;
+import cn.start.tz.module.pressure2.dal.dataobject.dynamictb.DynamicTbDO;
 import jodd.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
@@ -101,8 +102,11 @@ public interface BoilerTaskOrderReportMapper extends BaseMapperX<BoilerTaskOrder
                 .selectAs(BoilerTaskOrderDO::getOrderNo, BoilerMajorIssuesPageRespVO::getOrderNo)
                 .selectAs(BoilerTaskOrderDO::getCheckDate, BoilerMajorIssuesPageRespVO::getCheckDate)
                 .selectAs(BoilerTaskOrderItemDO::getEquipCode, BoilerMajorIssuesPageRespVO::getEquipCode)
+                .selectAs(DynamicTbDO::getPjType, BoilerMajorIssuesPageRespVO::getPjType)
+                .selectAs(DynamicTbDO::getReportType, BoilerMajorIssuesPageRespVO::getTbType)
                 .leftJoin(BoilerTaskOrderDO.class,BoilerTaskOrderDO::getId, BoilerTaskOrderReportDO::getOrderId)
-                .leftJoin(BoilerTaskOrderItemDO.class,BoilerTaskOrderItemDO::getId, BoilerTaskOrderReportDO::getOrderItemId).
+                .leftJoin(BoilerTaskOrderItemDO.class,BoilerTaskOrderItemDO::getId, BoilerTaskOrderReportDO::getOrderItemId)
+                .leftJoin(DynamicTbDO.class,DynamicTbDO::getId, BoilerTaskOrderReportDO::getTemplateId).
                 groupBy(BoilerTaskOrderReportDO::getId).
                 orderByDesc(BoilerTaskOrderReportDO::getSubmitTime);
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/pipetaskorderitemreport/PipeTaskOrderItemReportMapper.java

@@ -13,6 +13,8 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerMa
 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.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderreport.BoilerTaskOrderReportDO;
+import cn.start.tz.module.pressure2.dal.dataobject.dynamictb.DynamicTbDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitem.PipeTaskOrderItemDO;
@@ -119,10 +121,13 @@ public interface PipeTaskOrderItemReportMapper extends BaseMapperX<PipeTaskOrder
                 .selectAs(PipeTaskOrderDO::getCheckDate, BoilerMajorIssuesPageRespVO::getCheckDate)
                 .selectAs(PipeTaskOrderItemDO::getEquipCode, BoilerMajorIssuesPageRespVO::getEquipCode)
                 .selectAs(EquipPipeDO::getProjectNo, BoilerMajorIssuesPageRespVO::getProjectNo)
+                .selectAs(DynamicTbDO::getPjType, BoilerMajorIssuesPageRespVO::getPjType)
+                .selectAs(DynamicTbDO::getReportType, BoilerMajorIssuesPageRespVO::getTbType)
                 .isNotNull(PipeTaskOrderItemDO::getEquipCode)
                 .leftJoin(PipeTaskOrderDO.class,PipeTaskOrderDO::getId, PipeTaskOrderItemReportDO::getOrderId)
                 .leftJoin(PipeTaskOrderItemDO.class,PipeTaskOrderItemDO::getOrderId, PipeTaskOrderDO::getId)
                 .leftJoin(EquipPipeDO.class,EquipPipeDO::getId,PipeTaskOrderItemDO::getEquipId)
+                .leftJoin(DynamicTbDO.class,DynamicTbDO::getId, PipeTaskOrderItemReportDO::getTemplateId)
                 .groupBy(PipeTaskOrderItemReportDO::getId).
                 orderByDesc(PipeTaskOrderItemReportDO::getSubmitTime);
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderService.java

@@ -198,4 +198,6 @@ public interface BoilerTaskOrderService extends IService<BoilerTaskOrderDO>  {
     PageResult<BoilerOrderItemPageRespVO> inspectionOpinionPage(@Valid BoilerTaskOrderPageReqVO pageReqVO);
 
     PageResult<AdminUserRespDTO> getRecheckUserPage(BoilerRecheckUserPageReqVO pageReqVO);
+
+    Boolean generateInspectionPlan(MajorIssuesSubmitVO majorIssuesSubmitVO);
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -1746,7 +1746,11 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
                         //添加提交人
                         BoilerTaskOrderItemReportUserDO userDO = new BoilerTaskOrderItemReportUserDO();
-                        userDO.setUserId(reportDO.getSubmitId());
+                        if (reportDO.getSubmitId() != null){
+                            userDO.setUserId(reportDO.getSubmitId());
+                        }else{
+                            userDO.setUserId(reportDO.getCreator());
+                        }
                         userDO.setReportId(item.getId());
                         boilerTaskOrderItemReportUserMapper.insert(userDO);
 
@@ -6011,6 +6015,13 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
     }
 
+    @Override
+    public Boolean generateInspectionPlan(MajorIssuesSubmitVO majorIssuesSubmitVO) {
+
+        auditInspectionPlan(majorIssuesSubmitVO.getId(),200, "");
+
+        return true;
+    }
 
     @Override
     public PageResult<BoilerOrderItemPageRespVO> inspectionOpinionPage(BoilerTaskOrderPageReqVO pageReqVO) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderService.java

@@ -192,4 +192,5 @@ public interface PipeTaskOrderService extends IService<PipeTaskOrderDO>  {
 
     PageResult<PipeOrderItemPageRespVO> inspectionOpinionPage(@Valid BoilerTaskOrderPageReqVO pageReqVO);
 
+    Boolean generateInspectionPlan(MajorIssuesSubmitVO majorIssuesSubmitVO);
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -1375,7 +1375,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                     }
 
                     // 添加数量后缀（当数量大于 1 时）
-                    if (currentIndex > 1) {
+                    if (currentIndex > 1 || quantity > 1) {
                         addReport.setReportName(baseReportName + currentIndex);
                     } else {
                         addReport.setReportName(baseReportName);
@@ -5057,6 +5057,15 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         return pageResult;
     }
 
+    @Override
+    @Transactional
+    public Boolean generateInspectionPlan(MajorIssuesSubmitVO majorIssuesSubmitVO) {
+
+        auditInitiateApproval(majorIssuesSubmitVO.getId(),200, "");
+
+        return true;
+    }
+
     private PageResult<PipeOrderItemPageRespVO> inspectionOpinionPageQueryParam(BoilerTaskOrderPageReqVO pageReqVO) {
         //根据平台用户id查询
         if (StringUtils.isNotEmpty(pageReqVO.getMemberId())) {