Explorar el Código

update

Signed-off-by: anderx <312518615@qq.com>
anderx hace 5 años
padre
commit
ebfb8f189d

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

+ 58 - 43
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 Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="dwmc" jdbcType="VARCHAR" property="dwmc" />
@@ -72,6 +72,7 @@
     <result column="yssdkjzc" jdbcType="INTEGER" property="yssdkjzc" />
     <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_value" jdbcType="VARCHAR" property="sqskjzgbmxxdwgkfbValue" />
     <result column="tbr" jdbcType="VARCHAR" property="tbr" />
@@ -105,7 +106,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -139,7 +140,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -173,7 +174,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     id, dwmc, dwxz, dwxz_value, htly, ssszp, ssszc, ssyq, yysjjyspt, frdb, tyshxydm, 
     jjgm, rygm, clsj, zczb, txdz, yb, lxr, lxdh, email, zyywjhxcp, ndxmzyywsr18, ndxmjlr18, 
@@ -182,16 +183,16 @@
     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, 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
+    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
   </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 Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     select
     <if test="distinct">
@@ -210,7 +211,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -221,7 +222,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     delete from demand_collection
     where id = #{id,jdbcType=INTEGER}
@@ -230,7 +231,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     delete from demand_collection
     <if test="_parameter != null">
@@ -241,7 +242,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     insert into demand_collection (id, dwmc, dwxz, 
       dwxz_value, htly, ssszp, 
@@ -263,17 +264,17 @@
       ncqcgzyzhfsjszr, yjkzyzhsj, cgjs, 
       sfycghzxq, sfyyxhzdw, sfyyxhzdw_value, 
       yxhzfs, yxhzfs_value, yssdkjzc, 
-      yssdkjzc_value, nsqdsjxm, 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
-      )
+      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}, #{ssyq,jdbcType=VARCHAR}, #{yysjjyspt,jdbcType=VARCHAR}, 
@@ -294,23 +295,23 @@
       #{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}, #{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}
-      )
+      #{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 Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     insert into demand_collection
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -509,6 +510,9 @@
       <if test="nsqdsjxm != null">
         nsqdsjxm,
       </if>
+      <if test="nsqdsjxmValue != null">
+        nsqdsjxm_value,
+      </if>
       <if test="sqskjzgbmxxdwgkfb != null">
         sqskjzgbmxxdwgkfb,
       </if>
@@ -790,6 +794,9 @@
       <if test="nsqdsjxm != null">
         #{nsqdsjxm,jdbcType=INTEGER},
       </if>
+      <if test="nsqdsjxmValue != null">
+        #{nsqdsjxmValue,jdbcType=VARCHAR},
+      </if>
       <if test="sqskjzgbmxxdwgkfb != null">
         #{sqskjzgbmxxdwgkfb,jdbcType=INTEGER},
       </if>
@@ -880,7 +887,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     select count(*) from demand_collection
     <if test="_parameter != null">
@@ -891,7 +898,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1090,6 +1097,9 @@
       <if test="record.nsqdsjxm != null">
         nsqdsjxm = #{record.nsqdsjxm,jdbcType=INTEGER},
       </if>
+      <if test="record.nsqdsjxmValue != null">
+        nsqdsjxm_value = #{record.nsqdsjxmValue,jdbcType=VARCHAR},
+      </if>
       <if test="record.sqskjzgbmxxdwgkfb != null">
         sqskjzgbmxxdwgkfb = #{record.sqskjzgbmxxdwgkfb,jdbcType=INTEGER},
       </if>
@@ -1183,7 +1193,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     update demand_collection
     set id = #{record.id,jdbcType=INTEGER},
@@ -1251,6 +1261,7 @@
       yssdkjzc = #{record.yssdkjzc,jdbcType=INTEGER},
       yssdkjzc_value = #{record.yssdkjzcValue,jdbcType=VARCHAR},
       nsqdsjxm = #{record.nsqdsjxm,jdbcType=INTEGER},
+      nsqdsjxm_value = #{record.nsqdsjxmValue,jdbcType=VARCHAR},
       sqskjzgbmxxdwgkfb = #{record.sqskjzgbmxxdwgkfb,jdbcType=INTEGER},
       sqskjzgbmxxdwgkfb_value = #{record.sqskjzgbmxxdwgkfbValue,jdbcType=VARCHAR},
       tbr = #{record.tbr,jdbcType=VARCHAR},
