Просмотр исходного кода

客户资料新增表、字段开发

anderx лет назад: 7
Родитель
Сommit
635ab40012

+ 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_application_info"/> 
+    <table schema="aft" tableName="organization_year_project"/> 
   </context>
 </generatorConfiguration>

+ 96 - 0
src/main/java/com/goafanti/common/dao/OrganizationAnnualReportMapper.java

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.OrganizationAnnualReport;
+import com.goafanti.common.model.OrganizationAnnualReportExample;
+import java.util.List;
+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);
+}

+ 96 - 0
src/main/java/com/goafanti/common/dao/OrganizationYearProjectMapper.java

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.OrganizationYearProject;
+import com.goafanti.common.model.OrganizationYearProjectExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface OrganizationYearProjectMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    long countByExample(OrganizationYearProjectExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    int deleteByExample(OrganizationYearProjectExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    int insert(OrganizationYearProject record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    int insertSelective(OrganizationYearProject record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    List<OrganizationYearProject> selectByExample(OrganizationYearProjectExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    OrganizationYearProject selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") OrganizationYearProject record, @Param("example") OrganizationYearProjectExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    int updateByExample(@Param("record") OrganizationYearProject record, @Param("example") OrganizationYearProjectExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    int updateByPrimaryKeySelective(OrganizationYearProject record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    int updateByPrimaryKey(OrganizationYearProject record);
+}

+ 318 - 0
src/main/java/com/goafanti/common/mapper/OrganizationAnnualReportMapper.xml

@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.OrganizationAnnualReportMapper">
+  <resultMap id="BaseResultMap" type="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.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="year" jdbcType="INTEGER" property="year" />
+    <result column="sales_amount" jdbcType="VARCHAR" property="salesAmount" />
+    <result column="research_amount" jdbcType="VARCHAR" property="researchAmount" />
+    <result column="assets" jdbcType="VARCHAR" property="assets" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      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.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      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.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      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.
+    -->
+    id, uid, year, sales_amount, research_amount, assets, aid
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.OrganizationAnnualReportExample" resultMap="BaseResultMap">
+    <!--
+      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.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from organization_annual_report
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      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.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from organization_annual_report
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      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.
+    -->
+    delete from organization_annual_report
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.OrganizationAnnualReportExample">
+    <!--
+      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.
+    -->
+    delete from organization_annual_report
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" 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.
+    -->
+    insert into organization_annual_report (id, uid, year, 
+      sales_amount, research_amount, assets, 
+      aid)
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{year,jdbcType=INTEGER}, 
+      #{salesAmount,jdbcType=VARCHAR}, #{researchAmount,jdbcType=VARCHAR}, #{assets,jdbcType=VARCHAR}, 
+      #{aid,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.
+    -->
+    insert into organization_annual_report
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="uid != null">
+        uid,
+      </if>
+      <if test="year != null">
+        year,
+      </if>
+      <if test="salesAmount != null">
+        sales_amount,
+      </if>
+      <if test="researchAmount != null">
+        research_amount,
+      </if>
+      <if test="assets != null">
+        assets,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="year != null">
+        #{year,jdbcType=INTEGER},
+      </if>
+      <if test="salesAmount != null">
+        #{salesAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="researchAmount != null">
+        #{researchAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="assets != null">
+        #{assets,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        #{aid,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.
+    -->
+    select count(*) from organization_annual_report
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      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.
+    -->
+    update organization_annual_report
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.uid != null">
+        uid = #{record.uid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.year != null">
+        year = #{record.year,jdbcType=INTEGER},
+      </if>
+      <if test="record.salesAmount != null">
+        sales_amount = #{record.salesAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.researchAmount != null">
+        research_amount = #{record.researchAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.assets != null">
+        assets = #{record.assets,jdbcType=VARCHAR},
+      </if>
+      <if test="record.aid != null">
+        aid = #{record.aid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      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.
+    -->
+    update organization_annual_report
+    set id = #{record.id,jdbcType=VARCHAR},
+      uid = #{record.uid,jdbcType=VARCHAR},
+      year = #{record.year,jdbcType=INTEGER},
+      sales_amount = #{record.salesAmount,jdbcType=VARCHAR},
+      research_amount = #{record.researchAmount,jdbcType=VARCHAR},
+      assets = #{record.assets,jdbcType=VARCHAR},
+      aid = #{record.aid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" 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.
+    -->
+    update organization_annual_report
+    <set>
+      <if test="uid != null">
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="year != null">
+        year = #{year,jdbcType=INTEGER},
+      </if>
+      <if test="salesAmount != null">
+        sales_amount = #{salesAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="researchAmount != null">
+        research_amount = #{researchAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="assets != null">
+        assets = #{assets,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" 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.
+    -->
+    update organization_annual_report
+    set uid = #{uid,jdbcType=VARCHAR},
+      year = #{year,jdbcType=INTEGER},
+      sales_amount = #{salesAmount,jdbcType=VARCHAR},
+      research_amount = #{researchAmount,jdbcType=VARCHAR},
+      assets = #{assets,jdbcType=VARCHAR},
+      aid = #{aid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 318 - 0
src/main/java/com/goafanti/common/mapper/OrganizationYearProjectMapper.xml

@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.OrganizationYearProjectMapper">
+  <resultMap id="BaseResultMap" 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" />
+    <result column="project_name" jdbcType="VARCHAR" property="projectName" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      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.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      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.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      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, uid, year, project_name, status, remark, aid
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.OrganizationYearProjectExample" resultMap="BaseResultMap">
+    <!--
+      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.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from organization_year_project
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      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.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from organization_year_project
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      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.
+    -->
+    delete from organization_year_project
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.OrganizationYearProjectExample">
+    <!--
+      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.
+    -->
+    delete from organization_year_project
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="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.
+    -->
+    insert into organization_year_project (id, uid, year, 
+      project_name, status, remark, 
+      aid)
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{year,jdbcType=INTEGER}, 
+      #{projectName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, 
+      #{aid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="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.
+    -->
+    insert into organization_year_project
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="uid != null">
+        uid,
+      </if>
+      <if test="year != null">
+        year,
+      </if>
+      <if test="projectName != null">
+        project_name,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="year != null">
+        #{year,jdbcType=INTEGER},
+      </if>
+      <if test="projectName != null">
+        #{projectName,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.OrganizationYearProjectExample" 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:47 CST 2018.
+    -->
+    select count(*) from organization_year_project
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      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.
+    -->
+    update organization_year_project
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.uid != null">
+        uid = #{record.uid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.year != null">
+        year = #{record.year,jdbcType=INTEGER},
+      </if>
+      <if test="record.projectName != null">
+        project_name = #{record.projectName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.aid != null">
+        aid = #{record.aid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      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.
+    -->
+    update organization_year_project
+    set id = #{record.id,jdbcType=VARCHAR},
+      uid = #{record.uid,jdbcType=VARCHAR},
+      year = #{record.year,jdbcType=INTEGER},
+      project_name = #{record.projectName,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      aid = #{record.aid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="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.
+    -->
+    update organization_year_project
+    <set>
+      <if test="uid != null">
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="year != null">
+        year = #{year,jdbcType=INTEGER},
+      </if>
+      <if test="projectName != null">
+        project_name = #{projectName,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="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.
+    -->
+    update organization_year_project
+    set uid = #{uid,jdbcType=VARCHAR},
+      year = #{year,jdbcType=INTEGER},
+      project_name = #{projectName,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=VARCHAR},
+      aid = #{aid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 234 - 0
src/main/java/com/goafanti/common/model/OrganizationAnnualReport.java

@@ -0,0 +1,234 @@
+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;
+    }
+}

+ 782 - 0
src/main/java/com/goafanti/common/model/OrganizationAnnualReportExample.java

@@ -0,0 +1,782 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class OrganizationAnnualReportExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table organization_annual_report
+     *
+     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table organization_annual_report
+     *
+     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table organization_annual_report
+     *
+     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * 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
+     */
+    public OrganizationAnnualReportExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * 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
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * 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
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * 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
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * 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
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * 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
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * 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
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * 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
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * 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
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * 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
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * 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
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table organization_annual_report
+     *
+     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNull() {
+            addCriterion("uid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNotNull() {
+            addCriterion("uid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidEqualTo(String value) {
+            addCriterion("uid =", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotEqualTo(String value) {
+            addCriterion("uid <>", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThan(String value) {
+            addCriterion("uid >", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThanOrEqualTo(String value) {
+            addCriterion("uid >=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThan(String value) {
+            addCriterion("uid <", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThanOrEqualTo(String value) {
+            addCriterion("uid <=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLike(String value) {
+            addCriterion("uid like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotLike(String value) {
+            addCriterion("uid not like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIn(List<String> values) {
+            addCriterion("uid in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotIn(List<String> values) {
+            addCriterion("uid not in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidBetween(String value1, String value2) {
+            addCriterion("uid between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotBetween(String value1, String value2) {
+            addCriterion("uid not between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIsNull() {
+            addCriterion("year is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIsNotNull() {
+            addCriterion("year is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearEqualTo(Integer value) {
+            addCriterion("year =", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotEqualTo(Integer value) {
+            addCriterion("year <>", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearGreaterThan(Integer value) {
+            addCriterion("year >", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearGreaterThanOrEqualTo(Integer value) {
+            addCriterion("year >=", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearLessThan(Integer value) {
+            addCriterion("year <", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearLessThanOrEqualTo(Integer value) {
+            addCriterion("year <=", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIn(List<Integer> values) {
+            addCriterion("year in", values, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotIn(List<Integer> values) {
+            addCriterion("year not in", values, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearBetween(Integer value1, Integer value2) {
+            addCriterion("year between", value1, value2, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotBetween(Integer value1, Integer value2) {
+            addCriterion("year not between", value1, value2, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andSalesAmountIsNull() {
+            addCriterion("sales_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSalesAmountIsNotNull() {
+            addCriterion("sales_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSalesAmountEqualTo(String value) {
+            addCriterion("sales_amount =", value, "salesAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSalesAmountNotEqualTo(String value) {
+            addCriterion("sales_amount <>", value, "salesAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSalesAmountGreaterThan(String value) {
+            addCriterion("sales_amount >", value, "salesAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSalesAmountGreaterThanOrEqualTo(String value) {
+            addCriterion("sales_amount >=", value, "salesAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSalesAmountLessThan(String value) {
+            addCriterion("sales_amount <", value, "salesAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSalesAmountLessThanOrEqualTo(String value) {
+            addCriterion("sales_amount <=", value, "salesAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSalesAmountLike(String value) {
+            addCriterion("sales_amount like", value, "salesAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSalesAmountNotLike(String value) {
+            addCriterion("sales_amount not like", value, "salesAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSalesAmountIn(List<String> values) {
+            addCriterion("sales_amount in", values, "salesAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSalesAmountNotIn(List<String> values) {
+            addCriterion("sales_amount not in", values, "salesAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSalesAmountBetween(String value1, String value2) {
+            addCriterion("sales_amount between", value1, value2, "salesAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSalesAmountNotBetween(String value1, String value2) {
+            addCriterion("sales_amount not between", value1, value2, "salesAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResearchAmountIsNull() {
+            addCriterion("research_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResearchAmountIsNotNull() {
+            addCriterion("research_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResearchAmountEqualTo(String value) {
+            addCriterion("research_amount =", value, "researchAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResearchAmountNotEqualTo(String value) {
+            addCriterion("research_amount <>", value, "researchAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResearchAmountGreaterThan(String value) {
+            addCriterion("research_amount >", value, "researchAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResearchAmountGreaterThanOrEqualTo(String value) {
+            addCriterion("research_amount >=", value, "researchAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResearchAmountLessThan(String value) {
+            addCriterion("research_amount <", value, "researchAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResearchAmountLessThanOrEqualTo(String value) {
+            addCriterion("research_amount <=", value, "researchAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResearchAmountLike(String value) {
+            addCriterion("research_amount like", value, "researchAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResearchAmountNotLike(String value) {
+            addCriterion("research_amount not like", value, "researchAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResearchAmountIn(List<String> values) {
+            addCriterion("research_amount in", values, "researchAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResearchAmountNotIn(List<String> values) {
+            addCriterion("research_amount not in", values, "researchAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResearchAmountBetween(String value1, String value2) {
+            addCriterion("research_amount between", value1, value2, "researchAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResearchAmountNotBetween(String value1, String value2) {
+            addCriterion("research_amount not between", value1, value2, "researchAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAssetsIsNull() {
+            addCriterion("assets is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAssetsIsNotNull() {
+            addCriterion("assets is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAssetsEqualTo(String value) {
+            addCriterion("assets =", value, "assets");
+            return (Criteria) this;
+        }
+
+        public Criteria andAssetsNotEqualTo(String value) {
+            addCriterion("assets <>", value, "assets");
+            return (Criteria) this;
+        }
+
+        public Criteria andAssetsGreaterThan(String value) {
+            addCriterion("assets >", value, "assets");
+            return (Criteria) this;
+        }
+
+        public Criteria andAssetsGreaterThanOrEqualTo(String value) {
+            addCriterion("assets >=", value, "assets");
+            return (Criteria) this;
+        }
+
+        public Criteria andAssetsLessThan(String value) {
+            addCriterion("assets <", value, "assets");
+            return (Criteria) this;
+        }
+
+        public Criteria andAssetsLessThanOrEqualTo(String value) {
+            addCriterion("assets <=", value, "assets");
+            return (Criteria) this;
+        }
+
+        public Criteria andAssetsLike(String value) {
+            addCriterion("assets like", value, "assets");
+            return (Criteria) this;
+        }
+
+        public Criteria andAssetsNotLike(String value) {
+            addCriterion("assets not like", value, "assets");
+            return (Criteria) this;
+        }
+
+        public Criteria andAssetsIn(List<String> values) {
+            addCriterion("assets in", values, "assets");
+            return (Criteria) this;
+        }
+
+        public Criteria andAssetsNotIn(List<String> values) {
+            addCriterion("assets not in", values, "assets");
+            return (Criteria) this;
+        }
+
+        public Criteria andAssetsBetween(String value1, String value2) {
+            addCriterion("assets between", value1, value2, "assets");
+            return (Criteria) this;
+        }
+
+        public Criteria andAssetsNotBetween(String value1, String value2) {
+            addCriterion("assets not between", value1, value2, "assets");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIsNull() {
+            addCriterion("aid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIsNotNull() {
+            addCriterion("aid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidEqualTo(String value) {
+            addCriterion("aid =", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotEqualTo(String value) {
+            addCriterion("aid <>", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidGreaterThan(String value) {
+            addCriterion("aid >", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidGreaterThanOrEqualTo(String value) {
+            addCriterion("aid >=", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLessThan(String value) {
+            addCriterion("aid <", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLessThanOrEqualTo(String value) {
+            addCriterion("aid <=", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLike(String value) {
+            addCriterion("aid like", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotLike(String value) {
+            addCriterion("aid not like", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIn(List<String> values) {
+            addCriterion("aid in", values, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotIn(List<String> values) {
+            addCriterion("aid not in", values, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidBetween(String value1, String value2) {
+            addCriterion("aid between", value1, value2, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotBetween(String value1, String value2) {
+            addCriterion("aid not between", value1, value2, "aid");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table organization_annual_report
+     *
+     * @mbg.generated do_not_delete_during_merge Fri Jul 20 16:32:29 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table organization_annual_report
+     *
+     * @mbg.generated Fri Jul 20 16:32:29 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 234 - 0
src/main/java/com/goafanti/common/model/OrganizationYearProject.java

@@ -0,0 +1,234 @@
+package com.goafanti.common.model;
+
+public class OrganizationYearProject {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_year_project.id
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_year_project.uid
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    private String uid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_year_project.year
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    private Integer year;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_year_project.project_name
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    private String projectName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_year_project.status
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    private Integer status;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_year_project.remark
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    private String remark;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_year_project.aid
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    private String aid;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_year_project.id
+     *
+     * @return the value of organization_year_project.id
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_year_project.id
+     *
+     * @param id the value for organization_year_project.id
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 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_year_project.uid
+     *
+     * @return the value of organization_year_project.uid
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public String getUid() {
+        return uid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_year_project.uid
+     *
+     * @param uid the value for organization_year_project.uid
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 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_year_project.year
+     *
+     * @return the value of organization_year_project.year
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public Integer getYear() {
+        return year;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_year_project.year
+     *
+     * @param year the value for organization_year_project.year
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 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_year_project.project_name
+     *
+     * @return the value of organization_year_project.project_name
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public String getProjectName() {
+        return projectName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_year_project.project_name
+     *
+     * @param projectName the value for organization_year_project.project_name
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_year_project.status
+     *
+     * @return the value of organization_year_project.status
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_year_project.status
+     *
+     * @param status the value for organization_year_project.status
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_year_project.remark
+     *
+     * @return the value of organization_year_project.remark
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_year_project.remark
+     *
+     * @param remark the value for organization_year_project.remark
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_year_project.aid
+     *
+     * @return the value of organization_year_project.aid
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public String getAid() {
+        return aid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_year_project.aid
+     *
+     * @param aid the value for organization_year_project.aid
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+}

+ 772 - 0
src/main/java/com/goafanti/common/model/OrganizationYearProjectExample.java

@@ -0,0 +1,772 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class OrganizationYearProjectExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public OrganizationYearProjectExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNull() {
+            addCriterion("uid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNotNull() {
+            addCriterion("uid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidEqualTo(String value) {
+            addCriterion("uid =", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotEqualTo(String value) {
+            addCriterion("uid <>", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThan(String value) {
+            addCriterion("uid >", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThanOrEqualTo(String value) {
+            addCriterion("uid >=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThan(String value) {
+            addCriterion("uid <", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThanOrEqualTo(String value) {
+            addCriterion("uid <=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLike(String value) {
+            addCriterion("uid like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotLike(String value) {
+            addCriterion("uid not like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIn(List<String> values) {
+            addCriterion("uid in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotIn(List<String> values) {
+            addCriterion("uid not in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidBetween(String value1, String value2) {
+            addCriterion("uid between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotBetween(String value1, String value2) {
+            addCriterion("uid not between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIsNull() {
+            addCriterion("year is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIsNotNull() {
+            addCriterion("year is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearEqualTo(Integer value) {
+            addCriterion("year =", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotEqualTo(Integer value) {
+            addCriterion("year <>", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearGreaterThan(Integer value) {
+            addCriterion("year >", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearGreaterThanOrEqualTo(Integer value) {
+            addCriterion("year >=", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearLessThan(Integer value) {
+            addCriterion("year <", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearLessThanOrEqualTo(Integer value) {
+            addCriterion("year <=", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIn(List<Integer> values) {
+            addCriterion("year in", values, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotIn(List<Integer> values) {
+            addCriterion("year not in", values, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearBetween(Integer value1, Integer value2) {
+            addCriterion("year between", value1, value2, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotBetween(Integer value1, Integer value2) {
+            addCriterion("year not between", value1, value2, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectNameIsNull() {
+            addCriterion("project_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectNameIsNotNull() {
+            addCriterion("project_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectNameEqualTo(String value) {
+            addCriterion("project_name =", value, "projectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectNameNotEqualTo(String value) {
+            addCriterion("project_name <>", value, "projectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectNameGreaterThan(String value) {
+            addCriterion("project_name >", value, "projectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectNameGreaterThanOrEqualTo(String value) {
+            addCriterion("project_name >=", value, "projectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectNameLessThan(String value) {
+            addCriterion("project_name <", value, "projectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectNameLessThanOrEqualTo(String value) {
+            addCriterion("project_name <=", value, "projectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectNameLike(String value) {
+            addCriterion("project_name like", value, "projectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectNameNotLike(String value) {
+            addCriterion("project_name not like", value, "projectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectNameIn(List<String> values) {
+            addCriterion("project_name in", values, "projectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectNameNotIn(List<String> values) {
+            addCriterion("project_name not in", values, "projectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectNameBetween(String value1, String value2) {
+            addCriterion("project_name between", value1, value2, "projectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectNameNotBetween(String value1, String value2) {
+            addCriterion("project_name not between", value1, value2, "projectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIsNull() {
+            addCriterion("aid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIsNotNull() {
+            addCriterion("aid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidEqualTo(String value) {
+            addCriterion("aid =", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotEqualTo(String value) {
+            addCriterion("aid <>", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidGreaterThan(String value) {
+            addCriterion("aid >", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidGreaterThanOrEqualTo(String value) {
+            addCriterion("aid >=", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLessThan(String value) {
+            addCriterion("aid <", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLessThanOrEqualTo(String value) {
+            addCriterion("aid <=", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLike(String value) {
+            addCriterion("aid like", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotLike(String value) {
+            addCriterion("aid not like", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIn(List<String> values) {
+            addCriterion("aid in", values, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotIn(List<String> values) {
+            addCriterion("aid not in", values, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidBetween(String value1, String value2) {
+            addCriterion("aid between", value1, value2, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotBetween(String value1, String value2) {
+            addCriterion("aid not between", value1, value2, "aid");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table organization_year_project
+     *
+     * @mbg.generated do_not_delete_during_merge Fri Jul 20 16:32:47 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table organization_year_project
+     *
+     * @mbg.generated Fri Jul 20 16:32:47 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 69 - 0
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -33,6 +33,7 @@ import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.AftFile;
+import com.goafanti.common.model.OrganizationAnnualReport;
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.BeanUtilsExt;
@@ -51,6 +52,7 @@ import com.goafanti.customer.bo.CustomerPersonalDetailBo;
 import com.goafanti.customer.bo.FollowBusinessBo;
 import com.goafanti.customer.bo.UserDetailBo;
 import com.goafanti.customer.service.CustomerService;
+import com.goafanti.customer.service.OrgAnnualReportService;
 
 @RestController
 @RequestMapping("/api/admin/customer")
@@ -58,6 +60,8 @@ public class AdminCustomerApiController extends BaseApiController{
 	@Resource
 	private CustomerService customerService;
 	@Resource
+	private OrgAnnualReportService orgAnnualReportService;
+	@Resource
 	private AftFileService aftFileService;
 	@Value(value = "${upload.private.path}")
 	private String	uploadPrivatePath	= null;
@@ -1073,6 +1077,71 @@ public class AdminCustomerApiController extends BaseApiController{
 		}
 		return res;
 	}
+	/**
+	 * 新增客户年报
+	 **/
+	@RequestMapping(value = "/addOrgAnnual", method = RequestMethod.GET)
+	public Result addOrgAnnual(OrganizationAnnualReport o) {
+		Result res=new Result();
+		if (StringUtils.isEmpty(o.getUid())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户ID"));
+			return res;
+		}
+		res.setData(orgAnnualReportService.addOrgAnnual(o));
+		return res;
+	}
+	/**
+	 * 新增客户年报
+	 **/
+	@RequestMapping(value = "/delectOrgAnnual", method = RequestMethod.GET)
+	public Result delectOrgAnnual(OrganizationAnnualReport o) {
+		Result res=new Result();
+		if (StringUtils.isEmpty(o.getId())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "ID"));
+			return res;
+		}
+		res.setData(orgAnnualReportService.delectOrgAnnual(o.getId()));
+		return res;
+	}
+	/**
+	 * 查看客户年报
+	 **/
+	@RequestMapping(value = "/delectOrgAnnual", method = RequestMethod.GET)
+	public Result selectOrgAnnual(OrganizationAnnualReport o) {
+		Result res=new Result();
+		if (StringUtils.isEmpty(o.getId())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "ID"));
+			return res;
+		}
+		res.setData(orgAnnualReportService.selectOrgAnnual(o.getId()));
+		return res;
+	}
+	/**
+	 * 修改客户年报
+	 **/
+	@RequestMapping(value = "/updateOrgAnnual", method = RequestMethod.GET)
+	public Result updateOrgAnnual(OrganizationAnnualReport o) {
+		Result res=new Result();
+		if (StringUtils.isEmpty(o.getId())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "ID"));
+			return res;
+		}
+		res.setData(orgAnnualReportService.updateOrgAnnual(o));
+		return res;
+	}
+	/**
+	 * 客户年报列表
+	 **/
+	@RequestMapping(value = "/updateOrgAnnual", method = RequestMethod.GET)
+	public Result selectListOrgAnnual(OrganizationAnnualReport o) {
+		Result res=new Result();
+		if (StringUtils.isEmpty(o.getId())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "ID"));
+			return res;
+		}
+		res.setData(orgAnnualReportService.selectListOrgAnnual(o));
+		return res;
+	}
 }
 
 

+ 19 - 0
src/main/java/com/goafanti/customer/service/OrgAnnualReportService.java

@@ -0,0 +1,19 @@
+package com.goafanti.customer.service;
+
+import java.util.List;
+
+import com.goafanti.common.model.OrganizationAnnualReport;
+
+public interface OrgAnnualReportService {
+
+	int addOrgAnnual(OrganizationAnnualReport o);
+
+	int delectOrgAnnual(String id);
+
+	OrganizationAnnualReport selectOrgAnnual(String id);
+
+	int updateOrgAnnual(OrganizationAnnualReport o);
+
+	List<OrganizationAnnualReport> selectListOrgAnnual(OrganizationAnnualReport o);
+
+}

+ 47 - 0
src/main/java/com/goafanti/customer/service/impl/OrgAnnualReportServiceImpl.java

@@ -0,0 +1,47 @@
+package com.goafanti.customer.service.impl;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.goafanti.common.dao.OrganizationAnnualReportMapper;
+import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.model.OrganizationAnnualReport;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.customer.service.OrgAnnualReportService;
+
+public class OrgAnnualReportServiceImpl  extends BaseMybatisDao<UserMapper> implements OrgAnnualReportService {
+	@Autowired
+	private OrganizationAnnualReportMapper	organizationAnnualReportMapper;
+	
+	@Override
+	public int addOrgAnnual(OrganizationAnnualReport o) {
+		o.setId(UUID.randomUUID().toString());
+		o.setAid(TokenManager.getAdminId());
+		return organizationAnnualReportMapper.insert(o);
+	}
+
+	@Override
+	public int delectOrgAnnual(String id) {
+		return organizationAnnualReportMapper.deleteByPrimaryKey(id);
+	}
+
+	@Override
+	public OrganizationAnnualReport selectOrgAnnual(String id) {
+		return organizationAnnualReportMapper.selectByPrimaryKey(id);
+	}
+
+	@Override
+	public int updateOrgAnnual(OrganizationAnnualReport o) {
+		return organizationAnnualReportMapper.updateByPrimaryKey(o);
+	}
+
+	@Override
+	public List<OrganizationAnnualReport> selectListOrgAnnual(OrganizationAnnualReport o) {
+		
+		return null;
+	}
+
+}