From 6e2bd82e86f25cfe75c9810ced3ba0d4638fd4a0 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 1 Nov 2024 15:39:52 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=B0=83=E6=95=B4=EF=BC=9A?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7=E6=80=BB=E7=BB=8F=E8=90=A5?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=80=BB=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=80=BB=E7=BB=8F=E9=AA=8C=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC=E6=A8=A1=E6=9D=BFmapper.xml=E5=B1=82=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=96=B9=E6=B3=95=E5=8A=A0=E4=B8=8AtotalOperatingCost?=
 =?UTF-8?q?s=E5=AD=97=E6=AE=B5=20=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9EtotalOperatingCosts=E5=AD=97=E6=AE=B5=E5=92=8Cget?=
 =?UTF-8?q?=E3=80=81set=E6=96=B9=E6=B3=95=20=E6=8C=89=E7=85=A7=E6=96=B0?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E8=B0=83=E6=95=B4=E6=80=BB=E7=BB=8F=E9=AA=8C?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E5=89=8D=E7=AB=AF=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sales/domain/SalesEstimateTemplate.java   | 28 ++++++---
 .../sales/SalesEstimateTemplateMapper.xml     |  6 +-
 .../estimate/addOperatingCostTemplate.html    | 58 +++++++++++--------
 3 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimateTemplate.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimateTemplate.java
index a5ed83bc..ca5d433a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimateTemplate.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimateTemplate.java
@@ -43,23 +43,23 @@ public class SalesEstimateTemplate extends BaseEntity
     @Excel(name = "F挡利润率")
     private BigDecimal fProfitRate;
 
-    /** 不含税人工成本（RMB） */
-    @Excel(name = "不含税人工成本", readConverterExp = "R=MB")
+
+    /** 上一年度总经营成本 */
+    private BigDecimal totalOperatingCosts;
+
+    /** 不含税人工成本（RMB）停用 */
     private BigDecimal noTaxLaborCosts;
 
-    /** 不含税推广成本（RMB） */
-    @Excel(name = "不含税推广成本", readConverterExp = "R=MB")
+    /** 不含税推广成本（RMB）停用 */
     private BigDecimal noTaxPromotionalCosts;
 
-    /** 不含税业务成本（RMB） */
-    @Excel(name = "不含税业务成本", readConverterExp = "R=MB")
+    /** 不含税业务成本（RMB）停用 */
     private BigDecimal noTaxBusinessCosts;
 
-    /** 不含税管理成本（RMB） */
-    @Excel(name = "不含税管理成本", readConverterExp = "R=MB")
+    /** 不含税管理成本（RMB）停用 */
     private BigDecimal noTaxManagesCosts;
 
-    /** 不含税总物料成本（RMB） */
+    /** 不含税总物料成本（RMB）停用 */
     @Excel(name = "不含税总物料成本", readConverterExp = "R=MB")
     private BigDecimal noTaxMaterialCosts;
 
@@ -172,6 +172,15 @@ public class SalesEstimateTemplate extends BaseEntity
         return noTaxMaterialCosts;
     }
 