@@ -1287,7 +1298,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1483,6 +1494,9 @@
       <if test="nsqdsjxm != null">
         nsqdsjxm = #{nsqdsjxm,jdbcType=INTEGER},
       </if>
+      <if test="nsqdsjxmValue != null">
+        nsqdsjxm_value = #{nsqdsjxmValue,jdbcType=VARCHAR},
+      </if>
       <if test="sqskjzgbmxxdwgkfb != null">
         sqskjzgbmxxdwgkfb = #{sqskjzgbmxxdwgkfb,jdbcType=INTEGER},
       </if>
@@ -1574,7 +1588,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 11:00:32 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     update demand_collection
     set dwmc = #{dwmc,jdbcType=VARCHAR},
@@ -1641,6 +1655,7 @@
       yssdkjzc = #{yssdkjzc,jdbcType=INTEGER},
       yssdkjzc_value = #{yssdkjzcValue,jdbcType=VARCHAR},
       nsqdsjxm = #{nsqdsjxm,jdbcType=INTEGER},
+      nsqdsjxm_value = #{nsqdsjxmValue,jdbcType=VARCHAR},
       sqskjzgbmxxdwgkfb = #{sqskjzgbmxxdwgkfb,jdbcType=INTEGER},
       sqskjzgbmxxdwgkfb_value = #{sqskjzgbmxxdwgkfbValue,jdbcType=VARCHAR},
       tbr = #{tbr,jdbcType=VARCHAR},
@@ -1676,9 +1691,9 @@
 	  select a.id,dwmc,dwxz,dwxz_value dwxzValue ,htly,b.name ssszp,c.name ssszc,ssyq,yysjjyspt,frdb,tyshxydm,jjgm,rygm,
 	  zczb,txdz,yb,lxr,lxdh,email,zyywjhxcp,ndxmzyywsr18,ndxmjlr18,ndxmzyywsr19,ndxmjlr19,ndyftr,ndyftrzyysrbl,sfchyhdk,
 	  sfchyhdk_value sfchyhdkValue,sfwgxjsqy,sfwgxjsqy_value sfwgxjsqyValue,sfwkjxzxqy,sfwkjxzxqy_value sfwkjxzxqyValue,
-	  zlsl,zlsl_fmzl zlslFmzl,zlsl_syxx zlslSyxx,sfchkjzxzj,sfycxyz,sfycxyz_value sfycxyzValue,sfyhjgtzztz,
+	  zlsl,zlsl_fmzl zlslFmzl,zlsl_syxx zlslSyxx,sfchkjzxzj,sfycxyz,sfycxyz_value sfycxyzValue,sfyhjgtzztz,nsqdsjxm_value nsqdsjxmValue,
 	  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,
+	  cgdjqk_value cgdjqkValue,ncqcgzyzhfszzzh,ncqcgzyzhfshzkf,ncqcgzyzhfsjszr, yjkzyzhsj,cgjs,sfycghzxq,sfyyxhzdw,clsj,
 	  sfyyxhzdw_value sfyyxhzdwValue,yxhzfs,yxhzfs_value yxhzfsValue,yssdkjzc,yssdkjzc_value yssdkjzcValue,nsqdsjxm,
 	  sqskjzgbmxxdwgkfb,tbr,tbrsj,jsfzr,jsfsj,xqmc,xqbl,jsxqlx,xqly, mqcpjsxz,yfnd,yqdddxg,yjzkdgz,xyyftjqk,mqhzdxqk,
 	  sfyxybhzxq,yxhzdx,yxhzdx_value yxhzdxValue,ncqdhzfs,ncqdhzfs_value ncqdhzfsValue, xqjjjzsj,xqsfkegk,wjjjsntntgdhzzj,

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 302 - 279
src/main/java/com/goafanti/common/model/DemandCollection.java


