小程序接口

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/taskorder/BoilerTaskOrderAppApiController.java

@@ -4,6 +4,8 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.framework.common.pojo.PageResult;
+import cn.start.tz.module.pressure2.controller.admin.taskordernontaxrecord.vo.TaskOrderNonTaxRecordPageReqVO;
+import cn.start.tz.module.pressure2.controller.admin.taskordernontaxrecord.vo.TaskOrderNonTaxRecordRespVO;
 import cn.start.tz.module.pressure2.framework.appauth.core.annotation.AppAuth;
 import cn.start.tz.module.pressure2.framework.appauth.core.context.AppAuthContextHolder;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.*;
@@ -14,22 +16,29 @@ import cn.start.tz.module.pressure2.controller.appapi.boilertaskorder.vo.TaskOrd
 import cn.start.tz.module.pressure2.service.boilertaskorder.BoilerTaskOrderService;
 import cn.start.tz.module.pressure2.service.boilertaskordersignfile.BoilerTaskOrderSignFileService;
 import cn.start.tz.module.pressure2.service.taskorderbill.TaskOrderBillService;
+import cn.start.tz.module.pressure2.service.taskordernontaxrecord.TaskOrderNonTaxRecordService;
 import cn.start.tz.module.pressure2.service.tasksign.TaskSignService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.PermitAll;
 import jakarta.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 import static cn.start.tz.framework.common.pojo.CommonResult.success;
+import static cn.start.tz.framework.security.core.util.SecurityFrameworkUtils.getLoginUserMobile;
 
 @Tag(name = "小程序 - 锅炉任务单")
 @RestController
 @RequestMapping("/pressure2/app/task-order/boiler")
 @Validated
 @AppAuth
