上报管理调整

build-uat/update.sql

@@ -1469,4 +1469,26 @@ COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."APPROVAL_TIME" IS '
 
 --20260521
 ALTER TABLE "PRESSURE_TASK_ORDER" ADD COLUMN "ISSUE_URL" VARCHAR(50);
-COMMENT ON COLUMN "PRESSURE_TASK_ORDER"."ISSUE_URL" IS '出具报告文件地址';
+COMMENT ON COLUMN "PRESSURE_TASK_ORDER"."ISSUE_URL" IS '出具报告文件地址';
+
+ALTER TABLE "PRESSURE2_APPOINTMENT_CONFIRM_ORDER_REFUSE_ITEM" ADD COLUMN "CHECK_TYPE_NAME" VARCHAR(50);
+COMMENT ON COLUMN "PRESSURE2_APPOINTMENT_CONFIRM_ORDER_REFUSE_ITEM"."CHECK_TYPE_NAME" IS '检验类型文本';
+
+ALTER TABLE "PRESSURE2_APPOINTMENT_CONFIRM_REFUSE_YEAR_ITEM" ADD COLUMN "CHECK_TYPE_NAME" VARCHAR(50);
+COMMENT ON COLUMN "PRESSURE2_APPOINTMENT_CONFIRM_REFUSE_YEAR_ITEM"."CHECK_TYPE_NAME" IS '检验类型文本';
+
+ALTER TABLE "PRESSURE2_APPOINTMENT_CONFIRM_ORDER_REFUSE_ITEM" ADD COLUMN "EQUIP_STATUS_NAME" VARCHAR(32);
+COMMENT ON COLUMN "PRESSURE2_APPOINTMENT_CONFIRM_REFUSE_YEAR_ITEM"."EQUIP_STATUS_NAME" IS '运行状态文本';
+
+ALTER TABLE "PRESSURE2_APPOINTMENT_CONFIRM_ORDER_REFUSE_ITEM" ADD COLUMN "EQUIP_STATUS_NAME" VARCHAR(32);
+COMMENT ON COLUMN "PRESSURE2_APPOINTMENT_CONFIRM_REFUSE_YEAR_ITEM"."EQUIP_STATUS_NAME" IS '运行状态文本';
+
+ALTER TABLE "PRESSURE2_EQUIPMENT_RETURN_RECORD" ADD COLUMN "CHECK_TYPE_NAME" VARCHAR(50);
+ALTER TABLE "PRESSURE2_EQUIPMENT_RETURN_RECORD" ADD COLUMN "EQUIP_STATUS_NAME" VARCHAR(32);
+COMMENT ON COLUMN "PRESSURE2_EQUIPMENT_RETURN_RECORD"."CHECK_TYPE_NAME" IS '检验类型文本';
+COMMENT ON COLUMN "PRESSURE2_EQUIPMENT_RETURN_RECORD"."EQUIP_STATUS_NAME" IS '运行状态文本';
+
+ALTER TABLE "PRESSURE2_REPORT_CITY_RECORD" ADD COLUMN "CHECK_TYPE_NAME" VARCHAR(50);
+ALTER TABLE "PRESSURE2_REPORT_CITY_RECORD" ADD COLUMN "EQUIP_STATUS_NAME" VARCHAR(32);
+COMMENT ON COLUMN "PRESSURE2_REPORT_CITY_RECORD"."CHECK_TYPE_NAME" IS '检验类型文本';
+COMMENT ON COLUMN "PRESSURE2_REPORT_CITY_RECORD"."EQUIP_STATUS_NAME" IS '运行状态文本';

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmorderrefuseitem/vo/AppointmentConfirmOrderRefuseItemExcelVO.java