+ 86 - 16
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  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 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  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 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  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 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  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 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  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 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  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 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  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 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  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 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  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 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  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 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  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 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  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -4404,6 +4404,76 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
+		public Criteria andNsqdsjxmValueIsNull() {
+			addCriterion("nsqdsjxm_value is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andNsqdsjxmValueIsNotNull() {
+			addCriterion("nsqdsjxm_value is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andNsqdsjxmValueEqualTo(String value) {
+			addCriterion("nsqdsjxm_value =", value, "nsqdsjxmValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andNsqdsjxmValueNotEqualTo(String value) {
+			addCriterion("nsqdsjxm_value <>", value, "nsqdsjxmValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andNsqdsjxmValueGreaterThan(String value) {
+			addCriterion("nsqdsjxm_value >", value, "nsqdsjxmValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andNsqdsjxmValueGreaterThanOrEqualTo(String value) {
+			addCriterion("nsqdsjxm_value >=", value, "nsqdsjxmValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andNsqdsjxmValueLessThan(String value) {
+			addCriterion("nsqdsjxm_value <", value, "nsqdsjxmValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andNsqdsjxmValueLessThanOrEqualTo(String value) {
+			addCriterion("nsqdsjxm_value <=", value, "nsqdsjxmValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andNsqdsjxmValueLike(String value) {
+			addCriterion("nsqdsjxm_value like", value, "nsqdsjxmValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andNsqdsjxmValueNotLike(String value) {
+			addCriterion("nsqdsjxm_value not like", value, "nsqdsjxmValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andNsqdsjxmValueIn(List<String> values) {
+			addCriterion("nsqdsjxm_value in", values, "nsqdsjxmValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andNsqdsjxmValueNotIn(List<String> values) {
+			addCriterion("nsqdsjxm_value not in", values, "nsqdsjxmValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andNsqdsjxmValueBetween(String value1, String value2) {
+			addCriterion("nsqdsjxm_value between", value1, value2, "nsqdsjxmValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andNsqdsjxmValueNotBetween(String value1, String value2) {
+			addCriterion("nsqdsjxm_value not between", value1, value2, "nsqdsjxmValue");
+			return (Criteria) this;
+		}
+
 		public Criteria andSqskjzgbmxxdwgkfbIsNull() {
 			addCriterion("sqskjzgbmxxdwgkfb is null");
 			return (Criteria) this;
@@ -6297,7 +6367,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table demand_collection
-	 * @mbg.generated  Thu Jul 09 11:00:32 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -78,7 +78,11 @@ public class ExportExcelUtil {
 		//创建表头
 		XSSFRow row2 = sheet.createRow(1);
 		for(int i = 0; i < comment.length; i++){
-			sheet.setColumnWidth(i, 3000);//设置列宽
+			if (i==0) {
+				sheet.setColumnWidth(i, 1000);//设置列宽	
+			}else {
+				sheet.setColumnWidth(i, 3000);//设置列宽
+			}
 			XSSFCell c = row2.createCell(i);
 			c.setCellValue(comment[i]);
 			c.setCellStyle(style2);

+ 8 - 1
src/main/java/com/goafanti/demandCollection/bo/OutDemandCollection.java

@@ -66,6 +66,7 @@ public class OutDemandCollection {
 	private String yssdkjzc;
 	private String yssdkjzcValue;
 	private String nsqdsjxm;
+	private String nsqdsjxmValue;
 	private String sqskjzgbmxxdwgkfb;
 	private String sqskjzgbmxxdwgkfbValue;
 	private String tbr;
@@ -669,7 +670,7 @@ public class OutDemandCollection {
 	}
 	public String getNsqdsjxm() {
 		if(nsqdsjxm==null)return "";
-		if(nsqdsjxm.equals("0")) return "其他";
+		if(nsqdsjxm.equals("0")) return nsqdsjxmValue;
 		else if(nsqdsjxm.equals("1"))return "研发奖补 ";
 		else if(nsqdsjxm.equals("2"))return "省重点研发计划";
 		else if(nsqdsjxm.equals("3"))return "省科技人才计划";
@@ -915,6 +916,12 @@ public class OutDemandCollection {
 	public void setClsj(String clsj) {
 		this.clsj = clsj;
 	}
+	public String getNsqdsjxmValue() {
+		return nsqdsjxmValue;
+	}
+	public void setNsqdsjxmValue(String nsqdsjxmValue) {
+		this.nsqdsjxmValue = nsqdsjxmValue;
+	}
 	
 	
 	

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

@@ -64,13 +64,13 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 					"统一社会信用代码", "经济规模", "人员规模", "成立时间", "注册资本", "通讯地址", "邮编", "联系人", "联系电话", "email", "主营业务及核心产品(服务)",
 					"2018年度项目主营业务收入(万元)", "2018年度项目净利润(万元)", "2019年度项目主营业务收入(万元)", "2019年度项目净利润(万元)", "年度研发投入",
 					"年度研发投入占营业收入比例", "是否曾获银行贷款", "银行贷款", "是否为高新技术企业编号 ", "高企证书编号 ", "是否为科技型中小企业", "科企证书编号", "专利数量",
-					"发明专利", "实用新型", "是否曾获科技专项资金", "是否有产学研合作", "是否已获机构投资者投资 ", "成果名称","成果领域", "成果属性", "成果体现形式", "成果成熟度",
+					"发明专利", "实用新型", "是否曾获科技专项资金", "是否有产学研合作", "是否已获机构投资者投资 ", "成果名称", "成果领域", "成果属性", "成果体现形式", "成果成熟度",
 					"成果知识产权形式", "知识产权权属 ", "专利状态", "成果登记情况", "拟采取成果转移转化方式自主转化 ", "拟采取成果转移转化方式合作开发 ", "拟采取成果转移转化方式技术转让 ",
-					"预计可转移转化时间", "成果简述", "是否有成果合作需求", "是否有意向合作单位", "是否有意向合作单位", "意向合作方式", "意向合作方式", "已享受的科技政策",
-					"拟申请的省级项目", "是否授权省科技主管部门将上述有关信息对外公开发布", "填报人", "填报人手机", "技术负责人", "技术负责人手机", "需求名称", "需求类别",
-					"技术需求类型", "需求领域", "目前产品技术现状", "研发难点", "预期达到的效果(主要技术指标、技术成熟度、条件、成本等)", "已经开展的工作",
-					"现有研发条件情况(人员情况、仪器设备投入等)", "目前合作对象情况(合作对象、方式、已投入研发资金情况等)", "是否有下一步合作需求", "意向合作对象", "意向合作对象",
-					"拟采取的合作方式", "需求解决截止时间", "需求是否可以公开 ", "为解决技术难题能提供的合作资金", "资金用途", "资金缺口", "需求解决方式", "创建时间" };
+					"预计可转移转化时间", "成果简述", "是否有成果合作需求", "是否有意向合作单位", "意向合作单位", "意向合作方式", "已享受的科技政策", "拟申请的省级项目",
+					"是否授权省科技主管部门将上述有关信息对外公开发布","同意授权公开的范围内容", "填报人", "填报人手机", "技术负责人", "技术负责人手机", "需求名称", "需求类别", "技术需求类型", "需求领域",
+					"目前产品技术现状", "研发难点", "预期达到的效果(主要技术指标、技术成熟度、条件、成本等)", "已经开展的工作", "现有研发条件情况(人员情况、仪器设备投入等)",
+					"目前合作对象情况(合作对象、方式、已投入研发资金情况等)", "是否有下一步合作需求", "意向合作对象", "意向合作对象", "拟采取的合作方式", "需求解决截止时间",
+					"需求是否可以公开 ", "为解决技术难题能提供的合作资金", "资金用途", "资金缺口", "需求解决方式", "创建时间" };
     		String fileName ="需求征集表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
     		//type 0 变更
     		XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"需求征集表");
@@ -115,7 +115,7 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				case "是否为高新技术企业编号 " : o = ob.getSfwgxjsqy(); break;
     				case "高企证书编号 " : o = ob.getSfwgxjsqyValue(); break;
     				case "是否为科技型中小企业" : o = ob.getSfwkjxzxqy(); break;
-    				case "科企证书编号" : o = ob.getSfwkjxzxqy(); break;
+    				case "科企证书编号" : o = ob.getSfwkjxzxqyValue(); break;
     				case "专利数量" : o = ob.getZlsl(); break; 
     				case "发明专利" : o = ob.getZlslFmzl(); break; 
     				case "实用新型" : o = ob.getZlslSyxx(); break;