Browse Source

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
fa28e3a8dc

+ 11 - 11
src/main/java/com/goafanti/common/dao/DemandCollectionMapper.java

@@ -9,68 +9,68 @@ public interface DemandCollectionMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	long countByExample(DemandCollectionExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	int deleteByExample(DemandCollectionExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	int insert(DemandCollection record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	int insertSelective(DemandCollection record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	List<DemandCollection> selectByExample(DemandCollectionExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	DemandCollection selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") DemandCollection record,
 			@Param("example") DemandCollectionExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	int updateByExample(@Param("record") DemandCollection record, @Param("example") DemandCollectionExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	int updateByPrimaryKeySelective(DemandCollection record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	int updateByPrimaryKey(DemandCollection record);
 }

+ 100 - 85
src/main/java/com/goafanti/common/mapper/DemandCollectionMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="dwmc" jdbcType="VARCHAR" property="dwmc" />
@@ -16,7 +16,8 @@
     <result column="ssszc" jdbcType="INTEGER" property="ssszc" />
     <result column="sssza" jdbcType="INTEGER" property="sssza" />
     <result column="ssyq" jdbcType="VARCHAR" property="ssyq" />
-    <result column="yysjjyspt" jdbcType="VARCHAR" property="yysjjyspt" />
+    <result column="yysjjyspt" jdbcType="INTEGER" property="yysjjyspt" />
+    <result column="yysjjyspt_value" jdbcType="VARCHAR" property="yysjjysptValue" />
     <result column="frdb" jdbcType="VARCHAR" property="frdb" />
     <result column="tyshxydm" jdbcType="VARCHAR" property="tyshxydm" />
     <result column="jjgm" jdbcType="VARCHAR" property="jjgm" />
@@ -107,7 +108,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -141,7 +142,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -175,14 +176,14 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
-    id, dwmc, dwxz, dwxz_value, htly, ssszp, ssszc, sssza, ssyq, yysjjyspt, frdb, tyshxydm, 
-    jjgm, rygm, clsj, zczb, txdz, yb, lxr, lxdh, email, zyywjhxcp, ndxmzyywsr18, ndxmjlr18, 
-    ndxmzyywsr19, ndxmjlr19, ndyftr, ndyftrzyysrbl, sfchyhdk, sfchyhdk_value, sfwgxjsqy, 
-    sfwgxjsqy_value, sfwkjxzxqy, sfwkjxzxqy_value, zlsl, zlsl_fmzl, zlsl_syxx, sfchkjzxzj, 
-    sfycxyz, sfycxyz_value, sfyhjgtzztz, sfyhjgtzztz_value, cgmc, cgly, cgsx, cgtxxs, 
-    cgtxxs_value, cgcsd, cgzscqxs, zscqqs, zlzt, cgdjqk, cgdjqk_value, ncqcgzyzhfszzzh, 
+    id, dwmc, dwxz, dwxz_value, htly, ssszp, ssszc, sssza, ssyq, yysjjyspt, yysjjyspt_value, 
+    frdb, tyshxydm, jjgm, rygm, clsj, zczb, txdz, yb, lxr, lxdh, email, zyywjhxcp, ndxmzyywsr18, 
+    ndxmjlr18, ndxmzyywsr19, ndxmjlr19, ndyftr, ndyftrzyysrbl, sfchyhdk, sfchyhdk_value, 
+    sfwgxjsqy, sfwgxjsqy_value, sfwkjxzxqy, sfwkjxzxqy_value, zlsl, zlsl_fmzl, zlsl_syxx, 
+    sfchkjzxzj, sfycxyz, sfycxyz_value, sfyhjgtzztz, sfyhjgtzztz_value, cgmc, cgly, cgsx, 
+    cgtxxs, cgtxxs_value, cgcsd, cgzscqxs, zscqqs, zlzt, cgdjqk, cgdjqk_value, ncqcgzyzhfszzzh, 
     ncqcgzyzhfshzkf, ncqcgzyzhfsjszr, yjkzyzhsj, cgjs, sfycghzxq, sfyyxhzdw, sfyyxhzdw_value, 
     yxhzfs, yxhzfs_value, yssdkjzc, yssdkjzc_value, nsqdsjxm, nsqdsjxm_value, sqskjzgbmxxdwgkfb, 
     sqskjzgbmxxdwgkfb_value, tbr, tbrsj, jsfzr, jsfsj, xqmc, xqbl, jsxqlx, xqly, mqcpjsxz, 
@@ -193,7 +194,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
     select
     <if test="distinct">
@@ -212,7 +213,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -223,7 +224,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
     delete from demand_collection
     where id = #{id,jdbcType=INTEGER}
@@ -232,7 +233,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
     delete from demand_collection
     <if test="_parameter != null">
@@ -243,78 +244,78 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
     insert into demand_collection (id, dwmc, dwxz, 
       dwxz_value, htly, ssszp, 
       ssszc, sssza, ssyq, 
-      yysjjyspt, frdb, tyshxydm, 
-      jjgm, rygm, clsj, zczb, 
-      txdz, yb, lxr, lxdh, 
-      email, zyywjhxcp, ndxmzyywsr18, 
-      ndxmjlr18, ndxmzyywsr19, ndxmjlr19, 
-      ndyftr, ndyftrzyysrbl, sfchyhdk, 
-      sfchyhdk_value, sfwgxjsqy, sfwgxjsqy_value, 
-      sfwkjxzxqy, sfwkjxzxqy_value, zlsl, 
-      zlsl_fmzl, zlsl_syxx, sfchkjzxzj, 
-      sfycxyz, sfycxyz_value, sfyhjgtzztz, 
-      sfyhjgtzztz_value, cgmc, cgly, 
-      cgsx, cgtxxs, cgtxxs_value, 
-      cgcsd, cgzscqxs, zscqqs, 
-      zlzt, cgdjqk, cgdjqk_value, 
-      ncqcgzyzhfszzzh, ncqcgzyzhfshzkf, ncqcgzyzhfsjszr, 
-      yjkzyzhsj, cgjs, sfycghzxq, 
-      sfyyxhzdw, sfyyxhzdw_value, yxhzfs, 
-      yxhzfs_value, yssdkjzc, yssdkjzc_value, 
-      nsqdsjxm, nsqdsjxm_value, sqskjzgbmxxdwgkfb, 
-      sqskjzgbmxxdwgkfb_value, tbr, tbrsj, 
-      jsfzr, jsfsj, xqmc, 
-      xqbl, jsxqlx, xqly, 
-      mqcpjsxz, yfnd, yqdddxg, 
-      yjzkdgz, xyyftjqk, mqhzdxqk, 
-      sfyxybhzxq, yxhzdx, yxhzdx_value, 
-      ncqdhzfs, ncqdhzfs_value, xqjjjzsj, 
-      xqsfkegk, wjjjsntntgdhzzj, zjyt, 
-      zjqk, xqjjfs, create_time
-      )
+      yysjjyspt, yysjjyspt_value, frdb, 
+      tyshxydm, jjgm, rygm, 
+      clsj, zczb, txdz, yb, 
+      lxr, lxdh, email, zyywjhxcp, 
+      ndxmzyywsr18, ndxmjlr18, ndxmzyywsr19, 
+      ndxmjlr19, ndyftr, ndyftrzyysrbl, 
+      sfchyhdk, sfchyhdk_value, sfwgxjsqy, 
+      sfwgxjsqy_value, sfwkjxzxqy, sfwkjxzxqy_value, 
+      zlsl, zlsl_fmzl, zlsl_syxx, 
+      sfchkjzxzj, sfycxyz, sfycxyz_value, 
+      sfyhjgtzztz, sfyhjgtzztz_value, cgmc, 
+      cgly, cgsx, cgtxxs, 
+      cgtxxs_value, cgcsd, cgzscqxs, 
+      zscqqs, zlzt, cgdjqk, 
+      cgdjqk_value, ncqcgzyzhfszzzh, ncqcgzyzhfshzkf, 
+      ncqcgzyzhfsjszr, yjkzyzhsj, cgjs, 
+      sfycghzxq, sfyyxhzdw, sfyyxhzdw_value, 
+      yxhzfs, yxhzfs_value, yssdkjzc, 
+      yssdkjzc_value, nsqdsjxm, nsqdsjxm_value, 
+      sqskjzgbmxxdwgkfb, sqskjzgbmxxdwgkfb_value, 
+      tbr, tbrsj, jsfzr, 
+      jsfsj, xqmc, xqbl, 
+      jsxqlx, xqly, mqcpjsxz, 
+      yfnd, yqdddxg, yjzkdgz, 
+      xyyftjqk, mqhzdxqk, sfyxybhzxq, 
+      yxhzdx, yxhzdx_value, ncqdhzfs, 
+      ncqdhzfs_value, xqjjjzsj, xqsfkegk, 
+      wjjjsntntgdhzzj, zjyt, zjqk, 
+      xqjjfs, create_time)
     values (#{id,jdbcType=INTEGER}, #{dwmc,jdbcType=VARCHAR}, #{dwxz,jdbcType=INTEGER}, 
       #{dwxzValue,jdbcType=VARCHAR}, #{htly,jdbcType=VARCHAR}, #{ssszp,jdbcType=INTEGER}, 
       #{ssszc,jdbcType=INTEGER}, #{sssza,jdbcType=INTEGER}, #{ssyq,jdbcType=VARCHAR}, 
-      #{yysjjyspt,jdbcType=VARCHAR}, #{frdb,jdbcType=VARCHAR}, #{tyshxydm,jdbcType=VARCHAR}, 
-      #{jjgm,jdbcType=VARCHAR}, #{rygm,jdbcType=VARCHAR}, #{clsj,jdbcType=VARCHAR}, #{zczb,jdbcType=VARCHAR}, 
-      #{txdz,jdbcType=VARCHAR}, #{yb,jdbcType=VARCHAR}, #{lxr,jdbcType=VARCHAR}, #{lxdh,jdbcType=VARCHAR}, 
-      #{email,jdbcType=VARCHAR}, #{zyywjhxcp,jdbcType=VARCHAR}, #{ndxmzyywsr18,jdbcType=DECIMAL}, 
-      #{ndxmjlr18,jdbcType=DECIMAL}, #{ndxmzyywsr19,jdbcType=DECIMAL}, #{ndxmjlr19,jdbcType=DECIMAL}, 
-      #{ndyftr,jdbcType=INTEGER}, #{ndyftrzyysrbl,jdbcType=INTEGER}, #{sfchyhdk,jdbcType=INTEGER}, 
-      #{sfchyhdkValue,jdbcType=VARCHAR}, #{sfwgxjsqy,jdbcType=INTEGER}, #{sfwgxjsqyValue,jdbcType=VARCHAR}, 
-      #{sfwkjxzxqy,jdbcType=INTEGER}, #{sfwkjxzxqyValue,jdbcType=VARCHAR}, #{zlsl,jdbcType=INTEGER}, 
-      #{zlslFmzl,jdbcType=INTEGER}, #{zlslSyxx,jdbcType=INTEGER}, #{sfchkjzxzj,jdbcType=INTEGER}, 
-      #{sfycxyz,jdbcType=INTEGER}, #{sfycxyzValue,jdbcType=VARCHAR}, #{sfyhjgtzztz,jdbcType=VARCHAR}, 
-      #{sfyhjgtzztzValue,jdbcType=VARCHAR}, #{cgmc,jdbcType=VARCHAR}, #{cgly,jdbcType=INTEGER}, 
-      #{cgsx,jdbcType=VARCHAR}, #{cgtxxs,jdbcType=INTEGER}, #{cgtxxsValue,jdbcType=VARCHAR}, 
-      #{cgcsd,jdbcType=INTEGER}, #{cgzscqxs,jdbcType=INTEGER}, #{zscqqs,jdbcType=INTEGER}, 
-      #{zlzt,jdbcType=INTEGER}, #{cgdjqk,jdbcType=INTEGER}, #{cgdjqkValue,jdbcType=VARCHAR}, 
-      #{ncqcgzyzhfszzzh,jdbcType=VARCHAR}, #{ncqcgzyzhfshzkf,jdbcType=VARCHAR}, #{ncqcgzyzhfsjszr,jdbcType=VARCHAR}, 
-      #{yjkzyzhsj,jdbcType=INTEGER}, #{cgjs,jdbcType=VARCHAR}, #{sfycghzxq,jdbcType=INTEGER}, 
-      #{sfyyxhzdw,jdbcType=INTEGER}, #{sfyyxhzdwValue,jdbcType=VARCHAR}, #{yxhzfs,jdbcType=INTEGER}, 
-      #{yxhzfsValue,jdbcType=VARCHAR}, #{yssdkjzc,jdbcType=INTEGER}, #{yssdkjzcValue,jdbcType=VARCHAR}, 
-      #{nsqdsjxm,jdbcType=INTEGER}, #{nsqdsjxmValue,jdbcType=VARCHAR}, #{sqskjzgbmxxdwgkfb,jdbcType=INTEGER}, 
-      #{sqskjzgbmxxdwgkfbValue,jdbcType=VARCHAR}, #{tbr,jdbcType=VARCHAR}, #{tbrsj,jdbcType=VARCHAR}, 
-      #{jsfzr,jdbcType=VARCHAR}, #{jsfsj,jdbcType=VARCHAR}, #{xqmc,jdbcType=VARCHAR}, 
-      #{xqbl,jdbcType=INTEGER}, #{jsxqlx,jdbcType=VARCHAR}, #{xqly,jdbcType=VARCHAR}, 
-      #{mqcpjsxz,jdbcType=VARCHAR}, #{yfnd,jdbcType=VARCHAR}, #{yqdddxg,jdbcType=VARCHAR}, 
-      #{yjzkdgz,jdbcType=VARCHAR}, #{xyyftjqk,jdbcType=VARCHAR}, #{mqhzdxqk,jdbcType=VARCHAR}, 
-      #{sfyxybhzxq,jdbcType=INTEGER}, #{yxhzdx,jdbcType=INTEGER}, #{yxhzdxValue,jdbcType=VARCHAR}, 
-      #{ncqdhzfs,jdbcType=INTEGER}, #{ncqdhzfsValue,jdbcType=VARCHAR}, #{xqjjjzsj,jdbcType=VARCHAR}, 
-      #{xqsfkegk,jdbcType=INTEGER}, #{wjjjsntntgdhzzj,jdbcType=VARCHAR}, #{zjyt,jdbcType=VARCHAR}, 
-      #{zjqk,jdbcType=VARCHAR}, #{xqjjfs,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
-      )
+      #{yysjjyspt,jdbcType=INTEGER}, #{yysjjysptValue,jdbcType=VARCHAR}, #{frdb,jdbcType=VARCHAR}, 
+      #{tyshxydm,jdbcType=VARCHAR}, #{jjgm,jdbcType=VARCHAR}, #{rygm,jdbcType=VARCHAR}, 
+      #{clsj,jdbcType=VARCHAR}, #{zczb,jdbcType=VARCHAR}, #{txdz,jdbcType=VARCHAR}, #{yb,jdbcType=VARCHAR}, 
+      #{lxr,jdbcType=VARCHAR}, #{lxdh,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{zyywjhxcp,jdbcType=VARCHAR}, 
+      #{ndxmzyywsr18,jdbcType=DECIMAL}, #{ndxmjlr18,jdbcType=DECIMAL}, #{ndxmzyywsr19,jdbcType=DECIMAL}, 
+      #{ndxmjlr19,jdbcType=DECIMAL}, #{ndyftr,jdbcType=INTEGER}, #{ndyftrzyysrbl,jdbcType=INTEGER}, 
+      #{sfchyhdk,jdbcType=INTEGER}, #{sfchyhdkValue,jdbcType=VARCHAR}, #{sfwgxjsqy,jdbcType=INTEGER}, 
+      #{sfwgxjsqyValue,jdbcType=VARCHAR}, #{sfwkjxzxqy,jdbcType=INTEGER}, #{sfwkjxzxqyValue,jdbcType=VARCHAR}, 
+      #{zlsl,jdbcType=INTEGER}, #{zlslFmzl,jdbcType=INTEGER}, #{zlslSyxx,jdbcType=INTEGER}, 
+      #{sfchkjzxzj,jdbcType=INTEGER}, #{sfycxyz,jdbcType=INTEGER}, #{sfycxyzValue,jdbcType=VARCHAR}, 
+      #{sfyhjgtzztz,jdbcType=VARCHAR}, #{sfyhjgtzztzValue,jdbcType=VARCHAR}, #{cgmc,jdbcType=VARCHAR}, 
+      #{cgly,jdbcType=INTEGER}, #{cgsx,jdbcType=VARCHAR}, #{cgtxxs,jdbcType=INTEGER}, 
+      #{cgtxxsValue,jdbcType=VARCHAR}, #{cgcsd,jdbcType=INTEGER}, #{cgzscqxs,jdbcType=INTEGER}, 
+      #{zscqqs,jdbcType=INTEGER}, #{zlzt,jdbcType=INTEGER}, #{cgdjqk,jdbcType=INTEGER}, 
+      #{cgdjqkValue,jdbcType=VARCHAR}, #{ncqcgzyzhfszzzh,jdbcType=VARCHAR}, #{ncqcgzyzhfshzkf,jdbcType=VARCHAR}, 
+      #{ncqcgzyzhfsjszr,jdbcType=VARCHAR}, #{yjkzyzhsj,jdbcType=INTEGER}, #{cgjs,jdbcType=VARCHAR}, 
+      #{sfycghzxq,jdbcType=INTEGER}, #{sfyyxhzdw,jdbcType=INTEGER}, #{sfyyxhzdwValue,jdbcType=VARCHAR}, 
+      #{yxhzfs,jdbcType=INTEGER}, #{yxhzfsValue,jdbcType=VARCHAR}, #{yssdkjzc,jdbcType=INTEGER}, 
+      #{yssdkjzcValue,jdbcType=VARCHAR}, #{nsqdsjxm,jdbcType=INTEGER}, #{nsqdsjxmValue,jdbcType=VARCHAR}, 
+      #{sqskjzgbmxxdwgkfb,jdbcType=INTEGER}, #{sqskjzgbmxxdwgkfbValue,jdbcType=VARCHAR}, 
+      #{tbr,jdbcType=VARCHAR}, #{tbrsj,jdbcType=VARCHAR}, #{jsfzr,jdbcType=VARCHAR}, 
+      #{jsfsj,jdbcType=VARCHAR}, #{xqmc,jdbcType=VARCHAR}, #{xqbl,jdbcType=INTEGER}, 
+      #{jsxqlx,jdbcType=VARCHAR}, #{xqly,jdbcType=VARCHAR}, #{mqcpjsxz,jdbcType=VARCHAR}, 
+      #{yfnd,jdbcType=VARCHAR}, #{yqdddxg,jdbcType=VARCHAR}, #{yjzkdgz,jdbcType=VARCHAR}, 
+      #{xyyftjqk,jdbcType=VARCHAR}, #{mqhzdxqk,jdbcType=VARCHAR}, #{sfyxybhzxq,jdbcType=INTEGER}, 
+      #{yxhzdx,jdbcType=INTEGER}, #{yxhzdxValue,jdbcType=VARCHAR}, #{ncqdhzfs,jdbcType=INTEGER}, 
+      #{ncqdhzfsValue,jdbcType=VARCHAR}, #{xqjjjzsj,jdbcType=VARCHAR}, #{xqsfkegk,jdbcType=INTEGER}, 
+      #{wjjjsntntgdhzzj,jdbcType=VARCHAR}, #{zjyt,jdbcType=VARCHAR}, #{zjqk,jdbcType=VARCHAR}, 
+      #{xqjjfs,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.DemandCollection">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
     insert into demand_collection
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -348,6 +349,9 @@
       <if test="yysjjyspt != null">
         yysjjyspt,
       </if>
+      <if test="yysjjysptValue != null">
+        yysjjyspt_value,
+      </if>
       <if test="frdb != null">
         frdb,
       </if>
@@ -633,7 +637,10 @@
         #{ssyq,jdbcType=VARCHAR},
       </if>
       <if test="yysjjyspt != null">
-        #{yysjjyspt,jdbcType=VARCHAR},
+        #{yysjjyspt,jdbcType=INTEGER},
+      </if>
+      <if test="yysjjysptValue != null">
+        #{yysjjysptValue,jdbcType=VARCHAR},
       </if>
       <if test="frdb != null">
         #{frdb,jdbcType=VARCHAR},
@@ -896,7 +903,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
     select count(*) from demand_collection
     <if test="_parameter != null">
@@ -907,7 +914,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
     update demand_collection
     <set>
@@ -939,7 +946,10 @@
         ssyq = #{record.ssyq,jdbcType=VARCHAR},
       </if>
       <if test="record.yysjjyspt != null">
-        yysjjyspt = #{record.yysjjyspt,jdbcType=VARCHAR},
+        yysjjyspt = #{record.yysjjyspt,jdbcType=INTEGER},
+      </if>
+      <if test="record.yysjjysptValue != null">
+        yysjjyspt_value = #{record.yysjjysptValue,jdbcType=VARCHAR},
       </if>
       <if test="record.frdb != null">
         frdb = #{record.frdb,jdbcType=VARCHAR},
@@ -1205,7 +1215,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
     update demand_collection
     set id = #{record.id,jdbcType=INTEGER},
@@ -1217,7 +1227,8 @@
       ssszc = #{record.ssszc,jdbcType=INTEGER},
       sssza = #{record.sssza,jdbcType=INTEGER},
       ssyq = #{record.ssyq,jdbcType=VARCHAR},
-      yysjjyspt = #{record.yysjjyspt,jdbcType=VARCHAR},
+      yysjjyspt = #{record.yysjjyspt,jdbcType=INTEGER},
+      yysjjyspt_value = #{record.yysjjysptValue,jdbcType=VARCHAR},
       frdb = #{record.frdb,jdbcType=VARCHAR},
       tyshxydm = #{record.tyshxydm,jdbcType=VARCHAR},
       jjgm = #{record.jjgm,jdbcType=VARCHAR},
@@ -1311,7 +1322,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1340,7 +1351,10 @@
         ssyq = #{ssyq,jdbcType=VARCHAR},
       </if>
       <if test="yysjjyspt != null">
-        yysjjyspt = #{yysjjyspt,jdbcType=VARCHAR},
+        yysjjyspt = #{yysjjyspt,jdbcType=INTEGER},
+      </if>
+      <if test="yysjjysptValue != null">
+        yysjjyspt_value = #{yysjjysptValue,jdbcType=VARCHAR},
       </if>
       <if test="frdb != null">
         frdb = #{frdb,jdbcType=VARCHAR},
@@ -1604,7 +1618,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jul 10 08:42:03 CST 2020.
+      This element was generated on Sun Jul 12 15:34:35 CST 2020.
     -->
     update demand_collection
     set dwmc = #{dwmc,jdbcType=VARCHAR},
@@ -1615,7 +1629,8 @@
       ssszc = #{ssszc,jdbcType=INTEGER},
       sssza = #{sssza,jdbcType=INTEGER},
       ssyq = #{ssyq,jdbcType=VARCHAR},
-      yysjjyspt = #{yysjjyspt,jdbcType=VARCHAR},
+      yysjjyspt = #{yysjjyspt,jdbcType=INTEGER},
+      yysjjyspt_value = #{yysjjysptValue,jdbcType=VARCHAR},
       frdb = #{frdb,jdbcType=VARCHAR},
       tyshxydm = #{tyshxydm,jdbcType=VARCHAR},
       jjgm = #{jjgm,jdbcType=VARCHAR},

File diff suppressed because it is too large
+ 311 - 288
src/main/java/com/goafanti/common/model/DemandCollection.java


+ 94 - 34
src/main/java/com/goafanti/common/model/DemandCollectionExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class DemandCollectionExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	public DemandCollectionExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -754,63 +754,123 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptEqualTo(String value) {
+		public Criteria andYysjjysptEqualTo(Integer value) {
 			addCriterion("yysjjyspt =", value, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptNotEqualTo(String value) {
+		public Criteria andYysjjysptNotEqualTo(Integer value) {
 			addCriterion("yysjjyspt <>", value, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptGreaterThan(String value) {
+		public Criteria andYysjjysptGreaterThan(Integer value) {
 			addCriterion("yysjjyspt >", value, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptGreaterThanOrEqualTo(String value) {
+		public Criteria andYysjjysptGreaterThanOrEqualTo(Integer value) {
 			addCriterion("yysjjyspt >=", value, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptLessThan(String value) {
+		public Criteria andYysjjysptLessThan(Integer value) {
 			addCriterion("yysjjyspt <", value, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptLessThanOrEqualTo(String value) {
+		public Criteria andYysjjysptLessThanOrEqualTo(Integer value) {
 			addCriterion("yysjjyspt <=", value, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptLike(String value) {
-			addCriterion("yysjjyspt like", value, "yysjjyspt");
+		public Criteria andYysjjysptIn(List<Integer> values) {
+			addCriterion("yysjjyspt in", values, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptNotLike(String value) {
-			addCriterion("yysjjyspt not like", value, "yysjjyspt");
+		public Criteria andYysjjysptNotIn(List<Integer> values) {
+			addCriterion("yysjjyspt not in", values, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptIn(List<String> values) {
-			addCriterion("yysjjyspt in", values, "yysjjyspt");
+		public Criteria andYysjjysptBetween(Integer value1, Integer value2) {
+			addCriterion("yysjjyspt between", value1, value2, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptNotIn(List<String> values) {
-			addCriterion("yysjjyspt not in", values, "yysjjyspt");
+		public Criteria andYysjjysptNotBetween(Integer value1, Integer value2) {
+			addCriterion("yysjjyspt not between", value1, value2, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptBetween(String value1, String value2) {
-			addCriterion("yysjjyspt between", value1, value2, "yysjjyspt");
+		public Criteria andYysjjysptValueIsNull() {
+			addCriterion("yysjjyspt_value is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptNotBetween(String value1, String value2) {
-			addCriterion("yysjjyspt not between", value1, value2, "yysjjyspt");
+		public Criteria andYysjjysptValueIsNotNull() {
+			addCriterion("yysjjyspt_value is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueEqualTo(String value) {
+			addCriterion("yysjjyspt_value =", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueNotEqualTo(String value) {
+			addCriterion("yysjjyspt_value <>", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueGreaterThan(String value) {
+			addCriterion("yysjjyspt_value >", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueGreaterThanOrEqualTo(String value) {
+			addCriterion("yysjjyspt_value >=", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueLessThan(String value) {
+			addCriterion("yysjjyspt_value <", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueLessThanOrEqualTo(String value) {
+			addCriterion("yysjjyspt_value <=", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueLike(String value) {
+			addCriterion("yysjjyspt_value like", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueNotLike(String value) {
+			addCriterion("yysjjyspt_value not like", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueIn(List<String> values) {
+			addCriterion("yysjjyspt_value in", values, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueNotIn(List<String> values) {
+			addCriterion("yysjjyspt_value not in", values, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueBetween(String value1, String value2) {
+			addCriterion("yysjjyspt_value between", value1, value2, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueNotBetween(String value1, String value2) {
+			addCriterion("yysjjyspt_value not between", value1, value2, "yysjjysptValue");
 			return (Criteria) this;
 		}
 
@@ -6427,7 +6487,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table demand_collection
-	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
+	 * @mbg.generated  Sun Jul 12 15:34:35 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 10 - 0
src/main/java/com/goafanti/demandCollection/bo/InputDemandCollection.java

@@ -62,6 +62,8 @@ public class InputDemandCollection {
 	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
 	 */
 	private String yysjjyspt;
+	
+	private String yysjjysptValue;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column demand_collection.frdb
 	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
@@ -2230,5 +2232,13 @@ public class InputDemandCollection {
 	public void setEndTime(String endTime) {
 		this.endTime = endTime;
 	}
+
+	public String getYysjjysptValue() {
+		return yysjjysptValue;
+	}
+
+	public void setYysjjysptValue(String yysjjysptValue) {
+		this.yysjjysptValue = yysjjysptValue;
+	}
 	
 }

+ 38 - 5
src/main/java/com/goafanti/demandCollection/bo/OutDemandCollection.java

@@ -1,5 +1,7 @@
 package com.goafanti.demandCollection.bo;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class OutDemandCollection {
 	private String id;
 	private String dwmc;
@@ -11,6 +13,7 @@ public class OutDemandCollection {
 	private String sssza;
 	private String ssyq;
 	private String yysjjyspt;
+	private String yysjjysptValue;
 	private String frdb;
 	private String tyshxydm;
 	private String jjgm;
@@ -225,6 +228,14 @@ public class OutDemandCollection {
 	}
 
 	public String getYysjjyspt() {
+		if (yysjjyspt == null)
+			return "";
+		if (yysjjyspt.equals("0"))
+			return yysjjysptValue;
+		else if (yysjjyspt.equals("1"))
+			return "省级平台";
+		else if (yysjjyspt.equals("2"))
+			return "国家级平台";
 		return yysjjyspt;
 	}
 
@@ -738,7 +749,7 @@ public class OutDemandCollection {
 				if (string.equals("0"))
 					str2 = str2 + "其他,";
 				else if (string.equals("1"))
-					str2 = str2 + "行投资,";
+					str2 = str2 + "行投资,";
 				else if (string.equals("2"))
 					str2 = str2 + "银行贷款,";
 				else if (string.equals("3"))
@@ -949,15 +960,14 @@ public class OutDemandCollection {
 	public String getSqskjzgbmxxdwgkfb() {
 		if (sqskjzgbmxxdwgkfb == null)
 			return "";
-		if (sqskjzgbmxxdwgkfb.equals("1"))
+		else if   (sqskjzgbmxxdwgkfb.equals("0"))
+			return "其他,请具体描述同意授权公开的范围内容";
+		else if (sqskjzgbmxxdwgkfb.equals("1"))
 			return "同意授权公开单位信息";
 		else if (sqskjzgbmxxdwgkfb.equals("2"))
 			return "同意授权公开成果信息";
 		else if (sqskjzgbmxxdwgkfb.equals("3"))
-			return "其他,请具体描述同意授权公开的范围内容";
-		else if (sqskjzgbmxxdwgkfb.equals("4"))
 			return "不同意授权";
-
 		return sqskjzgbmxxdwgkfb;
 	}
 
@@ -1024,6 +1034,18 @@ public class OutDemandCollection {
 	}
 
 	public String getJsxqlx() {
+		if (jsxqlx == null)
+			return "";
+		if (jsxqlx.equals("0"))
+			return "其他";
+		else if (jsxqlx.equals("1"))
+			return "“卡脖子”技术";
+		else if (jsxqlx.equals("2"))
+			return "前沿颠覆性变革技术";
+		else if (jsxqlx.equals("3"))
+			return "重大核心关键技术";
+		else if (jsxqlx.equals("4"))
+			return "应用技术";
 		return jsxqlx;
 	}
 
@@ -1198,6 +1220,9 @@ public class OutDemandCollection {
 	}
 
 	public String getXqjjjzsj() {
+		if (StringUtils.isBlank(xqjjjzsj)) {
+			return "暂时不考虑";
+		}
 		return xqjjjzsj;
 	}
 
@@ -1307,4 +1332,12 @@ public class OutDemandCollection {
 		this.sssza = sssza;
 	}
 
+	public String getYysjjysptValue() {
+		return yysjjysptValue;
+	}
+
+	public void setYysjjysptValue(String yysjjysptValue) {
+		this.yysjjysptValue = yysjjysptValue;
+	}
+
 }