소스 검색

app,增加结束检验时间处理逻辑

yangguanjin 5 일 전
부모
커밋
7095b0cb31

+ 2 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerTaskOrderItemDetailVO.java

@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 
 @Schema(description = "管理后台 - 承压任务单 Response VO")
@@ -109,4 +110,5 @@ public class BoilerTaskOrderItemDetailVO {
     @Schema(description = "安全管理员电话")
     private String saferydh;
 
+    private LocalDate endCheckDate;
 }

+ 3 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeTaskOrderRespVO.java

@@ -441,4 +441,7 @@ public class PipeTaskOrderRespVO {
      * 企业类型
      */
     private String enterpriseType;
+
+
+    private LocalDate endCheckDate;
 }

+ 1 - 1
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/pipetaskorder/AppApiPipeTaskOrderController.java

@@ -58,7 +58,7 @@ public class AppApiPipeTaskOrderController {
     @Operation(summary = "获得管道任务单")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     public CommonResult<PipeTaskOrderRespVO> getPipeTaskOrder(@RequestParam("id") String id) {
-        return success(pipeTaskOrderService.getPipeTaskOrder(id));
+        return success(pipeTaskOrderService.getPipeTaskOrderForApp(id));
     }
 
     @PostMapping("/page")

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

@@ -691,6 +691,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
     public BoilerTaskOrderRespVO getBoilerTaskOrderForAPP(String id) {
         BoilerTaskOrderRespVO boilerTaskOrderRespVO = getBoilerTaskOrder(id);
         List<BoilerTaskOrderItemDetailVO> orderItems = boilerTaskOrderRespVO.getOrderItems();
+        // ================================== 主检人 ===================================
         Map<String, List<BoilerTaskOrderItemDetailVO>> mainCheckerIdToOrderItemsMap = orderItems.stream().collect(Collectors.groupingBy(BoilerTaskOrderItemDetailVO::getMainChecker));
         Map<String, AdminUserRespDTO> userIdToEntityMap = adminUserApi.getUserMap(mainCheckerIdToOrderItemsMap.keySet());
         for (Map.Entry<String, AdminUserRespDTO> userIdToEntityEntry : userIdToEntityMap.entrySet()) {

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

@@ -46,6 +46,7 @@ public interface PipeTaskOrderService extends IService<PipeTaskOrderDO>  {
      * @return 锅炉检验任务确认
      */
     PipeTaskOrderRespVO getPipeTaskOrder(String id);
+    PipeTaskOrderRespVO getPipeTaskOrderForApp(String id);
 
     /**
      * 获得锅炉检验任务确认分页

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

@@ -621,6 +621,20 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         return TaskOrderRespVO;
     }
 
+    @Override
+    public PipeTaskOrderRespVO getPipeTaskOrderForApp(String id) {
+        PipeTaskOrderRespVO pipeTaskOrder = getPipeTaskOrder(id);
+        if (pipeTaskOrder == null) {
+            return pipeTaskOrder;
+        }
+        PipeTaskOrderInputDO pipeTaskOrderInputDO = pipeTaskOrderInputMapper.selectOne(PipeTaskOrderInputDO::getOrderId, pipeTaskOrder.getId());
+        if (pipeTaskOrderInputDO == null) {
+            return pipeTaskOrder;
+        }
+        pipeTaskOrder.setEndCheckDate(pipeTaskOrderInputDO.getEndCheckDate());
+        return pipeTaskOrder;
+    }
+
     @Override
     public PageResult<PipeTaskOrderRespVO> getPipeTaskOrderPage(BoilerTaskOrderPageReqVO pageReqVO) {
 

+ 1 - 1
tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/boilertaskorderitem/BoilerTaskOrderItemMapper.xml

@@ -12,7 +12,7 @@
     <select id="selectDetailPage">
         select rownum,a.* from (
             select distinct
-                tot.ID as MAIN_ID,eb.ID,eb.EQUIP_DISTRICT,eb.EQUIP_STREET,bto.CHECK_TYPE,tot.FEE,eb.EQUIP_CODE,tot.EQUIP_ID,
+                tot.ID as MAIN_ID, tot.END_CHECK_DATE,eb.ID,eb.EQUIP_DISTRICT,eb.EQUIP_STREET,bto.CHECK_TYPE,tot.FEE,eb.EQUIP_CODE,tot.EQUIP_ID,
                 eb.MAX_CONTINUE_EVAPOR,eb.TONNAGE,eb.BOILER_MODEL,eb.NEXT_IN_CHECK_DATE,
                 eb.NEXT_OUT_CHECK_DATE,eb.NEXT_PRESSURE_CHECK_DATE,eb.CONTACT,eb.CONTACT_PHONE,eb.USE_REGISTER_NO as USE_CODE
                 ,btoir.TASK_STATUS,eb.type