财务管理费用显示调整

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

@@ -106,6 +106,9 @@ public class TaskOrderNonTaxApplyRespVO {
     @Schema(description = "服务费")
     private BigDecimal serviceAmount;
 
+    @Schema(description = "法定收费")
+    private BigDecimal shouldAmount;
+
     @Schema(description = "接收人邮箱")
     private String recipientEmail;
 

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

@@ -37,6 +37,9 @@ public class TaskOrderPaymentRespVO implements Serializable {
     @Schema(description = "费用")
     private BigDecimal serviceAmount;
 
+    @Schema(description = "法定金额")
+    private BigDecimal shouldAmount;
+
     @Schema(description = "免征费用")
     private BigDecimal exemptAmount;
 
@@ -93,15 +96,15 @@ public class TaskOrderPaymentRespVO implements Serializable {
 
     private Integer equipMainType;
 
-    public BigDecimal getActualAmount(){
-        if(serviceAmount == null){
-            return new BigDecimal(0);
-        }
-        if((checkType != null && checkType != 100) || reductionRadio == null){
-            return serviceAmount;
-        }
-
-        double v = 1 - this.reductionRadio.doubleValue();
-        return this.serviceAmount.multiply(new BigDecimal(v)).setScale(2, RoundingMode.HALF_UP);
-    }
+//    public BigDecimal getActualAmount(){
+//        if(serviceAmount == null){
+//            return new BigDecimal(0);
+//        }
+//        if((checkType != null && checkType != 100) || reductionRadio == null){
+//            return serviceAmount;
+//        }
+//
+//        double v = 1 - this.reductionRadio.doubleValue();
+//        return this.serviceAmount.multiply(new BigDecimal(v)).setScale(2, RoundingMode.HALF_UP);
+//    }
 }

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

@@ -3134,6 +3134,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
         orderReportService.addBoilerOrderReport(taskOrderDO.getAcceptOrderId(), taskOrderDO.getId());
 
+        //重新计算任务单和设备的金额
+        this.updateOrderFee(taskOrderDO.getId());
+
         return taskOrderDO;
 
     }

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

@@ -2386,6 +2386,9 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         orderReportService.addPipeOrderReport(taskOrderDO.getAcceptOrderId(), taskOrderDO.getId());
 
+        //重新计算任务单和设备的金额
+        this.updateOrderFee(taskOrderDO.getId());
+
         return taskOrderDO;
 
     }

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

@@ -616,7 +616,7 @@ public class TaskOrderNonTaxApplyServiceImpl extends ServiceImpl<TaskOrderNonTax
                     max.ifPresent(paymentFollowRecordDO -> taskOrderPaymentRespVO.setStatus(paymentFollowRecordDO.getStatus()));
                 }
                 System.out.println(taskOrderPaymentRespVO.getActualAmount());
-                taskOrderPaymentRespVO.setActualAmount(taskOrderPaymentRespVO.getActualAmount());
+//                taskOrderPaymentRespVO.setActualAmount(taskOrderPaymentRespVO.getActualAmount());
                 taskOrderPaymentRespVO.setDept(deptMap.get(taskOrderPaymentRespVO.getDeptId()));
             }
         }

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

@@ -15,6 +15,8 @@
         t.dept_id AS deptId,
         t.payer_contact_name AS payerContactName,
         t.payer_contact AS payerContact,
+        t.actual_amount AS actualAmount,
+        t.should_amount AS shouldAmount,
         t.service_amount AS serviceAmount,
         t.use_unit_id AS useUnitId,
         t.use_unit_name AS useUnitName,

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

@@ -37,6 +37,7 @@
         task_order.fee_type,
         task_order.check_type,
         task_order.service_amount,
+        task_order.should_amount,
         task_order.payer_contact_name as recipient,
         task_order.payer_contact as recipient_phone,
         task_order.payer_mail as recipient_email,