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

build-uat/update.sql

@@ -1539,6 +1539,13 @@ ALTER TABLE "SYSTEM_OAUTH2_ACCESS_TOKEN" MODIFY "REFRESH_TOKEN" VARCHAR(36 CHAR)
 
 --已加
 
+--20260603
+ALTER TABLE "PRESSURE_TASK_ORDER" ADD COLUMN "NO_TAX_PAYMENT_STATUS" INT DEFAULT (0);
+ALTER TABLE "PRESSURE_TASK_ORDER" ADD COLUMN "NO_TAX_PAY_TIME" DATETIME(6);
+COMMENT ON COLUMN "PRESSURE_TASK_ORDER"."NO_TAX_PAYMENT_STATUS" IS '非税缴费状态(0=待缴费,1=已缴费)';
+COMMENT ON COLUMN "PRESSURE_TASK_ORDER"."NO_TAX_PAY_TIME" IS '非税缴费时间';
+--已加
+
 ALTER TABLE "PRESSURE_TASK_ORDER" ADD COLUMN "IS_SYNC" VARCHAR(50);
 COMMENT ON COLUMN "PRESSURE_TASK_ORDER"."IS_SYNC" IS '是否是同步数据';
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/taskordernontaxapply/vo/TaskOrderPaymentPageReqVO.java

@@ -34,6 +34,9 @@ public class TaskOrderPaymentPageReqVO extends PageParam {
     @Schema(description = "缴费状态(0=待缴费,1=已缴费)", example = "2")
     private Integer paymentStatus;
 
+    @Schema(description = "非税缴费状态(0=待缴费,1=已缴费)", example = "2")
+    private Integer noTaxPaymentStatus;
+
     @Schema(description = "跟进人id")
     private String followId;
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/taskordernontaxapply/vo/TaskOrderPaymentRespVO.java

@@ -71,6 +71,9 @@ public class TaskOrderPaymentRespVO implements Serializable {
     @Schema(description = "缴费状态(0=待缴费,1=已缴费)")
     private Integer paymentStatus;
 
+    @Schema(description = "非税缴费状态(0=待缴费,1=已缴费)")
+    private Integer noTaxPaymentStatus;
+
     @Schema(description = "跟进人id")
     private String followId;
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/boilertaskorder/BoilerTaskOrderDO.java

@@ -332,4 +332,11 @@ public class BoilerTaskOrderDO extends BaseDO {
      * 企业类型
      */
     private String enterpriseType;
+
+    /**
+     * 非税缴费状态(0=待缴费,1=已缴费)
+     */
+    private Integer noTaxPaymentStatus;
+
+    private LocalDateTime noTaxPayTime;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/pipetaskorder/PipeTaskOrderDO.java

@@ -337,4 +337,11 @@ public class PipeTaskOrderDO extends BaseDO {
      */
     private String enterpriseType;
 
+    /**
+     * 非税缴费状态(0=待缴费,1=已缴费)
+     */
+    private Integer noTaxPaymentStatus;
+
+    private LocalDateTime noTaxPayTime;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -6478,8 +6478,8 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             }
             BoilerTaskOrderDO updateOrder = new BoilerTaskOrderDO();
             updateOrder.setId(item.getOrderId());
-            updateOrder.setPaymentStatus(1);
-            updateOrder.setPayTime(updateRecord.getPayDate());
+            updateOrder.setNoTaxPaymentStatus(1);
+            updateOrder.setNoTaxPayTime(updateRecord.getPayDate());
             boilerTaskOrderMapper.updateById(updateOrder);
         }
 

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

@@ -862,8 +862,8 @@ public class TaskOrderNonTaxRecordServiceImpl extends ServiceImpl<TaskOrderNonTa
             }
             BoilerTaskOrderDO updateOrder = new BoilerTaskOrderDO();
             updateOrder.setId(item.getOrderId());
-            updateOrder.setPaymentStatus(1);
-            updateOrder.setPayTime(updateRecord.getPayDate());
+            updateOrder.setNoTaxPaymentStatus(1);
+            updateOrder.setNoTaxPayTime(updateRecord.getPayDate());
             taskOrderMapper.updateById(updateOrder);
         }
 
@@ -967,8 +967,8 @@ public class TaskOrderNonTaxRecordServiceImpl extends ServiceImpl<TaskOrderNonTa
                                             // 更新任务单的缴费状态
                                             BoilerTaskOrderDO updateTaskOrder = new BoilerTaskOrderDO();
                                             updateTaskOrder.setId(orderId);
-                                            updateTaskOrder.setPaymentStatus(1); // 1=已缴费
-                                            updateTaskOrder.setPayTime(payTime);
+                                            updateTaskOrder.setNoTaxPaymentStatus(1); // 1=已缴费
+                                            updateTaskOrder.setNoTaxPayTime(payTime);
 
                                             taskOrderMapper.updateById(updateTaskOrder);
                                             log.info("成功更新任务单 {} 的缴费状态为已缴费", orderId);

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/taskordernontaxapply/TaskOrderLeftJoinMapper.xml

@@ -24,6 +24,7 @@
         t.equip_num AS equipNum,
         t.check_date AS checkDate,
         t.payment_status AS paymentStatus,
+        t.no_tax_payment_status AS noTaxPaymentStatus,
         t.confirm_date AS confirmDate,
         t.reduction_radio AS reductionRadio,
         t.equip_main_type AS equipMainType,
@@ -49,6 +50,9 @@
         <if test="reqVO.paymentStatus != null">
             AND t.payment_status = #{reqVO.paymentStatus}
         </if>
+        <if test="reqVO.noTaxPaymentStatus != null">
+            AND t.no_tax_payment_status = #{reqVO.noTaxPaymentStatus}
+        </if>
 
         <if test="reqVO.feeType != null">
             AND t.fee_type = #{reqVO.feeType}
@@ -116,6 +120,9 @@
         <if test="reqVO.paymentStatus != null">
             AND t.payment_status = #{reqVO.paymentStatus}
         </if>
+        <if test="reqVO.noTaxPaymentStatus != null">
+            AND t.no_tax_payment_status = #{reqVO.noTaxPaymentStatus}
+        </if>
         <if test="reqVO.feeType != null">
             AND t.fee_type = #{reqVO.feeType}
         </if>