@@ -90,4 +90,7 @@ public class AppointmentConfirmOrderRefuseItemExcelVO {
     @Schema(description = "部门名称")
     private String deptName;
 
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmorderrefuseitem/vo/AppointmentConfirmOrderRefuseItemPageReqVO.java

@@ -184,4 +184,7 @@ public class AppointmentConfirmOrderRefuseItemPageReqVO extends PageParam {
     @Schema(description = "检验性质数组(100=定期检查,200=年度检查,300=超年限检查)", example = "2")
     private List<Integer> checkTypes;
 
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmorderrefuseitem/vo/AppointmentConfirmOrderRefuseItemRespVO.java

@@ -223,4 +223,7 @@ public class AppointmentConfirmOrderRefuseItemRespVO {
 
     private Integer RefuseCheckStatus;
 
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmorderrefuseitem/vo/AppointmentConfirmOrderRefuseItemSaveReqVO.java

@@ -138,4 +138,7 @@ public class AppointmentConfirmOrderRefuseItemSaveReqVO {
     @Schema(description = "主设备类型", example = "2")
     private Integer equipMainType;
 
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmorderrefuseitem/vo/CityBureauAuditRecordRespVO.java

@@ -75,4 +75,7 @@ public class CityBureauAuditRecordRespVO {
     @Schema(description = "备注")
     private String remark;
 
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmrefuseyearitem/vo/AppointmentConfirmRefuseYearItemExportVO.java

@@ -118,4 +118,8 @@ public class AppointmentConfirmRefuseYearItemExportVO {
 
     @Schema(description = "约检联系人电话")
     private String contactPhone;
+
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmrefuseyearitem/vo/AppointmentConfirmRefuseYearItemPageReqVO.java

@@ -120,4 +120,8 @@ public class AppointmentConfirmRefuseYearItemPageReqVO extends PageParam {
     @Schema(description = "约检联系人电话")
     private String contactPhone;
 
+    private String checkTypeName;
+
+    private String equipStatusName;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmrefuseyearitem/vo/AppointmentConfirmRefuseYearItemRespVO.java

@@ -162,4 +162,8 @@ public class AppointmentConfirmRefuseYearItemRespVO {
 
     @Schema(description = "约检联系人电话")
     private String contactPhone;
+
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmrefuseyearitem/vo/AppointmentConfirmRefuseYearItemSaveReqVO.java

@@ -111,4 +111,8 @@ public class AppointmentConfirmRefuseYearItemSaveReqVO {
 
     @Schema(description = "约检联系人电话")
     private String contactPhone;
+
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equipmentreturnrecord/vo/EquipmentReturnRecordPageReqVO.java

@@ -170,4 +170,8 @@ public class EquipmentReturnRecordPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime returnTimeEnd;
 
+    private String checkTypeName;
+
+    private String equipStatusName;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equipmentreturnrecord/vo/EquipmentReturnRecordRespVO.java

@@ -193,4 +193,8 @@ public class EquipmentReturnRecordRespVO {
     @Schema(description = "设备登记区（名称）")
     private String beDistrictName;
 
+    private String checkTypeName;
+
+    private String equipStatusName;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equipmentreturnrecord/vo/EquipmentReturnRecordSaveReqVO.java

@@ -133,4 +133,8 @@ public class EquipmentReturnRecordSaveReqVO {
     @Schema(description = "设备主类型", example = "1")
     private Integer equipMainType;
 
+    private String checkTypeName;
+
+    private String equipStatusName;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/reportcityrecord/vo/ReportCityRecordPageReqVO.java

@@ -175,4 +175,7 @@ public class ReportCityRecordPageReqVO extends PageParam {
     @Schema(description = "设备类型", example = "1")
     private Integer equipMainType;
 
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/reportcityrecord/vo/ReportCityRecordRespVO.java

@@ -222,4 +222,7 @@ public class ReportCityRecordRespVO {
     @ExcelProperty("设备类型")
     private Integer equipMainType;
 
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/reportcityrecord/vo/ReportCityRecordSaveReqVO.java

@@ -166,4 +166,7 @@ public class ReportCityRecordSaveReqVO {
     @Schema(description = "设备类型", example = "1")
     private Integer equipMainType;
 
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/appointmentconfirmorderrefuseitem/AppointmentConfirmOrderRefuseItemDO.java

@@ -204,4 +204,8 @@ public class AppointmentConfirmOrderRefuseItemDO extends BaseDO {
      * 下次检验日期
      */
     private LocalDate nextCheckDate;
+
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/appointmentconfirmrefuseyearitem/AppointmentConfirmRefuseYearItemDO.java

@@ -159,4 +159,8 @@ public class AppointmentConfirmRefuseYearItemDO extends BaseDO {
      * 约检联系人电话
      */
     private String contactPhone;
+
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/equipmentreturnrecord/EquipmentReturnRecordDO.java

@@ -184,4 +184,8 @@ public class EquipmentReturnRecordDO extends BaseDO {
      */
     private LocalDate nextCheckDate;
 
+    private String checkTypeName;
+
+    private String equipStatusName;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/reportcityrecord/ReportCityRecordDO.java

@@ -231,4 +231,7 @@ public class ReportCityRecordDO extends BaseDO {
      */
     private Integer equipMainType;
 
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/appointmentconfirmorderrefuseitem/AppointmentConfirmOrderRefuseItemMapper.java

@@ -113,6 +113,8 @@ public interface AppointmentConfirmOrderRefuseItemMapper extends BaseMapperX<App
                 .eqIfPresent(AppointmentConfirmOrderRefuseItemDO::getMainReportId, reqVO.getMainReportId())
                 .eqIfPresent(AppointmentConfirmOrderRefuseItemDO::getMainTaskStatus, reqVO.getMainTaskStatus())
                 .eqIfPresent(AppointmentConfirmOrderRefuseItemDO::getEquipMainType, reqVO.getEquipMainType())
+                .eqIfPresent(AppointmentConfirmOrderRefuseItemDO::getCheckTypeName, reqVO.getCheckTypeName())
+                .eqIfPresent(AppointmentConfirmOrderRefuseItemDO::getEquipStatusName, reqVO.getEquipStatusName())
                 .likeIfPresent(AppointmentConfirmOrderRefuseItemDO::getUseRegisterNo,reqVO.getUseRegisterNo())
                 .orderByDesc(AppointmentConfirmOrderRefuseItemDO::getSubmitTime);
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/appointmentconfirmrefuseyearitem/AppointmentConfirmRefuseYearItemMapper.java

@@ -96,6 +96,8 @@ public interface AppointmentConfirmRefuseYearItemMapper extends BaseMapperX<Appo
                 .eqIfPresent(AppointmentConfirmRefuseYearItemDO::getBeDistrict, reqVO.getBeDistrict())
                 .eqIfPresent(AppointmentConfirmRefuseYearItemDO::getEquipType, reqVO.getEquipType())
                 .eqIfPresent(AppointmentConfirmRefuseYearItemDO::getEquipMainType, reqVO.getEquipMainType())
+                .eqIfPresent(AppointmentConfirmRefuseYearItemDO::getCheckTypeName, reqVO.getCheckTypeName())
+                .eqIfPresent(AppointmentConfirmRefuseYearItemDO::getEquipStatusName, reqVO.getEquipStatusName())
                 .orderByDesc(AppointmentConfirmRefuseYearItemDO::getCreateTime);
 
         return selectJoinPage(reqVO,AppointmentConfirmRefuseYearItemRespVO.class,recordDOMPJLambdaWrapper);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/acceptorder/AcceptOrderServiceImpl.java

@@ -57,6 +57,8 @@ import cn.start.tz.module.pressure2.service.equipboiler.EquipBoilerService;
 import cn.start.tz.module.pressure2.service.orderreport.OrderReportService;
 import cn.start.tz.module.system.api.dept.DeptApi;
 import cn.start.tz.module.system.api.dept.dto.DeptRespDTO;
+import cn.start.tz.module.system.api.dict.DictDataApi;
+import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson.JSONObject;
@@ -135,6 +137,9 @@ public class AcceptOrderServiceImpl implements AcceptOrderService {
     @Resource
     private RedisService redisService;
 
+    @Resource
+    private DictDataApi dictDataApi;
+
     @Resource
     private BoilerTaskOrderService taskOrderService;
 
@@ -375,6 +380,8 @@ public class AcceptOrderServiceImpl implements AcceptOrderService {
             throw new ServiceException(404,"受理单不存在");
         }
 
+        List<DictDataRespDTO> checkTypeDTOS = dictDataApi.getDictDataList("pressure_inspection_nature_boiler").getData();
+        List<DictDataRespDTO> boilerStatusDTOS = dictDataApi.getDictDataList("system_equip_boiler_status").getData();
         List<AppointmentConfirmOrderRefuseItemDO> list = equipContainerDOS.stream().map(item -> {
             AppointmentConfirmOrderRefuseItemDO appointmentConfirmOrderRefuseItemDO = new AppointmentConfirmOrderRefuseItemDO();
             appointmentConfirmOrderRefuseItemDO.setOrderId(appointmentRefuseVO.getOrderId());
@@ -388,6 +395,15 @@ public class AcceptOrderServiceImpl implements AcceptOrderService {
             appointmentConfirmOrderRefuseItemDO.setOrderNo(acceptOrderDO.getAcceptNo());
 
             appointmentConfirmOrderRefuseItemDO.setCheckType(100); //锅炉的都是定检
+            Integer checkType = acceptOrderDO.getCheckType();
+            if (CollUtil.isNotEmpty(checkTypeDTOS)){
+                String checkTypeName = checkTypeDTOS.stream()
+                        .filter(dict -> dict.getValue().equals(checkType.toString()))
+                        .map(DictDataRespDTO::getLabel)
+                        .findFirst()
+                        .orElse("");
+                appointmentConfirmOrderRefuseItemDO.setCheckTypeName(checkTypeName);
+            }
             appointmentConfirmOrderRefuseItemDO.setNextCheckDate(acceptOrderDO.getAppointmentDate());
             appointmentConfirmOrderRefuseItemDO.setEquipMainType(200); //锅炉
             appointmentConfirmOrderRefuseItemDO.setRejectionSource(1); //窗口拒检
@@ -405,6 +421,14 @@ public class AcceptOrderServiceImpl implements AcceptOrderService {
                 appointmentConfirmOrderRefuseItemDO.setUseRegisterNo(equipBoilerDO.getUseRegisterNo());
                 appointmentConfirmOrderRefuseItemDO.setProductNo(equipBoilerDO.getProductCode());
                 appointmentConfirmOrderRefuseItemDO.setEquipStatus(equipBoilerDO.getStatus());
+                if (CollUtil.isNotEmpty(boilerStatusDTOS)){
+                    String equipStatusName = boilerStatusDTOS.stream()
+                            .filter(dict -> dict.getValue().equals(equipBoilerDO.getStatus()))
+                            .map(DictDataRespDTO::getLabel)
+                            .findFirst()
+                            .orElse("");
+                    appointmentConfirmOrderRefuseItemDO.setEquipStatusName(equipStatusName);
+                }
                 appointmentConfirmOrderRefuseItemDO.setContact(equipBoilerDO.getContact());
                 appointmentConfirmOrderRefuseItemDO.setContactPhone(equipBoilerDO.getContactPhone());
             }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/acceptorder/PipeAcceptOrderServiceImpl.java

@@ -63,6 +63,8 @@ import cn.start.tz.module.pressure2.service.orderreport.OrderReportService;
 import cn.start.tz.module.pressure2.service.pipetaskorder.PipeTaskOrderService;
 import cn.start.tz.module.system.api.dept.DeptApi;
 import cn.start.tz.module.system.api.dept.dto.DeptRespDTO;
+import cn.start.tz.module.system.api.dict.DictDataApi;
+import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson.JSONObject;
@@ -138,6 +140,9 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
     @Resource
     private AdminUserApi adminUserApi;
 
+    @Resource
+    private DictDataApi dictDataApi;
+
     @Resource
     private RedisService redisService;
 
@@ -385,6 +390,8 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
             throw new ServiceException(404,"受理单不存在");
         }
 
+        List<DictDataRespDTO> checkTypeDTOS = dictDataApi.getDictDataList("pressure_inspection_nature_pipe").getData();
+        List<DictDataRespDTO> pipeStatusDTOS = dictDataApi.getDictDataList("PIPE_USE_STATUS").getData();
         List<AppointmentConfirmOrderRefuseItemDO> list = equipContainerDOS.stream().map(item -> {
             AppointmentConfirmOrderRefuseItemDO appointmentConfirmOrderRefuseItemDO = new AppointmentConfirmOrderRefuseItemDO();
             appointmentConfirmOrderRefuseItemDO.setOrderId(appointmentRefuseVO.getOrderId());
@@ -397,7 +404,16 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
             appointmentConfirmOrderRefuseItemDO.setCheckDate(acceptOrderDO.getAppointmentDate());
             appointmentConfirmOrderRefuseItemDO.setOrderNo(acceptOrderDO.getAcceptNo());
 
-            appointmentConfirmOrderRefuseItemDO.setCheckType(acceptOrderDO.getCheckType());
+            Integer checkType = acceptOrderDO.getCheckType();
+            if (CollUtil.isNotEmpty(checkTypeDTOS)){
+                String checkTypeName = checkTypeDTOS.stream()
+                        .filter(dict -> dict.getValue().equals(checkType.toString()))
+                        .map(DictDataRespDTO::getLabel)
+                        .findFirst()
+                        .orElse("");
+                appointmentConfirmOrderRefuseItemDO.setCheckTypeName(checkTypeName);
+            }
+            appointmentConfirmOrderRefuseItemDO.setCheckType(checkType);
             appointmentConfirmOrderRefuseItemDO.setNextCheckDate(acceptOrderDO.getAppointmentDate());
             appointmentConfirmOrderRefuseItemDO.setEquipMainType(300); //管道
             appointmentConfirmOrderRefuseItemDO.setRejectionSource(1); //窗口拒检
@@ -415,6 +431,14 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
                 appointmentConfirmOrderRefuseItemDO.setUseRegisterNo(equipPipeDO.getCertificateNo());
 //                appointmentConfirmOrderRefuseItemDO.setProductNo(equipPipeDO.getProductCode());
                 appointmentConfirmOrderRefuseItemDO.setEquipStatus(equipPipeDO.getUseStatus());
+                if (CollUtil.isNotEmpty(pipeStatusDTOS)){
+                    String equipStatusName = pipeStatusDTOS.stream()
+                            .filter(dict -> dict.getValue().equals(equipPipeDO.getUseStatus()))
+                            .map(DictDataRespDTO::getLabel)
+                            .findFirst()
+                            .orElse("");
+                    appointmentConfirmOrderRefuseItemDO.setEquipStatusName(equipStatusName);
+                }
                 appointmentConfirmOrderRefuseItemDO.setContact(equipPipeDO.getContact());
                 appointmentConfirmOrderRefuseItemDO.setContactPhone(equipPipeDO.getContactPhone());
             }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/appointmentconfirmorder/AppointmentConfirmOrderServiceImpl.java

@@ -65,6 +65,8 @@ import cn.start.tz.module.pressure2.service.membermessage.vo.SendMpMessageReqVO;
 import cn.start.tz.module.pressure2.service.orderreport.OrderReportService;
 import cn.start.tz.module.system.api.dept.DeptApi;
 import cn.start.tz.module.system.api.dept.dto.DeptRespDTO;
+import cn.start.tz.module.system.api.dict.DictDataApi;
+import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
 import cn.start.tz.module.system.api.orgcontact.OrgContactApi;
 import cn.start.tz.module.system.api.orgcontact.dto.OrgContactDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
@@ -154,6 +156,9 @@ public class AppointmentConfirmOrderServiceImpl implements AppointmentConfirmOrd
     @Resource
     private AdminUserApi adminUserApi;
 
+    @Resource
+    private DictDataApi dictDataApi;
+
     @Resource
     private OrgContactApi orgContactApi;
 
@@ -584,6 +589,9 @@ public class AppointmentConfirmOrderServiceImpl implements AppointmentConfirmOrd
         }
 
         Map<String, Object> processInstanceVariables = new HashMap<>();
+
+        List<DictDataRespDTO> checkTypeDTOS = dictDataApi.getDictDataList("pressure_inspection_nature_boiler").getData();
+        List<DictDataRespDTO> boilerStatusDTOS = dictDataApi.getDictDataList("system_equip_boiler_status").getData();
         List<AppointmentConfirmOrderRefuseItemDO> list = equipContainerDOS.stream().map(item -> {
             AppointmentConfirmOrderRefuseItemDO appointmentConfirmOrderRefuseItemDO = new AppointmentConfirmOrderRefuseItemDO();
             appointmentConfirmOrderRefuseItemDO.setOrderId(appointmentRefuseVO.getOrderId());
@@ -601,6 +609,14 @@ public class AppointmentConfirmOrderServiceImpl implements AppointmentConfirmOrd
             appointmentConfirmOrderRefuseItemDO.setUseRegisterNo(item.getUseRegisterNo());
             appointmentConfirmOrderRefuseItemDO.setProductNo(item.getProductCode());
             appointmentConfirmOrderRefuseItemDO.setEquipStatus(item.getStatus());
+            if (CollUtil.isNotEmpty(boilerStatusDTOS)){
+                String equipStatusName = boilerStatusDTOS.stream()
+                        .filter(dict -> dict.getValue().equals(item.getStatus()))
+                        .map(DictDataRespDTO::getLabel)
+                        .findFirst()
+                        .orElse("");
+                appointmentConfirmOrderRefuseItemDO.setEquipStatusName(equipStatusName);
+            }
             appointmentConfirmOrderRefuseItemDO.setContact(item.getContact());
             appointmentConfirmOrderRefuseItemDO.setContactPhone(item.getContactPhone());
 
@@ -623,6 +639,15 @@ public class AppointmentConfirmOrderServiceImpl implements AppointmentConfirmOrd
                 appointmentConfirmOrderRefuseItemDO.setOrderNo(appointmentConfirmOrderDO.getAppointmentNo());
                 appointmentConfirmOrderRefuseItemDO.setNextCheckDate(appointmentConfirmOrderDO.getAppointmentDate());
 //                appointmentConfirmOrderRefuseItemDO.setCheckType(appointmentConfirmOrderDO.getCheckType());
+                Integer checkType = appointmentConfirmOrderDO.getCheckType();
+                if (CollUtil.isNotEmpty(checkTypeDTOS)){
+                    String checkTypeName = checkTypeDTOS.stream()
+                            .filter(dict -> dict.getValue().equals(checkType.toString()))
+                            .map(DictDataRespDTO::getLabel)
+                            .findFirst()
+                            .orElse("");
+                    appointmentConfirmOrderRefuseItemDO.setCheckTypeName(checkTypeName);
+                }
             }
 
             if (appointmentRefuseVO.getType() == 100) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/appointmentconfirmorder/PipeAppointmentConfirmOrderServiceImpl.java

@@ -77,6 +77,8 @@ import cn.start.tz.module.pressure2.service.membermessage.MemberMessageRemoteSer
 import cn.start.tz.module.pressure2.service.membermessage.vo.SendMpMessageReqVO;
 import cn.start.tz.module.pressure2.service.orderreport.OrderReportService;
 import cn.start.tz.module.system.api.dept.DeptApi;
+import cn.start.tz.module.system.api.dict.DictDataApi;
+import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
 import cn.start.tz.module.system.api.orgcontact.OrgContactApi;
 import cn.start.tz.module.system.api.orgcontact.dto.OrgContactDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
@@ -196,6 +198,9 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
     @Resource
     private OrderReportService orderReportService;
 
+    @Resource
+    private DictDataApi dictDataApi;
+
     @Override
     public String create(AppointmentConfirmOrderDO appointmentConfirmOrderDO) {
 
@@ -664,6 +669,8 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
         }
 
         Map<String, Object> processInstanceVariables = new HashMap<>();
+        List<DictDataRespDTO> checkTypeDTOS = dictDataApi.getDictDataList("pressure_inspection_nature_pipe").getData();
+        List<DictDataRespDTO> pipeStatusDTOS = dictDataApi.getDictDataList("PIPE_USE_STATUS").getData();
         List<AppointmentConfirmOrderRefuseItemDO> list = equipContainerDOS.stream().map(item -> {
             AppointmentConfirmOrderRefuseItemDO appointmentConfirmOrderRefuseItemDO = new AppointmentConfirmOrderRefuseItemDO();
             appointmentConfirmOrderRefuseItemDO.setOrderId(appointmentRefuseVO.getOrderId());
@@ -678,6 +685,14 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
             appointmentConfirmOrderRefuseItemDO.setUnitName(item.getUnitName());
             appointmentConfirmOrderRefuseItemDO.setUseRegisterNo(item.getCertificateNo());
             appointmentConfirmOrderRefuseItemDO.setEquipStatus(item.getUseStatus());
+            if (CollUtil.isNotEmpty(pipeStatusDTOS)){
+                String equipStatusName = pipeStatusDTOS.stream()
+                        .filter(dict -> dict.getValue().equals(item.getUseStatus()))
+                        .map(DictDataRespDTO::getLabel)
+                        .findFirst()
+                        .orElse("");
+                appointmentConfirmOrderRefuseItemDO.setEquipStatusName(equipStatusName);
+            }
             appointmentConfirmOrderRefuseItemDO.setContact(item.getContact());
             appointmentConfirmOrderRefuseItemDO.setContactPhone(item.getContactPhone());
 
@@ -694,7 +709,16 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
                 appointmentConfirmOrderRefuseItemDO.setCheckDate(appointmentConfirmOrderDO.getAppointmentDate());
                 appointmentConfirmOrderRefuseItemDO.setOrderNo(appointmentConfirmOrderDO.getAppointmentNo());
                 appointmentConfirmOrderRefuseItemDO.setNextCheckDate(appointmentConfirmOrderDO.getAppointmentDate());
-                appointmentConfirmOrderRefuseItemDO.setCheckType(appointmentConfirmOrderDO.getCheckType());
+                Integer checkType = appointmentConfirmOrderDO.getCheckType();
+                if (CollUtil.isNotEmpty(checkTypeDTOS)){
+                    String checkTypeName = checkTypeDTOS.stream()
+                            .filter(dict -> dict.getValue().equals(checkType.toString()))
+                            .map(DictDataRespDTO::getLabel)
+                            .findFirst()
+                            .orElse("");
+                    appointmentConfirmOrderRefuseItemDO.setCheckTypeName(checkTypeName);
+                }
+                appointmentConfirmOrderRefuseItemDO.setCheckType(checkType);
             }
 
             if (appointmentRefuseVO.getType() == 100) {

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

@@ -2028,6 +2028,8 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                     .in(BoilerTaskOrderItemDO::getEquipCode, rejectEquipCodeList));
 
             List<AppointmentConfirmOrderRefuseItemDO> rejectItems = new ArrayList<>();
+            List<DictDataRespDTO> checkTypeDTOS = dictDataApi.getDictDataList("pressure_inspection_nature_boiler").getData();
+            List<DictDataRespDTO> boilerStatusDTOS = dictDataApi.getDictDataList("system_equip_boiler_status").getData();
             for (TaskOrderItemAuditUpdateVO itemAuditUpdateVO : rejectEquipList) {
                 AppointmentConfirmOrderRefuseItemDO rejectItem = new AppointmentConfirmOrderRefuseItemDO();
 
@@ -2044,11 +2046,29 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                     rejectItem.setUseRegisterNo(equipBoilerDO.getUseRegisterNo());
                     rejectItem.setProductNo(equipBoilerDO.getProductCode());
                     rejectItem.setEquipStatus(equipBoilerDO.getStatus());
+                    if (CollUtil.isNotEmpty(boilerStatusDTOS)){
+                        String equipStatusName = boilerStatusDTOS.stream()
+                                .filter(dict -> dict.getValue().equals(equipBoilerDO.getStatus()))
+                                .map(DictDataRespDTO::getLabel)
+                                .findFirst()
+                                .orElse("");
+                        rejectItem.setEquipStatusName(equipStatusName);
+                    }
                     rejectItem.setContact(equipBoilerDO.getContact());
                     rejectItem.setContactPhone(equipBoilerDO.getContactPhone());
                 }
 
                 rejectItem.setCheckType(100); //锅炉的都是定检
+                Integer checkType = taskOrderDO.getCheckType();
+                if (CollUtil.isNotEmpty(checkTypeDTOS)){
+                    String checkTypeName = checkTypeDTOS.stream()
+                            .filter(dict -> dict.getValue().equals(checkType.toString()))
+                            .map(DictDataRespDTO::getLabel)
+                            .findFirst()
+                            .orElse("");
+                    rejectItem.setCheckTypeName(checkTypeName);
+                }
+
                 rejectItem.setNextCheckDate(taskOrderDO.getCheckDate());
                 rejectItem.setEquipMainType(200);
                 rejectItem.setRejectionSource(2);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemsuspend/BoilerTaskOrderItemSuspendServiceImpl.java

@@ -25,6 +25,8 @@ import cn.start.tz.module.pressure2.service.boilertaskorder.BoilerTaskOrderServi
 import cn.start.tz.module.pressure2.service.boilertaskorderissuereport.BoilerTaskOrderIssueReportService;
 import cn.start.tz.module.pressure2.service.taskordernontaxapply.TaskOrderNonTaxApplyService;
 import cn.start.tz.module.pressure2.service.taskordernontaxapply.vo.TaskOrderNonTaxApplyCreateVO;
+import cn.start.tz.module.system.api.dict.DictDataApi;
+import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -108,6 +110,9 @@ public class BoilerTaskOrderItemSuspendServiceImpl extends ServiceImpl<BoilerTas
     @Resource
     private AdminUserApi adminUserApi;
 
+    @Resource
+    private DictDataApi dictDataApi;
+
     @Value("${spring.profiles.active}")
     private String env;
 
@@ -183,6 +188,8 @@ public class BoilerTaskOrderItemSuspendServiceImpl extends ServiceImpl<BoilerTas
 
         List<BoilerTaskOrderItemSuspendDO> taskOrderItemSuspendDOS = new ArrayList<>();
         List<AppointmentConfirmOrderRefuseItemDO> refuseItemDOList = new ArrayList<>();
+        List<DictDataRespDTO> checkTypeDTOS = dictDataApi.getDictDataList("pressure_inspection_nature_boiler").getData();
+        List<DictDataRespDTO> boilerStatusDTOS = dictDataApi.getDictDataList("system_equip_boiler_status").getData();
         for (BoilerTaskOrderItemDO taskOrderItemDO : taskOrderItemDOS) {
 
             BoilerTaskOrderItemSuspendDO taskOrderItemSuspendDO = new BoilerTaskOrderItemSuspendDO();
@@ -203,6 +210,16 @@ public class BoilerTaskOrderItemSuspendServiceImpl extends ServiceImpl<BoilerTas
             bean.setReasonDict(submitReqVO.getReasonDict());
             bean.setEquipMainType(200); //锅炉
             bean.setCheckType(100); //锅炉都是定检
+            bean.setRejectionSource(2);
+            Integer checkType = taskOrderDO.getCheckType();
+            if (CollUtil.isNotEmpty(checkTypeDTOS)){
+                String checkTypeName = checkTypeDTOS.stream()
+                        .filter(dict -> dict.getValue().equals(checkType.toString()))
+                        .map(DictDataRespDTO::getLabel)
+                        .findFirst()
+                        .orElse("");
+                bean.setCheckTypeName(checkTypeName);
+            }
             //是否上报
             if (submitReqVO.getFlag() == 1){
                 bean.setIsReportCity(true);
@@ -233,6 +250,14 @@ public class BoilerTaskOrderItemSuspendServiceImpl extends ServiceImpl<BoilerTas
                 bean.setUseRegisterNo(equipBoilerDO.getUseRegisterNo());
                 bean.setProductNo(equipBoilerDO.getProductCode());
                 bean.setEquipStatus(equipBoilerDO.getStatus());
+                if (CollUtil.isNotEmpty(boilerStatusDTOS)){
+                    String equipStatusName = boilerStatusDTOS.stream()
+                            .filter(dict -> dict.getValue().equals(equipBoilerDO.getStatus()))
+                            .map(DictDataRespDTO::getLabel)
+                            .findFirst()
+                            .orElse("");
+                    bean.setEquipStatusName(equipStatusName);
+                }
                 bean.setContact(equipBoilerDO.getContact());
                 bean.setContactPhone(equipBoilerDO.getContactPhone());
 

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

@@ -1709,6 +1709,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             }
 
             List<AppointmentConfirmOrderRefuseItemDO> rejectItems = new ArrayList<>();
+            List<DictDataRespDTO> checkTypeDTOS = dictDataApi.getDictDataList("pressure_inspection_nature_pipe").getData();
+            List<DictDataRespDTO> pipeStatusDTOS = dictDataApi.getDictDataList("PIPE_USE_STATUS").getData();
             for (PipeTaskOrderItemAuditUpdateVO itemAuditUpdateVO : rejectEquipList) {
                 AppointmentConfirmOrderRefuseItemDO rejectItem = new AppointmentConfirmOrderRefuseItemDO();
 
@@ -1725,12 +1727,28 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                     rejectItem.setUseRegisterNo(equipContainerDO.getCertificateNo());
 //                    rejectItem.setProductNo(equipContainerDO.getProductCode());
                     rejectItem.setEquipStatus(equipContainerDO.getUseStatus());
-
+                    if (CollUtil.isNotEmpty(pipeStatusDTOS)){
+                        String equipStatusName = pipeStatusDTOS.stream()
+                                .filter(dict -> dict.getValue().equals(equipContainerDO.getUseStatus()))
+                                .map(DictDataRespDTO::getLabel)
+                                .findFirst()
+                                .orElse("");
+                        rejectItem.setEquipStatusName(equipStatusName);
+                    }
                     rejectItem.setContact(equipContainerDO.getContact());
                     rejectItem.setContactPhone(equipContainerDO.getContactPhone());
                 }
 
-                rejectItem.setCheckType(taskOrderDO.getCheckType());
+                Integer checkType = taskOrderDO.getCheckType();
+                if (CollUtil.isNotEmpty(checkTypeDTOS)){
+                    String checkTypeName = checkTypeDTOS.stream()
+                            .filter(dict -> dict.getValue().equals(checkType.toString()))
+                            .map(DictDataRespDTO::getLabel)
+                            .findFirst()
+                            .orElse("");
+                    rejectItem.setCheckTypeName(checkTypeName);
+                }
+                rejectItem.setCheckType(checkType);
                 rejectItem.setNextCheckDate(taskOrderDO.getCheckDate());
 
                 rejectItem.setEquipMainType(300); //300管道

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemsuspend/PipeTaskOrderItemSuspendServiceImpl.java

@@ -30,6 +30,8 @@ import cn.start.tz.module.pressure2.service.pipetaskorder.PipeTaskOrderService;
 import cn.start.tz.module.pressure2.service.pipetaskorderissuereport.PipeTaskOrderIssueReportService;
 import cn.start.tz.module.pressure2.service.taskordernontaxapply.TaskOrderNonTaxApplyService;
 import cn.start.tz.module.pressure2.service.taskordernontaxapply.vo.TaskOrderNonTaxApplyCreateVO;
+import cn.start.tz.module.system.api.dict.DictDataApi;
+import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -114,6 +116,9 @@ public class PipeTaskOrderItemSuspendServiceImpl extends ServiceImpl<PipeTaskOrd
     @Resource
     private PipeTaskOrderService taskOrderService;
 
+    @Resource
+    private DictDataApi dictDataApi;
+
     @Resource
     private CommonThread commonThread;
 
@@ -190,6 +195,8 @@ public class PipeTaskOrderItemSuspendServiceImpl extends ServiceImpl<PipeTaskOrd
         Map<String, List<PipeTaskOrderItemSuspendDetailReqVO>> groupedByEquipPipeIds = submitReqVO.getOrderItemDetails().stream()
                 .collect(Collectors.groupingBy(PipeTaskOrderItemSuspendDetailReqVO::getEquipPipeId));
 
+        List<DictDataRespDTO> checkTypeDTOS = dictDataApi.getDictDataList("pressure_inspection_nature_pipe").getData();
+        List<DictDataRespDTO> pipeStatusDTOS = dictDataApi.getDictDataList("PIPE_USE_STATUS").getData();
         groupedByEquipPipeIds.forEach((equipPipeId, orderItemDetails) -> {
 
             PipeTaskOrderItemDO taskOrderItemDO = taskOrderItemMapper.selectById(equipPipeId);
@@ -224,7 +231,17 @@ public class PipeTaskOrderItemSuspendServiceImpl extends ServiceImpl<PipeTaskOrd
                     bean.setOrderNo(taskOrderDO.getOrderNo());
                     bean.setReasonDict(submitReqVO.getReasonDict());
                     bean.setEquipMainType(300); //管道
-                    bean.setCheckType(taskOrderDO.getCheckType());
+                    bean.setRejectionSource(2);
+                    Integer checkType = taskOrderDO.getCheckType();
+                    if (CollUtil.isNotEmpty(checkTypeDTOS)){
+                        String checkTypeName = checkTypeDTOS.stream()
+                                .filter(dict -> dict.getValue().equals(checkType.toString()))
+                                .map(DictDataRespDTO::getLabel)
+                                .findFirst()
+                                .orElse("");
+                        bean.setCheckTypeName(checkTypeName);
+                    }
+                    bean.setCheckType(checkType);
                     //是否上报
                     if (submitReqVO.getFlag() == 1){
                         bean.setIsReportCity(true);
@@ -247,6 +264,14 @@ public class PipeTaskOrderItemSuspendServiceImpl extends ServiceImpl<PipeTaskOrd
                         bean.setEquipId(equipPipeDetailDO.getId());
                         bean.setEquipCode(equipPipeDetailDO.getProjectNo());
                         bean.setEquipStatus(equipPipeDetailDO.getUseStatus());
+                        if (CollUtil.isNotEmpty(pipeStatusDTOS)){
+                            String equipStatusName = pipeStatusDTOS.stream()
+                                    .filter(dict -> dict.getValue().equals(equipPipeDO.getUseStatus()))
+                                    .map(DictDataRespDTO::getLabel)
+                                    .findFirst()
+                                    .orElse("");
+                            bean.setEquipStatusName(equipStatusName);
+                        }
                         bean.setUseRegisterNo(equipPipeDetailDO.getCertificateNo());
 
                         bean.setEquipDistrict(equipPipeDO.getEquipDistrict());