+
+    public BigDecimal getTotalOperatingCosts() {
+        return totalOperatingCosts;
+    }
+
+    public void setTotalOperatingCosts(BigDecimal totalOperatingCosts) {
+        this.totalOperatingCosts = totalOperatingCosts;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -182,6 +191,7 @@ public class SalesEstimateTemplate extends BaseEntity
             .append("dProfitRate", getdProfitRate())
             .append("eProfitRate", geteProfitRate())
             .append("fProfitRate", getfProfitRate())
+            .append("totalOperatingCosts", getTotalOperatingCosts())
             .append("noTaxLaborCosts", getNoTaxLaborCosts())
             .append("noTaxPromotionalCosts", getNoTaxPromotionalCosts())
             .append("noTaxBusinessCosts", getNoTaxBusinessCosts())
diff --git a/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateTemplateMapper.xml b/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateTemplateMapper.xml
index e0983e4c..0b4cc551 100644
--- a/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateTemplateMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateTemplateMapper.xml
@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dProfitRate"    column="D_profit_rate"    />
         <result property="eProfitRate"    column="E_profit_rate"    />
         <result property="fProfitRate"    column="F_profit_rate"    />
+        <result property="totalOperatingCosts"    column="total_operating_costs"    />
         <result property="noTaxLaborCosts"    column="no_tax_labor_costs"    />
         <result property="noTaxPromotionalCosts"    column="no_tax_promotional_costs"    />
         <result property="noTaxBusinessCosts"    column="no_tax_business_costs"    />
@@ -25,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSalesEstimateTemplateVo">
-        select estimate_template_id, A_profit_rate, B_profit_rate, C_profit_rate, D_profit_rate, E_profit_rate, F_profit_rate, no_tax_labor_costs, no_tax_promotional_costs, no_tax_business_costs, no_tax_manages_costs, no_tax_material_costs, create_by, create_time, update_by, update_time, remark from sales_estimate_template
+        select estimate_template_id, A_profit_rate, B_profit_rate, C_profit_rate, D_profit_rate, E_profit_rate, F_profit_rate, total_operating_costs, no_tax_labor_costs, no_tax_promotional_costs, no_tax_business_costs, no_tax_manages_costs, no_tax_material_costs, create_by, create_time, update_by, update_time, remark from sales_estimate_template
     </sql>
 
     <select id="selectSalesEstimateTemplateList" parameterType="SalesEstimateTemplate" resultMap="SalesEstimateTemplateResult">
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dProfitRate != null">D_profit_rate,</if>
             <if test="eProfitRate != null">E_profit_rate,</if>
             <if test="fProfitRate != null">F_profit_rate,</if>
+            <if test="totalOperatingCosts != null">total_operating_costs,</if>
             <if test="noTaxLaborCosts != null">no_tax_labor_costs,</if>
             <if test="noTaxPromotionalCosts != null">no_tax_promotional_costs,</if>
             <if test="noTaxBusinessCosts != null">no_tax_business_costs,</if>
@@ -70,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dProfitRate != null">#{dProfitRate},</if>
             <if test="eProfitRate != null">#{eProfitRate},</if>
             <if test="fProfitRate != null">#{fProfitRate},</if>
+            <if test="totalOperatingCosts != null">#{totalOperatingCosts},</if>
             <if test="noTaxLaborCosts != null">#{noTaxLaborCosts},</if>
             <if test="noTaxPromotionalCosts != null">#{noTaxPromotionalCosts},</if>
             <if test="noTaxBusinessCosts != null">#{noTaxBusinessCosts},</if>
@@ -92,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dProfitRate != null">D_profit_rate = #{dProfitRate},</if>
             <if test="eProfitRate != null">E_profit_rate = #{eProfitRate},</if>
             <if test="fProfitRate != null">F_profit_rate = #{fProfitRate},</if>
+            <if test="totalOperatingCosts != null">total_operating_costs = #{totalOperatingCosts},</if>
             <if test="noTaxLaborCosts != null">no_tax_labor_costs = #{noTaxLaborCosts},</if>
             <if test="noTaxPromotionalCosts != null">no_tax_promotional_costs = #{noTaxPromotionalCosts},</if>
             <if test="noTaxBusinessCosts != null">no_tax_business_costs = #{noTaxBusinessCosts},</if>
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/addOperatingCostTemplate.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/addOperatingCostTemplate.html
index 77b40231..89781788 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/addOperatingCostTemplate.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/addOperatingCostTemplate.html
@@ -31,41 +31,49 @@
 
         <div class="container">
             <div class="row">
-                <h4 class="font-weight-bold">总经营成本</h4>
+                <h4 class="font-weight-bold">上一年度总经营成本</h4>
              </div>
             <hr class="underline">
             <br>
         </div>
-            <div class="form-group">
-                <label class="col-sm-7 control-label is-required">不含税人工成本(RMB)：</label>
-                <div class="col-sm-5">
-                    <input name="noTaxLaborCosts" th:field="*{noTaxLaborCosts}" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-7 control-label is-required">不含税推广成本(RMB)：</label>
-                <div class="col-sm-5">
-                    <input name="noTaxPromotionalCosts" th:field="*{noTaxPromotionalCosts}" class="form-control" type="text" required>
-                </div>
-            </div>
 
-            <div class="form-group">
-                <label class="col-sm-7 control-label is-required">不含税业务成本(RMB)：</label>
-                <div class="col-sm-5">
-                    <input name="noTaxBusinessCosts" th:field="*{noTaxBusinessCosts}" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-7 control-label is-required">不含税管理成本(RMB)：</label>
-                <div class="col-sm-5">
-                    <input name="noTaxManagesCosts" th:field="*{noTaxManagesCosts}" class="form-control" type="text" required>
-                </div>
+        <div class="form-group">
+            <label class="col-sm-7 control-label is-required">不含税总经营成本(RMB)：</label>
+            <div class="col-sm-5">
+                <input name="totalOperatingCosts" th:field="*{totalOperatingCosts}" class="form-control" type="text" required>
             </div>
+        </div>
+
+<!--            <div class="form-group">-->
+<!--                <label class="col-sm-7 control-label is-required">不含税人工成本(RMB)：</label>-->
+<!--                <div class="col-sm-5">-->
+<!--                    <input name="noTaxLaborCosts" th:field="*{noTaxLaborCosts}" class="form-control" type="text" required>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="form-group">-->
+<!--                <label class="col-sm-7 control-label is-required">不含税推广成本(RMB)：</label>-->
+<!--                <div class="col-sm-5">-->
+<!--                    <input name="noTaxPromotionalCosts" th:field="*{noTaxPromotionalCosts}" class="form-control" type="text" required>-->
+<!--                </div>-->
+<!--            </div>-->
+
+<!--            <div class="form-group">-->
+<!--                <label class="col-sm-7 control-label is-required">不含税业务成本(RMB)：</label>-->
+<!--                <div class="col-sm-5">-->
+<!--                    <input name="noTaxBusinessCosts" th:field="*{noTaxBusinessCosts}" class="form-control" type="text" required>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="form-group">-->
+<!--                <label class="col-sm-7 control-label is-required">不含税管理成本(RMB)：</label>-->
+<!--                <div class="col-sm-5">-->
+<!--                    <input name="noTaxManagesCosts" th:field="*{noTaxManagesCosts}" class="form-control" type="text" required>-->
+<!--                </div>-->
+<!--            </div>-->
 
 
         <div class="container">
             <div class="row">
-                <h4 class="font-weight-bold">总物料成本</h4>
+                <h4 class="font-weight-bold">上一年度总物料成本</h4>
             </div>
             <hr class="underline">
             <br>