拒检查询导出调整

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

@@ -1,8 +1,11 @@
 package cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorderrefuseitem;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmrefuseyearitem.vo.AppointmentConfirmRefuseLegalItemExportVO;
 import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmrefuseyearitem.vo.AppointmentConfirmRefuseYearItemExportVO;
 import cn.start.tz.module.pressure2.controller.admin.acceptorder.vo.AcceptOrderCancelVO;
+import cn.start.tz.module.system.api.dict.DictDataApi;
+import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
@@ -43,6 +46,9 @@ public class AppointmentConfirmOrderRefuseItemController {
     @Resource
     private AppointmentConfirmOrderRefuseItemService appointmentConfirmOrderRefuseItemService;
 
+    @Resource
+    private DictDataApi dictDataApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建约检确认单拒绝设备项目")
 //    @PreAuthorize("@ss.hasPermission('pressure2:appointment-confirm-order-refuse-item:create')")
@@ -237,8 +243,9 @@ public class AppointmentConfirmOrderRefuseItemController {
         PageResult<AppointmentConfirmOrderRefuseItemRespVO> pageResult = appointmentConfirmOrderRefuseItemService.getAppointmentConfirmOrderRefuseItemPage(pageReqVO);
 
         // 转换为导出VO并处理字段格式
-        List<AppointmentConfirmRefuseYearItemExportVO> exportList = BeanUtils.toBean(pageResult.getList(), AppointmentConfirmRefuseYearItemExportVO.class);
+        List<AppointmentConfirmRefuseLegalItemExportVO> exportList = BeanUtils.toBean(pageResult.getList(), AppointmentConfirmRefuseLegalItemExportVO.class);
 
+        List<DictDataRespDTO> mainTypeList = dictDataApi.getDictDataList("pressure2_equip_main_type").getData();
         // 处理字典值转换
         exportList.forEach(item -> {
             if (ObjectUtil.isNotEmpty(item.getSubmitUser())) {
@@ -248,6 +255,12 @@ public class AppointmentConfirmOrderRefuseItemController {
             // 处理检验性质
             item.setCheckTypeStr(item.getCheckTypeName());
 
+            //设备类型
+            if (item.getEquipMainType() != null) {
+                mainTypeList.stream().filter(mainType -> mainType.getValue().equals(item.getEquipMainType())).findFirst()
+                        .ifPresent(mainTypeDTO -> item.setEquipMainTypeName(mainTypeDTO.getLabel()));
+            }
+
             // 处理拒绝定检状态
             if (item.getRefuseCheckStatus() != null) {
                 switch (item.getRefuseCheckStatus()) {
@@ -277,9 +290,6 @@ public class AppointmentConfirmOrderRefuseItemController {
                 }
             }
 
-            // 处理运行状态
-            item.setEquipStatusStr(item.getEquipStatusName());
-
             // 处理拒检原因
             if (item.getReasonDict() != null) {
                 switch (item.getReasonDict()) {
@@ -316,7 +326,7 @@ public class AppointmentConfirmOrderRefuseItemController {
         });
 
         // 导出Excel
-        ExcelUtils.write(response, "约检确认单拒绝设备项目数据.xls", "数据", AppointmentConfirmRefuseYearItemExportVO.class, exportList);
+        ExcelUtils.write(response, "约检确认单拒绝设备项目数据.xls", "数据", AppointmentConfirmRefuseLegalItemExportVO.class, exportList);
     }
 
 }

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

@@ -221,7 +221,7 @@ public class AppointmentConfirmOrderRefuseItemRespVO {
     @Schema(description = "设备使用注册号")
     private String useRegisterNo;
 
-    private Integer RefuseCheckStatus;
+    private Integer refuseCheckStatus;
 
     private String checkTypeName;
 

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

@@ -4,6 +4,8 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmrefuseyearitem.vo.AppointmentConfirmRefuseYearItemExportVO;
 import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorderrefuseitem.vo.AppointmentConfirmOrderRefuseItemPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorderrefuseitem.vo.AppointmentConfirmOrderRefuseItemRespVO;
+import cn.start.tz.module.system.api.dict.DictDataApi;
+import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -42,6 +44,9 @@ public class AppointmentConfirmRefuseYearItemController {
     @Resource
     private AppointmentConfirmRefuseYearItemService appointmentConfirmRefuseYearItemService;
 
+    @Resource
+    private DictDataApi dictDataApi;
+
     @PostMapping("/create")
     @Operation(summary = "提交拒绝年检设备")
     public CommonResult<String> createAppointmentConfirmRefuseYearItem(@Valid @RequestBody YearCheckIdVO yearCheckIdVO) {
@@ -147,6 +152,7 @@ public class AppointmentConfirmRefuseYearItemController {
         // 转换为导出VO并处理字段格式
         List<AppointmentConfirmRefuseYearItemExportVO> exportList = BeanUtils.toBean(list, AppointmentConfirmRefuseYearItemExportVO.class);
 
+        List<DictDataRespDTO> mainTypeList = dictDataApi.getDictDataList("pressure2_equip_main_type").getData();
         // 处理字典值转换
         exportList.forEach(item -> {
             if (ObjectUtil.isNotEmpty(item.getSubmitUser())) {
@@ -154,14 +160,12 @@ public class AppointmentConfirmRefuseYearItemController {
             }
 
             // 处理检验性质
-            if (item.getCheckType() != null) {
-                if (item.getCheckType() == 100) {
-                    item.setCheckTypeStr("定期检验");
-                } else if (item.getCheckType() == 200) {
-                    item.setCheckTypeStr("年度检查");
-                } else if (item.getCheckType() == 300) {
-                    item.setCheckTypeStr("超年限检验");
-                }
+            item.setCheckTypeStr(item.getCheckTypeName());
+
+            //设备类型
+            if (item.getEquipMainType() != null) {
+                mainTypeList.stream().filter(mainType -> mainType.getValue().equals(item.getEquipMainType())).findFirst()
+                        .ifPresent(mainTypeDTO -> item.setEquipMainTypeName(mainTypeDTO.getLabel()));
             }
 
             // 处理状态
@@ -175,17 +179,6 @@ public class AppointmentConfirmRefuseYearItemController {
                 item.setProcessStatusStr("拒绝年检");
             }
 
-            // 处理运行状态
-            if (item.getEquipStatus() != null) {
-                if (item.getEquipStatus() == 100) {
-                    item.setEquipStatusStr("在用");
-                } else if (item.getEquipStatus() == 200) {
-                    item.setEquipStatusStr("停运");
-                } else if (item.getEquipStatus() == 300) {
-                    item.setEquipStatusStr("注销");
-                }
-            }
-
             // 处理拒检原因
             if (item.getReasonDict() != null) {
                 switch (item.getReasonDict()) {

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

@@ -0,0 +1,120 @@
+package cn.start.tz.module.pressure2.controller.admin.appointmentconfirmrefuseyearitem.vo;
+
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 拒绝年检设备导出 Excel VO")
+@Data
+@ExcelIgnoreUnannotated
+public class AppointmentConfirmRefuseLegalItemExportVO {
+
+
+    @Schema(description = "使用单位")
+    @ExcelProperty(value = "单位名称")
+    @ColumnWidth(30)
+    private String unitName;
+
+    @Schema(description = "设备注册代码")
+    @ExcelProperty(value = "设备注册代码")
+    @ColumnWidth(20)
+    private String equipCode;
+
+    @Schema(description = "设备类型")
+    private String equipMainType;
+
+    @Schema(description = "设备类型")
+    @ExcelProperty(value = "设备类型")
+    @ColumnWidth(20)
+    private String equipMainTypeName;
+
+    @Schema(description = "检验性质(100=定期检验,200=年度检查,300=超年限检验)")
+    @ExcelProperty(value = "检验性质")
+    @ColumnWidth(15)
+    private String checkTypeStr;
+
+    @Schema(description = "区域")
+    @ExcelProperty(value = "区域")
+    @ColumnWidth(15)
+    private String equipDistrictName;
+
+    @Schema(description = "使用证编号")
+    @ExcelProperty(value = "使用证编号")
+    @ColumnWidth(20)
+    private String useRegisterNo;
+
+    @Schema(description = "拒绝定检状态(1=待处理,2=无需处理,3=审核中,4=审核已拒绝,5=已作废,6=待上报,7=已上报)")
+    @ExcelProperty(value = "拒绝定检状态")
+    @ColumnWidth(15)
+    private String refuseCheckStatusStr;
+
+    @Schema(description = "拒绝来源(1=窗口拒检,2=检验员拒检,3=客户拒检)")
+    @ExcelProperty(value = "拒绝来源")
+    @ColumnWidth(15)
+    private String rejectionSourceStr;
+
+    @Schema(description = "下次检验日期")
+    @ExcelProperty(value = "下次检验日期")
+    @ColumnWidth(15)
+    private LocalDate nextCheckDate;
+
+    @Schema(description = "拒检原因")
+    @ExcelProperty(value = "拒检原因")
+    @ColumnWidth(15)
+    private String reasonDictStr;
+
+    @Schema(description = "拒检说明")
+    @ExcelProperty(value = "说明")
+    @ColumnWidth(30)
+    private String reason;
+
+    @Schema(description = "提交人")
+    @ExcelProperty(value = "提交人")
+    @ColumnWidth(15)
+    private String submitUserName;
+
+    @Schema(description = "提交时间")
+    @ExcelProperty(value = "提交时间")
+    @ColumnWidth(20)
+    private LocalDateTime submitTime;
+
+    @Schema(description = "检验类型")
+    private Integer checkType;
+
+    @Schema(description = "处理状态(0=待处理,1=无需处理)")
+    private Integer processStatus;
+
+    @Schema(description = "运行状态(100=在用,200=停运,300=注销)")
+    private Integer equipStatus;
+
+    @Schema(description = "拒绝原因字典")
+    private String reasonDict;
+
+    @Schema(description = "拒绝定检状态(1=待处理,2=无需处理,3=审核中,4=审核已拒绝,5=已作废,6=待上报,7=已上报)")
+    private Integer refuseCheckStatus;
+
+    @Schema(description = "场景值（0=拒绝年检设备，1=拒绝约检）")
+    private Integer scene;
+
+    @Schema(description = "提交人")
+    private AdminUserRespDTO submitUser;
+
+    @Schema(description = "拒绝来源(1=窗口拒检,2=检验员拒检,3=客户拒检)")
+    private Integer rejectionSource;
+
+    @Schema(description = "约检联系人")
+    private String contact;
+
+    @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/AppointmentConfirmRefuseYearItemExportVO.java

@@ -15,54 +15,48 @@ import java.time.LocalDateTime;
 @ExcelIgnoreUnannotated
 public class AppointmentConfirmRefuseYearItemExportVO {
 
-    @Schema(description = "设备注册代码")
-    @ExcelProperty(value = "设备注册代码")
-    @ColumnWidth(20)
-    private String equipCode;
-
-    @Schema(description = "产品编号")
-    @ExcelProperty(value = "产品编号")
-    @ColumnWidth(20)
-    private String productNo;
 
     @Schema(description = "使用单位")
-    @ExcelProperty(value = "使用单位")
+    @ExcelProperty(value = "单位名称")
     @ColumnWidth(30)
     private String unitName;
 
-    @Schema(description = "使用证编号")
-    @ExcelProperty(value = "使用证编号")
+    @Schema(description = "设备注册代码")
+    @ExcelProperty(value = "设备注册代码")
     @ColumnWidth(20)
-    private String useRegisterNo;
+    private String equipCode;
 
-    @Schema(description = "区域")
-    @ExcelProperty(value = "区域")
-    @ColumnWidth(15)
-    private String equipDistrictName;
+    @Schema(description = "设备类型")
+    private String equipMainType;
+
+    @Schema(description = "设备类型")
+    @ExcelProperty(value = "设备类型")
+    @ColumnWidth(20)
+    private String equipMainTypeName;
 
     @Schema(description = "检验性质(100=定期检验,200=年度检查,300=超年限检验)")
     @ExcelProperty(value = "检验性质")
     @ColumnWidth(15)
     private String checkTypeStr;
 
-    @Schema(description = "拒绝来源(1=窗口拒检,2=检验员拒检,3=客户拒检)")
-    @ExcelProperty(value = "拒绝来源")
+    @Schema(description = "区域")
+    @ExcelProperty(value = "区域")
     @ColumnWidth(15)
-    private String rejectionSourceStr;
+    private String equipDistrictName;
+
+    @Schema(description = "使用证编号")
+    @ExcelProperty(value = "使用证编号")
+    @ColumnWidth(20)
+    private String useRegisterNo;
 
     @ExcelProperty(value = "拒绝年检状态")
-    @ColumnWidth(12)
+    @ColumnWidth(15)
     private String processStatusStr;
 
-    @Schema(description = "拒绝定检状态(1=待处理,2=无需处理,3=审核中,4=审核已拒绝,5=已作废,6=待上报,7=已上报)")
-    @ExcelProperty(value = "拒绝定检状态")
+    @Schema(description = "拒绝来源(1=窗口拒检,2=检验员拒检,3=客户拒检)")
+    @ExcelProperty(value = "拒绝来源")
     @ColumnWidth(15)
-    private String refuseCheckStatusStr;
-
-    @Schema(description = "运行状态(100=在用,200=停运,300=注销)")
-    @ExcelProperty(value = "运行状态")
-    @ColumnWidth(12)
-    private String equipStatusStr;
+    private String rejectionSourceStr;
 
     @Schema(description = "下次检验日期")
     @ExcelProperty(value = "下次检验日期")