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

update

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
e57bb6f142

+ 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
 	 */
 	long countByExample(DemandCollectionExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
 	 */
 	int deleteByExample(DemandCollectionExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
 	 */
 	int insert(DemandCollection record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
 	 */
 	int insertSelective(DemandCollection record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
 	 */
 	DemandCollection selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
 	 */
 	int updateByPrimaryKeySelective(DemandCollection record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
 	 */
 	int updateByPrimaryKey(DemandCollection record);
 }

+ 91 - 138
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 Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="dwmc" jdbcType="VARCHAR" property="dwmc" />
@@ -75,10 +75,8 @@
     <result column="yssdkjzc_value" jdbcType="VARCHAR" property="yssdkjzcValue" />
     <result column="nsqdsjxm" jdbcType="INTEGER" property="nsqdsjxm" />
     <result column="nsqdsjxm_value" jdbcType="VARCHAR" property="nsqdsjxmValue" />
-    <result column="sqskjzgbmxxdwgkfb" jdbcType="INTEGER" property="sqskjzgbmxxdwgkfb" />
+    <result column="sqskjzgbmxxdwgkfb" jdbcType="VARCHAR" property="sqskjzgbmxxdwgkfb" />
     <result column="sqskjzgbmxxdwgkfb_value" jdbcType="VARCHAR" property="sqskjzgbmxxdwgkfbValue" />
-    <result column="tbr" jdbcType="VARCHAR" property="tbr" />
-    <result column="tbrsj" jdbcType="VARCHAR" property="tbrsj" />
     <result column="jsfzr" jdbcType="VARCHAR" property="jsfzr" />
     <result column="jsfsj" jdbcType="VARCHAR" property="jsfsj" />
     <result column="xqmc" jdbcType="VARCHAR" property="xqmc" />
@@ -97,24 +95,23 @@
     <result column="ncqdhzfs" jdbcType="INTEGER" property="ncqdhzfs" />
     <result column="ncqdhzfs_value" jdbcType="VARCHAR" property="ncqdhzfsValue" />
     <result column="xqjjjzsj" jdbcType="VARCHAR" property="xqjjjzsj" />
-    <result column="xqsfkegk" jdbcType="INTEGER" property="xqsfkegk" />
     <result column="wjjjsntntgdhzzj" jdbcType="VARCHAR" property="wjjjsntntgdhzzj" />
     <result column="zjyt" jdbcType="VARCHAR" property="zjyt" />
     <result column="zjqk" jdbcType="VARCHAR" property="zjqk" />
-    <result column="xqjjfs" jdbcType="VARCHAR" property="xqjjfs" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="xqjjfs" jdbcType="INTEGER" property="xqjjfs" />
+    <result column="xqjjfs_value" jdbcType="VARCHAR" property="xqjjfsValue" />
     <result column="sfxwgw" jdbcType="VARCHAR" property="sfxwgw" />
     <result column="sfyxck" jdbcType="VARCHAR" property="sfyxck" />
-    <result column="xqjjfs_value" jdbcType="VARCHAR" property="xqjjfsValue" />
-    <result column="zyhzfs" jdbcType="VARCHAR" property="zyhzfs" />
     <result column="qyyzkdgjqykjcxhzqk" jdbcType="VARCHAR" property="qyyzkdgjqykjcxhzqk" />
+    <result column="zyhzfs" jdbcType="VARCHAR" property="zyhzfs" />
     <result column="zyhzfs_value" jdbcType="VARCHAR" property="zyhzfsValue" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </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 Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -148,7 +145,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -182,7 +179,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     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, 
@@ -192,16 +189,16 @@
     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, 
-    sfxwgw, sfyxck, xqjjfs_value, zyhzfs, qyyzkdgjqykjcxhzqk, zyhzfs_value
+    sqskjzgbmxxdwgkfb_value, jsfzr, jsfsj, xqmc, xqbl, jsxqlx, xqly, mqcpjsxz, yfnd, 
+    yqdddxg, yjzkdgz, xyyftjqk, mqhzdxqk, sfyxybhzxq, yxhzdx, yxhzdx_value, ncqdhzfs, 
+    ncqdhzfs_value, xqjjjzsj, wjjjsntntgdhzzj, zjyt, zjqk, xqjjfs, xqjjfs_value, sfxwgw, 
+    sfyxck, qyyzkdgjqykjcxhzqk, zyhzfs, zyhzfs_value, create_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.DemandCollectionExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     select
     <if test="distinct">
@@ -220,7 +217,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -231,7 +228,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     delete from demand_collection
     where id = #{id,jdbcType=INTEGER}
@@ -240,7 +237,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     delete from demand_collection
     <if test="_parameter != null">
@@ -251,7 +248,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     insert into demand_collection (id, dwmc, dwxz, 
       dwxz_value, htly, ssszp, 
@@ -276,17 +273,16 @@
       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, 
+      jsfzr, jsfsj, xqmc, 
+      xqbl, jsxqlx, xqly, 
+      mqcpjsxz, yfnd, yqdddxg, 
+      yjzkdgz, xyyftjqk, mqhzdxqk, 
+      sfyxybhzxq, yxhzdx, yxhzdx_value, 
+      ncqdhzfs, ncqdhzfs_value, xqjjjzsj, 
       wjjjsntntgdhzzj, zjyt, zjqk, 
-      xqjjfs, create_time, sfxwgw, 
-      sfyxck, xqjjfs_value, zyhzfs, 
-      qyyzkdgjqykjcxhzqk, zyhzfs_value)
+      xqjjfs, xqjjfs_value, sfxwgw, 
+      sfyxck, qyyzkdgjqykjcxhzqk, zyhzfs, 
+      zyhzfs_value, 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}, 
@@ -309,24 +305,23 @@
       #{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}, 
+      #{sqskjzgbmxxdwgkfb,jdbcType=VARCHAR}, #{sqskjzgbmxxdwgkfbValue,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}, 
       #{wjjjsntntgdhzzj,jdbcType=VARCHAR}, #{zjyt,jdbcType=VARCHAR}, #{zjqk,jdbcType=VARCHAR}, 
-      #{xqjjfs,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{sfxwgw,jdbcType=VARCHAR}, 
-      #{sfyxck,jdbcType=VARCHAR}, #{xqjjfsValue,jdbcType=VARCHAR}, #{zyhzfs,jdbcType=VARCHAR}, 
-      #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR}, #{zyhzfsValue,jdbcType=VARCHAR})
+      #{xqjjfs,jdbcType=INTEGER}, #{xqjjfsValue,jdbcType=VARCHAR}, #{sfxwgw,jdbcType=VARCHAR}, 
+      #{sfyxck,jdbcType=VARCHAR}, #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR}, #{zyhzfs,jdbcType=VARCHAR}, 
+      #{zyhzfsValue,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 Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     insert into demand_collection
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -540,12 +535,6 @@
       <if test="sqskjzgbmxxdwgkfbValue != null">
         sqskjzgbmxxdwgkfb_value,
       </if>
-      <if test="tbr != null">
-        tbr,
-      </if>
-      <if test="tbrsj != null">
-        tbrsj,
-      </if>
       <if test="jsfzr != null">
         jsfzr,
       </if>
@@ -600,9 +589,6 @@
       <if test="xqjjjzsj != null">
         xqjjjzsj,
       </if>
-      <if test="xqsfkegk != null">
-        xqsfkegk,
-      </if>
       <if test="wjjjsntntgdhzzj != null">
         wjjjsntntgdhzzj,
       </if>
@@ -615,8 +601,8 @@
       <if test="xqjjfs != null">
         xqjjfs,
       </if>
-      <if test="createTime != null">
-        create_time,
+      <if test="xqjjfsValue != null">
+        xqjjfs_value,
       </if>
       <if test="sfxwgw != null">
         sfxwgw,
@@ -624,18 +610,18 @@
       <if test="sfyxck != null">
         sfyxck,
       </if>
-      <if test="xqjjfsValue != null">
-        xqjjfs_value,
+      <if test="qyyzkdgjqykjcxhzqk != null">
+        qyyzkdgjqykjcxhzqk,
       </if>
       <if test="zyhzfs != null">
         zyhzfs,
       </if>
-      <if test="qyyzkdgjqykjcxhzqk != null">
-        qyyzkdgjqykjcxhzqk,
-      </if>
       <if test="zyhzfsValue != null">
         zyhzfs_value,
       </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -843,17 +829,11 @@
         #{nsqdsjxmValue,jdbcType=VARCHAR},
       </if>
       <if test="sqskjzgbmxxdwgkfb != null">
-        #{sqskjzgbmxxdwgkfb,jdbcType=INTEGER},
+        #{sqskjzgbmxxdwgkfb,jdbcType=VARCHAR},
       </if>
       <if test="sqskjzgbmxxdwgkfbValue != null">
         #{sqskjzgbmxxdwgkfbValue,jdbcType=VARCHAR},
       </if>
-      <if test="tbr != null">
-        #{tbr,jdbcType=VARCHAR},
-      </if>
-      <if test="tbrsj != null">
-        #{tbrsj,jdbcType=VARCHAR},
-      </if>
       <if test="jsfzr != null">
         #{jsfzr,jdbcType=VARCHAR},
       </if>
@@ -908,9 +888,6 @@
       <if test="xqjjjzsj != null">
         #{xqjjjzsj,jdbcType=VARCHAR},
       </if>
-      <if test="xqsfkegk != null">
-        #{xqsfkegk,jdbcType=INTEGER},
-      </if>
       <if test="wjjjsntntgdhzzj != null">
         #{wjjjsntntgdhzzj,jdbcType=VARCHAR},
       </if>
@@ -921,10 +898,10 @@
         #{zjqk,jdbcType=VARCHAR},
       </if>
       <if test="xqjjfs != null">
-        #{xqjjfs,jdbcType=VARCHAR},
+        #{xqjjfs,jdbcType=INTEGER},
       </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
+      <if test="xqjjfsValue != null">
+        #{xqjjfsValue,jdbcType=VARCHAR},
       </if>
       <if test="sfxwgw != null">
         #{sfxwgw,jdbcType=VARCHAR},
@@ -932,25 +909,25 @@
       <if test="sfyxck != null">
         #{sfyxck,jdbcType=VARCHAR},
       </if>
-      <if test="xqjjfsValue != null">
-        #{xqjjfsValue,jdbcType=VARCHAR},
+      <if test="qyyzkdgjqykjcxhzqk != null">
+        #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
       </if>
       <if test="zyhzfs != null">
         #{zyhzfs,jdbcType=VARCHAR},
       </if>
-      <if test="qyyzkdgjqykjcxhzqk != null">
-        #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
-      </if>
       <if test="zyhzfsValue != null">
         #{zyhzfsValue,jdbcType=VARCHAR},
       </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.DemandCollectionExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     select count(*) from demand_collection
     <if test="_parameter != null">
@@ -961,7 +938,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1170,17 +1147,11 @@
         nsqdsjxm_value = #{record.nsqdsjxmValue,jdbcType=VARCHAR},
       </if>
       <if test="record.sqskjzgbmxxdwgkfb != null">
-        sqskjzgbmxxdwgkfb = #{record.sqskjzgbmxxdwgkfb,jdbcType=INTEGER},
+        sqskjzgbmxxdwgkfb = #{record.sqskjzgbmxxdwgkfb,jdbcType=VARCHAR},
       </if>
       <if test="record.sqskjzgbmxxdwgkfbValue != null">
         sqskjzgbmxxdwgkfb_value = #{record.sqskjzgbmxxdwgkfbValue,jdbcType=VARCHAR},
       </if>
-      <if test="record.tbr != null">
-        tbr = #{record.tbr,jdbcType=VARCHAR},
-      </if>
-      <if test="record.tbrsj != null">
-        tbrsj = #{record.tbrsj,jdbcType=VARCHAR},
-      </if>
       <if test="record.jsfzr != null">
         jsfzr = #{record.jsfzr,jdbcType=VARCHAR},
       </if>
@@ -1235,9 +1206,6 @@
       <if test="record.xqjjjzsj != null">
         xqjjjzsj = #{record.xqjjjzsj,jdbcType=VARCHAR},
       </if>
-      <if test="record.xqsfkegk != null">
-        xqsfkegk = #{record.xqsfkegk,jdbcType=INTEGER},
-      </if>
       <if test="record.wjjjsntntgdhzzj != null">
         wjjjsntntgdhzzj = #{record.wjjjsntntgdhzzj,jdbcType=VARCHAR},
       </if>
@@ -1248,10 +1216,10 @@
         zjqk = #{record.zjqk,jdbcType=VARCHAR},
       </if>
       <if test="record.xqjjfs != null">
-        xqjjfs = #{record.xqjjfs,jdbcType=VARCHAR},
+        xqjjfs = #{record.xqjjfs,jdbcType=INTEGER},
       </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      <if test="record.xqjjfsValue != null">
+        xqjjfs_value = #{record.xqjjfsValue,jdbcType=VARCHAR},
       </if>
       <if test="record.sfxwgw != null">
         sfxwgw = #{record.sfxwgw,jdbcType=VARCHAR},
@@ -1259,18 +1227,18 @@
       <if test="record.sfyxck != null">
         sfyxck = #{record.sfyxck,jdbcType=VARCHAR},
       </if>
-      <if test="record.xqjjfsValue != null">
-        xqjjfs_value = #{record.xqjjfsValue,jdbcType=VARCHAR},
+      <if test="record.qyyzkdgjqykjcxhzqk != null">
+        qyyzkdgjqykjcxhzqk = #{record.qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
       </if>
       <if test="record.zyhzfs != null">
         zyhzfs = #{record.zyhzfs,jdbcType=VARCHAR},
       </if>
-      <if test="record.qyyzkdgjqykjcxhzqk != null">
-        qyyzkdgjqykjcxhzqk = #{record.qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
-      </if>
       <if test="record.zyhzfsValue != null">
         zyhzfs_value = #{record.zyhzfsValue,jdbcType=VARCHAR},
       </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -1280,7 +1248,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     update demand_collection
     set id = #{record.id,jdbcType=INTEGER},
@@ -1351,10 +1319,8 @@
       yssdkjzc_value = #{record.yssdkjzcValue,jdbcType=VARCHAR},
       nsqdsjxm = #{record.nsqdsjxm,jdbcType=INTEGER},
       nsqdsjxm_value = #{record.nsqdsjxmValue,jdbcType=VARCHAR},
-      sqskjzgbmxxdwgkfb = #{record.sqskjzgbmxxdwgkfb,jdbcType=INTEGER},
+      sqskjzgbmxxdwgkfb = #{record.sqskjzgbmxxdwgkfb,jdbcType=VARCHAR},
       sqskjzgbmxxdwgkfb_value = #{record.sqskjzgbmxxdwgkfbValue,jdbcType=VARCHAR},
-      tbr = #{record.tbr,jdbcType=VARCHAR},
-      tbrsj = #{record.tbrsj,jdbcType=VARCHAR},
       jsfzr = #{record.jsfzr,jdbcType=VARCHAR},
       jsfsj = #{record.jsfsj,jdbcType=VARCHAR},
       xqmc = #{record.xqmc,jdbcType=VARCHAR},
@@ -1373,18 +1339,17 @@
       ncqdhzfs = #{record.ncqdhzfs,jdbcType=INTEGER},
       ncqdhzfs_value = #{record.ncqdhzfsValue,jdbcType=VARCHAR},
       xqjjjzsj = #{record.xqjjjzsj,jdbcType=VARCHAR},
-      xqsfkegk = #{record.xqsfkegk,jdbcType=INTEGER},
       wjjjsntntgdhzzj = #{record.wjjjsntntgdhzzj,jdbcType=VARCHAR},
       zjyt = #{record.zjyt,jdbcType=VARCHAR},
       zjqk = #{record.zjqk,jdbcType=VARCHAR},
-      xqjjfs = #{record.xqjjfs,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      xqjjfs = #{record.xqjjfs,jdbcType=INTEGER},
+      xqjjfs_value = #{record.xqjjfsValue,jdbcType=VARCHAR},
       sfxwgw = #{record.sfxwgw,jdbcType=VARCHAR},
       sfyxck = #{record.sfyxck,jdbcType=VARCHAR},
-      xqjjfs_value = #{record.xqjjfsValue,jdbcType=VARCHAR},
-      zyhzfs = #{record.zyhzfs,jdbcType=VARCHAR},
       qyyzkdgjqykjcxhzqk = #{record.qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
-      zyhzfs_value = #{record.zyhzfsValue,jdbcType=VARCHAR}
+      zyhzfs = #{record.zyhzfs,jdbcType=VARCHAR},
+      zyhzfs_value = #{record.zyhzfsValue,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1393,7 +1358,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1599,17 +1564,11 @@
         nsqdsjxm_value = #{nsqdsjxmValue,jdbcType=VARCHAR},
       </if>
       <if test="sqskjzgbmxxdwgkfb != null">
-        sqskjzgbmxxdwgkfb = #{sqskjzgbmxxdwgkfb,jdbcType=INTEGER},
+        sqskjzgbmxxdwgkfb = #{sqskjzgbmxxdwgkfb,jdbcType=VARCHAR},
       </if>
       <if test="sqskjzgbmxxdwgkfbValue != null">
         sqskjzgbmxxdwgkfb_value = #{sqskjzgbmxxdwgkfbValue,jdbcType=VARCHAR},
       </if>
-      <if test="tbr != null">
-        tbr = #{tbr,jdbcType=VARCHAR},
-      </if>
-      <if test="tbrsj != null">
-        tbrsj = #{tbrsj,jdbcType=VARCHAR},
-      </if>
       <if test="jsfzr != null">
         jsfzr = #{jsfzr,jdbcType=VARCHAR},
       </if>
@@ -1664,9 +1623,6 @@
       <if test="xqjjjzsj != null">
         xqjjjzsj = #{xqjjjzsj,jdbcType=VARCHAR},
       </if>
-      <if test="xqsfkegk != null">
-        xqsfkegk = #{xqsfkegk,jdbcType=INTEGER},
-      </if>
       <if test="wjjjsntntgdhzzj != null">
         wjjjsntntgdhzzj = #{wjjjsntntgdhzzj,jdbcType=VARCHAR},
       </if>
@@ -1677,10 +1633,10 @@
         zjqk = #{zjqk,jdbcType=VARCHAR},
       </if>
       <if test="xqjjfs != null">
-        xqjjfs = #{xqjjfs,jdbcType=VARCHAR},
+        xqjjfs = #{xqjjfs,jdbcType=INTEGER},
       </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
+      <if test="xqjjfsValue != null">
+        xqjjfs_value = #{xqjjfsValue,jdbcType=VARCHAR},
       </if>
       <if test="sfxwgw != null">
         sfxwgw = #{sfxwgw,jdbcType=VARCHAR},
@@ -1688,18 +1644,18 @@
       <if test="sfyxck != null">
         sfyxck = #{sfyxck,jdbcType=VARCHAR},
       </if>
-      <if test="xqjjfsValue != null">
-        xqjjfs_value = #{xqjjfsValue,jdbcType=VARCHAR},
+      <if test="qyyzkdgjqykjcxhzqk != null">
+        qyyzkdgjqykjcxhzqk = #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
       </if>
       <if test="zyhzfs != null">
         zyhzfs = #{zyhzfs,jdbcType=VARCHAR},
       </if>
-      <if test="qyyzkdgjqykjcxhzqk != null">
-        qyyzkdgjqykjcxhzqk = #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
-      </if>
       <if test="zyhzfsValue != null">
         zyhzfs_value = #{zyhzfsValue,jdbcType=VARCHAR},
       </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1707,7 +1663,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 09:30:29 CST 2020.
+      This element was generated on Wed Jul 15 17:30:16 CST 2020.
     -->
     update demand_collection
     set dwmc = #{dwmc,jdbcType=VARCHAR},
@@ -1777,10 +1733,8 @@
       yssdkjzc_value = #{yssdkjzcValue,jdbcType=VARCHAR},
       nsqdsjxm = #{nsqdsjxm,jdbcType=INTEGER},
       nsqdsjxm_value = #{nsqdsjxmValue,jdbcType=VARCHAR},
-      sqskjzgbmxxdwgkfb = #{sqskjzgbmxxdwgkfb,jdbcType=INTEGER},
+      sqskjzgbmxxdwgkfb = #{sqskjzgbmxxdwgkfb,jdbcType=VARCHAR},
       sqskjzgbmxxdwgkfb_value = #{sqskjzgbmxxdwgkfbValue,jdbcType=VARCHAR},
-      tbr = #{tbr,jdbcType=VARCHAR},
-      tbrsj = #{tbrsj,jdbcType=VARCHAR},
       jsfzr = #{jsfzr,jdbcType=VARCHAR},
       jsfsj = #{jsfsj,jdbcType=VARCHAR},
       xqmc = #{xqmc,jdbcType=VARCHAR},
@@ -1799,18 +1753,17 @@
       ncqdhzfs = #{ncqdhzfs,jdbcType=INTEGER},
       ncqdhzfs_value = #{ncqdhzfsValue,jdbcType=VARCHAR},
       xqjjjzsj = #{xqjjjzsj,jdbcType=VARCHAR},
-      xqsfkegk = #{xqsfkegk,jdbcType=INTEGER},
       wjjjsntntgdhzzj = #{wjjjsntntgdhzzj,jdbcType=VARCHAR},
       zjyt = #{zjyt,jdbcType=VARCHAR},
       zjqk = #{zjqk,jdbcType=VARCHAR},
-      xqjjfs = #{xqjjfs,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
+      xqjjfs = #{xqjjfs,jdbcType=INTEGER},
+      xqjjfs_value = #{xqjjfsValue,jdbcType=VARCHAR},
       sfxwgw = #{sfxwgw,jdbcType=VARCHAR},
       sfyxck = #{sfyxck,jdbcType=VARCHAR},
-      xqjjfs_value = #{xqjjfsValue,jdbcType=VARCHAR},
-      zyhzfs = #{zyhzfs,jdbcType=VARCHAR},
       qyyzkdgjqykjcxhzqk = #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
-      zyhzfs_value = #{zyhzfsValue,jdbcType=VARCHAR}
+      zyhzfs = #{zyhzfs,jdbcType=VARCHAR},
+      zyhzfs_value = #{zyhzfsValue,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
    
@@ -1822,8 +1775,8 @@
 	  sfyhjgtzztz_value sfyhjgtzztzValue,cgmc,cgly,cgsx,cgtxxs,cgtxxs_value cgtxxsValue,cgcsd,cgzscqxs,zscqqs,zlzt,cgdjqk,
 	  cgdjqk_value cgdjqkValue,ncqcgzyzhfszzzh,ncqcgzyzhfshzkf,ncqcgzyzhfsjszr, yjkzyzhsj,cgjs,sfycghzxq,sfyyxhzdw,clsj,zyhzfs_value zyhzfsValue,
 	  sfyyxhzdw_value sfyyxhzdwValue,yxhzfs,yxhzfs_value yxhzfsValue,yssdkjzc,yssdkjzc_value yssdkjzcValue,nsqdsjxm,sfxwgw,sfyxck,
-	  sqskjzgbmxxdwgkfb,tbr,tbrsj,jsfzr,jsfsj,xqmc,xqbl,jsxqlx,xqly, mqcpjsxz,yfnd,yqdddxg,yjzkdgz,xyyftjqk,mqhzdxqk,zyhzfs,qyyzkdgjqykjcxhzqk,
-	  sfyxybhzxq,yxhzdx,yxhzdx_value yxhzdxValue,ncqdhzfs,ncqdhzfs_value ncqdhzfsValue, xqjjjzsj,xqsfkegk,wjjjsntntgdhzzj,zjyt,zjqk,
+	  sqskjzgbmxxdwgkfb,jsfzr,jsfsj,xqmc,xqbl,jsxqlx,xqly, mqcpjsxz,yfnd,yqdddxg,yjzkdgz,xyyftjqk,mqhzdxqk,zyhzfs,qyyzkdgjqykjcxhzqk,
+	  sfyxybhzxq,yxhzdx,yxhzdx_value yxhzdxValue,ncqdhzfs,ncqdhzfs_value ncqdhzfsValue, xqjjjzsj,wjjjsntntgdhzzj,zjyt,zjqk,
 	  xqjjfs,xqjjfs_value xqjjfsValue,sqskjzgbmxxdwgkfb_value sqskjzgbmxxdwgkfbValue,date_format(create_time,'%Y-%m-%d %H:%i:%S') createTime
 	from demand_collection a left join district_glossory b on a.ssszp=b.id left join district_glossory c on a.ssszc=c.id
 	left join district_glossory d on a.sssza=d.id where 1=1

Разница между файлами не показана из-за своего большого размера
+ 343 - 412
src/main/java/com/goafanti/common/model/DemandCollection.java


+ 158 - 358
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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 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  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -4604,52 +4604,62 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andSqskjzgbmxxdwgkfbEqualTo(Integer value) {
+		public Criteria andSqskjzgbmxxdwgkfbEqualTo(String value) {
 			addCriterion("sqskjzgbmxxdwgkfb =", value, "sqskjzgbmxxdwgkfb");
 			return (Criteria) this;
 		}
 
-		public Criteria andSqskjzgbmxxdwgkfbNotEqualTo(Integer value) {
+		public Criteria andSqskjzgbmxxdwgkfbNotEqualTo(String value) {
 			addCriterion("sqskjzgbmxxdwgkfb <>", value, "sqskjzgbmxxdwgkfb");
 			return (Criteria) this;
 		}
 
-		public Criteria andSqskjzgbmxxdwgkfbGreaterThan(Integer value) {
+		public Criteria andSqskjzgbmxxdwgkfbGreaterThan(String value) {
 			addCriterion("sqskjzgbmxxdwgkfb >", value, "sqskjzgbmxxdwgkfb");
 			return (Criteria) this;
 		}
 
-		public Criteria andSqskjzgbmxxdwgkfbGreaterThanOrEqualTo(Integer value) {
+		public Criteria andSqskjzgbmxxdwgkfbGreaterThanOrEqualTo(String value) {
 			addCriterion("sqskjzgbmxxdwgkfb >=", value, "sqskjzgbmxxdwgkfb");
 			return (Criteria) this;
 		}
 
-		public Criteria andSqskjzgbmxxdwgkfbLessThan(Integer value) {
+		public Criteria andSqskjzgbmxxdwgkfbLessThan(String value) {
 			addCriterion("sqskjzgbmxxdwgkfb <", value, "sqskjzgbmxxdwgkfb");
 			return (Criteria) this;
 		}
 
-		public Criteria andSqskjzgbmxxdwgkfbLessThanOrEqualTo(Integer value) {
+		public Criteria andSqskjzgbmxxdwgkfbLessThanOrEqualTo(String value) {
 			addCriterion("sqskjzgbmxxdwgkfb <=", value, "sqskjzgbmxxdwgkfb");
 			return (Criteria) this;
 		}
 
-		public Criteria andSqskjzgbmxxdwgkfbIn(List<Integer> values) {
+		public Criteria andSqskjzgbmxxdwgkfbLike(String value) {
+			addCriterion("sqskjzgbmxxdwgkfb like", value, "sqskjzgbmxxdwgkfb");
+			return (Criteria) this;
+		}
+
+		public Criteria andSqskjzgbmxxdwgkfbNotLike(String value) {
+			addCriterion("sqskjzgbmxxdwgkfb not like", value, "sqskjzgbmxxdwgkfb");
+			return (Criteria) this;
+		}
+
+		public Criteria andSqskjzgbmxxdwgkfbIn(List<String> values) {
 			addCriterion("sqskjzgbmxxdwgkfb in", values, "sqskjzgbmxxdwgkfb");
 			return (Criteria) this;
 		}
 
-		public Criteria andSqskjzgbmxxdwgkfbNotIn(List<Integer> values) {
+		public Criteria andSqskjzgbmxxdwgkfbNotIn(List<String> values) {
 			addCriterion("sqskjzgbmxxdwgkfb not in", values, "sqskjzgbmxxdwgkfb");
 			return (Criteria) this;
 		}
 
-		public Criteria andSqskjzgbmxxdwgkfbBetween(Integer value1, Integer value2) {
+		public Criteria andSqskjzgbmxxdwgkfbBetween(String value1, String value2) {
 			addCriterion("sqskjzgbmxxdwgkfb between", value1, value2, "sqskjzgbmxxdwgkfb");
 			return (Criteria) this;
 		}
 
-		public Criteria andSqskjzgbmxxdwgkfbNotBetween(Integer value1, Integer value2) {
+		public Criteria andSqskjzgbmxxdwgkfbNotBetween(String value1, String value2) {
 			addCriterion("sqskjzgbmxxdwgkfb not between", value1, value2, "sqskjzgbmxxdwgkfb");
 			return (Criteria) this;
 		}
@@ -4724,146 +4734,6 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andTbrIsNull() {
-			addCriterion("tbr is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrIsNotNull() {
-			addCriterion("tbr is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrEqualTo(String value) {
-			addCriterion("tbr =", value, "tbr");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrNotEqualTo(String value) {
-			addCriterion("tbr <>", value, "tbr");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrGreaterThan(String value) {
-			addCriterion("tbr >", value, "tbr");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrGreaterThanOrEqualTo(String value) {
-			addCriterion("tbr >=", value, "tbr");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrLessThan(String value) {
-			addCriterion("tbr <", value, "tbr");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrLessThanOrEqualTo(String value) {
-			addCriterion("tbr <=", value, "tbr");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrLike(String value) {
-			addCriterion("tbr like", value, "tbr");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrNotLike(String value) {
-			addCriterion("tbr not like", value, "tbr");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrIn(List<String> values) {
-			addCriterion("tbr in", values, "tbr");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrNotIn(List<String> values) {
-			addCriterion("tbr not in", values, "tbr");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrBetween(String value1, String value2) {
-			addCriterion("tbr between", value1, value2, "tbr");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrNotBetween(String value1, String value2) {
-			addCriterion("tbr not between", value1, value2, "tbr");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrsjIsNull() {
-			addCriterion("tbrsj is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrsjIsNotNull() {
-			addCriterion("tbrsj is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrsjEqualTo(String value) {
-			addCriterion("tbrsj =", value, "tbrsj");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrsjNotEqualTo(String value) {
-			addCriterion("tbrsj <>", value, "tbrsj");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrsjGreaterThan(String value) {
-			addCriterion("tbrsj >", value, "tbrsj");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrsjGreaterThanOrEqualTo(String value) {
-			addCriterion("tbrsj >=", value, "tbrsj");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrsjLessThan(String value) {
-			addCriterion("tbrsj <", value, "tbrsj");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrsjLessThanOrEqualTo(String value) {
-			addCriterion("tbrsj <=", value, "tbrsj");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrsjLike(String value) {
-			addCriterion("tbrsj like", value, "tbrsj");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrsjNotLike(String value) {
-			addCriterion("tbrsj not like", value, "tbrsj");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrsjIn(List<String> values) {
-			addCriterion("tbrsj in", values, "tbrsj");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrsjNotIn(List<String> values) {
-			addCriterion("tbrsj not in", values, "tbrsj");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrsjBetween(String value1, String value2) {
-			addCriterion("tbrsj between", value1, value2, "tbrsj");
-			return (Criteria) this;
-		}
-
-		public Criteria andTbrsjNotBetween(String value1, String value2) {
-			addCriterion("tbrsj not between", value1, value2, "tbrsj");
-			return (Criteria) this;
-		}
-
 		public Criteria andJsfzrIsNull() {
 			addCriterion("jsfzr is null");
 			return (Criteria) this;
@@ -6084,66 +5954,6 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andXqsfkegkIsNull() {
-			addCriterion("xqsfkegk is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andXqsfkegkIsNotNull() {
-			addCriterion("xqsfkegk is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andXqsfkegkEqualTo(Integer value) {
-			addCriterion("xqsfkegk =", value, "xqsfkegk");
-			return (Criteria) this;
-		}
-
-		public Criteria andXqsfkegkNotEqualTo(Integer value) {
-			addCriterion("xqsfkegk <>", value, "xqsfkegk");
-			return (Criteria) this;
-		}
-
-		public Criteria andXqsfkegkGreaterThan(Integer value) {
-			addCriterion("xqsfkegk >", value, "xqsfkegk");
-			return (Criteria) this;
-		}
-
-		public Criteria andXqsfkegkGreaterThanOrEqualTo(Integer value) {
-			addCriterion("xqsfkegk >=", value, "xqsfkegk");
-			return (Criteria) this;
-		}
-
-		public Criteria andXqsfkegkLessThan(Integer value) {
-			addCriterion("xqsfkegk <", value, "xqsfkegk");
-			return (Criteria) this;
-		}
-
-		public Criteria andXqsfkegkLessThanOrEqualTo(Integer value) {
-			addCriterion("xqsfkegk <=", value, "xqsfkegk");
-			return (Criteria) this;
-		}
-
-		public Criteria andXqsfkegkIn(List<Integer> values) {
-			addCriterion("xqsfkegk in", values, "xqsfkegk");
-			return (Criteria) this;
-		}
-
-		public Criteria andXqsfkegkNotIn(List<Integer> values) {
-			addCriterion("xqsfkegk not in", values, "xqsfkegk");
-			return (Criteria) this;
-		}
-
-		public Criteria andXqsfkegkBetween(Integer value1, Integer value2) {
-			addCriterion("xqsfkegk between", value1, value2, "xqsfkegk");
-			return (Criteria) this;
-		}
-
-		public Criteria andXqsfkegkNotBetween(Integer value1, Integer value2) {
-			addCriterion("xqsfkegk not between", value1, value2, "xqsfkegk");
-			return (Criteria) this;
-		}
-
 		public Criteria andWjjjsntntgdhzzjIsNull() {
 			addCriterion("wjjjsntntgdhzzj is null");
 			return (Criteria) this;
@@ -6364,123 +6174,123 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsEqualTo(String value) {
+		public Criteria andXqjjfsEqualTo(Integer value) {
 			addCriterion("xqjjfs =", value, "xqjjfs");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsNotEqualTo(String value) {
+		public Criteria andXqjjfsNotEqualTo(Integer value) {
 			addCriterion("xqjjfs <>", value, "xqjjfs");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsGreaterThan(String value) {
+		public Criteria andXqjjfsGreaterThan(Integer value) {
 			addCriterion("xqjjfs >", value, "xqjjfs");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsGreaterThanOrEqualTo(String value) {
+		public Criteria andXqjjfsGreaterThanOrEqualTo(Integer value) {
 			addCriterion("xqjjfs >=", value, "xqjjfs");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsLessThan(String value) {
+		public Criteria andXqjjfsLessThan(Integer value) {
 			addCriterion("xqjjfs <", value, "xqjjfs");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsLessThanOrEqualTo(String value) {
+		public Criteria andXqjjfsLessThanOrEqualTo(Integer value) {
 			addCriterion("xqjjfs <=", value, "xqjjfs");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsLike(String value) {
-			addCriterion("xqjjfs like", value, "xqjjfs");
+		public Criteria andXqjjfsIn(List<Integer> values) {
+			addCriterion("xqjjfs in", values, "xqjjfs");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsNotLike(String value) {
-			addCriterion("xqjjfs not like", value, "xqjjfs");
+		public Criteria andXqjjfsNotIn(List<Integer> values) {
+			addCriterion("xqjjfs not in", values, "xqjjfs");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsIn(List<String> values) {
-			addCriterion("xqjjfs in", values, "xqjjfs");
+		public Criteria andXqjjfsBetween(Integer value1, Integer value2) {
+			addCriterion("xqjjfs between", value1, value2, "xqjjfs");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsNotIn(List<String> values) {
-			addCriterion("xqjjfs not in", values, "xqjjfs");
+		public Criteria andXqjjfsNotBetween(Integer value1, Integer value2) {
+			addCriterion("xqjjfs not between", value1, value2, "xqjjfs");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsBetween(String value1, String value2) {
-			addCriterion("xqjjfs between", value1, value2, "xqjjfs");
+		public Criteria andXqjjfsValueIsNull() {
+			addCriterion("xqjjfs_value is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsNotBetween(String value1, String value2) {
-			addCriterion("xqjjfs not between", value1, value2, "xqjjfs");
+		public Criteria andXqjjfsValueIsNotNull() {
+			addCriterion("xqjjfs_value is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeIsNull() {
-			addCriterion("create_time is null");
+		public Criteria andXqjjfsValueEqualTo(String value) {
+			addCriterion("xqjjfs_value =", value, "xqjjfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeIsNotNull() {
-			addCriterion("create_time is not null");
+		public Criteria andXqjjfsValueNotEqualTo(String value) {
+			addCriterion("xqjjfs_value <>", value, "xqjjfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeEqualTo(Date value) {
-			addCriterion("create_time =", value, "createTime");
+		public Criteria andXqjjfsValueGreaterThan(String value) {
+			addCriterion("xqjjfs_value >", value, "xqjjfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeNotEqualTo(Date value) {
-			addCriterion("create_time <>", value, "createTime");
+		public Criteria andXqjjfsValueGreaterThanOrEqualTo(String value) {
+			addCriterion("xqjjfs_value >=", value, "xqjjfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeGreaterThan(Date value) {
-			addCriterion("create_time >", value, "createTime");
+		public Criteria andXqjjfsValueLessThan(String value) {
+			addCriterion("xqjjfs_value <", value, "xqjjfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
-			addCriterion("create_time >=", value, "createTime");
+		public Criteria andXqjjfsValueLessThanOrEqualTo(String value) {
+			addCriterion("xqjjfs_value <=", value, "xqjjfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeLessThan(Date value) {
-			addCriterion("create_time <", value, "createTime");
+		public Criteria andXqjjfsValueLike(String value) {
+			addCriterion("xqjjfs_value like", value, "xqjjfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
-			addCriterion("create_time <=", value, "createTime");
+		public Criteria andXqjjfsValueNotLike(String value) {
+			addCriterion("xqjjfs_value not like", value, "xqjjfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeIn(List<Date> values) {
-			addCriterion("create_time in", values, "createTime");
+		public Criteria andXqjjfsValueIn(List<String> values) {
+			addCriterion("xqjjfs_value in", values, "xqjjfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeNotIn(List<Date> values) {
-			addCriterion("create_time not in", values, "createTime");
+		public Criteria andXqjjfsValueNotIn(List<String> values) {
+			addCriterion("xqjjfs_value not in", values, "xqjjfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeBetween(Date value1, Date value2) {
-			addCriterion("create_time between", value1, value2, "createTime");
+		public Criteria andXqjjfsValueBetween(String value1, String value2) {
+			addCriterion("xqjjfs_value between", value1, value2, "xqjjfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
-			addCriterion("create_time not between", value1, value2, "createTime");
+		public Criteria andXqjjfsValueNotBetween(String value1, String value2) {
+			addCriterion("xqjjfs_value not between", value1, value2, "xqjjfsValue");
 			return (Criteria) this;
 		}
 
@@ -6624,73 +6434,73 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsValueIsNull() {
-			addCriterion("xqjjfs_value is null");
+		public Criteria andQyyzkdgjqykjcxhzqkIsNull() {
+			addCriterion("qyyzkdgjqykjcxhzqk is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsValueIsNotNull() {
-			addCriterion("xqjjfs_value is not null");
+		public Criteria andQyyzkdgjqykjcxhzqkIsNotNull() {
+			addCriterion("qyyzkdgjqykjcxhzqk is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsValueEqualTo(String value) {
-			addCriterion("xqjjfs_value =", value, "xqjjfsValue");
+		public Criteria andQyyzkdgjqykjcxhzqkEqualTo(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk =", value, "qyyzkdgjqykjcxhzqk");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsValueNotEqualTo(String value) {
-			addCriterion("xqjjfs_value <>", value, "xqjjfsValue");
+		public Criteria andQyyzkdgjqykjcxhzqkNotEqualTo(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk <>", value, "qyyzkdgjqykjcxhzqk");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsValueGreaterThan(String value) {
-			addCriterion("xqjjfs_value >", value, "xqjjfsValue");
+		public Criteria andQyyzkdgjqykjcxhzqkGreaterThan(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk >", value, "qyyzkdgjqykjcxhzqk");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsValueGreaterThanOrEqualTo(String value) {
-			addCriterion("xqjjfs_value >=", value, "xqjjfsValue");
+		public Criteria andQyyzkdgjqykjcxhzqkGreaterThanOrEqualTo(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk >=", value, "qyyzkdgjqykjcxhzqk");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsValueLessThan(String value) {
-			addCriterion("xqjjfs_value <", value, "xqjjfsValue");
+		public Criteria andQyyzkdgjqykjcxhzqkLessThan(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk <", value, "qyyzkdgjqykjcxhzqk");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsValueLessThanOrEqualTo(String value) {
-			addCriterion("xqjjfs_value <=", value, "xqjjfsValue");
+		public Criteria andQyyzkdgjqykjcxhzqkLessThanOrEqualTo(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk <=", value, "qyyzkdgjqykjcxhzqk");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsValueLike(String value) {
-			addCriterion("xqjjfs_value like", value, "xqjjfsValue");
+		public Criteria andQyyzkdgjqykjcxhzqkLike(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk like", value, "qyyzkdgjqykjcxhzqk");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsValueNotLike(String value) {
-			addCriterion("xqjjfs_value not like", value, "xqjjfsValue");
+		public Criteria andQyyzkdgjqykjcxhzqkNotLike(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk not like", value, "qyyzkdgjqykjcxhzqk");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsValueIn(List<String> values) {
-			addCriterion("xqjjfs_value in", values, "xqjjfsValue");
+		public Criteria andQyyzkdgjqykjcxhzqkIn(List<String> values) {
+			addCriterion("qyyzkdgjqykjcxhzqk in", values, "qyyzkdgjqykjcxhzqk");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsValueNotIn(List<String> values) {
-			addCriterion("xqjjfs_value not in", values, "xqjjfsValue");
+		public Criteria andQyyzkdgjqykjcxhzqkNotIn(List<String> values) {
+			addCriterion("qyyzkdgjqykjcxhzqk not in", values, "qyyzkdgjqykjcxhzqk");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsValueBetween(String value1, String value2) {
-			addCriterion("xqjjfs_value between", value1, value2, "xqjjfsValue");
+		public Criteria andQyyzkdgjqykjcxhzqkBetween(String value1, String value2) {
+			addCriterion("qyyzkdgjqykjcxhzqk between", value1, value2, "qyyzkdgjqykjcxhzqk");
 			return (Criteria) this;
 		}
 
-		public Criteria andXqjjfsValueNotBetween(String value1, String value2) {
-			addCriterion("xqjjfs_value not between", value1, value2, "xqjjfsValue");
+		public Criteria andQyyzkdgjqykjcxhzqkNotBetween(String value1, String value2) {
+			addCriterion("qyyzkdgjqykjcxhzqk not between", value1, value2, "qyyzkdgjqykjcxhzqk");
 			return (Criteria) this;
 		}
 
@@ -6764,150 +6574,140 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andQyyzkdgjqykjcxhzqkIsNull() {
-			addCriterion("qyyzkdgjqykjcxhzqk is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andQyyzkdgjqykjcxhzqkIsNotNull() {
-			addCriterion("qyyzkdgjqykjcxhzqk is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andQyyzkdgjqykjcxhzqkEqualTo(String value) {
-			addCriterion("qyyzkdgjqykjcxhzqk =", value, "qyyzkdgjqykjcxhzqk");
+		public Criteria andZyhzfsValueIsNull() {
+			addCriterion("zyhzfs_value is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andQyyzkdgjqykjcxhzqkNotEqualTo(String value) {
-			addCriterion("qyyzkdgjqykjcxhzqk <>", value, "qyyzkdgjqykjcxhzqk");
+		public Criteria andZyhzfsValueIsNotNull() {
+			addCriterion("zyhzfs_value is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andQyyzkdgjqykjcxhzqkGreaterThan(String value) {
-			addCriterion("qyyzkdgjqykjcxhzqk >", value, "qyyzkdgjqykjcxhzqk");
+		public Criteria andZyhzfsValueEqualTo(String value) {
+			addCriterion("zyhzfs_value =", value, "zyhzfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andQyyzkdgjqykjcxhzqkGreaterThanOrEqualTo(String value) {
-			addCriterion("qyyzkdgjqykjcxhzqk >=", value, "qyyzkdgjqykjcxhzqk");
+		public Criteria andZyhzfsValueNotEqualTo(String value) {
+			addCriterion("zyhzfs_value <>", value, "zyhzfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andQyyzkdgjqykjcxhzqkLessThan(String value) {
-			addCriterion("qyyzkdgjqykjcxhzqk <", value, "qyyzkdgjqykjcxhzqk");
+		public Criteria andZyhzfsValueGreaterThan(String value) {
+			addCriterion("zyhzfs_value >", value, "zyhzfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andQyyzkdgjqykjcxhzqkLessThanOrEqualTo(String value) {
-			addCriterion("qyyzkdgjqykjcxhzqk <=", value, "qyyzkdgjqykjcxhzqk");
+		public Criteria andZyhzfsValueGreaterThanOrEqualTo(String value) {
+			addCriterion("zyhzfs_value >=", value, "zyhzfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andQyyzkdgjqykjcxhzqkLike(String value) {
-			addCriterion("qyyzkdgjqykjcxhzqk like", value, "qyyzkdgjqykjcxhzqk");
+		public Criteria andZyhzfsValueLessThan(String value) {
+			addCriterion("zyhzfs_value <", value, "zyhzfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andQyyzkdgjqykjcxhzqkNotLike(String value) {
-			addCriterion("qyyzkdgjqykjcxhzqk not like", value, "qyyzkdgjqykjcxhzqk");
+		public Criteria andZyhzfsValueLessThanOrEqualTo(String value) {
+			addCriterion("zyhzfs_value <=", value, "zyhzfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andQyyzkdgjqykjcxhzqkIn(List<String> values) {
-			addCriterion("qyyzkdgjqykjcxhzqk in", values, "qyyzkdgjqykjcxhzqk");
+		public Criteria andZyhzfsValueLike(String value) {
+			addCriterion("zyhzfs_value like", value, "zyhzfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andQyyzkdgjqykjcxhzqkNotIn(List<String> values) {
-			addCriterion("qyyzkdgjqykjcxhzqk not in", values, "qyyzkdgjqykjcxhzqk");
+		public Criteria andZyhzfsValueNotLike(String value) {
+			addCriterion("zyhzfs_value not like", value, "zyhzfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andQyyzkdgjqykjcxhzqkBetween(String value1, String value2) {
-			addCriterion("qyyzkdgjqykjcxhzqk between", value1, value2, "qyyzkdgjqykjcxhzqk");
+		public Criteria andZyhzfsValueIn(List<String> values) {
+			addCriterion("zyhzfs_value in", values, "zyhzfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andQyyzkdgjqykjcxhzqkNotBetween(String value1, String value2) {
-			addCriterion("qyyzkdgjqykjcxhzqk not between", value1, value2, "qyyzkdgjqykjcxhzqk");
+		public Criteria andZyhzfsValueNotIn(List<String> values) {
+			addCriterion("zyhzfs_value not in", values, "zyhzfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andZyhzfsValueIsNull() {
-			addCriterion("zyhzfs_value is null");
+		public Criteria andZyhzfsValueBetween(String value1, String value2) {
+			addCriterion("zyhzfs_value between", value1, value2, "zyhzfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andZyhzfsValueIsNotNull() {
-			addCriterion("zyhzfs_value is not null");
+		public Criteria andZyhzfsValueNotBetween(String value1, String value2) {
+			addCriterion("zyhzfs_value not between", value1, value2, "zyhzfsValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andZyhzfsValueEqualTo(String value) {
-			addCriterion("zyhzfs_value =", value, "zyhzfsValue");
+		public Criteria andCreateTimeIsNull() {
+			addCriterion("create_time is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andZyhzfsValueNotEqualTo(String value) {
-			addCriterion("zyhzfs_value <>", value, "zyhzfsValue");
+		public Criteria andCreateTimeIsNotNull() {
+			addCriterion("create_time is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andZyhzfsValueGreaterThan(String value) {
-			addCriterion("zyhzfs_value >", value, "zyhzfsValue");
+		public Criteria andCreateTimeEqualTo(Date value) {
+			addCriterion("create_time =", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andZyhzfsValueGreaterThanOrEqualTo(String value) {
-			addCriterion("zyhzfs_value >=", value, "zyhzfsValue");
+		public Criteria andCreateTimeNotEqualTo(Date value) {
+			addCriterion("create_time <>", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andZyhzfsValueLessThan(String value) {
-			addCriterion("zyhzfs_value <", value, "zyhzfsValue");
+		public Criteria andCreateTimeGreaterThan(Date value) {
+			addCriterion("create_time >", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andZyhzfsValueLessThanOrEqualTo(String value) {
-			addCriterion("zyhzfs_value <=", value, "zyhzfsValue");
+		public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("create_time >=", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andZyhzfsValueLike(String value) {
-			addCriterion("zyhzfs_value like", value, "zyhzfsValue");
+		public Criteria andCreateTimeLessThan(Date value) {
+			addCriterion("create_time <", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andZyhzfsValueNotLike(String value) {
-			addCriterion("zyhzfs_value not like", value, "zyhzfsValue");
+		public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+			addCriterion("create_time <=", value, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andZyhzfsValueIn(List<String> values) {
-			addCriterion("zyhzfs_value in", values, "zyhzfsValue");
+		public Criteria andCreateTimeIn(List<Date> values) {
+			addCriterion("create_time in", values, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andZyhzfsValueNotIn(List<String> values) {
-			addCriterion("zyhzfs_value not in", values, "zyhzfsValue");
+		public Criteria andCreateTimeNotIn(List<Date> values) {
+			addCriterion("create_time not in", values, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andZyhzfsValueBetween(String value1, String value2) {
-			addCriterion("zyhzfs_value between", value1, value2, "zyhzfsValue");
+		public Criteria andCreateTimeBetween(Date value1, Date value2) {
+			addCriterion("create_time between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andZyhzfsValueNotBetween(String value1, String value2) {
-			addCriterion("zyhzfs_value not between", value1, value2, "zyhzfsValue");
+		public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+			addCriterion("create_time not between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
+	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 2 - 1
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -80,8 +80,9 @@ public class ExportExcelUtil {
 		//设置换行
 		for(int i = 0; i < comment.length; i++){
 			if (i==0) {
-				sheet.setColumnWidth(i, 1000);//设置列宽	
+				sheet.setColumnWidth(i, 1500);//设置列宽	
 			}else {
+//				sheet.autoSizeColumn(i,true); 
 				sheet.setColumnWidth(i, 3000);//设置列宽
 			}
 			XSSFCell c = row2.createCell(i);

+ 21 - 40
src/main/java/com/goafanti/demandCollection/bo/OutDemandCollection.java

@@ -73,8 +73,6 @@ public class OutDemandCollection {
 	private String nsqdsjxmValue;
 	private String sqskjzgbmxxdwgkfb;
 	private String sqskjzgbmxxdwgkfbValue;
-	private String tbr;
-	private String tbrsj;
 	private String jsfzr;
 	private String jsfsj;
 	private String xqmc;
@@ -965,21 +963,6 @@ public class OutDemandCollection {
 
 
 
-	public String getTbr() {
-		return tbr;
-	}
-
-	public void setTbr(String tbr) {
-		this.tbr = tbr;
-	}
-
-	public String getTbrsj() {
-		return tbrsj;
-	}
-
-	public void setTbrsj(String tbrsj) {
-		this.tbrsj = tbrsj;
-	}
 
 	public String getJsfzr() {
 		return jsfzr;
@@ -1220,19 +1203,6 @@ public class OutDemandCollection {
 		this.xqjjjzsj = xqjjjzsj;
 	}
 
-	public String getXqsfkegk() {
-		if (xqsfkegk == null)
-			return "";
-		if (xqsfkegk.equals("1"))
-			return "是";
-		else if (xqsfkegk.equals("0"))
-			return "否";
-		return xqsfkegk;
-	}
-
-	public void setXqsfkegk(String xqsfkegk) {
-		this.xqsfkegk = xqsfkegk;
-	}
 
 	public String getWjjjsntntgdhzzj() {
 		return wjjjsntntgdhzzj;
@@ -1343,16 +1313,27 @@ public class OutDemandCollection {
 		this.yysjjysptValue = yysjjysptValue;
 	}
 	public String getSqskjzgbmxxdwgkfb() {
-		if (sqskjzgbmxxdwgkfb == null)
-			return "";
-		else if   (sqskjzgbmxxdwgkfb.equals("0"))
-			return "其他,请具体描述同意授权公开的范围内容";
-		else if (sqskjzgbmxxdwgkfb.equals("1"))
-			return "同意授权公开单位信息";
-		else if (sqskjzgbmxxdwgkfb.equals("2"))
-			return "同意授权公开成果信息";
-		else if (sqskjzgbmxxdwgkfb.equals("3"))
-			return "不同意授权";
+		if (sqskjzgbmxxdwgkfb != null) {
+			String str = sqskjzgbmxxdwgkfb;
+			String str2 = "";
+			String s[] = str.split(",");
+			//1人员交流 2引进、联合培养人3技术转移 4信息资料交流 5合作研发 6设立联合研发机构/平台/网络
+			for (String string : s) {
+				if (string.equals("0"))
+					str2 = str2 + sqskjzgbmxxdwgkfbValue + ",";
+				else if (string.equals("1"))
+					str2 = str2 + "同意授权公开单位信息,";
+				else if (string.equals("2"))
+					str2 = str2 + "同意授权公成果信息,";
+				else if (string.equals("3"))
+					str2 = str2 + "同意授权公需求位信息,";
+				else if (string.equals("4"))
+					str2 = str2 + "不同意授权,";
+				
+			}
+			str2 = str2.substring(0, str2.length() - 1);
+			return str2;
+		}
 		return sqskjzgbmxxdwgkfb;
 	}
 

+ 14 - 21
src/main/java/com/goafanti/demandCollection/service/impl/DemandCollectionServiceImpl.java

@@ -1,6 +1,5 @@
 package com.goafanti.demandCollection.service.impl;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
@@ -9,7 +8,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
@@ -74,11 +72,10 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 					"是否有产学研合作", "是否已获机构投资者投资 ", "成果名称", "成果领域", "成果属性", "成果体现形式", "成果成熟度", "成果知识产权形式", "知识产权权属 ",
 					"专利状态", "成果登记情况", "拟采取成果转移转化方式自主转化 ", "拟采取成果转移转化方式合作开发 ", "拟采取成果转移转化方式技术转让 ", "预计可转移转化时间", "成果简述",
 					"是否有成果合作需求", "是否有意向合作单位", "意向合作单位", "意向合作方式", "企业已展开的国际与区域科技创新合作方式", "主要合作方式 ", "已享受的科技政策",
-					"拟申请的省级项目", "是否授权省科技主管部门将上述有关信息对外公开发布", "同意授权公开的范围内容", "填报人", "填报人手机", "技术负责人", "技术负责人手机", "需求名称",
-					"需求类别", "技术需求类型", "需求领域", "目前产品技术现状", "研发难点", "预期达到的效果(主要技术指标、技术成熟度、条件、成本等)", "已经开展的工作",
-					"现有研发条件情况(人员情况、仪器设备投入等)", "目前合作对象情况(合作对象、方式、已投入研发资金情况等)", "是否有下一步合作需求", "意向合作对象", "合作单位名称",
-					"拟采取的合作方式", "需求解决截止时间", "需求是否可以公开 ", "为解决技术难题能提供的合作资金", "资金用途", "资金缺口", "需求解决方式", "企业产品是否有销往国外",
-					"企业产品是否有意向出口", "创建时间" };
+					"拟申请的省级项目", "是否授权省科技主管部门将上述有关信息对外公开发布", "技术负责人", "技术负责人手机", "需求名称", "需求类别", "技术需求类型", "需求领域",
+					"目前产品技术现状", "研发难点", "预期达到的效果(主要技术指标、技术成熟度、条件、成本等)", "已经开展的工作", "现有研发条件情况(人员情况、仪器设备投入等)",
+					"目前合作对象情况(合作对象、方式、已投入研发资金情况等)", "是否有下一步合作需求", "意向合作对象", "合作单位名称", "拟采取的合作方式", "需求解决截止时间",
+					"需求是否可以公开 ", "为解决技术难题能提供的合作资金", "资金用途", "资金缺口", "需求解决方式", "企业产品是否有销往国外", "企业产品是否有意向出口", "创建时间" };
     		String fileName ="需求征集表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
     		XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"需求征集表");
     		//根据列表编写文档
@@ -87,9 +84,10 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 			styleTitle.setAlignment(HorizontalAlignment.CENTER);
 			styleTitle.setWrapText(true);
     		for (OutDemandCollection ob : (List<OutDemandCollection>)list) {
+    			int x=0;
+    			
     			//新增一行
     			XSSFRow r = sheet.createRow(sheet.getLastRowNum()+1);
-    			
     			for (int i = 0; i < comment.length; i++) {
     				//当前列的只
     				String o = "";
@@ -152,14 +150,15 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				case "是否有意向合作单位" : o = ob.getSfyyxhzdw(); break;
     				case "意向合作单位" : o = ob.getSfyyxhzdwValue(); break;
     				case "意向合作方式" : o = ob.getYxhzfs(); break;
-    				case "企业已展开的国际与区域科技创新合作方式" : o = ob.getQyyzkdgjqykjcxhzqk(); break;
+    				case "企业已展开的国际与区域科技创新合作方式" : o = ob.getQyyzkdgjqykjcxhzqk();
+    					if (x==0)sheet.setColumnWidth(i, 10000);
+    				break;
     				case "主要合作方式 " : o = ob.getZyhzfs(); break;
     				case "已享受的科技政策" : o = ob.getYssdkjzc(); break;
     				case "拟申请的省级项目" : o = ob.getNsqdsjxm(); break; 
-    				case "是否授权省科技主管部门将上述有关信息对外公开发布" : o = ob.getSqskjzgbmxxdwgkfb(); break;
-    				case "同意授权公开的范围内容" : o = ob.getSqskjzgbmxxdwgkfbValue(); break;
-    				case "填报人" : o = ob.getTbr(); break; 
-    				case "填报人手机" : o = ob.getTbrsj(); break; 
+    				case "是否授权省科技主管部门将上述有关信息对外公开发布" : o = ob.getSqskjzgbmxxdwgkfb(); 
+    					if (x==0)sheet.setColumnWidth(i, 10000);
+    				break;
     				case "技术负责人" : o = ob.getJsfzr(); break; 
     				case "技术负责人手机" : o = ob.getJsfsj(); break; 
     				case "需求名称" : o = ob.getXqmc(); break; 
@@ -177,7 +176,6 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				case "合作单位名称" : o = ob.getYxhzdxValue(); break;
     				case "拟采取的合作方式" : o = ob.getNcqdhzfs(); break; 
     				case "需求解决截止时间" : o = ob.getXqjjjzsj(); break; 
-    				case "需求是否可以公开 " : o = ob.getXqsfkegk(); break; 
     				case "为解决技术难题能提供的合作资金" : o = ob.getWjjjsntntgdhzzj(); break; 
     				case "资金用途" : o = ob.getZjyt(); break; 
     				case "资金缺口" : o = ob.getZjqk(); break; 
@@ -188,17 +186,12 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				default: o = ""; break;
     				}
     				XSSFCell c = r.createCell(i);
-    				sheet.autoSizeColumn(i,true); 
     				c.setCellStyle(styleTitle);
-    				if (sheet.getColumnWidth(i)>10000) {
-    					sheet.setColumnWidth(i, 10000);
-					}else {
-						sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 12 / 10);
-					}
     				c.setCellValue(o);
     			}
+    			
+    			x++;
     		}
-    		logger.debug("导出传参ok");    		
     		//返回名称及参数
 			 response.addHeader("Content-Disposition", "attachment;filename="  + new String(fileName.getBytes(),"iso-8859-1"));  
 			 response.setContentType("application/octet-stream;charset=utf-8");