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

tz-module-member/tz-module-member-biz/src/main/java/cn/start/tz/module/member/api/user/MemberUserApiImpl.java

@@ -129,6 +129,7 @@ public class MemberUserApiImpl implements MemberUserApi {
 //            msgId = userService.sendMpMessage(reqVO.getMemberId(), reqVO.getTemplateId(), wxMpTemplateDataList, bean);
             SendMpMessageReqVO reqVO1 = new SendMpMessageReqVO();
             reqVO1.setMemberId(reqVO.getMemberId());
+            reqVO1.setTemplateId(reqVO.getTemplateId());
             reqVO1.setBusinessId(reqVO.getBusinessId());
             reqVO1.setBusinessType(reqVO.getBusinessType());
             List<SendMpMessageReqVO.TemplateData> list = new ArrayList<>();

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 = "下次检验日期")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/planscheduling/vo/EquipBoilerPageRespVO.java

@@ -3,6 +3,7 @@ package cn.start.tz.module.pressure2.controller.admin.planscheduling.vo;
 import cn.start.tz.framework.excel.core.annotations.DictFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -84,18 +85,22 @@ public class EquipBoilerPageRespVO {
 
     @Schema(description = "使用单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "广丰陶瓷厂")
     @ExcelProperty("使用单位")
+    @ColumnWidth(25)
     private String unitName;
 
     @Schema(description = "区域", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("区域")
+    @ColumnWidth(10)
     private String equipDistrictName;
 
     @Schema(description = "联系人")
     @ExcelProperty("联系人")
+    @ColumnWidth(15)
     private String contact;
 
     @Schema(description = "联系人电话")
     @ExcelProperty("联系人电话")
+    @ColumnWidth(15)
     private String contactPhone;
 
     @Schema(description = "检验性质(100=定检,200=年检,300=超年限)", example = "2")
@@ -103,6 +108,7 @@ public class EquipBoilerPageRespVO {
 
     @Schema(description = "检验性质中文")
     @ExcelProperty("检验性质")
+    @ColumnWidth(15)
     private String checkTypeStr;
 
     @Schema(description = "是否存在待处理的约检确认单")
@@ -114,27 +120,33 @@ public class EquipBoilerPageRespVO {
 
     @Schema(description = "检验日期")
     @ExcelProperty("检验日期")
+    @ColumnWidth(15)
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate nextCheckDate;
 
     @Schema(description = "部门名称")
     @ExcelProperty("部门名称")
+    @ColumnWidth(15)
     private String deptName;
 
     @Schema(description = "设备注册代码", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("设备注册代码")
+    @ColumnWidth(15)
     private String equipCode;
 
     @Schema(description = "产品编号")
     @ExcelProperty("产品编号")
+    @ColumnWidth(15)
     private String productNo;
 
     @Schema(description = "使用证编号")
     @ExcelProperty("使用证编号")
+    @ColumnWidth(15)
     private String useRegisterNo;
 
     @Schema(description = "锅炉名称")
     @ExcelProperty("锅炉名称")
+    @ColumnWidth(15)
     private String equipName;
 
     @Schema(description = "容积")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/planscheduling/vo/EquipPipePageRespVO.java

@@ -3,6 +3,7 @@ package cn.start.tz.module.pressure2.controller.admin.planscheduling.vo;
 import cn.start.tz.framework.excel.core.annotations.DictFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -84,18 +85,22 @@ public class EquipPipePageRespVO {
 
     @Schema(description = "使用单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "广丰陶瓷厂")
     @ExcelProperty("使用单位")
+    @ColumnWidth(20)
     private String unitName;
 
     @Schema(description = "区域", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("区域")
+    @ColumnWidth(10)
     private String equipDistrictName;
 
     @Schema(description = "联系人")
     @ExcelProperty("联系人")
+    @ColumnWidth(15)
     private String contact;
 
     @Schema(description = "联系人电话")
     @ExcelProperty("联系人电话")
+    @ColumnWidth(15)
     private String contactPhone;
 
     @Schema(description = "检验性质(100=定检,200=年检,300=超年限)", example = "2")
@@ -103,6 +108,7 @@ public class EquipPipePageRespVO {
 
     @Schema(description = "检验性质中文")
     @ExcelProperty("检验性质")
+    @ColumnWidth(15)
     private String checkTypeStr;
 
     @Schema(description = "是否存在待处理的约检确认单")
@@ -114,15 +120,18 @@ public class EquipPipePageRespVO {
 
     @Schema(description = "检验日期")
     @ExcelProperty("检验日期")
+    @ColumnWidth(15)
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate nextCheckDate;
 
     @Schema(description = "部门名称")
     @ExcelProperty("部门名称")
+    @ColumnWidth(15)
     private String deptName;
 
     @Schema(description = "工程号", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("工程号")
+    @ColumnWidth(15)
     private String equipCode;
 
     @Schema(description = "产品编号")
@@ -130,10 +139,12 @@ public class EquipPipePageRespVO {
 
     @Schema(description = "使用证编号")
     @ExcelProperty("使用证编号")
+    @ColumnWidth(15)
     private String useRegisterNo;
 
     @Schema(description = "工程名称")
     @ExcelProperty("工程名称")
+    @ColumnWidth(15)
     private String equipName;
 
     @Schema(description = "容积")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/taskordernontaxrecord/vo/TaskOrderNonTaxRecordRespVO.java

@@ -21,32 +21,60 @@ public class TaskOrderNonTaxRecordRespVO {
     @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8583")
     private String id;
 
+    @Schema(description = "任务单号（导出用）")
+    @ExcelProperty("任务单号")
+    private String orderNosStr;
+
     @Schema
     @ExcelProperty("开单人")
     private String handledByName;
 
     @Schema(description = "开单日期")
-    @ExcelProperty("开单时间")
+    @ExcelProperty("开单日期")
     private LocalDateTime openDate;
 
+    @Schema(description = "缴费金额")
+    @ExcelProperty("任务单金额")
+    private BigDecimal totalAmount;
+
+    @Schema(description = "实际金额")
+    @ExcelProperty("拆单金额")
+    private BigDecimal actualAmount;
+
     @Schema(description = "付款人")
     @ExcelProperty("缴费单位（个人）")
     private String payer;
 
+    @Schema(description = "设备类型名称")
+    @ExcelProperty("设备类型")
+    private String equipMainTypeName;
+
+    @Schema(description = "缴费通知书")
+    @ExcelProperty("缴费通知书")
+    private String paymentInstructionNo;
+
+    @Schema(description = "付款状态名称")
+    @ExcelProperty("缴费单状态")
+    private String payStatusName;
+
+    @Schema(description = "单位名称", example = "张三")
+    @ExcelProperty("缴费单位")
+    private String unitName;
+
+    @Schema(description = "付款日期")
+    @ExcelProperty("收款日期")
+    private LocalDateTime payDate;
+
+    @Schema(description = "票据编号")
+    @ExcelProperty("财政票据号")
+    private String billNumber;
+
     @Schema(description = "联系电话")
     private String contactPhone;
 
     @Schema(description = "联系人邮箱")
     private String email;
 
-    @Schema(description = "缴费金额")
-    @ExcelProperty("缴费金额")
-    private BigDecimal totalAmount;
-
-    @Schema(description = "实际金额")
-    @ExcelProperty("实际金额")
-    private BigDecimal actualAmount;
-
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
@@ -80,10 +108,6 @@ public class TaskOrderNonTaxRecordRespVO {
     @Schema(description = "付款状态 100 待缴费 200 已缴费  300 已作废", example = "2")
     private Integer payStatus;
 
-    @Schema(description = "付款状态名称")
-    @ExcelProperty("付款状态")
-    private String payStatusName;
-
     /**
      * 设置付款状态时，自动更新付款状态名称
      */
@@ -111,26 +135,12 @@ public class TaskOrderNonTaxRecordRespVO {
         }
     }
 
-    @Schema(description = "缴费通知书")
-    @ExcelProperty("缴费通知书")
-    private String paymentInstructionNo;
-
     @Schema(description = "任务单号列表")
     private List<String> orderNos;
 
-    @Schema(description = "任务单号（导出用）")
-    @ExcelProperty("任务单号")
-    private String orderNosStr;
-
     @Schema(description = "部门", example = "25182")
     private String deptId;
 
-    @Schema(description = "付款日期")
-    private LocalDateTime payDate;
-
-    @Schema(description = "票据编号")
-    private String billNumber;
-
     @Schema(description = "缴费通知书")
     private String paymentInstruction;
 
@@ -140,19 +150,12 @@ public class TaskOrderNonTaxRecordRespVO {
     @Schema(description = "检验日期")
     private LocalDate checkDate;
 
-    @Schema(description = "单位名称", example = "张三")
-    private String unitName;
-
     @Schema(description = "使用单位名称", example = "张三")
     private String useUnitName;
 
     @Schema(description = "设备类型 200锅炉 300管道", example = "1")
     private Integer equipMainType;
 
-    @Schema(description = "设备类型名称")
-    @ExcelProperty("设备类型")
-    private String equipMainTypeName;
-
     /**
      * 设置设备类型时，自动更新设备类型名称
      */

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/appointmentconfirmorder/PipeAppointmentConfirmOrderAppController.java

@@ -121,7 +121,7 @@ public class PipeAppointmentConfirmOrderAppController {
         }
         pageReqVO.setUnitPhone(mobile);
         pageReqVO.setEquipMainType(300);
-        return success(appointmentConfirmOrderService.getAppointmentConfirmOrderPage(pageReqVO));
+        return success(appointmentConfirmOrderService.getAppointmentConfirmOrderPageApp(pageReqVO));
     }
 
 }

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

@@ -1114,12 +1114,13 @@ public class AppointmentConfirmOrderServiceImpl implements AppointmentConfirmOrd
 
             // if(sendTemplateMessageVO.getPage()){
             SendMpMessageReqVO.MiniProgram mini = new SendMpMessageReqVO.MiniProgram();
-            mini.setPagePath(String.format("pages/boiler/appointment-confirm/index?id=%s", sendTemplateMessageVO.getId()));
-            mini.setUsePath(true);
+//            mini.setPagePath(String.format("pages/boiler/appointment-confirm/index?id=%s", sendTemplateMessageVO.getId()));
+//            mini.setUsePath(true);
+//            mini.setAppid("wxf88e2dba767bb5d6");
             param.setMiniProgram(mini);
             //}
             param.setBusinessId(appointmentConfirmOrderDO.getId());
-            param.setBusinessType(0);
+            param.setBusinessType(200);
             memberMessageRemoteService.sendMpMessage(param);
         });
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12116_202400RecordOFData.java

@@ -83,6 +83,9 @@ public class QC12116_202400RecordOFData implements IDynamicOFData {
 
         if (itemReportDO != null){
 
+            //一览表生成时先删除所有值，防止设备不对
+            dynamicTbValService.deleteDynamicTbValByRefId(refId);
+
             PipeTaskOrderItemDO itemDO = pipeTaskOrderItemMapper.selectById(orderItemId);
             if (itemDO != null){
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamictbval/DynamicTbValService.java

@@ -60,4 +60,6 @@ public interface DynamicTbValService extends IService<DynamicTbValDO>  {
     List<DynamicTbValDO> getDynamicTbValByRefId(String refId);
 
     DynamicTBAndColVO getDynamicTbInsAndValByRefId(DynamicTBViewOrAddVO tbViewOrAddVO);
+
+    void deleteDynamicTbValByRefId(String refId);
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamictbval/DynamicTbValServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.start.tz.module.pressure2.service.dynamictbval;
 
 import cn.hutool.core.util.StrUtil;
+import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.start.tz.module.pressure2.controller.admin.dynamictb.vo.DynamicTbRespVO;
 import cn.start.tz.module.pressure2.controller.admin.dynamictbcol.vo.DynamicTbColRespVO;
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
@@ -10,6 +11,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.dynamictbcol.DynamicTbColDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbins.DynamicTbInsDO;
 import cn.start.tz.module.pressure2.dal.mysql.dynamictb.DynamicTbMapper;
 import cn.start.tz.module.pressure2.dal.mysql.dynamictbcol.DynamicTbColMapper;
+import cn.start.tz.module.pressure2.dal.mysql.dynamictbins.DynamicTbInsMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamictbins.DynamicTbInsService;
 import cn.start.tz.module.pressure2.util.OFDataUtils;
@@ -59,6 +61,10 @@ public class DynamicTbValServiceImpl extends ServiceImpl<DynamicTbValMapper, Dyn
 
     @Resource
     private DynamicTbMapper dynamicTbMapper;
+
+    @Resource
+    private DynamicTbInsMapper dynamicTbInsMapper;
+
     @Autowired
     OFDataUtils ofDataUtils;
 
@@ -191,6 +197,15 @@ public class DynamicTbValServiceImpl extends ServiceImpl<DynamicTbValMapper, Dyn
                 .orElse(Collections.emptyList());
     }
 
+    @Override
+    public void deleteDynamicTbValByRefId(String refId) {
+        DynamicTbInsDO dynamicTbInsDO = dynamicTbInsMapper.selectOne(DynamicTbInsDO::getRefId, refId);
+        if (dynamicTbInsDO != null){
+            dynamicTbValMapper.delete(new LambdaQueryWrapper<DynamicTbValDO>()
+                    .eq(DynamicTbValDO::getInsId, dynamicTbInsDO.getId()));
+        }
+    }
+
     /*@Override
     public DynamicTBAndColVO getDynamicTbInsAndValByRefId(DynamicTBViewOrAddVO tbViewOrAddVO) {
         DynamicTBAndColVO result = new DynamicTBAndColVO();

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

@@ -815,7 +815,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                                 //addReport1.setReportName(dynamicTbDO.getTbName());
                                 String baseReportName = recordReportDO.getProjectName();
                                 // 当设备数量大于 1 时，添加数量后缀
-                                if (orderItems.size() > 1 && itemIndex > 1) {
+                                if (orderItems.size() > 1) {
                                     addReport1.setReportName(baseReportName + itemIndex);
                                 } else {
                                     addReport1.setReportName(baseReportName);
@@ -1975,6 +1975,11 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         //修改金额
         this.updateOrderFee(id);
+
+        //同步报表
+        PipeTaskOrderSyncReportVO reqVO = new PipeTaskOrderSyncReportVO();
+        reqVO.setOrderId(id);
+        this.syncAllReportDataByOrderId(reqVO);
         
     }
 

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

@@ -3,6 +3,7 @@ package cn.start.tz.module.pressure2.service.pipetaskorderitemsuspend;
 import cn.hutool.core.collection.CollUtil;
 import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.start.tz.module.pressure.enums.TaskOrderStatusEnum;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderSyncReportVO;
 import cn.start.tz.module.pressure2.dal.dataobject.appointmentconfirmorderrefuseitem.AppointmentConfirmOrderRefuseItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.appointmentconfirmrefuseyearitem.AppointmentConfirmRefuseYearItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
@@ -344,6 +345,10 @@ public class PipeTaskOrderItemSuspendServiceImpl extends ServiceImpl<PipeTaskOrd
             updateDO.setEquipNum(Math.toIntExact(count));
             //修改金额
             taskOrderService.updateOrderFee(orderId.get());
+            //同步报表
+            PipeTaskOrderSyncReportVO reqVO = new PipeTaskOrderSyncReportVO();
+            reqVO.setOrderId(orderId.get());
+            taskOrderService.syncAllReportDataByOrderId(reqVO);
         }
         taskOrderMapper.updateById(updateDO);
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/taskordernontaxapply/TaskOrderNonTaxApplyServiceImpl.java

@@ -700,11 +700,12 @@ public class TaskOrderNonTaxApplyServiceImpl extends ServiceImpl<TaskOrderNonTax
 
                     param.setMemberId(memberUser.getId());
                     //公众号任务单缴费模版
-                    if (EnvEnum.LOCAL.getEnvName().equals(env)) {
-                        param.setTemplateId("nHwhCI8N0yTQWNW5twTkZEtduMhzWblSsWN8-fkezeA");
-                    } else if (EnvEnum.UAT.getEnvName().equals(env)) {
-                        param.setTemplateId("I7PfNFccAM6_GrheA83vGX-dPed_j6GbXMTva6HfsjU");
-                    }
+//                    if (EnvEnum.LOCAL.getEnvName().equals(env)) {
+//                        param.setTemplateId("nHwhCI8N0yTQWNW5twTkZEtduMhzWblSsWN8-fkezeA");
+//                    } else if (EnvEnum.UAT.getEnvName().equals(env)) {
+//                        param.setTemplateId("I7PfNFccAM6_GrheA83vGX-dPed_j6GbXMTva6HfsjU");
+//                    }
+                    param.setTemplateId("I7PfNFccAM6_GrheA83vGX-dPed_j6GbXMTva6HfsjU");
                     List<WxMpTemplateDataReqDto> list = new ArrayList<>();
                     String param1 = null;
                     param1 = orderList.get(0).getOrderNo() + EquipmentCheckTypeEnum.getByType(orderList.get(0).getCheckType()).getName();
@@ -723,8 +724,8 @@ public class TaskOrderNonTaxApplyServiceImpl extends ServiceImpl<TaskOrderNonTax
                     param.setWxMpTemplateDataList(list);
 
                     SendAppMpMessageReqDTO.MiniProgramDto mini = new SendAppMpMessageReqDTO.MiniProgramDto();
-                    mini.setPagePath(String.format("/pagesSub/online-payment/components/detail/index?id=%s", orderList.get(0).getId()));
-                    mini.setUsePath(true);
+//                    mini.setPagePath(String.format("/pagesSub/online-payment/components/detail/index?id=%s", orderList.get(0).getId()));
+//                    mini.setUsePath(true);
                     param.setMiniProgramDto(mini);
                     param.setBusinessId(orderList.get(0).getId());
                     param.setBusinessType(3);