Merge branch 'dev-lb' into 'main'

fix

See merge request !17

ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/CompanyEconomyInfoController.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -77,6 +78,18 @@ public class CompanyEconomyInfoController {
      */
     @PostMapping(value = "/save")
     public AjaxResult save(@RequestBody GridCompanyEconomyInfoExt infoExt) {
+        infoExt.setYearSales(infoExt.getSales().toString());
+        infoExt.setYearTaxes(infoExt.getTaxes().toString());
+        int sale = 0;
+        for(String s:infoExt.getSales()){
+            sale += Integer.parseInt(s);
+        }
+        infoExt.setSale(BigDecimal.valueOf(sale));
+        int tax = 0;
+        for (String s:infoExt.getTaxes()){
+            tax += Integer.parseInt(s);
+        }
+        infoExt.setTax(BigDecimal.valueOf(tax));
         companyEconomyInfoService.save(infoExt);
         return AjaxResult.success("提交成功");
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/grid/GridCompanyEconomyInfo.java

 package com.ruoyi.system.domain.grid;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
+@Data
 public class GridCompanyEconomyInfo implements Serializable {
     private String id;
 
@@ -58,71 +62,79 @@ public class GridCompanyEconomyInfo implements Serializable {
 
     private String companyName;
 
-    private static final long serialVersionUID = 1L;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(String companyId) {
-        this.companyId = companyId;
-    }
-
-    public BigDecimal getSale() {
-        return sale;
-    }
-
-    public void setSale(BigDecimal sale) {
-        this.sale = sale;
-    }
-
-    public BigDecimal getTax() {
-        return tax;
-    }
-
-    public void setTax(BigDecimal tax) {
-        this.tax = tax;
-    }
-
-    public BigDecimal getPerMu() {
-        return perMu;
-    }
+    private List<String> sales;
 
-    public void setPerMu(BigDecimal perMu) {
-        this.perMu = perMu;
-    }
+    private List<String> taxes;
 
-    public String getYear() {
-        return year;
-    }
+    private String yearSales;
 
-    public void setYear(String year) {
-        this.year = year;
-    }
+    private String yearTaxes;
 
-    public String getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(String isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getCreateTime() {
-        return createTime;
-    }
+    private static final long serialVersionUID = 1L;
 
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
+//    public String getId() {
+//        return id;
+//    }
+//
+//    public void setId(String id) {
+//        this.id = id;
+//    }
+//
+//    public String getCompanyId() {
+//        return companyId;
+//    }
+//
+//    public void setCompanyId(String companyId) {
+//        this.companyId = companyId;
+//    }
+//
+//    public BigDecimal getSale() {
+//        return sale;
+//    }
+//
+//    public void setSale(BigDecimal sale) {
+//        this.sale = sale;
+//    }
+//
+//    public BigDecimal getTax() {
+//        return tax;
+//    }
+//
+//    public void setTax(BigDecimal tax) {
+//        this.tax = tax;
+//    }
+//
+//    public BigDecimal getPerMu() {
+//        return perMu;
+//    }
+//
+//    public void setPerMu(BigDecimal perMu) {
+//        this.perMu = perMu;
+//    }
+//
+//    public String getYear() {
+//        return year;
+//    }
+//
+//    public void setYear(String year) {
+//        this.year = year;
+//    }
+//
+//    public String getIsValid() {
+//        return isValid;
+//    }
+//
+//    public void setIsValid(String isValid) {
+//        this.isValid = isValid;
+//    }
+//
+//    public String getCreateTime() {
+//        return createTime;
+//    }
+//
+//    public void setCreateTime(String createTime) {
+//        this.createTime = createTime;
+//    }
 
     @Override
     public String toString() {

ruoyi-system/src/main/resources/mapper/grid/GridCompanyEconomyInfoMapper.xml

@@ -10,6 +10,8 @@
     <result column="year" jdbcType="VARCHAR" property="year" />
     <result column="is_valid" jdbcType="VARCHAR" property="isValid" />
     <result column="create_time" jdbcType="VARCHAR" property="createTime" />
+    <result column="year_sales" jdbcType="VARCHAR" property="yearSales" />
+    <result column="year_taxes" jdbcType="VARCHAR" property="yearTaxes" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -70,7 +72,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, company_id, sale, tax, per_mu, year, is_valid, create_time
+    id, company_id, sale, tax, per_mu, year, is_valid, create_time, year_sales, year_taxes
   </sql>
   <select id="selectByExample" parameterType="com.ruoyi.system.domain.grid.GridCompanyEconomyInfoExample" resultMap="BaseResultMap">
     select
@@ -105,10 +107,11 @@
   <insert id="insert" parameterType="com.ruoyi.system.domain.grid.GridCompanyEconomyInfo">
     insert into grid_company_economy_info (id, company_id, sale,
       tax, per_mu, year,
-      is_valid, create_time)
+      is_valid, create_time, year_sales, year_taxes)
     values (#{id,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR}, #{sale,jdbcType=DECIMAL}, 
       #{tax,jdbcType=DECIMAL}, #{perMu,jdbcType=DECIMAL}, #{year,jdbcType=VARCHAR},
-      #{isValid,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR})
+      #{isValid,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}
+      , #{yearSales,jdbcType=VARCHAR}, #{yearTaxes,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.ruoyi.system.domain.grid.GridCompanyEconomyInfo">
     insert into grid_company_economy_info
@@ -137,6 +140,12 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="yearSales != null">
+        year_sales,
+      </if>
+      <if test="yearTaxes != null">
+        year_taxes,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -163,6 +172,12 @@
       <if test="createTime != null">
         #{createTime,jdbcType=VARCHAR},
       </if>
+      <if test="yearSales != null">
+        #{yearSales,jdbcType=VARCHAR},
+      </if>
+      <if test="yearTaxes != null">
+        #{yearTaxes,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ruoyi.system.domain.grid.GridCompanyEconomyInfoExample" resultType="java.lang.Long">
@@ -198,6 +213,12 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=VARCHAR},
       </if>
+      <if test="record.yearSales != null">
+        year_sales = #{record.yearSales,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        year_taxes = #{record.yearTaxes,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -212,7 +233,9 @@
       per_mu = #{record.perMu,jdbcType=DECIMAL},
       year = #{record.year,jdbcType=VARCHAR},
       is_valid = #{record.isValid,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=VARCHAR}
+      create_time = #{record.createTime,jdbcType=VARCHAR},
+      year_sales = #{record.yearSales,jdbcType=VARCHAR},
+      year_taxes = #{record.yearTaxes,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -241,6 +264,12 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=VARCHAR},
       </if>
+      <if test="record.yearSales != null">
+        year_sales = #{record.yearSales,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        year_taxes = #{record.yearTaxes,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -252,7 +281,9 @@
       per_mu = #{perMu,jdbcType=DECIMAL},
       year = #{year,jdbcType=VARCHAR},
       is_valid = #{isValid,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=VARCHAR}
+      create_time = #{createTime,jdbcType=VARCHAR},
+        year_sales = #{yearSales,jdbcType=VARCHAR},
+        year_taxes = #{yearTaxes,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file