Antiloveg лет назад: 8
Родитель
Сommit
163796bc23

+ 5 - 0
schema/2017-03-07.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `org_tech_product` add `account_url` varchar(255)  NULL  COMMENT '台帐URL'
+
+ALTER TABLE `org_ratepay` add `gross_profit` INT(6) NULL COMMENT '利润总额(万元)'
+
+ALTER TABLE `org_ratepay` add `research_cost` INT(6) NULL COMMENT '研发费用(万元)'

+ 26 - 3
src/main/java/com/goafanti/common/mapper/OrgRatepayMapper.xml

@@ -12,12 +12,14 @@
     <result column="tax_exempt_income" property="taxExemptIncome" jdbcType="INTEGER" />
     <result column="subsidy_income" property="subsidyIncome" jdbcType="INTEGER" />
     <result column="year" property="year" jdbcType="INTEGER" />
+    <result column="gross_profit" property="grossProfit" jdbcType="INTEGER" />
+    <result column="research_cost" property="researchCost" jdbcType="INTEGER" />
     <result column="tax_return_url" property="taxReturnUrl" jdbcType="VARCHAR" />
     <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, operating_income, management_cost, operating_profit, non_operating_income, 
-    non_taxable_income, tax_exempt_income, subsidy_income, year, tax_return_url, deleted_sign
+    non_taxable_income, tax_exempt_income, subsidy_income, year, gross_profit, research_cost, tax_return_url, deleted_sign
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -32,12 +34,13 @@
   <insert id="insert" parameterType="com.goafanti.common.model.OrgRatepay" >
     insert into org_ratepay (id, uid, operating_income, 
       management_cost, operating_profit, non_operating_income, 
-      non_taxable_income, tax_exempt_income, subsidy_income, year,
+      non_taxable_income, tax_exempt_income, subsidy_income, year, gross_profit, research_cost,
       tax_return_url, deleted_sign)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{operatingIncome,jdbcType=INTEGER}, 
       #{managementCost,jdbcType=INTEGER}, #{operatingProfit,jdbcType=INTEGER}, #{nonOperatingIncome,jdbcType=INTEGER}, 
       #{nonTaxableIncome,jdbcType=INTEGER}, #{taxExemptIncome,jdbcType=INTEGER}, #{subsidyIncome,jdbcType=INTEGER}, 
-      #{year,jdbcType=INTEGER}, #{taxReturnUrl,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER})
+      #{year,jdbcType=INTEGER}, #{grossProfit,jdbcType=INTEGER}, #{researchCost,jdbcType=INTEGER}, 
+      #{taxReturnUrl,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgRatepay" >
     insert into org_ratepay
@@ -72,6 +75,12 @@
       <if test="year != null" >
         year,
       </if>
+      <if test="grossProfit != null" >
+        gross_profit,
+      </if>
+      <if test="researchCost != null" >
+        research_cost,
+      </if>
       <if test="taxReturnUrl != null" >
         tax_return_url,
       </if>
@@ -110,6 +119,12 @@
       <if test="year != null" >
         #{year,jdbcType=INTEGER},
       </if>
+      <if test="grossProfit != null" >
+        #{grossProfit,jdbcType=INTEGER},
+      </if>
+      <if test="researchCost != null" >
+        #{researchCost,jdbcType=INTEGER},
+      </if>
        <if test="taxReturnUrl != null" >
         #{taxReturnUrl,jdbcType=VARCHAR},
       </if>
@@ -148,6 +163,12 @@
       <if test="year != null" >
         year = #{year,jdbcType=INTEGER},
       </if>
+       <if test="grossProfit != null" >
+        gross_profit = #{grossProfit,jdbcType=INTEGER},
+      </if>
+       <if test="researchCost != null" >
+        research_cost = #{researchCost,jdbcType=INTEGER},
+      </if>
       <if test="taxReturnUrl != null" >
         tax_return_url = #{taxReturnUrl,jdbcType=VARCHAR},
       </if>
@@ -168,6 +189,8 @@
       tax_exempt_income = #{taxExemptIncome,jdbcType=INTEGER},
       subsidy_income = #{subsidyIncome,jdbcType=INTEGER},
       year = #{year,jdbcType=INTEGER},
+      gross_profit = #{grossProfit,jdbcType=INTEGER},
+      research_cost = #{researchCost,jdbcType=INTEGER},
       tax_return_url = #{taxReturnUrl,jdbcType=VARCHAR},
       deleted_sign = #{deletedSign,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}

+ 29 - 0
src/main/java/com/goafanti/common/model/OrgRatepay.java

@@ -48,6 +48,17 @@ public class OrgRatepay {
      * 年份
      */
     private Integer year;
+    
+    /**
+     * 利润总额
+     */
+    private Integer grossProfit;
+    
+    /**
+     * 研发费用
+     */
+    private Integer research_cost;
+    
 
     /**
     * 纳税申报表url
@@ -155,7 +166,25 @@ public class OrgRatepay {
 	public void setYear(Integer year) {
 		this.year = year;
 	}
+	
+	
     
+	public Integer getGrossProfit() {
+		return grossProfit;
+	}
+
+	public void setGrossProfit(Integer grossProfit) {
+		this.grossProfit = grossProfit;
+	}
+
+	public Integer getResearch_cost() {
+		return research_cost;
+	}
+
+	public void setResearch_cost(Integer research_cost) {
+		this.research_cost = research_cost;
+	}
+
 	//企业纳税申报表
 	public String getTaxReturnDownloadFileName(){
 		if (StringUtils.isBlank(this.taxReturnUrl)){