+@Slf4j
 public class BoilerTaskOrderAppApiController {
 
     @Resource
@@ -114,4 +123,50 @@ public class BoilerTaskOrderAppApiController {
 
         return success(pageResult);
     }
+    @Resource
+    private TaskOrderNonTaxRecordService taskOrderNonTaxRecordService;
+
+    /**
+     * 非税记录查询分页(小程序)
+     * 根据登录用户的手机号(contactPhone)查询非税记录
+     */
+    @GetMapping("/non-tax-record/page")
+    @Operation(summary = "非税记录查询分页(小程序)")
+    @PermitAll
+    public CommonResult<PageResult<TaskOrderNonTaxRecordRespVO>> getNonTaxRecordPage(@Valid TaskOrderNonTaxRecordPageReqVO pageReqVO) {
+        // 获取登录用户的手机号作为过滤条件
+//        String mobile = getLoginUserMobile();
+//        if (StringUtils.isEmpty(mobile)) {
+//            return success(new PageResult<>());
+//        }
+//        // 设置联系电话过滤条件
+//        pageReqVO.setContactPhone(mobile);
+        // 审核通过的数据
+        pageReqVO.setStatus(List.of(200));
+        PageResult<TaskOrderNonTaxRecordRespVO> pageResult = taskOrderNonTaxRecordService.getTaskOrderNonTaxRecordPageApp(pageReqVO);
+        return success(pageResult);
+    }
+
+    /**
+     * 查看缴费通知书(小程序)
+     * 返回PDF文件URL，如果不存在则生成并保存
+     */
+    @GetMapping("/non-tax-record/notice-pdf-url")
+    @Operation(summary = "获取缴费通知书PDF文件URL(小程序)")
+    @PermitAll
+    public CommonResult<String> getNonTaxNoticePdfUrl(@RequestParam String id) {
+        try {
+            TaskOrderNonTaxRecordPageReqVO pageReqVO = new TaskOrderNonTaxRecordPageReqVO();
+            pageReqVO.setIds(List.of(id));
+            PageResult<TaskOrderNonTaxRecordRespVO> pageResult = taskOrderNonTaxRecordService.getTaskOrderNonTaxRecordPageApp(pageReqVO);
+            if (pageResult == null || pageResult.getList().isEmpty()) {
+                return success(null);
+            }
+            TaskOrderNonTaxRecordRespVO record = pageResult.getList().get(0);
+            return success(record.getNoticePdfUrl());
+        } catch (Exception e) {
+            log.error("获取缴费通知书PDF失败: id={}, error={}", id, e.getMessage(), e);
+            return success("");
+        }
+    }
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/taskorder/BoilerTaskOrderIssueReportAppController.java

@@ -2,6 +2,8 @@ package cn.start.tz.module.pressure2.controller.app.taskorder;
 
 import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.framework.common.pojo.PageResult;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportItemRespVO;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportPageReqVO;
 import cn.start.tz.module.pressure2.framework.appauth.core.annotation.AppAuth;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderRespVO;
@@ -13,12 +15,17 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
+import jakarta.annotation.security.PermitAll;
+import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.ByteArrayOutputStream;
+
 import static cn.start.tz.framework.common.pojo.CommonResult.success;
 import static cn.start.tz.framework.security.core.util.SecurityFrameworkUtils.getLoginUserMobile;
 
@@ -27,6 +34,7 @@ import static cn.start.tz.framework.security.core.util.SecurityFrameworkUtils.ge
 @RequestMapping("/pressure2/app/task-order/issue-report/boiler")
 @Validated
 @AppAuth
+@Slf4j
 public class BoilerTaskOrderIssueReportAppController {
 
     @Resource
@@ -79,47 +87,50 @@ public class BoilerTaskOrderIssueReportAppController {
     // }
 
     // TODO: 待提供更多信息 - boilerTaskOrderIssueReportService.getTaskOrderIssueReportEquipPageApp
-    // @GetMapping("/record-equip/page")
-    // public CommonResult<PageResult<TaskOrderIssueReportItemRespVO>> getTaskOrderIssueReportEquipPageApp(@Valid BoilerTaskOrderIssueReportPageReqVO pageReqVO) {
-    //     String mobile = getLoginUserMobile();
-    //     if(StringUtils.isNotBlank(mobile)){
-    //         pageReqVO.setRecipientPhone(mobile);
-    //     }else{
-    //         return success(PageResult.empty());
-    //     }
-    //
-    //     String currentUserUnitId = miniAuthService.getCurrentUserUnitCode();
-    //     if(!"-1".equals(currentUserUnitId)){
-    //         pageReqVO.setUnitCode(currentUserUnitId);
-    //     }
-    //
-    //     PageResult<TaskOrderIssueReportItemRespVO> pageResult = boilerTaskOrderIssueReportService.getTaskOrderIssueReportEquipPageApp(pageReqVO);
-    //     return success(pageResult);
-    // }
+     @GetMapping("/record-equip/page")
+     @PermitAll
+     public CommonResult<PageResult<TaskOrderIssueReportItemRespVO>> getTaskOrderIssueReportEquipPageApp(@Valid TaskOrderIssueReportPageReqVO pageReqVO) {
+//         String mobile = getLoginUserMobile();
+//         if(StringUtils.isNotBlank(mobile)){
+//             pageReqVO.setRecipientPhone(mobile);
+//         }else{
+//             return success(PageResult.empty());
+//         }
+
+//         String currentUserUnitId = miniAuthService.getCurrentUserUnitCode();
+//         if(!"-1".equals(currentUserUnitId)){
+//             pageReqVO.setUnitCode(currentUserUnitId);
+//         }
+
+         PageResult<TaskOrderIssueReportItemRespVO> pageResult = boilerTaskOrderIssueReportService.getTaskOrderIssueReportEquipPageApp(pageReqVO);
+         return success(pageResult);
+     }
 
     // TODO: 待提供更多信息 - boilerTaskOrderIssueReportService.getUseLogoOutputStream
-    // @GetMapping("/use-logo/preview")
-    // @Operation(summary = "生成使用登记证 id=orderItemId")
-    // public void reportPreviewPostApp(HttpServletResponse response, @RequestParam String id) throws Exception {
-    //     response.setContentType("application/pdf");
-    //     response.setHeader("Content-Disposition", "inline; filename=report_" + id + ".pdf");
-    //     try (ByteArrayOutputStream outputStream = boilerTaskOrderIssueReportService.getUseLogoOutputStream(id, 100)) {
-    //         ServletOutputStream responseOutputStream = response.getOutputStream();
-    //         outputStream.writeTo(responseOutputStream);
-    //     } catch (Exception e) {
-    //         log.error("reportPreview error",e);
-    //         response.reset();
-    //         response.setContentType("application/json");
-    //         response.setCharacterEncoding("UTF-8");
-    //         response.getWriter().write("{\"error\":\"文件生成失败: " + e.getMessage() + "\"}");
-    //     }
-    // }
+     @GetMapping("/use-logo/preview")
+     @Operation(summary = "生成使用登记证 id=orderItemId")
+     @PermitAll
+     public void reportPreviewPostApp(HttpServletResponse response, @RequestParam String id) throws Exception {
+         response.setContentType("application/pdf");
+         response.setHeader("Content-Disposition", "inline; filename=report_" + id + ".pdf");
+         try (ByteArrayOutputStream outputStream = boilerTaskOrderIssueReportService.getUseLogoOutputStream(id, 100)) {
+             ServletOutputStream responseOutputStream = response.getOutputStream();
+             outputStream.writeTo(responseOutputStream);
+         } catch (Exception e) {
+             log.error("reportPreview error",e);
+             response.reset();
+             response.setContentType("application/json");
+             response.setCharacterEncoding("UTF-8");
+             response.getWriter().write("{\"error\":\"文件生成失败: " + e.getMessage() + "\"}");
+         }
+     }
 
     // TODO: 待提供更多信息 - boilerTaskOrderIssueReportService.getUseLogoUrl
-    // @GetMapping("/use-logo/preview-url")
-    // @Operation(summary = "获取使用登记证 URL id=orderItemId")
-    // public CommonResult<String> getUseLogoUrlApp(@RequestParam String id) throws Exception {
-    //     String useLogoUrl = boilerTaskOrderIssueReportService.getUseLogoUrl(id);
-    //     return success(useLogoUrl);
-    // }
+     @GetMapping("/use-logo/preview-url")
+     @Operation(summary = "获取使用登记证 URL id=orderItemId")
+     @PermitAll
+     public CommonResult<String> getUseLogoUrlApp(@RequestParam String id) throws Exception {
+         String useLogoUrl = boilerTaskOrderIssueReportService.getUseLogoUrl(id);
+         return success(useLogoUrl);
+     }
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/taskorder/PipeTaskOrderIssueReportAppController.java

@@ -2,6 +2,8 @@ package cn.start.tz.module.pressure2.controller.app.taskorder;
 
 import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.framework.common.pojo.PageResult;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportItemRespVO;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportPageReqVO;
 import cn.start.tz.module.pressure2.framework.appauth.core.annotation.AppAuth;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderRespVO;
@@ -13,18 +15,26 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
+import jakarta.annotation.security.PermitAll;
+import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.ByteArrayOutputStream;
+
 import static cn.start.tz.framework.common.pojo.CommonResult.success;
+import static cn.start.tz.framework.security.core.util.SecurityFrameworkUtils.getLoginUserMobile;
 
 @Tag(name = "小程序 - 管道出具报告")
 @RestController
 @RequestMapping("/pressure2/app/task-order/issue-report/pipe")
 @Validated
 @AppAuth
+@Slf4j
 public class PipeTaskOrderIssueReportAppController {
 
     @Resource
@@ -94,30 +104,51 @@ public class PipeTaskOrderIssueReportAppController {
     //     PageResult<TaskOrderIssueReportItemRespVO> pageResult = pipeTaskOrderIssueReportService.getTaskOrderIssueReportEquipPageApp(pageReqVO);
     //     return success(pageResult);
     // }
+    @GetMapping("/record-equip/page")
+    @PermitAll
+
+    public CommonResult<PageResult<TaskOrderIssueReportItemRespVO>> getTaskOrderIssueReportEquipPageApp(@Valid TaskOrderIssueReportPageReqVO pageReqVO) {
+//        String mobile = getLoginUserMobile();
+//        if(StringUtils.isNotBlank(mobile)){
+//            pageReqVO.setRecipientPhone(mobile);
+//        }else{
+//            return success(PageResult.empty());
+//        }
+
+//         String currentUserUnitId = miniAuthService.getCurrentUserUnitCode();
+//         if(!"-1".equals(currentUserUnitId)){
+//             pageReqVO.setUnitCode(currentUserUnitId);
+//         }
+
+        PageResult<TaskOrderIssueReportItemRespVO> pageResult = pipeTaskOrderIssueReportService.getTaskOrderIssueReportEquipPageApp(pageReqVO);
+        return success(pageResult);
+    }
 
     // TODO: 待提供更多信息 - pipeTaskOrderIssueReportService.getUseLogoOutputStream
-    // @GetMapping("/use-logo/preview")
-    // @Operation(summary = "生成使用登记证 id=orderItemId")
-    // public void reportPreviewPostApp(HttpServletResponse response, @RequestParam String id) throws Exception {
-    //     response.setContentType("application/pdf");
-    //     response.setHeader("Content-Disposition", "inline; filename=report_" + id + ".pdf");
-    //     try (ByteArrayOutputStream outputStream = pipeTaskOrderIssueReportService.getUseLogoOutputStream(id, 100)) {
-    //         ServletOutputStream responseOutputStream = response.getOutputStream();
-    //         outputStream.writeTo(responseOutputStream);
-    //     } catch (Exception e) {
-    //         log.error("reportPreview error",e);
-    //         response.reset();
-    //         response.setContentType("application/json");
-    //         response.setCharacterEncoding("UTF-8");
-    //         response.getWriter().write("{\"error\":\"文件生成失败: " + e.getMessage() + "\"}");
-    //     }
-    // }
+     @GetMapping("/use-logo/preview")
+     @Operation(summary = "生成使用登记证 id=orderItemId")
+     @PermitAll
+     public void reportPreviewPostApp(HttpServletResponse response, @RequestParam String id) throws Exception {
+         response.setContentType("application/pdf");
+         response.setHeader("Content-Disposition", "inline; filename=report_" + id + ".pdf");
+         try (ByteArrayOutputStream outputStream = pipeTaskOrderIssueReportService.getUseLogoOutputStream(id, 100)) {
+             ServletOutputStream responseOutputStream = response.getOutputStream();
+             outputStream.writeTo(responseOutputStream);
+         } catch (Exception e) {
+             log.error("reportPreview error",e);
+             response.reset();
+             response.setContentType("application/json");
+             response.setCharacterEncoding("UTF-8");
+             response.getWriter().write("{\"error\":\"文件生成失败: " + e.getMessage() + "\"}");
+         }
+     }
 
     // TODO: 待提供更多信息 - pipeTaskOrderIssueReportService.getUseLogoUrl
-    // @GetMapping("/use-logo/preview-url")
-    // @Operation(summary = "获取使用登记证 URL id=orderItemId")
-    // public CommonResult<String> getUseLogoUrlApp(@RequestParam String id) throws Exception {
-    //     String useLogoUrl = pipeTaskOrderIssueReportService.getUseLogoUrl(id);
-    //     return success(useLogoUrl);
-    // }
+     @GetMapping("/use-logo/preview-url")
+     @Operation(summary = "获取使用登记证 URL id=orderItemId")
+     @PermitAll
+     public CommonResult<String> getUseLogoUrlApp(@RequestParam String id) throws Exception {
+         String useLogoUrl = pipeTaskOrderIssueReportService.getUseLogoUrl(id);
+         return success(useLogoUrl);
+     }
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/taskorder/vo/TaskOrderIssueReportItemRespVO.java

@@ -0,0 +1,61 @@
+package cn.start.tz.module.pressure2.controller.app.taskorder.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 任务单出具报告记录-设备项 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TaskOrderIssueReportItemRespVO {
+
+    @Schema(description = "id", example = "21408")
+    @ExcelProperty("id")
+    private String id;
+
+    @Schema(description = "任务单设备", example = "14597")
+    @ExcelProperty("任务单设备")
+    private String itemId;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "出具报告时间")
+    private LocalDateTime issueTime;
+
+    @Schema(description = "设备代码", example = "EQ001")
+    @ExcelProperty("设备代码")
+    private String equipCode;
+
+    @Schema(description = "设备名称", example = "压力容器")
+    @ExcelProperty("设备名称")
+    private String equipName;
+
+    @Schema(description = "检验性质")
+    private Integer checkType;
+
+    @Schema(description = "检验时间")
+    private LocalDate checkDate;
+
+    @Schema(description = "区域")
+    private Integer equipDistrict;
+
+    @Schema(description = "区域")
+    private String equipDistrictName;
+
+    @Schema(description = "街道")
+    private Integer equipStreet;
+
+    @Schema(description = "街道")
+    private String equipStreetName;
+
+    private String useLogo;
+
+
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/taskorder/vo/TaskOrderIssueReportPageReqVO.java

@@ -0,0 +1,107 @@
+package cn.start.tz.module.pressure2.controller.app.taskorder.vo;
+
+import cn.start.tz.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static cn.start.tz.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 任务单出具报告记录分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class TaskOrderIssueReportPageReqVO extends PageParam {
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "标志发放时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] useLogoTime;
+
+    @Schema(description = "检验时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] checkDate;
+
+    @Schema(description = "报告清单类型 100 全部报告，200 部分报告", example = "1")
+    private Integer checklistType;
+
+    @Schema(description = "任务单id", example = "332")
+    private String orderId;
+
+    @Schema(description = "出具方式 100 快递邮寄 200 业务员送达 300 线下领取 400 其他")
+    private Integer issueMethod;
+
+    @Schema(description = "接收/领取人")
+    private String recipient;
+
+    @Schema(description = "接收/领取电话")
+    private String recipientPhone;
+
+    @Schema(description = "接收地址")
+    private String recipientAddress;
+
+    @Schema(description = "邮寄单号")
+    private String trackingNumber;
+
+    @Schema(description = "快递公司")
+    private String trackingCompany;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "一式几份")
+    private Integer copyNumber;
+
+    @Schema(description = "业务员")
+    private String businessMan;
+
+    @Schema(description = "其他方式描述")
+    private String otherMethod;
+
+    @Schema(description = "报告类型 100实体报告 200电子报告", example = "2")
+    private Integer reportType;
+
+    @Schema(description = "小程序推送")
+    private Boolean miniProgramPush;
+
+    @Schema(description = "邮箱推送")
+    private Boolean emailPush;
+
+    @Schema(description = "邮箱")
+    private String email;
+
+    @Schema(description = "小程序推送-主帐号管理员")
+    private Boolean miniProgramAdmin;
+
+    @Schema(description = "小程序推送-子账号", example = "6056")
+    private Boolean miniProgramSubAccount;
+
+    @Schema(description = "小程序推送-接收人平台用户id", example = "6056")
+    private String recipientMemberUserId;
+
+    @Schema(description = "业务类型(0=出具报告,1=打印发证)", example = "6056")
+    private Integer businessType;
+
+    @Schema(description = "任务单设备关联报告id", example = "6056")
+    private String orderItemReportId;
+
+    @Schema(description = "任务单设备id", example = "6056")
+    private String orderItemId;
+
+    private String equipCode;
+
+    private String unitCode;
+
+    /**
+     * 任务单出具报告记录ids
+     */
+    private List<String> issueReportIds;
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorderissuereportitem/BoilerTaskOrderIssueReportItemMapper.java

@@ -5,8 +5,16 @@ import java.util.*;
 import cn.start.tz.framework.common.pojo.PageResult;
 import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.start.tz.framework.mybatis.core.mapper.BaseMapperX;
+import cn.start.tz.framework.mybatis.core.query.MPJLambdaWrapperX;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderissuereport.vo.BoilerTaskOrderIssueReportVO;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportItemRespVO;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportPageReqVO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderissuereport.BoilerTaskOrderIssueReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderissuereportitem.BoilerTaskOrderIssueReportItemDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
+import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderissuereportitem.vo.*;
 import org.apache.ibatis.annotations.Param;
@@ -28,5 +36,59 @@ public interface BoilerTaskOrderIssueReportItemMapper extends BaseMapperX<Boiler
     }
 
     List<BoilerTaskOrderIssueReportVO> selectReportByItemIds(@Param("itemIds") List<String> itemIds);
+    /**
+     * 查询任务单出具报告记录-设备项分页，关联任务单设备信息
+     */
+    default PageResult<TaskOrderIssueReportItemRespVO> selectEquipUseLogoPage(TaskOrderIssueReportPageReqVO pageReqVO) {
+        // 构建关联查询条件
+        MPJLambdaWrapperX<BoilerTaskOrderIssueReportItemDO> wrapper = new MPJLambdaWrapperX<>();
+
+        wrapper.selectAll(BoilerTaskOrderIssueReportItemDO.class)
+//                .select(BoilerTaskOrderItemDO::getEquipCode, BoilerTaskOrderItemDO::getEquipName)  // 关联查询设备的代码和名称
+                .selectAs(EquipBoilerDO::getEquipCode, TaskOrderIssueReportItemRespVO::getEquipCode)
+                .selectAs(EquipBoilerDO::getEquipName, TaskOrderIssueReportItemRespVO::getEquipName)
+                .selectAs(BoilerTaskOrderDO::getCheckType,TaskOrderIssueReportItemRespVO::getCheckType)
+                .selectAs(BoilerTaskOrderDO::getCheckDate,TaskOrderIssueReportItemRespVO::getCheckDate)
+                .selectAs(BoilerTaskOrderDO::getEquipDistrict,TaskOrderIssueReportItemRespVO::getEquipDistrict)
+                .selectAs(BoilerTaskOrderDO::getEquipStreet,TaskOrderIssueReportItemRespVO::getEquipStreet)
+                .selectAs(BoilerTaskOrderItemDO::getUseLogo,TaskOrderIssueReportItemRespVO::getUseLogo)
+                //.selectMin(TaskOrderIssueReportItemDO::getCreateTime)
+                .select("min(t.create_time) as issue_time")
+
+                .leftJoin(BoilerTaskOrderItemDO.class, BoilerTaskOrderItemDO::getId, BoilerTaskOrderIssueReportItemDO::getItemId)
+                .leftJoin(EquipBoilerDO.class, EquipBoilerDO::getId, BoilerTaskOrderItemDO::getEquipId)
+                .leftJoin(BoilerTaskOrderDO.class, BoilerTaskOrderDO::getId, BoilerTaskOrderItemDO::getOrderId)
+                .leftJoin(BoilerTaskOrderIssueReportDO.class, BoilerTaskOrderIssueReportDO::getId, BoilerTaskOrderIssueReportItemDO::getIssueReportId)
+                .groupBy(BoilerTaskOrderItemDO::getId)
+                .orderByDesc(BoilerTaskOrderIssueReportItemDO::getCreateTime);
+
+        wrapper.eqIfPresent(BoilerTaskOrderIssueReportItemDO::getItemId, pageReqVO.getOrderItemId())
+                .eqIfPresent(BoilerTaskOrderIssueReportItemDO::getIssueReportId, pageReqVO.getOrderItemReportId())
+                .betweenIfPresent(BoilerTaskOrderIssueReportItemDO::getCreateTime, pageReqVO.getCreateTime());
+
+        if(pageReqVO.getUseLogoTime() != null && pageReqVO.getUseLogoTime().length >1){
+            wrapper.between(BoilerTaskOrderItemDO::getUseLogoTime,pageReqVO.getUseLogoTime()[0],pageReqVO.getUseLogoTime()[1]);
+        }
+
+        if(pageReqVO.getCheckDate() != null && pageReqVO.getCheckDate().length >1){
+            wrapper.between(BoilerTaskOrderDO::getCheckDate,pageReqVO.getCheckDate()[0],pageReqVO.getCheckDate()[1]);
+        }
+
+        if(StringUtils.isNotBlank(pageReqVO.getRecipientPhone())){
+            wrapper.eq(BoilerTaskOrderIssueReportDO::getRecipientPhone,pageReqVO.getRecipientPhone());
+        }
+        if(StringUtils.isNotBlank(pageReqVO.getEquipCode())){
+            wrapper.eq(BoilerTaskOrderItemDO::getEquipCode,pageReqVO.getEquipCode());
+        }
+
+        if(StringUtils.isNotBlank(pageReqVO.getUnitCode())){
+            wrapper.eq(BoilerTaskOrderDO::getUnitCode,pageReqVO.getUnitCode());
+        }
+
+        wrapper.in(BoilerTaskOrderDO::getCheckType, Arrays.asList(100,300));
+
+        // 执行分页查询
+        return selectJoinPage(pageReqVO, TaskOrderIssueReportItemRespVO.class, wrapper);
+    }
 
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/pipetaskorderissuereportitem/PipeTaskOrderIssueReportItemMapper.java

@@ -5,9 +5,21 @@ import java.util.*;
 import cn.start.tz.framework.common.pojo.PageResult;
 import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.start.tz.framework.mybatis.core.mapper.BaseMapperX;
+import cn.start.tz.framework.mybatis.core.query.MPJLambdaWrapperX;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderissuereport.vo.BoilerTaskOrderIssueReportVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderissuereport.vo.PipeTaskOrderIssueReportVO;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportItemRespVO;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportPageReqVO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderissuereport.BoilerTaskOrderIssueReportDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderissuereportitem.BoilerTaskOrderIssueReportItemDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
+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.pipetaskorderissuereport.PipeTaskOrderIssueReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderissuereportitem.PipeTaskOrderIssueReportItemDO;
+import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitem.PipeTaskOrderItemDO;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderissuereportitem.vo.*;
 import org.apache.ibatis.annotations.Param;
@@ -30,4 +42,60 @@ public interface PipeTaskOrderIssueReportItemMapper extends BaseMapperX<PipeTask
 
     List<PipeTaskOrderIssueReportVO> selectReportByItemIds(@Param("itemIds") List<String> itemIds);
 
+
+    /**
+     * 查询任务单出具报告记录-设备项分页，关联任务单设备信息
+     */
+    default PageResult<TaskOrderIssueReportItemRespVO> selectEquipUseLogoPage(TaskOrderIssueReportPageReqVO pageReqVO) {
+        // 构建关联查询条件
+        MPJLambdaWrapperX<PipeTaskOrderIssueReportItemDO> wrapper = new MPJLambdaWrapperX<>();
+
+        wrapper.selectAll(PipeTaskOrderIssueReportItemDO.class)
+//                .select(PipeTaskOrderItemDO::getEquipCode, PipeTaskOrderItemDO::getEquipCode)  // 关联查询设备的代码和名称
+                .selectAs(EquipPipeDO::getProjectNo, TaskOrderIssueReportItemRespVO::getEquipCode)
+                .selectAs(EquipPipeDO::getProjectName, TaskOrderIssueReportItemRespVO::getEquipName)
+                .selectAs(PipeTaskOrderDO::getCheckType,TaskOrderIssueReportItemRespVO::getCheckType)
+                .selectAs(PipeTaskOrderDO::getCheckDate,TaskOrderIssueReportItemRespVO::getCheckDate)
+                .selectAs(PipeTaskOrderDO::getEquipDistrict,TaskOrderIssueReportItemRespVO::getEquipDistrict)
+                .selectAs(PipeTaskOrderDO::getEquipStreet,TaskOrderIssueReportItemRespVO::getEquipStreet)
+                .selectAs(PipeTaskOrderItemDO::getUseLogo,TaskOrderIssueReportItemRespVO::getUseLogo)
+                //.selectMin(TaskOrderIssueReportItemDO::getCreateTime)
+                .select("min(t.create_time) as issue_time")
+
+                .leftJoin(PipeTaskOrderItemDO.class, PipeTaskOrderItemDO::getId, PipeTaskOrderIssueReportItemDO::getItemId)
+                .leftJoin(EquipPipeDO.class, EquipPipeDO::getId, PipeTaskOrderIssueReportItemDO::getItemId)
+                .leftJoin(PipeTaskOrderDO.class, PipeTaskOrderDO::getId, PipeTaskOrderItemDO::getOrderId)
+                .leftJoin(PipeTaskOrderIssueReportDO.class, PipeTaskOrderIssueReportDO::getId, PipeTaskOrderIssueReportItemDO::getIssueReportId)
+                .groupBy(PipeTaskOrderItemDO::getId)
+                .orderByDesc(PipeTaskOrderIssueReportItemDO::getCreateTime);
+
+        wrapper.eqIfPresent(PipeTaskOrderIssueReportItemDO::getItemId, pageReqVO.getOrderItemId())
+                .eqIfPresent(PipeTaskOrderIssueReportItemDO::getIssueReportId, pageReqVO.getOrderItemReportId())
+                .betweenIfPresent(PipeTaskOrderIssueReportItemDO::getCreateTime, pageReqVO.getCreateTime());
+
+        if(pageReqVO.getUseLogoTime() != null && pageReqVO.getUseLogoTime().length >1){
+            wrapper.between(PipeTaskOrderItemDO::getUseLogoTime,pageReqVO.getUseLogoTime()[0],pageReqVO.getUseLogoTime()[1]);
+        }
+
+        if(pageReqVO.getCheckDate() != null && pageReqVO.getCheckDate().length >1){
+            wrapper.between(PipeTaskOrderDO::getCheckDate,pageReqVO.getCheckDate()[0],pageReqVO.getCheckDate()[1]);
+        }
+
+        if(StringUtils.isNotBlank(pageReqVO.getRecipientPhone())){
+            wrapper.eq(PipeTaskOrderIssueReportDO::getRecipientPhone,pageReqVO.getRecipientPhone());
+        }
+        if(StringUtils.isNotBlank(pageReqVO.getEquipCode())){
+            wrapper.eq(PipeTaskOrderItemDO::getEquipCode,pageReqVO.getEquipCode());
+        }
+
+        if(StringUtils.isNotBlank(pageReqVO.getUnitCode())){
+            wrapper.eq(PipeTaskOrderDO::getUnitCode,pageReqVO.getUnitCode());
+        }
+
+        wrapper.in(PipeTaskOrderDO::getCheckType, Arrays.asList(100,300));
+
+        // 执行分页查询
+        return selectJoinPage(pageReqVO, TaskOrderIssueReportItemRespVO.class, wrapper);
+    }
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/framework/appauth/config/AppAuthWebConfiguration.java

@@ -17,12 +17,7 @@ public class AppAuthWebConfiguration implements WebMvcConfigurer {
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(appAuthInterceptor)
                 .addPathPatterns(
-                        "/app-api/pressure2/app/accept-order/**",
-                        "/app-api/pressure2/app/appointment-confirm-order/**",
-                        "/app-api/pressure2/app/equip-container/**",
-                        "/app-api/pressure2/app/task-order/**",
-                        "/app-api/pressure2/app/task-order-item-report/**",
-                        "/app-api/pressure2/app/report-template/**"
+                        "/app-api/pressure2/app/**"
                 );
     }
 

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

@@ -1084,11 +1084,12 @@ public class AppointmentConfirmOrderServiceImpl implements AppointmentConfirmOrd
 
             param.setMemberId(memberUser.getId());
             // 	3f-xg-UmbhgSb0QrU_3QYoN70uFWPfbhkBMhObgr3CE
-            if (EnvEnum.HSD.getEnvName().equals(env)) {
-                param.setTemplateId("3f-xg-UmbhgSb0QrU_3QYoN70uFWPfbhkBMhObgr3CE");
-            } else if (EnvEnum.UAT.getEnvName().equals(env)) {
-                param.setTemplateId("roTC0SQzXdla8FZJLyl3X84cSbrOsLMikD9lpmPD3YY");
-            }
+//            if (EnvEnum.HSD.getEnvName().equals(env)) {
+//                param.setTemplateId("3f-xg-UmbhgSb0QrU_3QYoN70uFWPfbhkBMhObgr3CE");
+//            } else if (EnvEnum.UAT.getEnvName().equals(env)) {
+//                param.setTemplateId("roTC0SQzXdla8FZJLyl3X84cSbrOsLMikD9lpmPD3YY");
+//            }
+            param.setTemplateId("roTC0SQzXdla8FZJLyl3X84cSbrOsLMikD9lpmPD3YY");
             List<SendMpMessageReqVO.TemplateData> list = new ArrayList<>();
 
             list.add(new SendMpMessageReqVO.TemplateData("thing49", unitName, null));

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderissuereport/BoilerTaskOrderIssueReportService.java

@@ -4,6 +4,8 @@ import java.io.ByteArrayOutputStream;
 import java.util.*;
 
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.*;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportItemRespVO;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportPageReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
 import jakarta.validation.*;
@@ -66,6 +68,8 @@ public interface BoilerTaskOrderIssueReportService extends IService<BoilerTaskOr
 
     void issueReportPush(String orderItemId);
 
+    PageResult<TaskOrderIssueReportItemRespVO> getTaskOrderIssueReportEquipPageApp(@Valid TaskOrderIssueReportPageReqVO pageReqVO);
+
     BoilerTaskOrderIssueReportRespVO getTaskOrderIssueReport(String id);
 
     PageResult<BoilerTaskOrderIssueReportRespVO> getTaskOrderIssueReportPage(BoilerTaskOrderIssueReportPageReqVO pageReqVO);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderissuereport/BoilerTaskOrderIssueReportServiceImpl.java

@@ -38,6 +38,8 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskordersignfile.vo.
 import cn.start.tz.module.pressure2.controller.admin.bpmtaskinfo.vo.BpmTaskRespVO;
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderinput.vo.PipeTaskOrderInputPrintReqVO;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportItemRespVO;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportPageReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilerconnecttbservice.BoilerConnectTbServiceDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilerelectronicreportauditrecord.BoilerElectronicReportAuditRecordDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
@@ -1212,6 +1214,17 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
             taskOrderItemMapper.update(updateWrapper);
         }
     }
+    @Override
+    public PageResult<TaskOrderIssueReportItemRespVO> getTaskOrderIssueReportEquipPageApp(TaskOrderIssueReportPageReqVO pageReqVO) {
+        PageResult<TaskOrderIssueReportItemRespVO> pageResult = taskOrderIssueReportItemMapper.selectEquipUseLogoPage(pageReqVO);
+        if(CollUtil.isNotEmpty(pageResult.getList() )){
+            pageResult.getList().forEach(item->{
+                item.setEquipDistrictName(AreaUtils.getAreaName(item.getEquipDistrict()));
+                item.setEquipStreetName(AreaUtils.getAreaName(item.getEquipStreet()));
+            });
+        }
+        return pageResult;
+    }
 
     @Override
     public String getUseLogoUrl(String id) throws Exception {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/membermessage/MemberMessageRemoteServiceImpl.java

@@ -75,13 +75,13 @@ public class MemberMessageRemoteServiceImpl implements MemberMessageRemoteServic
         ResponseEntity<String> response = restTemplate.exchange(
                 url, HttpMethod.POST, entity, String.class);
         long elapsed = System.currentTimeMillis() - startTime;
-
+        log.info(response.getBody());
         if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
             CommonResult<Integer> result = JsonUtils.parseObject(
                     response.getBody(), RESULT_TYPE);
             if (result != null && result.isSuccess()) {
-                log.info("[sendMpMessage][推送完成][memberId={}, result={}, 耗时={}ms]",
-                        reqVO.getMemberId(), result.getData(), elapsed);
+                log.info("[sendMpMessage][推送完成][memberId={}, result={}, msg={}, 耗时={}ms]",
+                        reqVO.getMemberId(), result.getData(), result.getMsg(), elapsed);
                 return result.getData();
             }
             log.warn("[sendMpMessage][响应失败][memberId={}, code={}, msg={}, 耗时={}ms]",

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderissuereport/PipeTaskOrderIssueReportService.java

@@ -15,6 +15,8 @@ import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeOrderI
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderArchiveDetailRespVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderRespVO;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportItemRespVO;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportPageReqVO;
 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.pipetaskorder.PipeTaskOrderDO;
@@ -75,6 +77,8 @@ public interface PipeTaskOrderIssueReportService extends IService<PipeTaskOrderI
 
     void taskOrderIssueReport(@Valid PipeTaskOrderIssueReportVO taskOrderIssueReportVO);
 
+    PageResult<TaskOrderIssueReportItemRespVO> getTaskOrderIssueReportEquipPageApp(@Valid TaskOrderIssueReportPageReqVO pageReqVO);
+
     ByteArrayOutputStream getUseLogoOutputStream(String id, Integer fileType) throws Exception;
 
     void issueReportPush(String orderItemId);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderissuereport/PipeTaskOrderIssueReportServiceImpl.java

@@ -25,6 +25,8 @@ import cn.start.tz.module.member.api.user.dto.MemberUserRespDTO;
 import cn.start.tz.module.member.api.user.dto.SendAppMpMessageReqDTO;
 import cn.start.tz.module.member.api.user.dto.WxMpTemplateDataReqDto;
 import cn.start.tz.module.pressure2.constant.TemplateIdConstants;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportItemRespVO;
+import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportPageReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.orderreport.OrderReportDO;
 import cn.start.tz.module.pressure2.dal.mysql.orderreport.OrderReportMapper;
 import cn.start.tz.module.pressure2.enums.TaskOrderItemReportTypeEnum;
@@ -811,6 +813,17 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
             }
         });
     }
+    @Override
+    public PageResult<TaskOrderIssueReportItemRespVO> getTaskOrderIssueReportEquipPageApp(TaskOrderIssueReportPageReqVO pageReqVO) {
+        PageResult<TaskOrderIssueReportItemRespVO> pageResult = taskOrderIssueReportItemMapper.selectEquipUseLogoPage(pageReqVO);
+        if(CollUtil.isNotEmpty(pageResult.getList() )){
+            pageResult.getList().forEach(item->{
+                item.setEquipDistrictName(AreaUtils.getAreaName(item.getEquipDistrict()));
+                item.setEquipStreetName(AreaUtils.getAreaName(item.getEquipStreet()));
+            });
+        }
+        return pageResult;
+    }
 
     @Override
     public ByteArrayOutputStream getUseLogoOutputStream(String id, Integer fileType) throws Exception {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/taskordernontaxrecord/TaskOrderNonTaxRecordService.java

@@ -56,6 +56,8 @@ public interface TaskOrderNonTaxRecordService extends IService<TaskOrderNonTaxRe
      */
     PageResult<TaskOrderNonTaxRecordRespVO> getTaskOrderNonTaxRecordPage(TaskOrderNonTaxRecordPageReqVO pageReqVO);
 
+    PageResult<TaskOrderNonTaxRecordRespVO> getTaskOrderNonTaxRecordPageApp(TaskOrderNonTaxRecordPageReqVO pageReqVO);
+
     void cancelTaskOrderNonTaxRecord(@Valid TaskOrderNonTaxRecordIdsVO taskOrderNonTaxRecordIdsVO);
 
     Boolean approve(String loginUserId, @Valid TaskOrderNonTaxAuditVO reqVO);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/taskordernontaxrecord/TaskOrderNonTaxRecordServiceImpl.java

@@ -1,7 +1,6 @@
 package cn.start.tz.module.pressure2.service.taskordernontaxrecord;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.PhoneUtil;
@@ -17,12 +16,9 @@ import cn.start.tz.module.bpm.api.task.dto.BpmProcessInstanceDTO;
 import cn.start.tz.module.bpm.api.task.dto.BpmProcessInstanceRespDTO;
 import cn.start.tz.module.bpm.api.task.dto.BpmTaskApproveDTO;
 import cn.start.tz.module.bpm.api.task.dto.BpmTaskRejectDTO;
-import cn.start.tz.module.bpm.enums.boiler.BoilerBpmModeConstantsEnum;
 import cn.start.tz.module.bpm.enums.boiler.BoilerBpmModelConstants;
-import cn.start.tz.module.bpm.enums.task.BpmModeConstantsEnum;
 import cn.start.tz.module.bpm.enums.task.BpmTaskStatusEnum;
 import cn.start.tz.module.grape.city.api.GrapeCityApi;
-import cn.start.tz.module.grape.city.api.vo.GrapeCityReqDTO;
 import cn.start.tz.module.infra.api.file.FileApi;
 import cn.start.tz.module.infra.api.sign.SignApi;
 import cn.start.tz.module.infra.api.sign.dto.CntSignReqDTO;
@@ -34,14 +30,12 @@ import cn.start.tz.module.infra.api.sms.dto.SmsReqDTO;
 import cn.start.tz.module.pressure2.api.taskorder.dto.NonTaxPayStatusDTO;
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
 import cn.start.tz.module.pressure2.controller.admin.taskordernontaxrecord.vo.*;
-import cn.start.tz.module.pressure2.dal.dataobject.acceptorder.AcceptOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilerconnecttbservice.BoilerConnectTbServiceDO;
 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.dynamictb.DynamicTbDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbins.DynamicTbInsDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitem.PipeTaskOrderItemDO;
-import cn.start.tz.module.pressure2.dal.dataobject.reporttemplate.ReportTemplateDO;
 import cn.start.tz.module.pressure2.dal.dataobject.taskordernontaxapply.TaskOrderNonTaxApplyDO;
 import cn.start.tz.module.pressure2.dal.dataobject.taskordernontaxapplyrecord.TaskOrderNonTaxApplyRecordDO;
 import cn.start.tz.module.pressure2.dal.dataobject.taskordernontaxrecord.TaskOrderNonTaxRecordDO;
@@ -64,7 +58,6 @@ import cn.start.tz.module.pressure2.service.dynamictbins.DynamicTbInsService;
 import cn.start.tz.module.pressure2.service.pdf.PdfService;
 import cn.start.tz.module.pressure2.service.thirdparty.financialsystem.FinancialSystemService;
 import cn.start.tz.module.pressure2.service.thirdparty.financialsystem.vo.IncomepaymentData;
-import cn.start.tz.module.pressure2.util.CheckCode;
 import cn.start.tz.module.pressure2.util.ImageUtils;
 import cn.start.tz.module.system.api.dept.DeptApi;
 import cn.start.tz.module.system.api.dept.dto.DeptRespDTO;
@@ -75,7 +68,6 @@ import cn.start.tz.module.system.api.shorturl.dto.ShortDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import cn.start.tz.module.system.enums.common.IsYesOrNoEnum;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -90,18 +82,13 @@ import org.springframework.validation.annotation.Validated;
 
 import java.io.ByteArrayOutputStream;
 import java.math.BigDecimal;
-import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 import static cn.start.tz.framework.common.exception.util.ServiceExceptionUtil.exception0;
 import static cn.start.tz.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static cn.start.tz.module.grape.city.enums.ApiConstants.TEMPLATE_NON_TAX;
-import static cn.start.tz.module.pressure2.service.thirdparty.financialsystem.FinancialSystemServiceImpl.unitCode;
-import static cn.start.tz.module.pressure2.service.thirdparty.financialsystem.FinancialSystemServiceImpl.unitName;
 
 /**
  * 任务单非税记录 Service 实现类
@@ -322,6 +309,65 @@ public class TaskOrderNonTaxRecordServiceImpl extends ServiceImpl<TaskOrderNonTa
 
         return pageResult;
     }
+    @Override
+    public PageResult<TaskOrderNonTaxRecordRespVO> getTaskOrderNonTaxRecordPageApp(TaskOrderNonTaxRecordPageReqVO pageReqVO) {
+
+        if (StringUtils.isNotEmpty(pageReqVO.getBpmUserId())) {
+            BpmProcessInstanceDTO bpmProcessInstanceDTO = new BpmProcessInstanceDTO();
+            bpmProcessInstanceDTO.setStatus(100);
+            if (CollUtil.isNotEmpty(pageReqVO.getStatus())) {
+                bpmProcessInstanceDTO.setStatus(pageReqVO.getStatus().get(0));
+            }
+            bpmProcessInstanceDTO.setProcessDefinitionKey(BoilerBpmModelConstants.PRESSURE2_NON_TAX);
+            List<BpmProcessInstanceRespDTO> checkedData = bpmProcessInstanceApi.getProcessInstanceList(pageReqVO.getBpmUserId(), bpmProcessInstanceDTO).getCheckedData();
+            if (CollUtil.isNotEmpty(checkedData)) {
+                List<String> list = checkedData.stream().map(BpmProcessInstanceRespDTO::getId).toList();
+                if (CollUtil.isNotEmpty(list)) {
+                    pageReqVO.setProcessInstanceIds(list);
+                }
+            } else {
+                return PageResult.empty();
+            }
+        }
+
+        PageResult<TaskOrderNonTaxRecordRespVO> pageResult = taskOrderNonTaxRecordMapper.selectPageJoin(pageReqVO);
+        if (CollectionUtils.isAnyEmpty(pageResult.getList())) {
+            return pageResult;
+        }
+
+//        List<String> deptIds = pageResult.getList().stream().map(TaskOrderNonTaxRecordRespVO::getDeptId).toList();
+//        List<String> userIds = pageResult.getList().stream().map(TaskOrderNonTaxRecordRespVO::getHandledBy).toList();
+        List<String> creatorIds = pageResult.getList().stream()
+                .map(TaskOrderNonTaxRecordRespVO::getCreator)
+                .filter(Objects::nonNull)
+                .toList();
+//        Map<String, DeptRespDTO> deptMap = deptApi.getDeptMap(deptIds);
+        //Map<String, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
+        Map<String, AdminUserRespDTO> creatorMap = adminUserApi.getUserMap(creatorIds);
+
+        pageResult.getList().forEach(item -> {
+//            item.setDept(deptMap.get(item.getDeptId()));
+            item.setCreatorUser(creatorMap.get(item.getCreator()));
+
+            List<BoilerTaskOrderDO> taskOrderDOS = taskOrderNonTaxRecordItemMapper.selectTaskOrder(item.getId());
+            item.setTaskOrders(taskOrderDOS);
+            if(!taskOrderDOS.isEmpty()){
+                item.setOrderNos(taskOrderDOS.stream().map(BoilerTaskOrderDO::getOrderNo).toList());
+            }
+
+            //设备数量
+            if (item.getEquipMainType() == 200){
+                Long count = boilerTaskOrderItemMapper.selectCount(BoilerTaskOrderItemDO::getOrderId, item.getOrderId());
+                item.setEquipNum(count);
+            }else if (item.getEquipMainType() == 300){
+                Long count = pipeTaskOrderItemMapper.selectCount(PipeTaskOrderItemDO::getOrderId, item.getOrderId());
+                item.setEquipNum(count);
+            }
+
+        });
+
+        return pageResult;
+    }
 
     @Override
     @Transactional

tz-module-system/tz-module-system-biz/src/main/resources/application-uat.yaml

@@ -76,7 +76,7 @@ spring:
 
   # rocketmq 配置项，对应 RocketMQProperties 配置类
   rocketmq:
-    name-server: 127.0.0.1:9876 # RocketMQ Namesrv
+    name-server: 192.168.20.224:9876 # RocketMQ Namesrv
 
 --- #################### 定时任务相关配置 ####################
 xxl: