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

build-uat/Dockerfile-admin1

@@ -0,0 +1,7 @@
+FROM nginx:1.29.4
+WORKDIR /usr/share/nginx/html/
+#RUN mkdir -p /usr/share/nginx/html/
+#RUN ls -ls
+COPY ./html  /usr/share/nginx/html/
+COPY ./nginx.conf /etc/nginx/conf.d/default.conf
+CMD ["nginx", "-g", "daemon off;"]

build-uat/nginx1.conf

@@ -0,0 +1,18 @@
+server {
+    listen 80;
+    # gzip config
+    gzip on;
+    gzip_min_length 1k;
+    gzip_comp_level 9;
+    gzip_types text/plain text/css text/javascript application/json application/javascript application/x-javascript application/xml;
+    gzip_vary on;
+    gzip_disable "MSIE [1-6]\.";
+
+    root /usr/share/nginx/html;
+
+    location / {
+        add_header Cache-Control no-cache;
+	proxy_set_header Host 192.168.19.165:40081;
+        try_files $uri $uri/ /index.html;
+    }
+}

build-uat/update.sql

@@ -1054,4 +1054,481 @@ ALTER TABLE "PRESSURE2_ORDER_REPORT" ADD COLUMN "SIGN_DATE" TIMESTAMP(6);
 ALTER TABLE "PRESSURE2_ORDER_REPORT" ADD COLUMN "SIGN_URL" VARCHAR(50);
 COMMENT ON TABLE "PRESSURE2_ORDER_REPORT" IS '受理单服务单';
 COMMENT ON COLUMN "PRESSURE2_ORDER_REPORT"."SIGN_DATE" IS '签名日期';
-COMMENT ON COLUMN "PRESSURE2_ORDER_REPORT"."SIGN_URL" IS '客户签名';
+COMMENT ON COLUMN "PRESSURE2_ORDER_REPORT"."SIGN_URL" IS '客户签名';
+
+
+--20250518
+        
+CREATE TABLE "PRESSURE2_PAYMENT_FOLLOW_RECORD"
+(
+    "ID" VARCHAR2(64) NOT NULL,
+    "TASK_ORDER_ID" VARCHAR2(64) NOT NULL,
+    "REMARK" VARCHAR2(1000),
+    "CREATOR" VARCHAR2(64) DEFAULT '',
+    "CREATE_TIME" TIMESTAMP(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    "UPDATER" VARCHAR2(64) DEFAULT '',
+    "UPDATE_TIME" TIMESTAMP(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    "DELETED" BIT DEFAULT 0,
+    "STATUS" INT,
+    NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ;
+
+COMMENT ON TABLE "PRESSURE2_PAYMENT_FOLLOW_RECORD" IS '缴费跟进记录';
+COMMENT ON COLUMN "PRESSURE2_PAYMENT_FOLLOW_RECORD"."ID" IS '主键';
+COMMENT ON COLUMN "PRESSURE2_PAYMENT_FOLLOW_RECORD"."TASK_ORDER_ID" IS '任务单id';
+COMMENT ON COLUMN "PRESSURE2_PAYMENT_FOLLOW_RECORD"."REMARK" IS '备注';
+COMMENT ON COLUMN "PRESSURE2_PAYMENT_FOLLOW_RECORD"."CREATOR" IS '创建人';
+COMMENT ON COLUMN "PRESSURE2_PAYMENT_FOLLOW_RECORD"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "PRESSURE2_PAYMENT_FOLLOW_RECORD"."UPDATER" IS '更新者';
+COMMENT ON COLUMN "PRESSURE2_PAYMENT_FOLLOW_RECORD"."UPDATE_TIME" IS '更新时间';
+COMMENT ON COLUMN "PRESSURE2_PAYMENT_FOLLOW_RECORD"."DELETED" IS '是否删除';
+COMMENT ON COLUMN "PRESSURE2_PAYMENT_FOLLOW_RECORD"."STATUS" IS '公众号推送状态(0=成功,1=拒绝接收,2=其他原因失败,3=发送失败)';
+
+CREATE TABLE "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"
+(
+    "ID" VARCHAR(50) NOT NULL,
+    "ORDER_ID" VARCHAR(50),
+    "CREATE_TIME" TIMESTAMP(0) NOT NULL,
+    "UPDATER" VARCHAR(64 CHAR),
+"UPDATE_TIME" TIMESTAMP(0) NOT NULL,
+"DELETED" BIT DEFAULT 0 NOT NULL,
+"STATUS" INT DEFAULT 100,
+"PAYMENT_INSTRUCTION_NO" VARCHAR(255),
+"REMARK" VARCHAR(1000),
+"RETURN_REASON" VARCHAR(1000),
+"BILLING_TIME" DATETIME(6),
+"EQUIP_MAIN_TYPE" INTEGER,
+"CREATOR" VARCHAR(50),
+"RECORD_ID" VARCHAR(50),
+"RECEIVABLE_AMOUNT" NUMBER(10,2),
+"SPLIT_AMOUNT" NUMBER(10,2),
+NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ;
+
+COMMENT ON TABLE "PRESSURE2_TASK_ORDER_NON_TAX_APPLY" IS '任务单非税开单申请';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."ID" IS 'ID';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."ORDER_ID" IS '任务单id';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."UPDATER" IS '更新人';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."UPDATE_TIME" IS '更新时间';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."DELETED" IS '是否删除';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."STATUS" IS '状态';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."PAYMENT_INSTRUCTION_NO" IS '缴费通知书';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."REMARK" IS '备注';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."RETURN_REASON" IS '退回原因';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."BILLING_TIME" IS '开单日期';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."EQUIP_MAIN_TYPE" IS '设备类型 200 锅炉 300 管道';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."CREATOR" IS '创建人';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."RECORD_ID" IS '申请记录';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."RECEIVABLE_AMOUNT" IS '应收金额';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY"."SPLIT_AMOUNT" IS '拆单金额';
+
+CREATE TABLE "PRESSURE2_TASK_ORDER_NON_TAX_APPLY_RECORD"
+(
+    "ID" VARCHAR2(64) NOT NULL,
+    "APPLY_ID" VARCHAR2(64) NOT NULL,
+    "RECORD_ID" VARCHAR2(64) NOT NULL,
+    "IS_ORDER_SPLIT" VARCHAR2(20) DEFAULT '0',
+    "CREATOR" VARCHAR2(64) DEFAULT '',
+    "CREATE_TIME" TIMESTAMP(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    "UPDATER" VARCHAR2(64) DEFAULT '',
+    "UPDATE_TIME" TIMESTAMP(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    "DELETED" BIT DEFAULT 0,
+    NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ;
+
+COMMENT ON TABLE "PRESSURE2_TASK_ORDER_NON_TAX_APPLY_RECORD" IS '任务单非税开单申请记录关联表';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY_RECORD"."ID" IS '主键';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY_RECORD"."APPLY_ID" IS '开单申请id';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY_RECORD"."RECORD_ID" IS '记录id';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY_RECORD"."IS_ORDER_SPLIT" IS '是否拆单 0否 1是';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY_RECORD"."CREATOR" IS '创建人';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY_RECORD"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY_RECORD"."UPDATER" IS '更新者';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY_RECORD"."UPDATE_TIME" IS '更新时间';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_APPLY_RECORD"."DELETED" IS '是否删除';
+
+CREATE TABLE "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"
+(
+    "ID" VARCHAR(50) NOT NULL,
+    "PAYER" VARCHAR(255),
+    "CONTACT_PHONE" VARCHAR(500),
+    "EMAIL" VARCHAR(500),
+    "TOTAL_AMOUNT" DECIMAL(22,6),
+    "ACTUAL_AMOUNT" DECIMAL(22,6),
+    "CREATE_TIME" TIMESTAMP(0) NOT NULL,
+    "UPDATER" VARCHAR(64 CHAR),
+"UPDATE_TIME" TIMESTAMP(0) NOT NULL,
+"DELETED" BIT DEFAULT 0 NOT NULL,
+"CREATOR" VARCHAR(50),
+"REMARK" VARCHAR(500),
+"PAY_ACCOUNT" VARCHAR(255),
+"PAY_BANK" VARCHAR(500),
+"RECIPIENT" VARCHAR(500),
+"RECIPIENT_BANK" VARCHAR(500),
+"RECIPIENT_ACCOUNT" VARCHAR(500),
+"DEADLINE" DATE,
+"HANDLED_BY" VARCHAR(50),
+"OPEN_DATE" DATETIME(6),
+"STATUS" INT DEFAULT 100,
+"PAY_STATUS" INT DEFAULT 100,
+"PAYMENT_INSTRUCTION_NO" VARCHAR(255),
+"DEPT_ID" VARCHAR(50),
+"PAY_DATE" DATETIME(6),
+"BILL_NUMBER" VARCHAR(50),
+"PAYMENT_INSTRUCTION" VARCHAR(1000),
+"PROCESS_INSTANCE_ID" VARCHAR(64),
+"CHECK_DATE" DATE,
+"UNIT_NAME" VARCHAR(500),
+"USE_UNIT_NAME" VARCHAR(500),
+"EQUIP_MAIN_TYPE" INTEGER,
+"PAY_DEADLINE" DATE,
+"RECIPIENT_PHONE" VARCHAR(255),
+"CLIENT_UNIT" VARCHAR(255),
+"CLIENT_UNIT_CODE" VARCHAR(500),
+"CHARGE_ITEM_CODE" VARCHAR(500),
+"CHARGE_ITEM_NAME" VARCHAR(500),
+"NUM" INT,
+"PRICING" VARCHAR(500),
+"IMP_URL" VARCHAR(500),
+"NOTICE_PDF_URL" VARCHAR2(500),
+NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ;
+
+COMMENT ON TABLE "PRESSURE2_TASK_ORDER_NON_TAX_RECORD" IS '任务单非税记录';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."ID" IS 'ID';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."PAYER" IS '付款人';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."CONTACT_PHONE" IS '联系电话';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."EMAIL" IS '利息人邮箱';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."TOTAL_AMOUNT" IS '缴费金额';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."ACTUAL_AMOUNT" IS '实际金额';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."UPDATER" IS '更新人';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."UPDATE_TIME" IS '更新时间';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."DELETED" IS '是否删除';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."CREATOR" IS '创建人';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."REMARK" IS '备注';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."PAY_ACCOUNT" IS '付款账号';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."PAY_BANK" IS '付款银行';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."RECIPIENT" IS '收款人';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."RECIPIENT_BANK" IS '收款银行';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."RECIPIENT_ACCOUNT" IS '收款账号';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."DEADLINE" IS '截止日期';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."HANDLED_BY" IS '经办人';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."OPEN_DATE" IS '开单日期';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."STATUS" IS '审核状态  100 待审核  200 审核通过 300 已拒绝';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."PAY_STATUS" IS '付款状态 100 待缴费 200 已缴费  300 已作废';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."PAYMENT_INSTRUCTION_NO" IS '缴费通知书';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."DEPT_ID" IS '部门';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."PAY_DATE" IS '付款日期';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."BILL_NUMBER" IS '票据编号';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."PAYMENT_INSTRUCTION" IS '缴费通知书';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."PROCESS_INSTANCE_ID" IS '流程id';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."CHECK_DATE" IS '检验日期';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."UNIT_NAME" IS '单位名称';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."USE_UNIT_NAME" IS '使用单位名称';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."EQUIP_MAIN_TYPE" IS '设备类型 200锅炉 300管道';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."PAY_DEADLINE" IS '付款截止日期';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."RECIPIENT_PHONE" IS '报告接收电话';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."CLIENT_UNIT" IS '委托单位名称';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."CLIENT_UNIT_CODE" IS '委托单位编码';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."CHARGE_ITEM_CODE" IS '收费项目编码';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."CHARGE_ITEM_NAME" IS '收费项目名称';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."NUM" IS '数量';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."PRICING" IS '收费标准';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."IMP_URL" IS '缴费通知书';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD"."NOTICE_PDF_URL" IS '缴费通知书PDF文件URL';
+
+CREATE TABLE "PRESSURE2_TASK_ORDER_NON_TAX_RECORD_ITEM"
+(
+    "ID" VARCHAR(50) NOT NULL,
+    "RECORD_ID" VARCHAR(50),
+    "ORDER_ID" VARCHAR(50),
+    "CREATE_TIME" TIMESTAMP(0) NOT NULL,
+    "UPDATER" VARCHAR(64 CHAR),
+"UPDATE_TIME" TIMESTAMP(0) NOT NULL,
+"DELETED" BIT DEFAULT 0 NOT NULL,
+"CREATOR" VARCHAR(50),
+NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ;
+
+COMMENT ON TABLE "PRESSURE2_TASK_ORDER_NON_TAX_RECORD_ITEM" IS '任务单非税记录子项';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD_ITEM"."ID" IS 'id';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD_ITEM"."RECORD_ID" IS '记录';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD_ITEM"."ORDER_ID" IS '任务单';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD_ITEM"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD_ITEM"."UPDATER" IS '更新人';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD_ITEM"."UPDATE_TIME" IS '更新时间';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD_ITEM"."DELETED" IS '是否删除';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_RECORD_ITEM"."CREATOR" IS '创建人';
+
+CREATE TABLE "PRESSURE2_TASK_ORDER_NON_TAX_REPORT"
+(
+    "ID" VARCHAR(64) NOT NULL,
+    "NON_TAX_RECORD_ID" VARCHAR(50),
+    "TEMPLATE_ID" VARCHAR(64),
+    "CREATOR" VARCHAR(64),
+    "CREATE_TIME" TIMESTAMP(6) NOT NULL,
+    "UPDATER" VARCHAR(64),
+    "UPDATE_TIME" TIMESTAMP(6) NOT NULL,
+    "DELETED" BIT NOT NULL,
+    "REPORT_NAME" VARCHAR(100),
+    "EQUIP_MAIN_TYPE" INTEGER,
+    "INS_ID" VARCHAR(50),
+    NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ;
+
+COMMENT ON TABLE "PRESSURE2_TASK_ORDER_NON_TAX_REPORT" IS '非税通知书';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_REPORT"."ID" IS '主键';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_REPORT"."NON_TAX_RECORD_ID" IS '非税记录单号';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_REPORT"."TEMPLATE_ID" IS '模板ID';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_REPORT"."CREATOR" IS '创建人';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_REPORT"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_REPORT"."UPDATER" IS '修改人';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_REPORT"."UPDATE_TIME" IS '修改时间';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_REPORT"."DELETED" IS '是否删除';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_REPORT"."REPORT_NAME" IS '报告名称';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_REPORT"."EQUIP_MAIN_TYPE" IS '设备分类';
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_REPORT"."INS_ID" IS '报表明细ID';
+
+CREATE TABLE "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"
+(
+    "ID" VARCHAR(64) NOT NULL,
+    "TASK_ORDER_ID" VARCHAR(50),
+    "TEMPLATE_ID" VARCHAR(64),
+    "CREATOR" VARCHAR(64),
+    "CREATE_TIME" TIMESTAMP(6) NOT NULL,
+    "UPDATER" VARCHAR(64),
+    "UPDATE_TIME" TIMESTAMP(6) NOT NULL,
+    "DELETED" BIT NOT NULL,
+    "REPORT_NO" VARCHAR(50),
+    "STATUS" INT,
+    "REMARK" VARCHAR(1000),
+    "REPORT_NAME" VARCHAR(100),
+    "APPROVAL_ID" VARCHAR(50),
+    "APPROVAL_TIME" DATETIME(6),
+    "APPROVAL_NAME" VARCHAR(100),
+    "SUBMIT_ID" VARCHAR(50),
+    "SUBMIT_TIME" DATETIME(6),
+    "SUBMIT_NAME" VARCHAR(50),
+    "PROJECT_NO" VARCHAR(50),
+    "UNIT_NAME" VARCHAR(50),
+    "CERTIFICATE_NO" varchar(256),
+    "DEPT_ID" VARCHAR(50),
+    "EQUIP_ID" VARCHAR(50),
+    NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ;
+
+COMMENT ON TABLE "PRESSURE2_PIPE_USE_REGISTRATION_REPORT" IS '管道使用登记表';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."ID" IS '主键';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."TASK_ORDER_ID" IS '任务单号';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."TEMPLATE_ID" IS '模板ID';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."CREATOR" IS '创建人';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."UPDATER" IS '修改人';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."UPDATE_TIME" IS '修改时间';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."DELETED" IS '是否删除';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."REPORT_NO" IS '报表编号';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."STATUS" IS '审核状态';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."REMARK" IS '备注';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."REPORT_NAME" IS '报告名称';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."APPROVAL_ID" IS '审核人';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."APPROVAL_TIME" IS '审核时间';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."APPROVAL_NAME" IS '审核人名称';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."SUBMIT_ID" IS '提交人';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."SUBMIT_TIME" IS '提交时间';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."SUBMIT_NAME" IS '提交人名称';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."PROJECT_NO" IS '工程号';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."UNIT_NAME" IS '使用单位名称';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."CERTIFICATE_NO" IS '使用登记证编号';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."DEPT_ID" IS '部门ID';
+COMMENT ON COLUMN "PRESSURE2_PIPE_USE_REGISTRATION_REPORT"."EQUIP_ID" IS '设备ID';
+
+
+ALTER TABLE "PRESSURE2_EQUIP_PIPE" ADD COLUMN "IS_EFFECTIVE" VARCHAR(50) DEFAULT (1);
+COMMENT ON COLUMN "PRESSURE2_EQUIP_PIPE"."IS_EFFECTIVE" IS '是否有效';
+--20260519
+ALTER TABLE "PRESSURE2_BOILER_TASK_ORDER_ITEM" ADD COLUMN "IS_SUSPEND" BIT DEFAULT (0);
+ALTER TABLE "PRESSURE2_BOILER_TASK_ORDER_ITEM" ADD COLUMN "SUSPEND_TIME" DATETIME(6);
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM"."IS_SUSPEND" IS '是否中止检验';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM"."SUSPEND_TIME" IS '中止时间';
+
+ALTER TABLE "PRESSURE2_PIPE_TASK_ORDER_ITEM" ADD COLUMN "IS_SUSPEND" BIT DEFAULT (0);
+ALTER TABLE "PRESSURE2_PIPE_TASK_ORDER_ITEM" ADD COLUMN "SUSPEND_TIME" DATETIME(6);
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM"."IS_SUSPEND" IS '是否中止检验';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM"."SUSPEND_TIME" IS '中止时间';
+
+CREATE TABLE "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"
+(
+    "ID" VARCHAR(64),
+    "ORDER_ID" VARCHAR(64) NOT NULL,
+    "EQUIP_ID" VARCHAR(64) NOT NULL,
+    "EQUIP_CODE" VARCHAR(64),
+    "PLAN_DATE" DATE,
+    "IS_LEASE" BIT,
+    "USE_REGISTER_NO" VARCHAR(100),
+    "EQUIP_TYPE" VARCHAR(64),
+    "EQUIP_NAME" VARCHAR(255 CHAR),
+"PRODUCT_NO" VARCHAR(255 CHAR),
+"SAFE_MANAGER" VARCHAR(64 CHAR),
+"SAFE_MANAGER_PHONE" VARCHAR(32 CHAR),
+"NEXT_IN_CHECK_DATE" DATE,
+"NEXT_OUT_CHECK_DATE" DATE,
+"NEXT_PRESSURE_CHECK_DATE" DATE,
+"OVERDUE_DATE" DATE,
+"CREATOR" VARCHAR(64 CHAR),
+"CREATE_TIME" TIMESTAMP(0) NOT NULL,
+"UPDATER" VARCHAR(64 CHAR),
+"UPDATE_TIME" TIMESTAMP(0) NOT NULL,
+"DELETED" BIT DEFAULT 0 NOT NULL,
+"SUBMIT_TIME" DATETIME(6),
+"SUBMIT_ID" VARCHAR(64),
+"IS_CANCEL" BIT DEFAULT 0,
+"REASON" VARCHAR2(1000),
+"APPROVAL_ID" VARCHAR2(64),
+"APPROVAL_TIME" TIMESTAMP(6)) STORAGE(ON "MAIN", CLUSTERBTR) ;
+
+COMMENT ON TABLE "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND" IS '锅炉中止检验记录';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."ID" IS 'id';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."ORDER_ID" IS '订单id';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."EQUIP_ID" IS '设备id';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."EQUIP_CODE" IS '设备代码';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."PLAN_DATE" IS '计划排期';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."IS_LEASE" IS '是否租借';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."USE_REGISTER_NO" IS '使用登记证编号';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."EQUIP_TYPE" IS '类别';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."EQUIP_NAME" IS '名称';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."PRODUCT_NO" IS '产品编号';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."SAFE_MANAGER" IS '安全管理人员';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."SAFE_MANAGER_PHONE" IS '安全管理人员电话';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."NEXT_IN_CHECK_DATE" IS '下次内部检验时间';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."NEXT_OUT_CHECK_DATE" IS '下次外部检验时间';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."NEXT_PRESSURE_CHECK_DATE" IS '下次耐压时间';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."OVERDUE_DATE" IS '设备超期时间';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."CREATOR" IS '创建人';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."UPDATER" IS '更新人';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."UPDATE_TIME" IS '更新时间';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."DELETED" IS '是否删除';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."SUBMIT_TIME" IS '提交时间';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."SUBMIT_ID" IS '提交人';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."IS_CANCEL" IS '是否取消';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."REASON" IS '中止检验';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."APPROVAL_ID" IS '任务单变更审核人id';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_SUSPEND"."APPROVAL_TIME" IS '任务单变更审核时间';
+
+CREATE TABLE "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"
+(
+    "ID" VARCHAR(64),
+    "ORDER_ID" VARCHAR(64) NOT NULL,
+    "EQUIP_ID" VARCHAR(64) NOT NULL,
+    "PROJECT_NO" VARCHAR(64),
+    "PLAN_DATE" DATE,
+    "IS_LEASE" BIT,
+    "USE_REGISTER_NO" VARCHAR(100),
+    "EQUIP_TYPE" VARCHAR(64),
+    "PROJECT_NAME" VARCHAR(255 CHAR),
+"PRODUCT_NO" VARCHAR(255 CHAR),
+"SAFE_MANAGER" VARCHAR(64 CHAR),
+"SAFE_MANAGER_PHONE" VARCHAR(32 CHAR),
+"NEXT_LEGAL_CHECK_DATE" DATE,
+"NEXT_YEAR_CHECK_DATE" DATE,
+"OVERDUE_DATE" DATE,
+"CREATOR" VARCHAR(64 CHAR),
+"CREATE_TIME" TIMESTAMP(0) NOT NULL,
+"UPDATER" VARCHAR(64 CHAR),
+"UPDATE_TIME" TIMESTAMP(0) NOT NULL,
+"DELETED" BIT DEFAULT 0 NOT NULL,
+"SUBMIT_TIME" DATETIME(6),
+"SUBMIT_ID" VARCHAR(64),
+"IS_CANCEL" BIT DEFAULT 0,
+"REASON" VARCHAR2(1000),
+"APPROVAL_ID" VARCHAR2(64),
+"APPROVAL_TIME" TIMESTAMP(6)) STORAGE(ON "MAIN", CLUSTERBTR) ;
+
+COMMENT ON TABLE "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND" IS '管道中止检验记录';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."ID" IS 'id';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."ORDER_ID" IS '订单id';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."EQUIP_ID" IS '设备id';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."PROJECT_NO" IS '工程号';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."PLAN_DATE" IS '计划排期';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."IS_LEASE" IS '是否租借';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."USE_REGISTER_NO" IS '使用登记证编号';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."EQUIP_TYPE" IS '类别';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."PROJECT_NAME" IS '工程名称';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."PRODUCT_NO" IS '产品编号';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."SAFE_MANAGER" IS '安全管理人员';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."SAFE_MANAGER_PHONE" IS '安全管理人员电话';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."NEXT_LEGAL_CHECK_DATE" IS '下次法定检验时间';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."NEXT_YEAR_CHECK_DATE" IS '下次年度检验时间';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."OVERDUE_DATE" IS '设备超期时间';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."CREATOR" IS '创建人';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."UPDATER" IS '更新人';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."UPDATE_TIME" IS '更新时间';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."DELETED" IS '是否删除';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."SUBMIT_TIME" IS '提交时间';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."SUBMIT_ID" IS '提交人';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."IS_CANCEL" IS '是否取消';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."REASON" IS '中止检验';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."APPROVAL_ID" IS '任务单变更审核人id';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_SUSPEND"."APPROVAL_TIME" IS '任务单变更审核时间';
+
+--20260521
+ALTER TABLE "PRESSURE_TASK_ORDER" ADD COLUMN "ISSUE_URL" VARCHAR(50);
+COMMENT ON COLUMN "PRESSURE_TASK_ORDER"."ISSUE_URL" IS '出具报告文件地址';
+
+ALTER TABLE "PRESSURE2_APPOINTMENT_CONFIRM_ORDER_REFUSE_ITEM" ADD COLUMN "CHECK_TYPE_NAME" VARCHAR(50);
+COMMENT ON COLUMN "PRESSURE2_APPOINTMENT_CONFIRM_ORDER_REFUSE_ITEM"."CHECK_TYPE_NAME" IS '检验类型文本';
+
+ALTER TABLE "PRESSURE2_APPOINTMENT_CONFIRM_REFUSE_YEAR_ITEM" ADD COLUMN "CHECK_TYPE_NAME" VARCHAR(50);
+COMMENT ON COLUMN "PRESSURE2_APPOINTMENT_CONFIRM_REFUSE_YEAR_ITEM"."CHECK_TYPE_NAME" IS '检验类型文本';
+
+ALTER TABLE "PRESSURE2_APPOINTMENT_CONFIRM_ORDER_REFUSE_ITEM" ADD COLUMN "EQUIP_STATUS_NAME" VARCHAR(32);
+COMMENT ON COLUMN "PRESSURE2_APPOINTMENT_CONFIRM_ORDER_REFUSE_ITEM"."EQUIP_STATUS_NAME" IS '运行状态文本';
+
+ALTER TABLE "PRESSURE2_APPOINTMENT_CONFIRM_REFUSE_YEAR_ITEM" ADD COLUMN "EQUIP_STATUS_NAME" VARCHAR(32);
+COMMENT ON COLUMN "PRESSURE2_APPOINTMENT_CONFIRM_REFUSE_YEAR_ITEM"."EQUIP_STATUS_NAME" IS '运行状态文本';
+
+ALTER TABLE "PRESSURE2_EQUIPMENT_RETURN_RECORD" ADD COLUMN "CHECK_TYPE_NAME" VARCHAR(50);
+ALTER TABLE "PRESSURE2_EQUIPMENT_RETURN_RECORD" ADD COLUMN "EQUIP_STATUS_NAME" VARCHAR(32);
+COMMENT ON COLUMN "PRESSURE2_EQUIPMENT_RETURN_RECORD"."CHECK_TYPE_NAME" IS '检验类型文本';
+COMMENT ON COLUMN "PRESSURE2_EQUIPMENT_RETURN_RECORD"."EQUIP_STATUS_NAME" IS '运行状态文本';
+
+ALTER TABLE "PRESSURE2_REPORT_CITY_RECORD" ADD COLUMN "CHECK_TYPE_NAME" VARCHAR(50);
+ALTER TABLE "PRESSURE2_REPORT_CITY_RECORD" ADD COLUMN "EQUIP_STATUS_NAME" VARCHAR(32);
+COMMENT ON COLUMN "PRESSURE2_REPORT_CITY_RECORD"."CHECK_TYPE_NAME" IS '检验类型文本';
+COMMENT ON COLUMN "PRESSURE2_REPORT_CITY_RECORD"."EQUIP_STATUS_NAME" IS '运行状态文本';
+
+
+-- 0522以上已加
+
+--20260525
+ALTER TABLE "PRESSURE2_TASK_ORDER_NON_TAX_REPORT" ADD COLUMN "QRCODE_PATH" VARCHAR(32);
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_REPORT"."CHECK_TYPE_NAME" IS '二维码路径';
+
+ALTER TABLE "PRESSURE2_EQUIP_PIPE" ADD COLUMN "PENDING_INSPECTION_REMARK" VARCHAR2(1000) DEFAULT ('');
+ALTER TABLE "PRESSURE2_EQUIP_PIPE" ADD COLUMN "ANNOTATOR_DATE" DATETIME(6);
+ALTER TABLE "PRESSURE2_EQUIP_PIPE" ADD COLUMN "ANNOTATOR_ID" VARCHAR(50);
+ALTER TABLE "PRESSURE2_EQUIP_PIPE" ADD COLUMN "ANNOTATOR_NAME" VARCHAR(50);
+COMMENT ON COLUMN "PRESSURE2_EQUIP_PIPE"."PENDING_INSPECTION_REMARK" IS '待约检备注';
+COMMENT ON COLUMN "PRESSURE2_EQUIP_PIPE"."ANNOTATOR_DATE" IS '备注时间';
+COMMENT ON COLUMN "PRESSURE2_EQUIP_PIPE"."ANNOTATOR_ID" IS '备注人ID';
+COMMENT ON COLUMN "PRESSURE2_EQUIP_PIPE"."ANNOTATOR_NAME" IS '备注人名称';
+
+ALTER TABLE "PRESSURE2_EQUIP_BOILER" ADD COLUMN "PENDING_INSPECTION_REMARK" VARCHAR2(1000) DEFAULT ('');
+ALTER TABLE "PRESSURE2_EQUIP_BOILER" ADD COLUMN "ANNOTATOR_DATE" DATETIME(6);
+ALTER TABLE "PRESSURE2_EQUIP_BOILER" ADD COLUMN "ANNOTATOR_ID" VARCHAR(50);
+ALTER TABLE "PRESSURE2_EQUIP_BOILER" ADD COLUMN "ANNOTATOR_NAME" VARCHAR(50);
+COMMENT ON COLUMN "PRESSURE2_EQUIP_BOILER"."PENDING_INSPECTION_REMARK" IS '待约检备注';
+COMMENT ON COLUMN "PRESSURE2_EQUIP_BOILER"."ANNOTATOR_DATE" IS '备注时间';
+COMMENT ON COLUMN "PRESSURE2_EQUIP_BOILER"."ANNOTATOR_ID" IS '备注人ID';
+COMMENT ON COLUMN "PRESSURE2_EQUIP_BOILER"."ANNOTATOR_NAME" IS '备注人名称';
+
+-- 0527以上已加
+
+--20250527
+--上报管理菜单调整
+update system_menu set PARENT_ID = '0a148121ee6a5d745928e00b11c72e2b' where PARENT_ID = 'c3060cb5927de6ceaa25aec939057c3a';
+update system_menu set STATUS = 1 where ID = 'c3060cb5927de6ceaa25aec939057c3a'
+
+ALTER TABLE "PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT" ADD COLUMN "CONFIRMATION_TIME" DATE;
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT"."CONFIRMATION_TIME" IS '检验意见通知书确认日期';
+
+ALTER TABLE "PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT" ADD COLUMN "CONFIRMATION_TIME" DATE;
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT"."CONFIRMATION_TIME" IS '检验意见通知书确认日期';
+
+-- 0527以上已加

tz-framework/tz-spring-boot-starter-env/src/main/java/cn/start/tz/framework/env/core/enums/EnvEnum.java

@@ -13,6 +13,7 @@ import lombok.Getter;
 public enum EnvEnum {
 
     LOCAL("local", "开发环境"),
+    HSD("hsd", "开发环境"),
     UAT("uat", "特种uat环境");
 
     private final String envName;

tz-module-bpm/tz-module-bpm-api/src/main/java/cn/start/tz/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java

@@ -38,5 +38,5 @@ public class BpmProcessInstanceCreateReqDTO {
      * 100 - 容器 200 - 锅炉 300 - 管道
      */
     @Schema(description = "设备类型")
-    private String EquipMainType;
+    private String equipMainType;
 }

tz-module-bpm/tz-module-bpm-api/src/main/java/cn/start/tz/module/bpm/enums/boiler/BoilerBpmModeConstantsEnum.java

@@ -15,6 +15,7 @@ public enum BoilerBpmModeConstantsEnum {
     PRESSURE2_SERIOUS_ACCIDENT("pressure2_boiler_serious_accident", "重大事故审核"),
     PRESSURE2_INSPECTION_SCHEME("pressure2_boiler_inspection_scheme", "检验方案"),
     PRESSURE2_WORKING_INSTRUCTION("pressure2_boiler_working_instruction", "作业指导书"),
+    PRESSURE2_NON_TAX("PRESSURE2_NON_TAX", "锅炉管道非税缴费"),
     ;
 
     /**

tz-module-bpm/tz-module-bpm-api/src/main/java/cn/start/tz/module/bpm/enums/boiler/BoilerBpmModelConstants.java

@@ -48,9 +48,9 @@ public interface BoilerBpmModelConstants {
     String PRESSURE2_BOILER_WORKING_INSTRUCTION= "pressure2_boiler_working_instruction";
 
     /**
-     *   非税缴费
+     * 锅炉管道非税缴费
      **/
-    String PRESSURE_NON_TAX= "non_tax";
+    String PRESSURE2_NON_TAX= "PRESSURE2_NON_TAX";
 
     /**
      * 承压动态报表表单

tz-module-bpm/tz-module-bpm-biz/src/main/java/cn/start/tz/module/bpm/framework/rpc/config/RpcConfiguration.java

@@ -12,6 +12,7 @@ import cn.start.tz.module.pressure2.api.appointmentconfirmorderrefuseitem.PipeAp
 import cn.start.tz.module.pressure2.api.dynamictb.DynamicTbApi;
 import cn.start.tz.module.pressure2.api.taskorder.BoilerTaskOrderApi;
 import cn.start.tz.module.pressure2.api.taskorder.PipeTaskOrderApi;
+import cn.start.tz.module.pressure2.api.taskordernontaxrecord.Pressure2TaskOrderNonTaxRecordApi;
 import cn.start.tz.module.system.api.dept.DeptApi;
 import cn.start.tz.module.system.api.dept.PostApi;
 import cn.start.tz.module.system.api.dict.DictDataApi;
@@ -28,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
         TaskOrderNonTaxRecordApi.class
         // pressure2模块
         ,DynamicTbApi.class, BoilerTaskOrderApi.class, BoilerAcceptOrderApi.class, PipeTaskOrderApi.class, PipeAcceptOrderApi.class,
-        PipeAppointmentConfirmOrderRefuseItemApi.class, BoilerAppointmentConfirmOrderRefuseItemApi.class
+        PipeAppointmentConfirmOrderRefuseItemApi.class, BoilerAppointmentConfirmOrderRefuseItemApi.class, Pressure2TaskOrderNonTaxRecordApi.class
 })
 public class RpcConfiguration {
 }

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

@@ -1,9 +1,9 @@
 package cn.start.tz.module.bpm.service.pressure2.taskordernontaxrecord;
 
-import cn.start.tz.module.bpm.enums.BpmModelConstants;
+import cn.start.tz.module.bpm.enums.boiler.BoilerBpmModelConstants;
 import cn.start.tz.module.bpm.event.BpmProcessInstanceStatusEvent;
 import cn.start.tz.module.bpm.event.BpmProcessInstanceStatusEventListener;
-import cn.start.tz.module.pressure.api.taskordernontaxrecord.TaskOrderNonTaxRecordApi;
+import cn.start.tz.module.pressure2.api.taskordernontaxrecord.Pressure2TaskOrderNonTaxRecordApi;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RuntimeService;
@@ -18,17 +18,17 @@ public class BpmBoilerTaskOrderNonTaxRecordStatusListener extends BpmProcessInst
     RuntimeService runtimeService;
 
     @Resource
-    private TaskOrderNonTaxRecordApi taskOrderNonTaxRecordApi;
+    private Pressure2TaskOrderNonTaxRecordApi taskOrderNonTaxRecordApi;
 
     @Override
     protected String getProcessDefinitionKey() {
-        return BpmModelConstants.PRESSURE_NON_TAX;
+        return BoilerBpmModelConstants.PRESSURE2_NON_TAX;
     }
 
     @Override
     protected void onEvent(BpmProcessInstanceStatusEvent event) {
         log.info("报告审核,id:{},status:{},reason:{}",event.getBusinessKey(),event.getStatus(),event.getReason());
-//        taskOrderNonTaxRecordApi.audit(event.getBusinessKey(), event.getStatus(),event.getReason());
+        taskOrderNonTaxRecordApi.audit(event.getBusinessKey(), event.getStatus(),event.getReason());
     }
 
 }

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

@@ -85,6 +85,10 @@ public interface MemberUserApi {
     @Operation(summary = "用户关联企业认证信息新增")
     CommonResult<String> createUseUnitRelation(@RequestBody @Valid UseUnitRelationSaveReqVO createReqVO);
 
+    @PostMapping(PREFIX + "/getUseUnitRelation")
+    @Operation(summary = "用户关联企业认证信息新增")
+    CommonResult<List<UseUnitRelationSaveReqVO>> getUseUnitRelation(@RequestBody @Valid String id);
+
     @PostMapping(PREFIX + "/deleteUseUnitRelation")
     @Operation(summary = "用户关联企业认证信息新增")
     CommonResult<Boolean> deleteUseUnitRelation(@RequestBody @Valid UseUnitRelationSaveReqVO createReqVO);

tz-module-member/tz-module-member-api/src/main/java/cn/start/tz/module/member/api/user/dto/UseUnitVO.java

@@ -0,0 +1,181 @@
+package cn.start.tz.module.member.api.user.dto;
+
+import lombok.*;
+
+/**
+ * 用户认证企业 DO
+ *
+ * @author 特种管理员
+ */
+@Data
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class UseUnitVO{
+
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 营业执照
+     */
+    private String businessLicense;
+    /**
+     * 主体类型
+     */
+    private String subjectType;
+    /**
+     * 单位名称
+     */
+    private String unitName;
+    /**
+     * 统一社会信用代码
+     */
+    private String unifiedSocialCreditCode;
+    /**
+     * 法人
+     */
+    private String legalName;
+    /**
+     * 详细地址
+     */
+    private String unitAddress;
+    /**
+     * 所在区域
+     */
+    private Integer administrativeRegion;
+    /**
+     * 所在街道
+     */
+    private Integer unitStreet;
+    /**
+     * 所在区域名字
+     */
+    private String administrativeRegionName;
+    /**
+     * 所在街道名字
+     */
+    private String unitStreetName;
+    /**
+     * 单位管理员姓名
+     */
+    private String unitManageName;
+    /**
+     * 单位管理员手机号
+     */
+    private String unitManagePhone;
+    /**
+     * 单位状态默认为0待审核 1已认证2被拒绝3已作废
+     */
+    private String unitStatus;
+    /**
+     * 拒绝原因
+     */
+    private String refuseReason;
+    /**
+     * 委托书
+     */
+    private String entrustBook;
+    /**
+     * 认证类型(个人/企业)
+     */
+    private String authenticationType;
+    /**
+     * 认证编号
+     */
+    private String authenticationNo;
+
+    /**
+     * 发票类型
+     */
+    private String invoiceType;
+    /**
+     * 抬头类型
+     */
+    private String riseType;
+    /**
+     * 单位税号
+     */
+    private String unitTax;
+    /**
+     * 发票抬头
+     */
+    private String invoiceRise;
+    /**
+     * 注册地址
+     */
+    private String regAddress;
+    /**
+     * 注册电话
+     */
+    private String regPhone;
+    /**
+     * 开户银行
+     */
+    private String bankDeposit;
+    /**
+     * 银行账号
+     */
+    private String bankAccount;
+    /**
+     * 收票邮箱
+     */
+    private String ticketReceivingEmail;
+    /**
+     * 关联单位库的id
+     */
+    private String systemUnitId;
+    /**
+     * 审核人
+     */
+    private String auditor;
+    /**
+     * 审核人名称
+     */
+    private String auditorName;
+
+    /**
+     *  作业地址
+     * */
+    private String homeworkAddress;
+    /**
+     *  作业区域
+     * */
+    private String homeworkDistrict;
+
+
+    /**
+     *
+     *  注册所在区域
+     * */
+    private Integer regBeDistrict;
+
+    /**
+     * 是否使用单位（0、否；1、是）
+     */
+    private String isUseUnit;
+    /**
+     * 是否制造单位（0、否；1、是）
+     */
+    private String isMakeUnit;
+    /**
+     * 是否安装单位（0、否；1、是）
+     */
+    private String isInstallUnit;
+    /**
+     * 是否维保单位（0、否；1、是）
+     */
+    private String isMaintUnit;
+    /**
+     * 是否改造单位（0、否；1、是）
+     */
+    private String isReformUnit;
+
+
+    private String username;
+
+    private String password;
+
+}

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

@@ -6,6 +6,7 @@ import cn.start.tz.framework.common.util.object.BeanUtils;
 import cn.start.tz.module.member.api.user.dto.*;
 import cn.start.tz.module.member.controller.admin.templatesendlog.vo.TemplateSendLogSaveReqVO;
 import cn.start.tz.module.member.controller.app.user.vo.MpUserInfoVo;
+import cn.start.tz.module.member.controller.app.useruint.vo.UseUnitRelationRsp;
 import cn.start.tz.module.member.convert.user.MemberUserConvert;
 import cn.start.tz.module.member.dal.dataobject.mprelation.MpRelationDO;
 import cn.start.tz.module.member.dal.dataobject.user.MemberUserDO;
@@ -14,6 +15,11 @@ import cn.start.tz.module.member.dal.mysql.mprelation.MpRelationMapper;
 import cn.start.tz.module.member.dal.mysql.user.MemberUserMapper;
 import cn.start.tz.module.member.dal.mysql.useunitrelation.UseUnitRelationMapper;
 import cn.start.tz.module.member.enums.ErrorCodeConstants;
+import cn.start.tz.module.member.service.member.MemberRemoteService;
+import cn.start.tz.module.member.service.member.vo.MemberUserCreateReqVO;
+import cn.start.tz.module.member.service.member.vo.MemberUserRespVO;
+import cn.start.tz.module.member.service.membermessage.MemberMessageRemoteService;
+import cn.start.tz.module.member.service.membermessage.vo.SendMpMessageReqVO;
 import cn.start.tz.module.member.service.templatesendlog.TemplateSendLogService;
 import cn.start.tz.module.member.service.user.MemberUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -27,6 +33,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import jakarta.annotation.Resource;
+
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
@@ -55,6 +63,11 @@ public class MemberUserApiImpl implements MemberUserApi {
     @Resource
     private UseUnitRelationMapper useUnitRelationMapper;
 
+    @Resource
+    private MemberRemoteService memberRemoteService;
+
+    @Resource
+    private MemberMessageRemoteService memberMessageRemoteService;
 
     @Override
     public CommonResult<MemberUserRespDTO> getUser(String id) {
@@ -74,7 +87,18 @@ public class MemberUserApiImpl implements MemberUserApi {
 
     @Override
     public CommonResult<MemberUserRespDTO> getUserByMobile(String mobile) {
-        return success(MemberUserConvert.INSTANCE.convert2(userService.getUserByMobile(mobile)));
+//        return success(MemberUserConvert.INSTANCE.convert2(userService.getUserByMobile(mobile)));
+        MemberUserRespVO userByMobile = memberRemoteService.getUserByMobile(mobile);
+        if (ObjectUtils.isEmpty(userByMobile)) {
+            throw exception(USER_NOT_EXISTS);
+        }
+        MemberUserRespDTO memberUserRespDTO = new MemberUserRespDTO();
+        memberUserRespDTO.setMobile(userByMobile.getMobile());
+        memberUserRespDTO.setNickname(userByMobile.getNickname());
+        memberUserRespDTO.setName(userByMobile.getName());
+        memberUserRespDTO.setAvatar(userByMobile.getAvatar());
+        memberUserRespDTO.setId(userByMobile.getId());
+        return success(memberUserRespDTO);
     }
 
     @Override
@@ -102,7 +126,26 @@ public class MemberUserApiImpl implements MemberUserApi {
                 }
             }
 
-            msgId = userService.sendMpMessage(reqVO.getMemberId(), reqVO.getTemplateId(), wxMpTemplateDataList, bean);
+//            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<>();
+            for (WxMpTemplateData wxMpTemplateData : wxMpTemplateDataList) {
+                SendMpMessageReqVO.TemplateData templateData = new SendMpMessageReqVO.TemplateData();
+                templateData.setName(wxMpTemplateData.getName());
+                templateData.setValue(wxMpTemplateData.getValue());
+                templateData.setColor(wxMpTemplateData.getColor());
+                list.add(templateData);
+            }
+            reqVO1.setTemplateDataList(list);
+            SendMpMessageReqVO.MiniProgram miniProgram = new SendMpMessageReqVO.MiniProgram();
+            miniProgram.setAppid(bean.getAppid());
+            miniProgram.setPagePath(bean.getPagePath());
+            reqVO1.setMiniProgram(miniProgram);
+            memberMessageRemoteService.sendMpMessage(reqVO1);
         }catch (Exception e){
             errorCode = e.getMessage();
             e.printStackTrace();
@@ -162,6 +205,13 @@ public class MemberUserApiImpl implements MemberUserApi {
         return success(useUnitRelation.getId());
     }
 
+    @Override
+    public CommonResult<List<UseUnitRelationSaveReqVO>> getUseUnitRelation(String id) {
+        List<UseUnitRelationDO> unitByUserId = useUnitRelationMapper.selectList(UseUnitRelationDO::getMemberId,id);
+
+        return success(BeanUtils.toBean(unitByUserId, UseUnitRelationSaveReqVO.class));
+    }
+
     @Override
     public CommonResult<Boolean> deleteUseUnitRelation(@RequestBody @Valid UseUnitRelationSaveReqVO createReqVO) {
         useUnitRelationMapper.delete(UseUnitRelationDO::getMemberId, createReqVO.getMemberId());
@@ -174,9 +224,26 @@ public class MemberUserApiImpl implements MemberUserApi {
      */
     @Override
     public CommonResult<MemberUserRespDTO> createUser(MemberUserReqVo reqVo) {
-        MemberUserDO user = userService.createUser(reqVo.getMobile(), reqVo.getNickname(), reqVo.getAvtar(), reqVo.getRegisterIp(), reqVo.getTerminal());
-        MemberUserConvert.INSTANCE.convert2(user);
-        return success( MemberUserConvert.INSTANCE.convert2(user));
+//        MemberUserDO user = userService.createUser(reqVo.getMobile(), reqVo.getNickname(), reqVo.getAvtar(), reqVo.getRegisterIp(), reqVo.getTerminal());
+//        MemberUserConvert.INSTANCE.convert2(user);
+//        return success( MemberUserConvert.INSTANCE.convert2(user));
+        MemberUserCreateReqVO memberUserCreateReqVO = new MemberUserCreateReqVO();
+        memberUserCreateReqVO.setMobile(reqVo.getMobile());
+        memberUserCreateReqVO.setNickname(reqVo.getNickname());
+        memberUserCreateReqVO.setAvatar(reqVo.getAvtar());
+        memberUserCreateReqVO.setRegisterIp(reqVo.getRegisterIp());
+        memberUserCreateReqVO.setRegisterTerminal(reqVo.getTerminal());
+        memberUserCreateReqVO.setName(reqVo.getNickname());
+        memberUserCreateReqVO.setKszxOpenid(reqVo.getMobile());
+        MemberUserRespVO user = memberRemoteService.createUser(memberUserCreateReqVO);
+        MemberUserRespDTO memberUserRespDTO = new MemberUserRespDTO();
+        memberUserRespDTO.setId(user.getId());
+        memberUserRespDTO.setMobile(user.getMobile());
+        memberUserRespDTO.setNickname(user.getNickname());
+        memberUserRespDTO.setName(user.getName());
+        memberUserRespDTO.setAvatar(user.getAvatar());
+        memberUserRespDTO.setStatus(user.getStatus());
+        return success(memberUserRespDTO);
     }
 
     @Override

tz-module-member/tz-module-member-biz/src/main/java/cn/start/tz/module/member/service/member/MemberRemoteService.java

@@ -0,0 +1,32 @@
+package cn.start.tz.module.member.service.member;
+
+
+import cn.start.tz.module.member.service.member.vo.MemberUserCreateReqVO;
+import cn.start.tz.module.member.service.member.vo.MemberUserRespVO;
+
+/**
+ * 平台用户远程服务接口
+ * <p>
+ * 提供平台用户的远程调用服务，包括用户创建和查询功能
+ *
+ * @author 系统管理员
+ */
+public interface MemberRemoteService {
+
+    /**
+     * 创建平台用户
+     *
+     * @param reqVO 平台用户创建请求对象，包含用户基本信息
+     * @return 创建成功的平台用户响应对象，包含用户ID和详细信息
+     */
+    MemberUserRespVO createUser(MemberUserCreateReqVO reqVO);
+
+    /**
+     * 根据手机号查询平台用户
+     *
+     * @param mobile 手机号码，用于唯一标识用户
+     * @return 平台用户响应对象，如果用户不存在则返回null
+     */
+    MemberUserRespVO getUserByMobile(String mobile);
+
+}

tz-module-member/tz-module-member-biz/src/main/java/cn/start/tz/module/member/service/member/MemberRemoteServiceImpl.java

@@ -0,0 +1,152 @@
+package cn.start.tz.module.member.service.member;
+
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.crypto.digest.DigestUtil;
+import cn.start.tz.framework.common.pojo.CommonResult;
+import cn.start.tz.framework.common.util.json.JsonUtils;
+
+import cn.start.tz.module.member.service.member.vo.MemberUserCreateReqVO;
+import cn.start.tz.module.member.service.member.vo.MemberUserRespVO;
+import com.fasterxml.jackson.core.type.TypeReference;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.http.*;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.time.Duration;
+
+@Slf4j
+@Service
+public class MemberRemoteServiceImpl implements MemberRemoteService {
+
+    /**
+     * nonce Redis Key 模板: member_remote_nonce:{appId}:{nonce}
+     */
+    private static final String NONCE_KEY_FORMAT = "member_remote_nonce:%s:%s";
+
+    private static final TypeReference<CommonResult<MemberUserRespVO>> USER_RESULT_TYPE =
+            new TypeReference<CommonResult<MemberUserRespVO>>() {};
+
+    @Resource(name = "externalRestTemplate")
+    private RestTemplate restTemplate;
+
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Value("${app-auth.base-url:http://localhost:48080}")
+    private String baseUrl;
+
+    @Value("${app-auth.app-id:xxxxxx}")
+    private String appId;
+
+    @Value("${app-auth.app-secret:yyyyyy}")
+    private String appSecret;
+
+    @Override
+    public MemberUserRespVO createUser(MemberUserCreateReqVO reqVO) {
+        long timestamp = System.currentTimeMillis();
+        String nonce = IdUtil.fastSimpleUUID();
+
+        // 请求体序列化
+        String bodyJson = JsonUtils.toJsonString(reqVO);
+
+        // 签名计算：第1步（查询参数为空）+ 第2步（请求体）+ 第3步（Header排序）+ appSecret
+        String signString = buildSignString("", bodyJson, timestamp, nonce);
+        String sign = DigestUtil.sha256Hex(signString);
+
+        // nonce 存 Redis 防重放
+        String nonceKey = String.format(NONCE_KEY_FORMAT, appId, nonce);
+        stringRedisTemplate.opsForValue().set(nonceKey, "1", Duration.ofSeconds(120));
+
+        HttpHeaders headers = buildSignHeaders(timestamp, nonce, sign);
+        headers.setContentType(MediaType.APPLICATION_JSON);
+
+        HttpEntity<String> entity = new HttpEntity<>(bodyJson, headers);
+
+        String url = baseUrl + "/external-api/member/user/create";
+        log.info("[createUser][请求][POST {}][mobile={}]", url, reqVO.getMobile());
+
+        long startTime = System.currentTimeMillis();
+        ResponseEntity<String> response = restTemplate.exchange(
+                url, HttpMethod.POST, entity, String.class);
+        long elapsed = System.currentTimeMillis() - startTime;
+
+        MemberUserRespVO result = parseResponse(response, reqVO.getMobile(), elapsed);
+        log.info("[createUser][完成][mobile={}, userId={}, 耗时={}ms]",
+                reqVO.getMobile(), result != null ? result.getId() : null, elapsed);
+        return result;
+    }
+
+    @Override
+    public MemberUserRespVO getUserByMobile(String mobile) {
+        long timestamp = System.currentTimeMillis();
+        String nonce = IdUtil.fastSimpleUUID();
+
+        // 查询参数按 key 字典序拼接: mobile={mobile}
+        String queryStr = "mobile=" + mobile;
+
+        // 签名计算：第1步（查询参数）+ 第2步（空）+ 第3步（Header排序）+ appSecret
+        String signString = buildSignString(queryStr, "", timestamp, nonce);
+        String sign = DigestUtil.sha256Hex(signString);
+
+        // nonce 存 Redis 防重放
+        String nonceKey = String.format(NONCE_KEY_FORMAT, appId, nonce);
+        stringRedisTemplate.opsForValue().set(nonceKey, "1", Duration.ofSeconds(120));
+
+        HttpHeaders headers = buildSignHeaders(timestamp, nonce, sign);
+        HttpEntity<Void> entity = new HttpEntity<>(headers);
+
+        String url = baseUrl + "/external-api/member/user/getByMobile?mobile=" + mobile;
+        log.info("[getUserByMobile][请求][GET {}]", url);
+
+        long startTime = System.currentTimeMillis();
+        ResponseEntity<String> response = restTemplate.exchange(
+                url, HttpMethod.GET, entity, String.class);
+        long elapsed = System.currentTimeMillis() - startTime;
+
+        MemberUserRespVO result = parseResponse(response, mobile, elapsed);
+        log.info("[getUserByMobile][完成][mobile={}, userId={}, 耗时={}ms]",
+                mobile, result != null ? result.getId() : null, elapsed);
+        return result;
+    }
+
+    private String buildSignString(String queryParams, String requestBody, long timestamp, String nonce) {
+        // 第1步 + 第2步 + 第3步(Header按key字典序: appId < nonce < timestamp) + appSecret
+        return queryParams
+                + requestBody
+                + "appId=" + appId + "&nonce=" + nonce + "&timestamp=" + timestamp
+                + appSecret;
+    }
+
+    private HttpHeaders buildSignHeaders(long timestamp, String nonce, String sign) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("appId", appId);
+        headers.set("timestamp", String.valueOf(timestamp));
+        headers.set("nonce", nonce);
+        headers.set("sign", sign);
+        return headers;
+    }
+
+    private MemberUserRespVO parseResponse(ResponseEntity<String> response, String mobile, long elapsed) {
+        if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+            CommonResult<MemberUserRespVO> result = JsonUtils.parseObject(
+                    response.getBody(), USER_RESULT_TYPE);
+            if (result != null && result.isSuccess()) {
+                return result.getData();
+            }
+            log.warn("[parseResponse][响应失败][mobile={}, code={}, msg={}, 耗时={}ms]",
+                    mobile,
+                    result != null ? result.getCode() : null,
+                    result != null ? result.getMsg() : null,
+                    elapsed);
+            return null;
+        }
+        log.warn("[parseResponse][HTTP状态异常][mobile={}, status={}, 耗时={}ms]",
+                mobile, response.getStatusCode(), elapsed);
+        return null;
+    }
+
+}

tz-module-member/tz-module-member-biz/src/main/java/cn/start/tz/module/member/service/member/vo/MemberUserCreateReqVO.java

@@ -0,0 +1,17 @@
+package cn.start.tz.module.member.service.member.vo;
+
+import lombok.Data;
+
+@Data
+public class MemberUserCreateReqVO {
+
+    private String mobile;
+    private String nickname;
+    private String name;
+    private String avatar;
+    private Integer sex;
+    private String kszxOpenid;
+    private String registerIp;
+    private Integer registerTerminal;
+
+}

tz-module-member/tz-module-member-biz/src/main/java/cn/start/tz/module/member/service/member/vo/MemberUserRespVO.java

@@ -0,0 +1,20 @@
+package cn.start.tz.module.member.service.member.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MemberUserRespVO {
+
+    private String id;
+    private String mobile;
+    private String nickname;
+    private String name;
+    private String avatar;
+    private Integer sex;
+    private Integer status;
+    private String kszxOpenid;
+    private String createTime;
+
+}

tz-module-member/tz-module-member-biz/src/main/java/cn/start/tz/module/member/service/membermessage/ExternalApiRestTemplateConfig.java

@@ -0,0 +1,49 @@
+package cn.start.tz.module.member.service.membermessage;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+import javax.net.ssl.*;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+
+@Slf4j
+@Configuration
+public class ExternalApiRestTemplateConfig {
+
+    @Value("${app-auth.ssl-verify:false}")
+    private boolean sslVerify;
+
+    @Bean("externalRestTemplate")
+    public RestTemplate externalRestTemplate() throws Exception {
+        if (!sslVerify) {
+            log.info("[externalRestTemplate][SSL证书验证已关闭，适用于UAT/测试环境]");
+            TrustManager[] trustAllCerts = new TrustManager[]{
+                new X509TrustManager() {
+                    @Override
+                    public X509Certificate[] getAcceptedIssuers() {
+                        return new X509Certificate[0];
+                    }
+
+                    @Override
+                    public void checkClientTrusted(X509Certificate[] certs, String authType) {
+                    }
+
+                    @Override
+                    public void checkServerTrusted(X509Certificate[] certs, String authType) {
+                    }
+                }
+            };
+            SSLContext sslContext = SSLContext.getInstance("TLS");
+            sslContext.init(null, trustAllCerts, new SecureRandom());
+            HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
+            HostnameVerifier hostnameVerifier = (hostname, session) -> true;
+            HttpsURLConnection.setDefaultHostnameVerifier(hostnameVerifier);
+        }
+        return new RestTemplate();
+    }
+
+}

tz-module-member/tz-module-member-biz/src/main/java/cn/start/tz/module/member/service/membermessage/MemberMessageRemoteService.java

@@ -0,0 +1,15 @@
+package cn.start.tz.module.member.service.membermessage;
+
+
+import cn.start.tz.module.member.service.membermessage.vo.SendMpMessageReqVO;
+
+public interface MemberMessageRemoteService {
+
+    /**
+     * 推送微信公众号模版消息
+     *
+     * @return 推送结果: 0=成功, 1=用户拒绝接收, 3=推送失败
+     */
+    Integer sendMpMessage(SendMpMessageReqVO reqVO);
+
+}

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

@@ -0,0 +1,101 @@
+package cn.start.tz.module.member.service.membermessage;
+
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.crypto.digest.DigestUtil;
+import cn.start.tz.framework.common.pojo.CommonResult;
+import cn.start.tz.framework.common.util.json.JsonUtils;
+
+import cn.start.tz.module.member.service.membermessage.vo.SendMpMessageReqVO;
+import com.fasterxml.jackson.core.type.TypeReference;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.http.*;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.time.Duration;
+
+@Slf4j
+@Service
+public class MemberMessageRemoteServiceImpl implements MemberMessageRemoteService {
+
+    private static final String NONCE_KEY_FORMAT = "member_message_nonce:%s:%s";
+
+    private static final TypeReference<CommonResult<Integer>> RESULT_TYPE =
+            new TypeReference<CommonResult<Integer>>() {};
+
+    @Resource(name = "externalRestTemplate")
+    private RestTemplate restTemplate;
+
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Value("${app-auth.base-url:http://localhost:48080}")
+    private String baseUrl;
+
+    @Value("${app-auth.app-id:xxxxxx}")
+    private String appId;
+
+    @Value("${app-auth.app-secret:yyyyyy}")
+    private String appSecret;
+
+    @Override
+    public Integer sendMpMessage(SendMpMessageReqVO reqVO) {
+        long timestamp = System.currentTimeMillis();
+        String nonce = IdUtil.fastSimpleUUID();
+
+        // 请求体序列化
+        String bodyJson = JsonUtils.toJsonString(reqVO);
+
+        // 签名：第1步(查询参数空) + 第2步(请求体) + 第3步(Header按key字典序) + appSecret
+        String signString = bodyJson
+                + "appId=" + appId + "&nonce=" + nonce + "&timestamp=" + timestamp
+                + appSecret;
+        String sign = DigestUtil.sha256Hex(signString);
+
+        // nonce 存 Redis 防重放
+        String nonceKey = String.format(NONCE_KEY_FORMAT, appId, nonce);
+        stringRedisTemplate.opsForValue().set(nonceKey, "1", Duration.ofSeconds(120));
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("appId", appId);
+        headers.set("timestamp", String.valueOf(timestamp));
+        headers.set("nonce", nonce);
+        headers.set("sign", sign);
+
+        HttpEntity<String> entity = new HttpEntity<>(bodyJson, headers);
+
+        String url = baseUrl + "/external-api/member/message/send-mp-message";
+        log.info("[sendMpMessage][请求][POST {}][memberId={}, templateId={}, businessId={}]",
+                url, reqVO.getMemberId(), reqVO.getTemplateId(), reqVO.getBusinessId());
+
+        long startTime = System.currentTimeMillis();
+        ResponseEntity<String> response = restTemplate.exchange(
+                url, HttpMethod.POST, entity, String.class);
+        long elapsed = System.currentTimeMillis() - startTime;
+
+        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);
+                return result.getData();
+            }
+            log.warn("[sendMpMessage][响应失败][memberId={}, code={}, msg={}, 耗时={}ms]",
+                    reqVO.getMemberId(),
+                    result != null ? result.getCode() : null,
+                    result != null ? result.getMsg() : null,
+                    elapsed);
+            return 3;
+        }
+
+        log.warn("[sendMpMessage][HTTP状态异常][memberId={}, status={}, 耗时={}ms]",
+                reqVO.getMemberId(), response.getStatusCode(), elapsed);
+        return 3;
+    }
+
+}

tz-module-member/tz-module-member-biz/src/main/java/cn/start/tz/module/member/service/membermessage/vo/SendMpMessageReqVO.java

@@ -0,0 +1,39 @@
+package cn.start.tz.module.member.service.membermessage.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+public class SendMpMessageReqVO {
+
+    private String memberId;
+    private String templateId;
+    private List<TemplateData> templateDataList;
+    private MiniProgram miniProgram;
+    private String businessId;
+    private Integer businessType;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class TemplateData {
+
+        private String name;
+        private String value;
+        private String color;
+
+    }
+
+    @Data
+    public static class MiniProgram {
+
+        private String appid;
+        private String pagePath;
+        private Boolean usePath;
+
+    }
+
+}

tz-module-member/tz-module-member-biz/src/main/resources/application-hsd.yaml

@@ -151,3 +151,7 @@ tz:
     mock-enable: true
   access-log: # 访问日志的配置项
     enable: false
+app-auth:
+  base-url: https://cloud-admin-uat.gzsei.com
+  app-id: 20260527
+  app-secret: ce9fba85d73b475ab3897cbb9d62d61d

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

@@ -151,3 +151,7 @@ tz:
     mock-enable: true
   access-log: # 访问日志的配置项
     enable: false
+app-auth:
+  base-url: https://cloud-admin-uat.gzsei.com
+  app-id: 20260527
+  app-secret: ce9fba85d73b475ab3897cbb9d62d61d

tz-module-pressure2/tz-module-pressure2-api/src/main/java/cn/start/tz/module/pressure2/api/taskorder/dto/NonTaxPayStatusDTO.java

@@ -0,0 +1,46 @@
+package cn.start.tz.module.pressure2.api.taskorder.dto;
+
+import lombok.Data;
+
+/**
+ * 非税缴费通知状态DTO
+ */
+@Data
+public class NonTaxPayStatusDTO {
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 受理单号
+     */
+    private String acceptNo;
+
+    /**
+     * 缴费通知单号
+     */
+    private String payNoticeNo;
+
+    /**
+     * 使用单位名称
+     */
+    private String useUnitName;
+
+    /**
+     * 缴费通知书链接
+     */
+    private String impUrl;
+
+    /**
+     * 缴费有效期至
+     * 格式: yyyy-MM-dd
+     */
+    private String payValidityDate;
+
+    /**
+     * 缴费金额
+     */
+    private String payMoney;
+}

tz-module-pressure2/tz-module-pressure2-api/src/main/java/cn/start/tz/module/pressure2/api/taskordernontaxrecord/Pressure2TaskOrderNonTaxRecordApi.java

@@ -0,0 +1,28 @@
+package cn.start.tz.module.pressure2.api.taskordernontaxrecord;
+
+
+import cn.start.tz.framework.common.pojo.CommonResult;
+import cn.start.tz.module.pressure2.enums.ApiConstants;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = ApiConstants.NAME)
+@Tag(name = "RPC 服务 - 任务单")
+public interface Pressure2TaskOrderNonTaxRecordApi {
+
+
+    String PREFIX = ApiConstants.PREFIX + "/pressure2/taskordernontaxrecord";
+
+    @PutMapping(PREFIX + "/update-status")
+    @Operation(summary = "更新状态")
+    @Parameter(name = "id", description = "id", example = "1024", required = true)
+    @Parameter(name = "status", description = "status", example = "100", required = true)
+    @Parameter(name = "reason", description = "reason", example = "100", required = false)
+    CommonResult<Boolean> audit(@RequestParam("id") String id, @RequestParam("status") Integer status, @RequestParam(required = false) String reason);
+
+
+}

tz-module-pressure2/tz-module-pressure2-api/src/main/java/cn/start/tz/module/pressure2/enums/EnvConstants.java

@@ -0,0 +1,25 @@
+package cn.start.tz.module.pressure2.enums;
+
+/**
+ * 环境常量
+ *
+ * @author 特种管理员
+ */
+public interface EnvConstants {
+
+    /**
+     * 开发环境
+     */
+    String ENV_DEV = "dev";
+
+    /**
+     * 测试环境
+     */
+    String ENV_UAT = "uat";
+
+    /**
+     * 生产环境
+     */
+    String ENV_PROD = "prod";
+
+}

tz-module-pressure2/tz-module-pressure2-api/src/main/java/cn/start/tz/module/pressure2/enums/ErrorCodeConstants.java

@@ -139,6 +139,22 @@ public interface ErrorCodeConstants{
 
     ErrorCode USE_SIGN_REPORT_NOT_EXISTS = new ErrorCode(1067, "使用标志不存在");
 
+    ErrorCode TASK_ORDER_NON_TAX_APPLY_NOT_EXISTS = new ErrorCode(1068, "任务单非税开单申请不存在");
+
+    ErrorCode TASK_ORDER_NON_TAX_RECORD_NOT_EXISTS = new ErrorCode(1069, "任务单非税记录不存在");
+
+    ErrorCode TASK_ORDER_NON_TAX_APPLY_RECORD_NOT_EXISTS = new ErrorCode(1070, "任务单非税开单不存在");
+
+    ErrorCode TASK_ORDER_NON_TAX_RECORD_ITEM_NOT_EXISTS = new ErrorCode(1071, "任务单非税记录子项不存在");
+
+    ErrorCode TASK_ORDER_NON_TAX_REPORT_NOT_EXISTS = new ErrorCode(1072, "非税通知书不存在");
+
+    ErrorCode PAYMENT_FOLLOW_RECORD_NOT_EXISTS = new ErrorCode(1073, "缴费跟进记录不存在");
+
+    ErrorCode BOILER_TASK_ORDER_ITEM_SUSPEND_NOT_EXISTS = new ErrorCode(1074, "锅炉中止检验记录不存在");
+
+    ErrorCode PIPE_TASK_ORDER_ITEM_SUSPEND_NOT_EXISTS = new ErrorCode(1075, "管道中止检验记录不存在");
+
     ErrorCode EQUIP_BOILER_NOT_EXISTS = new ErrorCode(2000, "锅炉设备不存在");
 
     ErrorCode BOILER_EQUIP_OPERATION_RECORD_NOT_EXISTS = new ErrorCode(2001, "锅炉操作记录不存在");

tz-module-pressure2/tz-module-pressure2-api/src/main/java/cn/start/tz/module/pressure2/enums/TaskOrderNonTaxApplyStatusEnum.java

@@ -0,0 +1,41 @@
+package cn.start.tz.module.pressure2.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum TaskOrderNonTaxApplyStatusEnum {
+
+    NON_BILLING(0, "未开单"),
+    RECHECK(100, "校核中"),
+    PASS(200, "已开单"),
+    RETURN(300, "退回"),
+    PART_PASS(400, "已拆单"),
+    ;
+    /**
+     * 状态
+     */
+    private final Integer status;
+    /**
+     * 名字
+     */
+    private final String name;
+
+    /**
+     * 根据status获取对应的枚举实例
+     * @param status 状态值
+     * @return 对应的枚举实例
+     */
+    public static TaskOrderNonTaxApplyStatusEnum getByStatus(Integer status) {
+        if (status == null) {
+            return null;
+        }
+        for (TaskOrderNonTaxApplyStatusEnum value : values()) {
+            if (status.equals(value.getStatus())) {
+                return value;
+            }
+        }
+        return null;
+    }
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/api/taskordernontaxrecord/Pressure2TaskOrderNonTaxRecordApiImpl.java

@@ -0,0 +1,23 @@
+package cn.start.tz.module.pressure2.api.taskordernontaxrecord;
+
+import cn.start.tz.framework.common.pojo.CommonResult;
+import cn.start.tz.module.pressure2.service.taskordernontaxrecord.TaskOrderNonTaxRecordService;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController // 提供 RESTful API 接口，给 Feign 调用
+@Validated
+public class Pressure2TaskOrderNonTaxRecordApiImpl implements Pressure2TaskOrderNonTaxRecordApi {
+
+    @Resource
+    private TaskOrderNonTaxRecordService taskOrderNonTaxRecordService;
+
+    @Override
+    public CommonResult<Boolean> audit(String id, Integer status, String reason) {
+        Boolean b = taskOrderNonTaxRecordService.audit(id, status, reason);
+        return CommonResult.success(b);
+    }
+
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/acceptorder/vo/AcceptOrderPageReqVO.java

@@ -184,4 +184,7 @@ public class AcceptOrderPageReqVO extends PageParam {
 
     @Schema(description = "设备类型 100容器 200锅炉 300管道")
     private Integer equipMainType;
+
+    @Schema(description = "设备注册代码")
+    private String equipCode;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmorder/vo/AppointmentConfirmOrderRespVO.java

@@ -251,4 +251,16 @@ public class AppointmentConfirmOrderRespVO {
 
     @Schema(description ="约检确认单异常信息")
     private BoilerOrderExceptionRespVO orderExceptionRespVO;
+
+    /**
+     * 使用单位id
+     */
+    private String useUnitId;
+
+    private BigDecimal reductionRadio;
+
+    /**
+     * 企业类型
+     */
+    private String enterpriseType;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmorder/vo/AppointmentRefuseVO.java

@@ -1,5 +1,6 @@
 package cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorder.vo;
 
+import cn.start.tz.module.pressure2.dal.dataobject.equippipedetail.EquipPipeDetailDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -12,6 +13,9 @@ public class AppointmentRefuseVO {
     @Schema(description = "id列表", required = true)
     private List<String> equipIds;
 
+    @Schema(description = "管线列表")
+    private List<EquipPipeDetailDO> detailEquipRows;
+
     @Schema(description = "订单id")
     private String orderId;
 
@@ -33,4 +37,8 @@ public class AppointmentRefuseVO {
     @Schema(description = "单据类型 1 约检单 2 受理单 3任务单",defaultValue ="1")
     private Integer orderType;
 
+    /**
+     * 拒绝来源(1=窗口拒检,2=检验员拒检,3=客户拒检)
+     */
+    private Integer rejectionSource;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmorder/vo/AppointmentSubmitVO.java

@@ -180,4 +180,14 @@ public class AppointmentSubmitVO {
 
     @Schema(description = "设备主类型", example = "1")
     private Integer equipMainType;
+
+    @Schema(description ="使用单位id")
+    private String useUnitId;
+
+    private BigDecimal reductionRadio;
+
+    /**
+     * 企业类型
+     */
+    private String enterpriseType;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmorder/vo/ConfirmOrderPageVO.java

@@ -39,7 +39,7 @@ public class ConfirmOrderPageVO extends PageParam {
     private List<Integer> equipStreet;
 
     @Schema(description = "部门")
-    private String deptId;
+    private String relateDepartment;
 
     @Schema(description = "容器类型")
     private List<String> typeList;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmorder/vo/PipeAppointmentConfirmOrderRespVO.java

@@ -259,4 +259,17 @@ public class PipeAppointmentConfirmOrderRespVO {
 
     @Schema(description = "小组信息")
     private List<TeamItemVO> teamList;
+
+
+    /**
+     * 使用单位id
+     */
+    private String useUnitId;
+
+    private BigDecimal reductionRadio;
+
+    /**
+     * 企业类型
+     */
+    private String enterpriseType;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmorder/vo/PipeAppointmentSubmitVO.java

@@ -184,4 +184,14 @@ public class PipeAppointmentSubmitVO {
 
     @Schema(description = "人员")
     private List<SubmitTeamItemVO> teamList ;
+
+    @Schema(description ="使用单位id")
+    private String useUnitId;
+
+    private BigDecimal reductionRadio;
+
+    /**
+     * 企业类型
+     */
+    private String enterpriseType;
 }

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())) {
@@ -246,14 +253,12 @@ public class AppointmentConfirmOrderRefuseItemController {
             }
 
             // 处理检验性质
-            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()));
             }
 
             // 处理拒绝定检状态
@@ -285,17 +290,6 @@ public class AppointmentConfirmOrderRefuseItemController {
                 }
             }
 
-            // 处理运行状态
-            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()) {
@@ -332,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/AppointmentConfirmOrderRefuseItemExcelVO.java

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

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

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

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

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

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

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

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

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

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmrefuseyearitem/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 = "下次检验日期")
@@ -118,4 +112,8 @@ public class AppointmentConfirmRefuseYearItemExportVO {
 
     @Schema(description = "约检联系人电话")
     private String contactPhone;
+
+    private String checkTypeName;
+
+    private String equipStatusName;
 }

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

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

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

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

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

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

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/BoilerTaskOrderInspectionController.java

@@ -3,6 +3,7 @@ package cn.start.tz.module.pressure2.controller.admin.boilertaskorder;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.ObjectUtil;
+import cn.start.tz.framework.common.exception.ServiceException;
 import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.framework.common.pojo.PageResult;
 import cn.start.tz.framework.common.util.object.BeanUtils;
@@ -148,6 +149,9 @@ public class BoilerTaskOrderInspectionController {
     @Tag(name = "检验意见通知书隐患上报")
     public void getAppointmentConfirmOrderRefuseItemReportedExcel(@RequestBody BoilerTaskOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
         PageResult<BoilerOrderItemPageRespVO> pageResult = boilerTaskOrderService.inspectionOpinionPage(pageReqVO);
+        if (pageResult.getList() == null || pageResult.getList().isEmpty()){
+            throw new ServiceException(500,"没有数据需要导出");
+        }
         List<BoilerInspectionOpinionReportedExcelVO> list = BeanUtils.toBean(pageResult.getList(), BoilerInspectionOpinionReportedExcelVO.class);
         list.forEach(item -> {
             if (!CollUtil.isEmpty(item.getReportDOList())) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerMajorIssuesPageReqVO.java

@@ -53,4 +53,8 @@ public class BoilerMajorIssuesPageReqVO extends PageParam {
     @Schema(description = "审批流-实例ids")
     private List<String> processInstanceIds;
 
+    private String approverId;
+
+    private String auditId;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerOrderItemPageRespVO.java

@@ -103,6 +103,9 @@ public class BoilerOrderItemPageRespVO {
     @Schema(description = "设备名称")
     private String equipName;
 
+    @Schema(description = "锅炉型号")
+    private String boilerModel;
+
 
     @Schema(description = "流程id", example = "5644")
     private String processInstanceId;
@@ -380,4 +383,29 @@ public class BoilerOrderItemPageRespVO {
     private Integer mainTaskStatus;
 
     private LocalDateTime finishUploadTime;
+
+    @JsonIgnore
+    private String handlerIdJson;
+
+    @JsonIgnore
+    private String reporterIdJson;
+
+    @Schema(description ="意见书经办人ID列表")
+    private List<String> handlerIdList;
+
+    @Schema(description ="意见书经办人列表")
+    private List<AdminUserRespDTO> handlerUserList;
+
+    @Schema(description = "意见书上报人ID列表")
+    private List<String> reporterIdList;
+
+    @Schema(description = "意见书上报人列表")
+    private List<AdminUserRespDTO> reporterUserList;
+
+    private String approvalId;
+
+    private String ratifyId;
+
+    private AdminUserRespDTO ratifyUser;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerOrderItemReportVO.java

@@ -113,6 +113,9 @@ public class    BoilerOrderItemReportVO {
     @Schema(description = "当前报告结论")
     private String reportConclusion;
 
+    @Schema(description = "检验结果")
+    private String reportResult;
+
     private Integer status;
 
     @Schema(description = "图片")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerRecheckUserPageReqVO.java

@@ -53,4 +53,6 @@ public class BoilerRecheckUserPageReqVO extends PageParam {
     @Schema(description = "任务单ID")
     private String orderId;
 
+    private String orderItemId;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerTaskOrderPageReqVO.java

@@ -399,6 +399,14 @@ public class BoilerTaskOrderPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime ratifyTimeEnd;
 
+    @Schema(description = "受理开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime schedulingTimeStart;
+
+    @Schema(description = "受理结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime schedulingTimeEnd;
+
     @Schema(description ="整改状态 (0=待确认,1=待整改,2=已提交,3=材料有误,4=整改通过)")
     private List<Integer> rectificationStatusList;
 
@@ -413,4 +421,17 @@ public class BoilerTaskOrderPageReqVO extends PageParam {
 
     @Schema(description ="公众号推送客户状态(0=成功,1=拒绝接收,2=其他原因失败,3=发送失败,4=未发送)")
     private List<Integer> mpSendStatusList;
+
+    private String socialCreditCode;
+
+    private String payerContact;
+
+    private String payerContactName;
+
+    private String nonTaxApplyStatus;
+
+    private String acceptUserId;
+
+    @Schema(description = "是否已超期")
+    private Boolean isOverdue;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerTaskOrderRespVO.java

@@ -5,6 +5,7 @@ import cn.start.tz.module.pressure2.controller.admin.boilerorderexception.vo.Boi
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderfollowrecord.vo.BoilerTaskOrderFollowRecordRespVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitem.vo.BoilerTaskOrderItemRespVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskordersignfile.BoilerTaskOrderSignFileDO;
 import cn.start.tz.module.pressure2.dal.dataobject.notificationformreport.NotificationformReportDO;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -70,6 +71,9 @@ public class BoilerTaskOrderRespVO {
     @ExcelProperty("检验员")
     private List<AdminUserRespDTO> appoinmentUser;
 
+    @Schema(description = "检验员列表（兼容字段）")
+    private List<AdminUserRespDTO> checkUsers;
+
     @Schema(description = "收费方式")
     @ExcelProperty("收费方式")
     private Integer payWay;
@@ -184,6 +188,8 @@ public class BoilerTaskOrderRespVO {
     @Schema(description = "应收金额")
     private BigDecimal shouldAmount;
 
+    private BigDecimal actualAmount;
+
     @Schema(description = "减免费用")
     private BigDecimal reduceFee;
 
@@ -212,11 +218,14 @@ public class BoilerTaskOrderRespVO {
     private Integer feeNature;
 
     @Schema(description = "设备主类型")
-    private String equipMainType;
+    private Integer equipMainType;
 
     @Schema(description = "审核状态")
     private Integer status;
 
+    @Schema(description = "计划id")
+    private String schedulingId;
+
     /**
      *  审核
      * */
@@ -331,6 +340,9 @@ public class BoilerTaskOrderRespVO {
     @Schema(description = "受理时间")
     private LocalDateTime schedulingTime;
 
+    @Schema(description = "约检确认日期")
+    private LocalDate appointmentConfirmDate;
+
     @Schema(description = "使用登记证编号")
     private String useRegisterNo;
 
@@ -357,6 +369,8 @@ public class BoilerTaskOrderRespVO {
     @Schema(description = "委托协议：服务单/受理单模版名称")
     private String templateName;
 
+    private String insId;
+
     @Schema(description = "发放人id")
     private String releaseId;
 
@@ -417,4 +431,20 @@ public class BoilerTaskOrderRespVO {
 
     @Schema(description = "联系电话")
     private String deptPhone;
+
+    private String reportConclusion;
+
+    // 签名文件列表
+    private List<BoilerTaskOrderSignFileDO> signFileList;
+
+    @Schema(description ="使用单位id")
+    private String useUnitId;
+
+    private BigDecimal reductionRadio;
+
+    /**
+     * 企业类型
+     */
+    private String enterpriseType;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerTaskOrderSaveReqVO.java

@@ -58,4 +58,33 @@ public class BoilerTaskOrderSaveReqVO {
     @Schema(description = "受理单提交时间")
     private LocalDateTime submitTime;
 
+    /**
+     * 单位联系人
+     */
+    private String unitContact;
+    /**
+     * 联系人电话
+     */
+    private String unitPhone;
+
+    /**
+     * 接收人
+     * */
+    private String recipient;
+
+    /**
+     * 接收人电话
+     * */
+    private String recipientPhone;
+
+    /**
+     *  缴费联系人名称
+     *  */
+    private String payerContactName;
+
+    /**
+     *  缴费人电话
+     * */
+    private String payerContact;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorderitemsuspend/BoilerTaskOrderItemSuspendController.java

@@ -0,0 +1,84 @@
+package cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemsuspend;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.start.tz.framework.common.pojo.PageParam;
+import cn.start.tz.framework.common.pojo.PageResult;
+import cn.start.tz.framework.common.pojo.CommonResult;
+import cn.start.tz.framework.common.util.object.BeanUtils;
+import static cn.start.tz.framework.common.pojo.CommonResult.success;
+
+import cn.start.tz.framework.excel.core.util.ExcelUtils;
+
+import cn.start.tz.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.start.tz.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemsuspend.vo.*;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemsuspend.BoilerTaskOrderItemSuspendDO;
+import cn.start.tz.module.pressure2.service.boilertaskorderitemsuspend.BoilerTaskOrderItemSuspendService;
+
+@Tag(name = "管理后台 - 锅炉中止检验记录")
+@RestController
+@RequestMapping("/pressure2/boiler-task-order-item-suspend")
+@Validated
+public class BoilerTaskOrderItemSuspendController {
+
+    @Resource
+    private BoilerTaskOrderItemSuspendService boilerTaskOrderItemSuspendService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建锅炉中止检验记录")
+    public CommonResult<String> createBoilerTaskOrderItemSuspend(@Valid @RequestBody BoilerTaskOrderItemSuspendSaveReqVO createReqVO) {
+        return success(boilerTaskOrderItemSuspendService.createBoilerTaskOrderItemSuspend(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新锅炉中止检验记录")
+    public CommonResult<Boolean> updateBoilerTaskOrderItemSuspend(@Valid @RequestBody BoilerTaskOrderItemSuspendSaveReqVO updateReqVO) {
+        boilerTaskOrderItemSuspendService.updateBoilerTaskOrderItemSuspend(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除锅炉中止检验记录")
+    @Parameter(name = "id", description = "编号", required = true)
+    public CommonResult<Boolean> deleteBoilerTaskOrderItemSuspend(@RequestParam("id") String id) {
+        boilerTaskOrderItemSuspendService.deleteBoilerTaskOrderItemSuspend(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得锅炉中止检验记录")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<BoilerTaskOrderItemSuspendRespVO> getBoilerTaskOrderItemSuspend(@RequestParam("id") String id) {
+        BoilerTaskOrderItemSuspendDO boilerTaskOrderItemSuspend = boilerTaskOrderItemSuspendService.getBoilerTaskOrderItemSuspend(id);
+        return success(BeanUtils.toBean(boilerTaskOrderItemSuspend, BoilerTaskOrderItemSuspendRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得锅炉中止检验记录分页")
+    public CommonResult<PageResult<BoilerTaskOrderItemSuspendRespVO>> getBoilerTaskOrderItemSuspendPage(@Valid BoilerTaskOrderItemSuspendPageReqVO pageReqVO) {
+        PageResult<BoilerTaskOrderItemSuspendRespVO> pageResult = boilerTaskOrderItemSuspendService.getBoilerTaskOrderItemSuspendPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BoilerTaskOrderItemSuspendRespVO.class));
+    }
+
+    @PostMapping("/suspend")
+    @Operation(summary = "批量中止检验")
+    public CommonResult<Boolean> submitTaskOrderItemSuspend(@Valid @RequestBody TaskOrderItemSuspendSubmitReqVO submitReqVO) {
+        boilerTaskOrderItemSuspendService.submitTaskOrderItemSuspend(submitReqVO);
+        return success(true);
+    }
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorderitemsuspend/vo/BoilerTaskOrderItemSuspendPageReqVO.java

@@ -0,0 +1,96 @@
+package cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemsuspend.vo;
+
+import lombok.*;
+
+import java.time.LocalDate;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.start.tz.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+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 BoilerTaskOrderItemSuspendPageReqVO extends PageParam {
+
+    @Schema(description = "订单id", example = "19217")
+    private String orderId;
+
+    @Schema(description = "设备id", example = "5260")
+    private String equipId;
+
+    @Schema(description = "设备代码")
+    private String equipCode;
+
+    @Schema(description = "计划排期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] planDate;
+
+    @Schema(description = "是否租借")
+    private Boolean isLease;
+
+    @Schema(description = "使用登记证编号")
+    private String useRegisterNo;
+
+    @Schema(description = "类别", example = "2")
+    private String equipType;
+
+    @Schema(description = "名称", example = "张三")
+    private String equipName;
+
+    @Schema(description = "产品编号")
+    private String productNo;
+
+    @Schema(description = "安全管理人员")
+    private String safeManager;
+
+    @Schema(description = "安全管理人员电话")
+    private String safeManagerPhone;
+
+    @Schema(description = "下次内部检验时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] nextInCheckDate;
+
+    @Schema(description = "下次外部检验时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] nextOutCheckDate;
+
+    @Schema(description = "下次耐压时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] nextPressureCheckDate;
+
+    @Schema(description = "设备超期时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] overdueDate;
+
+    @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[] submitTime;
+
+    @Schema(description = "提交人", example = "6215")
+    private String submitId;
+
+    @Schema(description = "是否取消")
+    private Boolean isCancel;
+
+    @Schema(description = "中止检验", example = "不香")
+    private String reason;
+
+    @Schema(description = "任务单变更审核人id", example = "1092")
+    private String approvalId;
+
+    @Schema(description = "任务单变更审核时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] approvalTime;
+
+    private Integer checkType;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorderitemsuspend/vo/BoilerTaskOrderItemSuspendRespVO.java

@@ -0,0 +1,116 @@
+package cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemsuspend.vo;
+
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDate;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 锅炉中止检验记录 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class BoilerTaskOrderItemSuspendRespVO {
+
+    @Schema(description = "id", example = "10270")
+    @ExcelProperty("id")
+    private String id;
+
+    @Schema(description = "订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19217")
+    @ExcelProperty("订单id")
+    private String orderId;
+
+    @Schema(description = "设备id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5260")
+    @ExcelProperty("设备id")
+    private String equipId;
+
+    @Schema(description = "设备代码")
+    @ExcelProperty("设备代码")
+    private String equipCode;
+
+    @Schema(description = "计划排期")
+    @ExcelProperty("计划排期")
+    private LocalDate planDate;
+
+    @Schema(description = "是否租借")
+    @ExcelProperty("是否租借")
+    private Boolean isLease;
+
+    @Schema(description = "使用登记证编号")
+    @ExcelProperty("使用登记证编号")
+    private String useRegisterNo;
+
+    @Schema(description = "类别", example = "2")
+    @ExcelProperty("类别")
+    private String equipType;
+
+    @Schema(description = "名称", example = "张三")
+    @ExcelProperty("名称")
+    private String equipName;
+
+    @Schema(description = "产品编号")
+    @ExcelProperty("产品编号")
+    private String productNo;
+
+    @Schema(description = "安全管理人员")
+    @ExcelProperty("安全管理人员")
+    private String safeManager;
+
+    @Schema(description = "安全管理人员电话")
+    @ExcelProperty("安全管理人员电话")
+    private String safeManagerPhone;
+
+    @Schema(description = "下次内部检验时间")
+    @ExcelProperty("下次内部检验时间")
+    private LocalDate nextInCheckDate;
+
+    @Schema(description = "下次外部检验时间")
+    @ExcelProperty("下次外部检验时间")
+    private LocalDate nextOutCheckDate;
+
+    @Schema(description = "下次耐压时间")
+    @ExcelProperty("下次耐压时间")
+    private LocalDate nextPressureCheckDate;
+
+    @Schema(description = "设备超期时间")
+    @ExcelProperty("设备超期时间")
+    private LocalDate overdueDate;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "提交时间")
+    @ExcelProperty("提交时间")
+    private LocalDateTime submitTime;
+
+    @Schema(description = "提交人", example = "6215")
+    @ExcelProperty("提交人")
+    private String submitId;
+
+    @Schema(description = "是否取消")
+    @ExcelProperty("是否取消")
+    private Boolean isCancel;
+
+    @Schema(description = "中止检验", example = "不香")
+    @ExcelProperty("中止检验")
+    private String reason;
+
+    @Schema(description = "任务单变更审核人id", example = "1092")
+    @ExcelProperty("任务单变更审核人id")
+    private String approvalId;
+
+    @Schema(description = "任务单变更审核时间")
+    @ExcelProperty("任务单变更审核时间")
+    private LocalDateTime approvalTime;
+
+    private AdminUserRespDTO submitUser;
+
+    private Integer checkType;
+
+    @Schema(description = "单位名称")
+    private String unitName;
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorderitemsuspend/vo/BoilerTaskOrderItemSuspendSaveReqVO.java

@@ -0,0 +1,84 @@
+package cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemsuspend.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDate;
+import java.util.*;
+import jakarta.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 锅炉中止检验记录新增/修改 Request VO")
+@Data
+public class BoilerTaskOrderItemSuspendSaveReqVO {
+
+    @Schema(description = "id", example = "10270")
+    private String id;
+
+    @Schema(description = "订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19217")
+    @NotEmpty(message = "订单id不能为空")
+    private String orderId;
+
+    @Schema(description = "设备id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5260")
+    @NotEmpty(message = "设备id不能为空")
+    private String equipId;
+
+    @Schema(description = "设备代码")
+    private String equipCode;
+
+    @Schema(description = "计划排期")
+    private LocalDate planDate;
+
+    @Schema(description = "是否租借")
+    private Boolean isLease;
+
+    @Schema(description = "使用登记证编号")
+    private String useRegisterNo;
+
+    @Schema(description = "类别", example = "2")
+    private String equipType;
+
+    @Schema(description = "名称", example = "张三")
+    private String equipName;
+
+    @Schema(description = "产品编号")
+    private String productNo;
+
+    @Schema(description = "安全管理人员")
+    private String safeManager;
+
+    @Schema(description = "安全管理人员电话")
+    private String safeManagerPhone;
+
+    @Schema(description = "下次内部检验时间")
+    private LocalDate nextInCheckDate;
+
+    @Schema(description = "下次外部检验时间")
+    private LocalDate nextOutCheckDate;
+
+    @Schema(description = "下次耐压时间")
+    private LocalDate nextPressureCheckDate;
+
+    @Schema(description = "设备超期时间")
+    private LocalDate overdueDate;
+
+    @Schema(description = "提交时间")
+    private LocalDateTime submitTime;
+
+    @Schema(description = "提交人", example = "6215")
+    private String submitId;
+
+    @Schema(description = "是否取消")
+    private Boolean isCancel;
+
+    @Schema(description = "中止检验", example = "不香")
+    private String reason;
+
+    @Schema(description = "任务单变更审核人id", example = "1092")
+    private String approvalId;
+
+    @Schema(description = "任务单变更审核时间")
+    private LocalDateTime approvalTime;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorderitemsuspend/vo/TaskOrderItemSuspendSubmitReqVO.java

@@ -0,0 +1,19 @@
+package cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemsuspend.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TaskOrderItemSuspendSubmitReqVO {
+
+    @Schema(description = "orderItemIds", required = true)
+    private List<String> orderItemIds;
+
+    private String reason;
+
+    private String reasonDict;
+
+    private Integer flag;
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskordersecuritycheck/BoilerTaskOrderSecurityCheckController.java

@@ -39,14 +39,14 @@ public class BoilerTaskOrderSecurityCheckController {
        return success(boilerTaskOrderSecurityCheckService.createTaskOrderSecurityCheck(createReqVO));
    }
 
-    /* @PutMapping("/update")
+     @PostMapping("/update")
      @Operation(summary = "更新安全检查记录")
      //@PreAuthorize("@ss.hasPermission('pressure:task-order-security-check:update')")
-     public CommonResult<Boolean> updateTaskOrderSecurityCheck(@Valid @RequestBody TaskOrderSecurityCheckSaveReqVO updateReqVO) {
-         taskOrderSecurityCheckService.updateTaskOrderSecurityCheck(updateReqVO);
+     public CommonResult<Boolean> updateTaskOrderSecurityCheck(@Valid @RequestBody BoilerTaskOrderSecurityCheckSaveReqVO updateReqVO) {
+        boilerTaskOrderSecurityCheckService.updateTaskOrderSecurityCheck(updateReqVO);
          return success(true);
      }
-  */
+
     @GetMapping("/default-template")
     @Operation(summary = "获得安全检查记录 模版")
     //@PreAuthorize("@ss.hasPermission('pressure:task-order-security-check:query')")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskordersecuritycheck/vo/BoilerTaskOrderSecurityCheckSaveReqVO.java

@@ -13,12 +13,10 @@ public class BoilerTaskOrderSecurityCheckSaveReqVO {
     @Schema(description = "id", example = "11493")
     private String id;
 
-    @Schema(description = "任务单", requiredMode = Schema.RequiredMode.REQUIRED, example = "21366")
-    @NotEmpty(message = "任务单不能为空")
+    @Schema(description = "任务单")
     private String orderId;
 
-    @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
-    @NotEmpty(message = "名称不能为空")
+    @Schema(description = "名称")
     private String name;
 
     @Schema(description = "结论")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskordersignfile/BoilerTaskOrderSignFileController.java

@@ -92,4 +92,11 @@ public class BoilerTaskOrderSignFileController {
                         BeanUtils.toBean(list, BoilerTaskOrderSignFileRespVO.class));
     }
 
+    @PostMapping("/service-from/push")
+    @Operation(summary = "服务单推送到小程序端")
+    public CommonResult<Boolean> serviceFromPush(@Valid @RequestBody TaskOrderPushReqVO reqVO) throws Exception {
+        boilerTaskOrderSignFileService.serviceFromPush(reqVO);
+        return success(Boolean.TRUE);
+    }
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskordersignfile/vo/BoilerTaskOrderSignFileRespVO.java

@@ -74,6 +74,10 @@ public class BoilerTaskOrderSignFileRespVO {
 
     private String equipCode;
 
+    private String equipName;
+
+    private String projectName;
+
     private String orderNo;
 
     private String useUnitName;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskordersignfile/vo/TaskOrderPushReqVO.java

@@ -0,0 +1,44 @@
+package cn.start.tz.module.pressure2.controller.admin.boilertaskordersignfile.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class TaskOrderPushReqVO {
+
+    @Schema(description = "orderId")
+    @NotNull(message = "任务单id不能为空")
+    private String orderId;
+
+
+    /**
+     * 接收人
+     */
+    @Schema(description = "接收人")
+    private String receiver;
+
+    /**
+     * 服务单接收人电话
+     */
+    @Schema(description = "接收人电话")
+    private String receiverPhone;
+    @Schema(description = "接收人Email")
+    private String receiverEmail;
+
+    @Schema(description = "业务类型(100=任务单,200=检验结果告知,300=安全检查记录,400=重大问题线索)", example = "2")
+    @NotNull(message = "业务类型不能为空")
+    private Integer businessType;
+
+    @Schema(description = "用户签名url", example = "https://www.iocoder.cn")
+    private String signUrl;
+
+    @Schema(description = "设备id", example = "https://www.iocoder.cn")
+    private String orderItemId;
+
+    @Schema(description = "安全检查记录ID")
+    private String securityCheckId;
+
+    @Schema(description = "设备类型")
+    private String equipMainType;
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equipboiler/vo/EquipBoilerPageReqVO.java

@@ -47,4 +47,10 @@ public class EquipBoilerPageReqVO extends PageParam {
 
     @Schema(description = "关联部门")
     private String relatedDepartment;
+
+    @Schema(description = "出厂编号")
+    private String factoryCode;
+
+    @Schema(description = "单位内编号")
+    private String unitInternalCode;
 }

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

@@ -2,6 +2,7 @@ package cn.start.tz.module.pressure2.controller.admin.equipboiler.vo;
 
 import cn.start.tz.framework.excel.core.annotations.DictFormat;
 import cn.start.tz.framework.excel.core.convert.DictConvert;
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -40,6 +41,14 @@ public class EquipBoilerPageRespVO {
     @ExcelProperty("设备注册代码")
     private String equipCode;
 
+    @Schema(description = "设备名称")
+    @ExcelIgnore
+    private String equipName;
+
+    @Schema(description = "出厂编号")
+    @ExcelIgnore
+    private String factoryCode;
+
     @Schema(description = "使用证号")
     @ExcelProperty("使用证号")
     private String useRegisterNo;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equipboilerscheduling/vo/EquipBoilerSchedulingBoilersRespVO.java

@@ -88,6 +88,8 @@ public class EquipBoilerSchedulingBoilersRespVO {
 
     private String unitCode;
 
+    private String unitId;
+
     private String unitName;
 
     @Schema(description = "设备出厂编号")

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

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

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

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

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

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

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equippipe/vo/EquipPipePageReqVO.java

@@ -310,4 +310,9 @@ public class EquipPipePageReqVO extends PageParam {
      * 管道主要规格
      */
     private String standard;
+    /**
+     * 是否有效
+     */
+    private String isEffective;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equippipe/vo/EquipPipeRespVO.java

@@ -368,4 +368,9 @@ public class EquipPipeRespVO {
      * 管道主要规格
      */
     private String standard;
+    /**
+     * 是否有效
+     */
+    private String isEffective;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equippipe/vo/EquipPipeSaveReqVO.java

@@ -312,4 +312,8 @@ public class EquipPipeSaveReqVO {
      * 管道主要规格
      */
     private String standard;
+    /**
+     * 是否有效
+     */
+    private String isEffective;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equippipescheduling/vo/EquipPipeSchedulingPipesRespVO.java

@@ -70,6 +70,8 @@ public class EquipPipeSchedulingPipesRespVO {
 
     private String unitCode;
 
+    private String unitId;
+
     private String unitName;
 
     private String projectNo;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equippipescheduling/vo/PipeShiftScheduleReqVO.java

@@ -26,6 +26,9 @@ public class PipeShiftScheduleReqVO {
     @Schema(description = "状态")
     private Integer status;
 
+    @Schema(description = "检验员姓名，支持模糊匹配")
+    private String checkerName;
+
     @Schema(description = "关联部门")
     private String relateDepartment;
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/externalOA/ExternalOAController.java

@@ -184,4 +184,21 @@ public class ExternalOAController {
             return CommonResult.error(500, "获取待办事项链接失败：" + e.getMessage());
         }
     }
+
+    /**
+     * 根据summaryId获取OA待办事项的审批链接
+     *
+     * @return 审批链接URL
+     */
+    @GetMapping("/getAffairSummaryList")
+    public CommonResult<List<Long>> getAffairSummaryList() {
+        try {
+            List<Long> affairSummaryList = externalOAService.getAffairSummaryList();
+            return success(affairSummaryList);
+        } catch (Exception e) {
+            log.error("获取待办事项失败，", e);
+            return success(new ArrayList<>());
+        }
+    }
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/notificationformreport/NotificationformReportController.java

@@ -40,14 +40,12 @@ public class NotificationformReportController {
 
     @PostMapping("/create")
     @Operation(summary = "创建检验情况告知")
-    @PreAuthorize("@ss.hasPermission('pressure2:notificationform-report:create')")
     public CommonResult<String> createNotificationformReport(@Valid @RequestBody NotificationformReportSaveReqVO createReqVO) {
         return success(notificationformReportService.createNotificationformReport(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新检验情况告知")
-    @PreAuthorize("@ss.hasPermission('pressure2:notificationform-report:update')")
     public CommonResult<Boolean> updateNotificationformReport(@Valid @RequestBody NotificationformReportSaveReqVO updateReqVO) {
         notificationformReportService.updateNotificationformReport(updateReqVO);
         return success(true);
@@ -56,7 +54,6 @@ public class NotificationformReportController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除检验情况告知")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('pressure2:notificationform-report:delete')")
     public CommonResult<Boolean> deleteNotificationformReport(@RequestParam("id") String id) {
         notificationformReportService.deleteNotificationformReport(id);
         return success(true);
@@ -65,7 +62,6 @@ public class NotificationformReportController {
     @GetMapping("/get")
     @Operation(summary = "获得检验情况告知")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('pressure2:notificationform-report:query')")
     public CommonResult<NotificationformReportRespVO> getNotificationformReport(@RequestParam("id") String id) {
         NotificationformReportDO notificationformReport = notificationformReportService.getNotificationformReport(id);
         return success(BeanUtils.toBean(notificationformReport, NotificationformReportRespVO.class));
@@ -73,7 +69,6 @@ public class NotificationformReportController {
 
     @GetMapping("/page")
     @Operation(summary = "获得检验情况告知分页")
-    @PreAuthorize("@ss.hasPermission('pressure2:notificationform-report:query')")
     public CommonResult<PageResult<NotificationformReportRespVO>> getNotificationformReportPage(@Valid NotificationformReportPageReqVO pageReqVO) {
         PageResult<NotificationformReportDO> pageResult = notificationformReportService.getNotificationformReportPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, NotificationformReportRespVO.class));
@@ -81,7 +76,6 @@ public class NotificationformReportController {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出检验情况告知 Excel")
-    @PreAuthorize("@ss.hasPermission('pressure2:notificationform-report:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportNotificationformReportExcel(@Valid NotificationformReportPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
@@ -92,4 +86,11 @@ public class NotificationformReportController {
                         BeanUtils.toBean(list, NotificationformReportRespVO.class));
     }
 
+    @GetMapping("/updateNotificationReport/{orderId}")
+    @Operation(summary = "更新检验情况报告")
+    public CommonResult<Boolean> updateNotificationReport(@PathVariable String orderId) {
+        notificationformReportService.updateNotificationReport(orderId);
+        return success(true);
+    }
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/orderreport/OrderReportController.java

@@ -105,4 +105,11 @@ public class OrderReportController {
         orderReportService.generatePipeOrderReport(acceptOrderId);
         return success(true);
     }
+
+    @PostMapping("/serviceFromSendEmail")
+    @Operation(summary = "锅炉服务单/受理单/检验告知书邮箱发送")
+    public CommonResult<Boolean> serviceFromSendEmail(@Valid @RequestBody TaskOrderSignFilePageReqVO pageReqVO) {
+        return success(orderReportService.serviceFromSendEmail(pageReqVO));
+    }
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/orderreport/vo/TaskOrderSignFilePageReqVO.java

@@ -0,0 +1,71 @@
+package cn.start.tz.module.pressure2.controller.admin.orderreport.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.LocalDate;
+import java.time.LocalDateTime;
+
+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 TaskOrderSignFilePageReqVO extends PageParam {
+
+    @Schema(description = "签名文件id")
+    private String id;
+
+    @Schema(description = "任务单ID", example = "8318")
+    private String orderId;
+
+    @Schema(description = "业务类型(100=任务单,200=检验结果告知,300=安全检查记录,400=重大问题线索)", example = "2")
+    private Integer businessType;
+
+    @Schema(description = "签名日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] signDate;
+
+    @Schema(description = "是否签名")
+    private String isSignature;
+
+    @Schema(description = "是否推送")
+    private String isPush;
+
+    @Schema(description = "用户签名url", example = "https://www.iocoder.cn")
+    private String signUrl;
+
+    @Schema(description = "接收人")
+    private String receiver;
+
+    @Schema(description = "接收人电话")
+    private String receiverPhone;
+
+    @Schema(description = "签名盖章后的文件pdf")
+    private String signFilePdf;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "邮箱")
+    private String email;
+
+    @Schema(description = "任务单设备id")
+    private String orderItemId;
+
+    @Schema(description = "安全检查记录id")
+    private String securityCheckId;
+
+    private String templateId;
+
+    private String insId;
+
+    private String reportId;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/paymentfollowrecord/PaymentFollowRecordController.java

@@ -0,0 +1,89 @@
+package cn.start.tz.module.pressure2.controller.admin.paymentfollowrecord;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.start.tz.framework.common.pojo.PageParam;
+import cn.start.tz.framework.common.pojo.PageResult;
+import cn.start.tz.framework.common.pojo.CommonResult;
+import cn.start.tz.framework.common.util.object.BeanUtils;
+import static cn.start.tz.framework.common.pojo.CommonResult.success;
+
+import cn.start.tz.framework.excel.core.util.ExcelUtils;
+
+import cn.start.tz.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.start.tz.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import cn.start.tz.module.pressure2.controller.admin.paymentfollowrecord.vo.*;
+import cn.start.tz.module.pressure2.dal.dataobject.paymentfollowrecord.PaymentFollowRecordDO;
+import cn.start.tz.module.pressure2.service.paymentfollowrecord.PaymentFollowRecordService;
+
+@Tag(name = "管理后台 - 缴费跟进记录")
+@RestController
+@RequestMapping("/pressure2/payment-follow-record")
+@Validated
+public class PaymentFollowRecordController {
+
+    @Resource
+    private PaymentFollowRecordService paymentFollowRecordService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建缴费跟进记录")
+    public CommonResult<String> createPaymentFollowRecord(@Valid @RequestBody PaymentFollowRecordSaveReqVO createReqVO) {
+        return success(paymentFollowRecordService.createPaymentFollowRecord(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新缴费跟进记录")
+    public CommonResult<Boolean> updatePaymentFollowRecord(@Valid @RequestBody PaymentFollowRecordSaveReqVO updateReqVO) {
+        paymentFollowRecordService.updatePaymentFollowRecord(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除缴费跟进记录")
+    @Parameter(name = "id", description = "编号", required = true)
+    public CommonResult<Boolean> deletePaymentFollowRecord(@RequestParam("id") String id) {
+        paymentFollowRecordService.deletePaymentFollowRecord(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得缴费跟进记录")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<PaymentFollowRecordRespVO> getPaymentFollowRecord(@RequestParam("id") String id) {
+        PaymentFollowRecordDO paymentFollowRecord = paymentFollowRecordService.getPaymentFollowRecord(id);
+        return success(BeanUtils.toBean(paymentFollowRecord, PaymentFollowRecordRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得缴费跟进记录分页")
+    public CommonResult<PageResult<PaymentFollowRecordRespVO>> getPaymentFollowRecordPage(@Valid PaymentFollowRecordPageReqVO pageReqVO) {
+        PageResult<PaymentFollowRecordRespVO> pageResult = paymentFollowRecordService.getPaymentFollowRecordPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, PaymentFollowRecordRespVO.class));
+    }
+
+//    @GetMapping("/export-excel")
+//    @Operation(summary = "导出缴费跟进记录 Excel")
+//    @ApiAccessLog(operateType = EXPORT)
+//    public void exportPaymentFollowRecordExcel(@Valid PaymentFollowRecordPageReqVO pageReqVO,
+//              HttpServletResponse response) throws IOException {
+//        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+//        List<PaymentFollowRecordRespVO> list = paymentFollowRecordService.getPaymentFollowRecordPage(pageReqVO).getList();
+//        // 导出 Excel
+//        ExcelUtils.write(response, "缴费跟进记录.xls", "数据", PaymentFollowRecordRespVO.class,
+//                        BeanUtils.toBean(list, PaymentFollowRecordRespVO.class));
+//    }
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/paymentfollowrecord/vo/PaymentFollowRecordPageReqVO.java

@@ -0,0 +1,31 @@
+package cn.start.tz.module.pressure2.controller.admin.paymentfollowrecord.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.start.tz.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+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 PaymentFollowRecordPageReqVO extends PageParam {
+
+    @Schema(description = "任务单id", example = "11494")
+    private String taskOrderId;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "公众号推送状态(0=成功,1=拒绝接收,2=其他原因失败,3=发送失败)", example = "1")
+    private Integer status;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/paymentfollowrecord/vo/PaymentFollowRecordRespVO.java

@@ -0,0 +1,41 @@
+package cn.start.tz.module.pressure2.controller.admin.paymentfollowrecord.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 缴费跟进记录 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class PaymentFollowRecordRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "5308")
+    @ExcelProperty("主键")
+    private String id;
+
+    @Schema(description = "任务单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "11494")
+    @ExcelProperty("任务单id")
+    private String taskOrderId;
+
+    @Schema(description = "备注", example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "公众号推送状态(0=成功,1=拒绝接收,2=其他原因失败,3=发送失败)", example = "1")
+    @ExcelProperty("公众号推送状态(0=成功,1=拒绝接收,2=其他原因失败,3=发送失败)")
+    private Integer status;
+
+    @Schema(description = "跟进人id")
+    private String followId;
+
+    @Schema(description = "跟进人名称")
+    private String followName;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/paymentfollowrecord/vo/PaymentFollowRecordSaveReqVO.java

@@ -0,0 +1,25 @@
+package cn.start.tz.module.pressure2.controller.admin.paymentfollowrecord.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 缴费跟进记录新增/修改 Request VO")
+@Data
+public class PaymentFollowRecordSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "5308")
+    private String id;
+
+    @Schema(description = "任务单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "11494")
+    @NotEmpty(message = "任务单id不能为空")
+    private String taskOrderId;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "公众号推送状态(0=成功,1=拒绝接收,2=其他原因失败,3=发送失败)", example = "1")
+    private Integer status;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/PipeTaskOrderController.java

@@ -492,7 +492,7 @@ public class PipeTaskOrderController {
 
     @GetMapping("/order-item/initiateApproval/page")
     @Operation(summary = "任务单-审核列表")
-    public CommonResult<PageResult<PipeOrderItemPageRespVO>> approveOpinionNoticePage(@Valid BoilerTaskOrderPageReqVO pageReqVO) {
+    public CommonResult<PageResult<PipeOrderItemPageRespVO>> approveOpinionNoticePage(@Valid PipeTaskOrderPageReqVO pageReqVO) {
         PageResult<PipeOrderItemPageRespVO> pageResult = pipeTaskOrderService.approveOpinionNoticePage(pageReqVO);
         return success(pageResult);
     }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/PipeTaskOrderInspectionController.java

@@ -3,6 +3,7 @@ package cn.start.tz.module.pressure2.controller.admin.pipetaskorder;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.ObjectUtil;
+import cn.start.tz.framework.common.exception.ServiceException;
 import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.framework.common.pojo.PageResult;
 import cn.start.tz.framework.common.util.object.BeanUtils;
@@ -12,6 +13,7 @@ import cn.start.tz.module.pressure.enums.TaskOrderStatusEnum;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.*;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeInspectionOpinionReportedExcelVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeOrderItemPageRespVO;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.app.taskorderitemreport.vo.InspectionOpinionUploadReqVo;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
@@ -74,7 +76,7 @@ public class PipeTaskOrderInspectionController {
     @GetMapping("/page")
     @Operation(summary = "检验意见通知书")
     @Tag(name = "检验意见通知书")
-    public CommonResult<PageResult<PipeOrderItemPageRespVO>> inspectionOpinionPage(@Valid BoilerTaskOrderPageReqVO pageReqVO) {
+    public CommonResult<PageResult<PipeOrderItemPageRespVO>> inspectionOpinionPage(@Valid PipeTaskOrderPageReqVO pageReqVO) {
         PageResult<PipeOrderItemPageRespVO> taskOrderPage = pipeTaskOrderService.inspectionOpinionPage(pageReqVO);
         return success(taskOrderPage);
     }
@@ -82,7 +84,7 @@ public class PipeTaskOrderInspectionController {
     @GetMapping("/details")
     @Operation(summary = "检验意见通知书详情")
     public CommonResult<PipeOrderItemPageRespVO> appInspectionOpinionById(@RequestParam("id") String id) {
-        BoilerTaskOrderPageReqVO taskOrderPageReqVO = new BoilerTaskOrderPageReqVO();
+        PipeTaskOrderPageReqVO taskOrderPageReqVO = new PipeTaskOrderPageReqVO();
         taskOrderPageReqVO.setId(id);
         PageResult<PipeOrderItemPageRespVO> orderItemPageRespVOPageResult = pipeTaskOrderService.inspectionOpinionPage(taskOrderPageReqVO);
         if (!ObjectUtil.isEmpty(orderItemPageRespVOPageResult) && CollUtil.isNotEmpty(orderItemPageRespVOPageResult.getList())) {
@@ -108,7 +110,7 @@ public class PipeTaskOrderInspectionController {
     @PostMapping("/opinionReportedExcel/export-excel")
     @Operation(summary = "检验意见通知导出")
     @Tag(name = "检验意见通知导出")
-    public void opinionReportedExcel(@RequestBody BoilerTaskOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
+    public void opinionReportedExcel(@RequestBody PipeTaskOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
         List<OpinionReportedExcelExcelVO> opinionReportedExcelExcelVOS = pipeTaskOrderInspectionService.opinionReportedExcel(pageReqVO);
         ExcelUtils.write(response, "承压报告-检验意见通知导出.xls", "数据", OpinionReportedExcelExcelVO.class, opinionReportedExcelExcelVOS);
     }
@@ -147,8 +149,11 @@ public class PipeTaskOrderInspectionController {
     @PostMapping("/reported/export-excel")
     @Operation(summary = "隐患上报记录导出")
     @Tag(name = "检验意见通知书隐患上报")
-    public void getAppointmentConfirmOrderRefuseItemReportedExcel(@RequestBody BoilerTaskOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
+    public void getAppointmentConfirmOrderRefuseItemReportedExcel(@RequestBody PipeTaskOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
         PageResult<PipeOrderItemPageRespVO> pageResult = pipeTaskOrderService.inspectionOpinionPage(pageReqVO);
+        if (pageResult.getList() == null || pageResult.getList().isEmpty()){
+            throw new ServiceException(500,"没有数据需要导出");
+        }
         List<PipeInspectionOpinionReportedExcelVO> list = BeanUtils.toBean(pageResult.getList(), PipeInspectionOpinionReportedExcelVO.class);
         list.forEach(item -> {
             if (!CollUtil.isEmpty(item.getReportDOList())) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/PipeTaskOrderIssueReportController.java

@@ -172,7 +172,7 @@ public class PipeTaskOrderIssueReportController {
 
     @GetMapping("/order-item/report/conclusion/page")
     @Operation(summary = "任务单-报告结论列表")
-    public CommonResult<PageResult<PipeOrderItemPageRespVO>> orderItemReportConclusionPage(@Valid BoilerTaskOrderPageReqVO pageReqVO) {
+    public CommonResult<PageResult<PipeOrderItemPageRespVO>> orderItemReportConclusionPage(@Valid PipeTaskOrderPageReqVO pageReqVO) {
         PageResult<PipeOrderItemPageRespVO> pageResult = taskOrderIssueReportService.orderItemReportConclusionPage(pageReqVO);
         return success(pageResult);
     }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeInspectionOpinionReportedExcelVO.java

@@ -84,8 +84,8 @@ public class PipeInspectionOpinionReportedExcelVO {
     @ExcelProperty("任务单号")
     private String orderNo;
 
-    @Schema(description = "设备代码")
-    @ExcelProperty(value = "设备注册代码")
+    @Schema(description = "工程号")
+    @ExcelProperty(value = "工程号")
     private String equipCode;
 
     @Schema(description = "使用单位")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeOrderItemPageRespVO.java

@@ -229,6 +229,8 @@ public class PipeOrderItemPageRespVO {
     @Schema(description = "当前审核人")
     private AdminUserRespDTO currentAuditor;
 
+    private AdminUserRespDTO ratifyUser;
+
     @Schema(description = "提交人")
     private AdminUserRespDTO submitUser;
 
@@ -389,4 +391,26 @@ public class PipeOrderItemPageRespVO {
     private Integer mainTaskStatus;
 
     private LocalDateTime finishUploadTime;
+
+    @JsonIgnore
+    private String handlerIdJson;
+
+    @JsonIgnore
+    private String reporterIdJson;
+
+    @Schema(description ="意见书经办人ID列表")
+    private List<String> handlerIdList;
+
+    @Schema(description ="意见书经办人列表")
+    private List<AdminUserRespDTO> handlerUserList;
+
+    @Schema(description = "意见书上报人ID列表")
+    private List<String> reporterIdList;
+
+    @Schema(description = "意见书上报人列表")
+    private List<AdminUserRespDTO> reporterUserList;
+
+    private String approvalId;
+
+    private String ratifyId;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeOrderItemProjectVO.java

@@ -112,4 +112,15 @@ public class PipeOrderItemProjectVO {
     private String pipeMedium;
 
     private String startEndPoint;
+
+    @Schema(description = "拒绝原因", example = "不喜欢")
+    private String reason;
+
+    private String reasonDict;
+
+    @Schema(description = "编辑类型")
+    private String editType;
+
+    @Schema(description = "拒绝类型")
+    private Integer rejectType;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeOrderItemReportVO.java

@@ -113,6 +113,8 @@ public class PipeOrderItemReportVO {
     @Schema(description = "当前报告结论")
     private String reportConclusion;
 
+    private String reportResult;
+
     private Integer status;
 
     @Schema(description = "图片")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeTaskOrderPageReqVO.java

@@ -278,7 +278,7 @@ public class PipeTaskOrderPageReqVO extends PageParam {
     private List<String> ids;
 
     @Schema(description = "设备类型", example = "1")
-    private Integer equipType;
+    private String equipType;
 
     @Schema(description = "equipStreet")
     private Integer equipStreet;
@@ -402,6 +402,13 @@ public class PipeTaskOrderPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime ratifyTimeEnd;
 
+    @Schema(description = "受理开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime schedulingTimeStart;
+
+    @Schema(description = "受理结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime schedulingTimeEnd;
 
     @Schema(description ="整改状态 (0=待确认,1=待整改,2=已提交,3=材料有误,4=整改通过)")
     private List<Integer> rectificationStatusList;
@@ -417,4 +424,17 @@ public class PipeTaskOrderPageReqVO extends PageParam {
 
     @Schema(description ="公众号推送客户状态(0=成功,1=拒绝接收,2=其他原因失败,3=发送失败,4=未发送)")
     private List<Integer> mpSendStatusList;
+
+    private String socialCreditCode;
+
+    private String payerContact;
+
+    private String payerContactName;
+
+    private String nonTaxApplyStatus;
+
+    private String acceptUserId;
+
+    @Schema(description = "是否已超期")
+    private Boolean isOverdue;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeTaskOrderRespVO.java

@@ -6,6 +6,7 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTa
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderfollowrecord.vo.BoilerTaskOrderFollowRecordRespVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderfollowrecord.vo.PipeTaskOrderFollowRecordRespVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskordersignfile.BoilerTaskOrderSignFileDO;
 import cn.start.tz.module.pressure2.dal.dataobject.notificationformreport.NotificationformReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
@@ -184,6 +185,8 @@ public class PipeTaskOrderRespVO {
     @Schema(description = "应收金额")
     private BigDecimal shouldAmount;
 
+    private BigDecimal actualAmount;
+
     @Schema(description = "减免费用")
     private BigDecimal reduceFee;
 
@@ -360,6 +363,8 @@ public class PipeTaskOrderRespVO {
     @Schema(description = "委托协议：服务单/受理单模版名称")
     private String templateName;
 
+    private String insId;
+
     @Schema(description = "发放人id")
     private String releaseId;
 
@@ -419,4 +424,18 @@ public class PipeTaskOrderRespVO {
 
     @Schema(description = "联系电话")
     private String deptPhone;
+
+    private String reportConclusion;
+
+    private List<BoilerTaskOrderSignFileDO> signFileList;
+
+    @Schema(description ="使用单位id")
+    private String useUnitId;
+
+    private BigDecimal reductionRadio;
+
+    /**
+     * 企业类型
+     */
+    private String enterpriseType;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorderitemsuspend/PipeTaskOrderItemSuspendController.java

@@ -0,0 +1,85 @@
+package cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemsuspend;
+
+import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemsuspend.vo.TaskOrderItemSuspendSubmitReqVO;
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.start.tz.framework.common.pojo.PageParam;
+import cn.start.tz.framework.common.pojo.PageResult;
+import cn.start.tz.framework.common.pojo.CommonResult;
+import cn.start.tz.framework.common.util.object.BeanUtils;
+import static cn.start.tz.framework.common.pojo.CommonResult.success;
+
+import cn.start.tz.framework.excel.core.util.ExcelUtils;
+
+import cn.start.tz.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.start.tz.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemsuspend.vo.*;
+import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemsuspend.PipeTaskOrderItemSuspendDO;
+import cn.start.tz.module.pressure2.service.pipetaskorderitemsuspend.PipeTaskOrderItemSuspendService;
+
+@Tag(name = "管理后台 - 管道中止检验记录")
+@RestController
+@RequestMapping("/pressure2/pipe-task-order-item-suspend")
+@Validated
+public class PipeTaskOrderItemSuspendController {
+
+    @Resource
+    private PipeTaskOrderItemSuspendService pipeTaskOrderItemSuspendService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建管道中止检验记录")
+    public CommonResult<String> createPipeTaskOrderItemSuspend(@Valid @RequestBody PipeTaskOrderItemSuspendSaveReqVO createReqVO) {
+        return success(pipeTaskOrderItemSuspendService.createPipeTaskOrderItemSuspend(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新管道中止检验记录")
+    public CommonResult<Boolean> updatePipeTaskOrderItemSuspend(@Valid @RequestBody PipeTaskOrderItemSuspendSaveReqVO updateReqVO) {
+        pipeTaskOrderItemSuspendService.updatePipeTaskOrderItemSuspend(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除管道中止检验记录")
+    @Parameter(name = "id", description = "编号", required = true)
+    public CommonResult<Boolean> deletePipeTaskOrderItemSuspend(@RequestParam("id") String id) {
+        pipeTaskOrderItemSuspendService.deletePipeTaskOrderItemSuspend(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得管道中止检验记录")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<PipeTaskOrderItemSuspendRespVO> getPipeTaskOrderItemSuspend(@RequestParam("id") String id) {
+        PipeTaskOrderItemSuspendDO pipeTaskOrderItemSuspend = pipeTaskOrderItemSuspendService.getPipeTaskOrderItemSuspend(id);
+        return success(BeanUtils.toBean(pipeTaskOrderItemSuspend, PipeTaskOrderItemSuspendRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得管道中止检验记录分页")
+    public CommonResult<PageResult<PipeTaskOrderItemSuspendRespVO>> getPipeTaskOrderItemSuspendPage(@Valid PipeTaskOrderItemSuspendPageReqVO pageReqVO) {
+        PageResult<PipeTaskOrderItemSuspendRespVO> pageResult = pipeTaskOrderItemSuspendService.getPipeTaskOrderItemSuspendPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, PipeTaskOrderItemSuspendRespVO.class));
+    }
+
+    @PostMapping("/suspend")
+    @Operation(summary = "批量中止检验")
+    public CommonResult<Boolean> submitTaskOrderItemSuspend(@Valid @RequestBody PipeTaskOrderItemSuspendSubmitReqVO submitReqVO) {
+        pipeTaskOrderItemSuspendService.submitTaskOrderItemSuspend(submitReqVO);
+        return success(true);
+    }
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorderitemsuspend/vo/PipeTaskOrderItemSuspendDetailReqVO.java

@@ -0,0 +1,26 @@
+package cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemsuspend.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 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 PipeTaskOrderItemSuspendDetailReqVO extends PageParam {
+
+    @Schema(description = "管线id", example = "3525")
+    private String id;
+
+    @Schema(description = "设备明细id", example = "3589")
+    private String equipPipeId;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorderitemsuspend/vo/PipeTaskOrderItemSuspendPageReqVO.java

@@ -0,0 +1,92 @@
+package cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemsuspend.vo;
+
+import lombok.*;
+
+import java.time.LocalDate;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.start.tz.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+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 PipeTaskOrderItemSuspendPageReqVO extends PageParam {
+
+    @Schema(description = "订单id", example = "6255")
+    private String orderId;
+
+    @Schema(description = "设备id", example = "22810")
+    private String equipId;
+
+    @Schema(description = "工程号")
+    private String projectNo;
+
+    @Schema(description = "计划排期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] planDate;
+
+    @Schema(description = "是否租借")
+    private Boolean isLease;
+
+    @Schema(description = "使用登记证编号")
+    private String useRegisterNo;
+
+    @Schema(description = "类别", example = "1")
+    private String equipType;
+
+    @Schema(description = "工程名称", example = "芋艿")
+    private String projectName;
+
+    @Schema(description = "产品编号")
+    private String productNo;
+
+    @Schema(description = "安全管理人员")
+    private String safeManager;
+
+    @Schema(description = "安全管理人员电话")
+    private String safeManagerPhone;
+
+    @Schema(description = "下次法定检验时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] nextLegalCheckDate;
+
+    @Schema(description = "下次年度检验时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] nextYearCheckDate;
+
+    @Schema(description = "设备超期时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] overdueDate;
+
+    @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[] submitTime;
+
+    @Schema(description = "提交人", example = "25736")
+    private String submitId;
+
+    @Schema(description = "是否取消")
+    private Boolean isCancel;
+
+    @Schema(description = "中止检验", example = "不喜欢")
+    private String reason;
+
+    @Schema(description = "任务单变更审核人id", example = "5735")
+    private String approvalId;
+
+    @Schema(description = "任务单变更审核时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] approvalTime;
+
+    private Integer checkType;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorderitemsuspend/vo/PipeTaskOrderItemSuspendRespVO.java

@@ -0,0 +1,113 @@
+package cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemsuspend.vo;
+
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDate;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 管道中止检验记录 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class PipeTaskOrderItemSuspendRespVO {
+
+    @Schema(description = "id", example = "26835")
+    @ExcelProperty("id")
+    private String id;
+
+    @Schema(description = "订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6255")
+    @ExcelProperty("订单id")
+    private String orderId;
+
+    @Schema(description = "设备id", requiredMode = Schema.RequiredMode.REQUIRED, example = "22810")
+    @ExcelProperty("设备id")
+    private String equipId;
+
+    @Schema(description = "工程号")
+    @ExcelProperty("工程号")
+    private String projectNo;
+
+    @Schema(description = "计划排期")
+    @ExcelProperty("计划排期")
+    private LocalDate planDate;
+
+    @Schema(description = "是否租借")
+    @ExcelProperty("是否租借")
+    private Boolean isLease;
+
+    @Schema(description = "使用登记证编号")
+    @ExcelProperty("使用登记证编号")
+    private String useRegisterNo;
+
+    @Schema(description = "类别", example = "1")
+    @ExcelProperty("类别")
+    private String equipType;
+
+    @Schema(description = "工程名称", example = "芋艿")
+    @ExcelProperty("工程名称")
+    private String projectName;
+
+    @Schema(description = "产品编号")
+    @ExcelProperty("产品编号")
+    private String productNo;
+
+    @Schema(description = "安全管理人员")
+    @ExcelProperty("安全管理人员")
+    private String safeManager;
+
+    @Schema(description = "安全管理人员电话")
+    @ExcelProperty("安全管理人员电话")
+    private String safeManagerPhone;
+
+    @Schema(description = "下次法定检验时间")
+    @ExcelProperty("下次法定检验时间")
+    private LocalDate nextLegalCheckDate;
+
+    @Schema(description = "下次年度检验时间")
+    @ExcelProperty("下次年度检验时间")
+    private LocalDate nextYearCheckDate;
+
+    @Schema(description = "设备超期时间")
+    @ExcelProperty("设备超期时间")
+    private LocalDate overdueDate;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "提交时间")
+    @ExcelProperty("提交时间")
+    private LocalDateTime submitTime;
+
+    @Schema(description = "提交人", example = "25736")
+    @ExcelProperty("提交人")
+    private String submitId;
+
+    @Schema(description = "是否取消")
+    @ExcelProperty("是否取消")
+    private Boolean isCancel;
+
+    @Schema(description = "中止检验", example = "不喜欢")
+    @ExcelProperty("中止检验")
+    private String reason;
+
+    @Schema(description = "任务单变更审核人id", example = "5735")
+    @ExcelProperty("任务单变更审核人id")
+    private String approvalId;
+
+    @Schema(description = "任务单变更审核时间")
+    @ExcelProperty("任务单变更审核时间")
+    private LocalDateTime approvalTime;
+
+    private AdminUserRespDTO submitUser;
+
+    private Integer checkType;
+
+    @Schema(description = "单位名称")
+    private String unitName;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorderitemsuspend/vo/PipeTaskOrderItemSuspendSaveReqVO.java

@@ -0,0 +1,81 @@
+package cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemsuspend.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDate;
+import java.util.*;
+import jakarta.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 管道中止检验记录新增/修改 Request VO")
+@Data
+public class PipeTaskOrderItemSuspendSaveReqVO {
+
+    @Schema(description = "id", example = "26835")
+    private String id;
+
+    @Schema(description = "订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6255")
+    @NotEmpty(message = "订单id不能为空")
+    private String orderId;
+
+    @Schema(description = "设备id", requiredMode = Schema.RequiredMode.REQUIRED, example = "22810")
+    @NotEmpty(message = "设备id不能为空")
+    private String equipId;
+
+    @Schema(description = "工程号")
+    private String projectNo;
+
+    @Schema(description = "计划排期")
+    private LocalDate planDate;
+
+    @Schema(description = "是否租借")
+    private Boolean isLease;
+
+    @Schema(description = "使用登记证编号")
+    private String useRegisterNo;
+
+    @Schema(description = "类别", example = "1")
+    private String equipType;
+
+    @Schema(description = "工程名称", example = "芋艿")
+    private String projectName;
+
+    @Schema(description = "产品编号")
+    private String productNo;
+
+    @Schema(description = "安全管理人员")
+    private String safeManager;
+
+    @Schema(description = "安全管理人员电话")
+    private String safeManagerPhone;
+
+    @Schema(description = "下次法定检验时间")
+    private LocalDate nextLegalCheckDate;
+
+    @Schema(description = "下次年度检验时间")
+    private LocalDate nextYearCheckDate;
+
+    @Schema(description = "设备超期时间")
+    private LocalDate overdueDate;
+
+    @Schema(description = "提交时间")
+    private LocalDateTime submitTime;
+
+    @Schema(description = "提交人", example = "25736")
+    private String submitId;
+
+    @Schema(description = "是否取消")
+    private Boolean isCancel;
+
+    @Schema(description = "中止检验", example = "不喜欢")
+    private String reason;
+
+    @Schema(description = "任务单变更审核人id", example = "5735")
+    private String approvalId;
+
+    @Schema(description = "任务单变更审核时间")
+    private LocalDateTime approvalTime;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorderitemsuspend/vo/PipeTaskOrderItemSuspendSubmitReqVO.java

@@ -0,0 +1,21 @@
+package cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemsuspend.vo;
+
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemdetail.vo.PipeTaskOrderItemDetailPageReqVO;
+import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemdetail.PipeTaskOrderItemDetailDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PipeTaskOrderItemSuspendSubmitReqVO {
+
+    private String reason;
+
+    private String reasonDict;
+
+    private Integer flag;
+
+    private List<PipeTaskOrderItemSuspendDetailReqVO> orderItemDetails;
+
+}