Browse Source

新增固定资产

anderx 7 years ago
parent
commit
c741d895b4

+ 1 - 1
GeneratorConfig.xml

@@ -9,6 +9,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="aft" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="aft" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="aft" type="XMLMAPPER" />
-    <table schema="aft" tableName="organization_year_project"/> 
+    <table schema="aft" tableName="organization_annual_report"/> 
   </context>
 </generatorConfiguration>

+ 68 - 88
src/main/java/com/goafanti/common/dao/OrganizationAnnualReportMapper.java

@@ -7,94 +7,74 @@ import org.apache.ibatis.annotations.Param;
 
 public interface OrganizationAnnualReportMapper {
     /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table organization_annual_report
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    long countByExample(OrganizationAnnualReportExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table organization_annual_report
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    int deleteByExample(OrganizationAnnualReportExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table organization_annual_report
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    int deleteByPrimaryKey(String id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table organization_annual_report
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    int insert(OrganizationAnnualReport record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table organization_annual_report
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    int insertSelective(OrganizationAnnualReport record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table organization_annual_report
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    List<OrganizationAnnualReport> selectByExample(OrganizationAnnualReportExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table organization_annual_report
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    OrganizationAnnualReport selectByPrimaryKey(String id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table organization_annual_report
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    int updateByExampleSelective(@Param("record") OrganizationAnnualReport record, @Param("example") OrganizationAnnualReportExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table organization_annual_report
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    int updateByExample(@Param("record") OrganizationAnnualReport record, @Param("example") OrganizationAnnualReportExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table organization_annual_report
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    int updateByPrimaryKeySelective(OrganizationAnnualReport record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table organization_annual_report
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    int updateByPrimaryKey(OrganizationAnnualReport record);
-
-    int checkYear(@Param("uid")String uid, @Param("year")Integer year);
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_annual_report
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	long countByExample(OrganizationAnnualReportExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_annual_report
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	int deleteByExample(OrganizationAnnualReportExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_annual_report
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	int deleteByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_annual_report
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	int insert(OrganizationAnnualReport record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_annual_report
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	int insertSelective(OrganizationAnnualReport record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_annual_report
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	List<OrganizationAnnualReport> selectByExample(OrganizationAnnualReportExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_annual_report
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	OrganizationAnnualReport selectByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_annual_report
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	int updateByExampleSelective(@Param("record") OrganizationAnnualReport record,
+			@Param("example") OrganizationAnnualReportExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_annual_report
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	int updateByExample(@Param("record") OrganizationAnnualReport record,
+			@Param("example") OrganizationAnnualReportExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_annual_report
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	int updateByPrimaryKeySelective(OrganizationAnnualReport record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_annual_report
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	int updateByPrimaryKey(OrganizationAnnualReport record);
+
+	int checkYear(@Param("uid")String uid, @Param("year")Integer year);
 
     int checkAnnual(@Param("id")String id, @Param("uid")String uid, @Param("year")Integer year);
 

+ 37 - 28
src/main/java/com/goafanti/common/mapper/OrganizationAnnualReportMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -14,14 +14,9 @@
     <result column="research_amount" jdbcType="VARCHAR" property="researchAmount" />
     <result column="assets" jdbcType="VARCHAR" property="assets" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="fixed_assets" jdbcType="VARCHAR" property="fixedAssets" />
   </resultMap>
-  
   <resultMap id="YearProjectMap" type="com.goafanti.common.model.OrganizationYearProject">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:47 CST 2018.
-    -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
     <result column="year" jdbcType="INTEGER" property="year" />
@@ -34,7 +29,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -68,7 +63,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -102,9 +97,9 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
-    id, uid, year, sales_amount, research_amount, assets, aid
+    id, uid, year, sales_amount, research_amount, assets, aid, fixed_assets
   </sql>
   <sql id="Year_Project_List">
     <!--
@@ -118,7 +113,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
     select
     <if test="distinct">
@@ -137,7 +132,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -148,7 +143,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
     delete from organization_annual_report
     where id = #{id,jdbcType=VARCHAR}
@@ -157,7 +152,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
     delete from organization_annual_report
     <if test="_parameter != null">
@@ -168,20 +163,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
     insert into organization_annual_report (id, uid, year, 
       sales_amount, research_amount, assets, 
-      aid)
+      aid, fixed_assets)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{year,jdbcType=INTEGER}, 
       #{salesAmount,jdbcType=VARCHAR}, #{researchAmount,jdbcType=VARCHAR}, #{assets,jdbcType=VARCHAR}, 
-      #{aid,jdbcType=VARCHAR})
+      #{aid,jdbcType=VARCHAR}, #{fixedAssets,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationAnnualReport">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
     insert into organization_annual_report
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -206,6 +201,9 @@
       <if test="aid != null">
         aid,
       </if>
+      <if test="fixedAssets != null">
+        fixed_assets,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -229,13 +227,16 @@
       <if test="aid != null">
         #{aid,jdbcType=VARCHAR},
       </if>
+      <if test="fixedAssets != null">
+        #{fixedAssets,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.OrganizationAnnualReportExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
     select count(*) from organization_annual_report
     <if test="_parameter != null">
@@ -246,7 +247,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
     update organization_annual_report
     <set>
@@ -271,6 +272,9 @@
       <if test="record.aid != null">
         aid = #{record.aid,jdbcType=VARCHAR},
       </if>
+      <if test="record.fixedAssets != null">
+        fixed_assets = #{record.fixedAssets,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -280,7 +284,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
     update organization_annual_report
     set id = #{record.id,jdbcType=VARCHAR},
@@ -289,7 +293,8 @@
       sales_amount = #{record.salesAmount,jdbcType=VARCHAR},
       research_amount = #{record.researchAmount,jdbcType=VARCHAR},
       assets = #{record.assets,jdbcType=VARCHAR},
-      aid = #{record.aid,jdbcType=VARCHAR}
+      aid = #{record.aid,jdbcType=VARCHAR},
+      fixed_assets = #{record.fixedAssets,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -298,7 +303,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
     update organization_annual_report
     <set>
@@ -320,6 +325,9 @@
       <if test="aid != null">
         aid = #{aid,jdbcType=VARCHAR},
       </if>
+      <if test="fixedAssets != null">
+        fixed_assets = #{fixedAssets,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -327,7 +335,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 20 16:32:29 CST 2018.
+      This element was generated on Fri Jul 27 15:10:52 CST 2018.
     -->
     update organization_annual_report
     set uid = #{uid,jdbcType=VARCHAR},
@@ -335,13 +343,14 @@
       sales_amount = #{salesAmount,jdbcType=VARCHAR},
       research_amount = #{researchAmount,jdbcType=VARCHAR},
       assets = #{assets,jdbcType=VARCHAR},
-      aid = #{aid,jdbcType=VARCHAR}
+      aid = #{aid,jdbcType=VARCHAR},
+      fixed_assets = #{fixedAssets,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <select id="checkYear"  resultType="integer">
+  <select id="checkYear" resultType="integer">
   	select count(*) from organization_annual_report where uid = #{uid,jdbcType=VARCHAR} and  year = #{year,jdbcType=INTEGER} 
   </select>
-  <select id="checkAnnual"  resultType="integer">
+  <select id="checkAnnual" resultType="integer">
   	select count(*) from organization_annual_report where id!= #{id,jdbcType=VARCHAR} and uid = #{uid,jdbcType=VARCHAR} and year = #{year,jdbcType=INTEGER}  
   </select>
   <select id="selectOrgAnnualList" resultMap="BaseResultMap">

+ 185 - 230
src/main/java/com/goafanti/common/model/OrganizationAnnualReport.java

@@ -1,234 +1,189 @@
 package com.goafanti.common.model;
 
 public class OrganizationAnnualReport {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_annual_report.id
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    private String id;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_annual_report.uid
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    private String uid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_annual_report.year
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    private Integer year;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_annual_report.sales_amount
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    private String salesAmount;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_annual_report.research_amount
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    private String researchAmount;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_annual_report.assets
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    private String assets;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_annual_report.aid
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    private String aid;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column organization_annual_report.id
-     *
-     * @return the value of organization_annual_report.id
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column organization_annual_report.id
-     *
-     * @param id the value for organization_annual_report.id
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column organization_annual_report.uid
-     *
-     * @return the value of organization_annual_report.uid
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    public String getUid() {
-        return uid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column organization_annual_report.uid
-     *
-     * @param uid the value for organization_annual_report.uid
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column organization_annual_report.year
-     *
-     * @return the value of organization_annual_report.year
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    public Integer getYear() {
-        return year;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column organization_annual_report.year
-     *
-     * @param year the value for organization_annual_report.year
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    public void setYear(Integer year) {
-        this.year = year;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column organization_annual_report.sales_amount
-     *
-     * @return the value of organization_annual_report.sales_amount
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    public String getSalesAmount() {
-        return salesAmount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column organization_annual_report.sales_amount
-     *
-     * @param salesAmount the value for organization_annual_report.sales_amount
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    public void setSalesAmount(String salesAmount) {
-        this.salesAmount = salesAmount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column organization_annual_report.research_amount
-     *
-     * @return the value of organization_annual_report.research_amount
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    public String getResearchAmount() {
-        return researchAmount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column organization_annual_report.research_amount
-     *
-     * @param researchAmount the value for organization_annual_report.research_amount
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    public void setResearchAmount(String researchAmount) {
-        this.researchAmount = researchAmount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column organization_annual_report.assets
-     *
-     * @return the value of organization_annual_report.assets
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    public String getAssets() {
-        return assets;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column organization_annual_report.assets
-     *
-     * @param assets the value for organization_annual_report.assets
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    public void setAssets(String assets) {
-        this.assets = assets;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column organization_annual_report.aid
-     *
-     * @return the value of organization_annual_report.aid
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    public String getAid() {
-        return aid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column organization_annual_report.aid
-     *
-     * @param aid the value for organization_annual_report.aid
-     *
-     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
-     */
-    public void setAid(String aid) {
-        this.aid = aid;
-    }
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_annual_report.id
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	private String id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_annual_report.uid
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	private String uid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_annual_report.year
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	private Integer year;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_annual_report.sales_amount
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	private String salesAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_annual_report.research_amount
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	private String researchAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_annual_report.assets
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	private String assets;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_annual_report.aid
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	private String aid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_annual_report.fixed_assets
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	private String fixedAssets;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_annual_report.id
+	 * @return  the value of organization_annual_report.id
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_annual_report.id
+	 * @param id  the value for organization_annual_report.id
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_annual_report.uid
+	 * @return  the value of organization_annual_report.uid
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public String getUid() {
+		return uid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_annual_report.uid
+	 * @param uid  the value for organization_annual_report.uid
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_annual_report.year
+	 * @return  the value of organization_annual_report.year
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public Integer getYear() {
+		return year;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_annual_report.year
+	 * @param year  the value for organization_annual_report.year
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_annual_report.sales_amount
+	 * @return  the value of organization_annual_report.sales_amount
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public String getSalesAmount() {
+		return salesAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_annual_report.sales_amount
+	 * @param salesAmount  the value for organization_annual_report.sales_amount
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public void setSalesAmount(String salesAmount) {
+		this.salesAmount = salesAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_annual_report.research_amount
+	 * @return  the value of organization_annual_report.research_amount
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public String getResearchAmount() {
+		return researchAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_annual_report.research_amount
+	 * @param researchAmount  the value for organization_annual_report.research_amount
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public void setResearchAmount(String researchAmount) {
+		this.researchAmount = researchAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_annual_report.assets
+	 * @return  the value of organization_annual_report.assets
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public String getAssets() {
+		return assets;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_annual_report.assets
+	 * @param assets  the value for organization_annual_report.assets
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public void setAssets(String assets) {
+		this.assets = assets;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_annual_report.aid
+	 * @return  the value of organization_annual_report.aid
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public String getAid() {
+		return aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_annual_report.aid
+	 * @param aid  the value for organization_annual_report.aid
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_annual_report.fixed_assets
+	 * @return  the value of organization_annual_report.fixed_assets
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public String getFixedAssets() {
+		return fixedAssets;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_annual_report.fixed_assets
+	 * @param fixedAssets  the value for organization_annual_report.fixed_assets
+	 * @mbg.generated  Fri Jul 27 15:10:52 CST 2018
+	 */
+	public void setFixedAssets(String fixedAssets) {
+		this.fixedAssets = fixedAssets;
+	}
 }

File diff suppressed because it is too large
+ 792 - 763
src/main/java/com/goafanti/common/model/OrganizationAnnualReportExample.java


+ 2 - 2
src/main/java/com/goafanti/customer/service/impl/AdminOrgAnnualReportServiceImpl.java

@@ -31,8 +31,8 @@ public class AdminOrgAnnualReportServiceImpl  extends BaseMybatisDao<Organizatio
 	@Override
 	public int addOrgAnnual(OrganizationAnnualReport o) {
 		o.setId(UUID.randomUUID().toString());
-//		o.setAid(TokenManager.getAdminId());
-		o.setAid("1");
+		o.setAid(TokenManager.getAdminId());
+//		o.setAid("1");
 		countIntegrity(o.getUid());
 		return organizationAnnualReportMapper.insert(o);
 	}