管道打印发证相同任务单多设备不互相影响出报告

build-uat/update.sql

@@ -1550,4 +1550,7 @@ ALTER TABLE "PRESSURE_TASK_ORDER" ADD COLUMN "IS_SYNC" VARCHAR(50);
 COMMENT ON COLUMN "PRESSURE_TASK_ORDER"."IS_SYNC" IS '是否是同步数据';
 
 INSERT INTO "INFRA_CONFIG" ("ID","CATEGORY","TYPE","NAME","CONFIG_KEY","VALUE","VISIBLE","REMARK","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED" ) VALUES ('f4f25ba4fa087abf9c67d75ba4a6c0ab','定时任务开关','2','是否定时查询非税记录的缴费状态并更新','is_enable_update_no_tax_status','false',1,'true:开启 false:关闭','1','2026-06-02 18:40:46','1','2026-06-02 19:05:59',0);
+-- 已加
+
+ALTER TABLE "PRESSURE2_PIPE_TASK_ORDER_ISSUE_REPORT" ADD COLUMN "EQUIP_ID" VARCHAR(64);
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ISSUE_REPORT"."EQUIP_ID" IS '设备ID';

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorderissuereport/vo/PipeTaskOrderIssueReportVO.java

@@ -95,4 +95,6 @@ public class PipeTaskOrderIssueReportVO implements Serializable {
 
     @Schema(description = "发放原因", example = "1")
     private String reasonDist;
+
+    private String equipId;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/pipetaskorderissuereport/PipeTaskOrderIssueReportDO.java

@@ -115,5 +115,9 @@ public class PipeTaskOrderIssueReportDO extends BaseDO {
      * 业务类型(0=出具报告,1=打印发证)
      */
     private Boolean businessType;
+    /**
+     * 设备ID
+     */
+    private String equipId;
 
 }

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

@@ -1504,6 +1504,10 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
     @Transactional
     public void taskOrderBatchIssueReport(@Valid List<PipeTaskOrderIssueReportVO> taskOrderIssueReportVO) {
         taskOrderIssueReportVO.forEach(taskOrderIssueReport -> {
+            if (CollUtil.isEmpty(taskOrderIssueReport.getItemList())) {
+                throw exception(new ErrorCode(1001,"设备id不能为空"));
+            }
+            taskOrderIssueReport.setEquipId(taskOrderIssueReport.getItemList().get(0));
             taskOrderIssueReport.setIsIssueReportFlag(1);
             this.taskOrderIssueReport(taskOrderIssueReport);
         });

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/pipetaskorderitem/PipeTaskOrderItemQueryMapper.xml

@@ -62,7 +62,7 @@
         FROM pressure2_pipe_task_order_item t1
         LEFT JOIN pressure2_pipe_task_order_item_report t3 ON t3.ORDER_ID = t1.ORDER_ID AND t3.deleted = 0
         LEFT JOIN pressure_task_order t2 ON t2.id = t1.order_id AND t2.deleted = 0
-        LEFT JOIN pressure2_pipe_task_order_issue_report t4 ON t4.order_item_report_id = t3.id AND t4.deleted = 0 and t4.business_type = 1
+        LEFT JOIN pressure2_pipe_task_order_issue_report t4 ON t4.order_item_report_id = t3.id AND t4.equip_id = t1.equip_id AND t4.deleted = 0 and t4.business_type = 1
         LEFT JOIN PRESSURE2_PIPE_TASK_ORDER_ITEM_PRINT t5 ON t5.item_id = t1.id AND t5.deleted = 0
         LEFT JOIN PRESSURE2_EQUIP_PIPE t6 on t6.ID = t1.equip_id
         <where>