Browse Source

Merge branch 'test' of jishutao/jitao-server into prod

anderx 6 years ago
parent
commit
1fd583045c

+ 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 CST 2020
 	 */
 	int updateByPrimaryKey(DemandCollection record);
 }

+ 145 - 83
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 08:56:04 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" />
@@ -47,7 +47,8 @@
     <result column="sfycxyz" jdbcType="INTEGER" property="sfycxyz" />
     <result column="sfycxyz_value" jdbcType="VARCHAR" property="sfycxyzValue" />
     <result column="sfyhjgtzztz" jdbcType="VARCHAR" property="sfyhjgtzztz" />
-    <result column="sfyhjgtzztz_value" jdbcType="DECIMAL" property="sfyhjgtzztzValue" />
+    <result column="sfyhjgtzztz_value" jdbcType="VARCHAR" property="sfyhjgtzztzValue" />
+    <result column="cgmc" jdbcType="VARCHAR" property="cgmc" />
     <result column="cgly" jdbcType="INTEGER" property="cgly" />
     <result column="cgsx" jdbcType="VARCHAR" property="cgsx" />
     <result column="cgtxxs" jdbcType="INTEGER" property="cgtxxs" />
@@ -58,9 +59,9 @@
     <result column="zlzt" jdbcType="INTEGER" property="zlzt" />
     <result column="cgdjqk" jdbcType="INTEGER" property="cgdjqk" />
     <result column="cgdjqk_value" jdbcType="VARCHAR" property="cgdjqkValue" />
-    <result column="ncqcgzyzhfszzzh" jdbcType="INTEGER" property="ncqcgzyzhfszzzh" />
-    <result column="ncqcgzyzhfshzkf" jdbcType="INTEGER" property="ncqcgzyzhfshzkf" />
-    <result column="ncqcgzyzhfsjszr" jdbcType="INTEGER" property="ncqcgzyzhfsjszr" />
+    <result column="ncqcgzyzhfszzzh" jdbcType="VARCHAR" property="ncqcgzyzhfszzzh" />
+    <result column="ncqcgzyzhfshzkf" jdbcType="VARCHAR" property="ncqcgzyzhfshzkf" />
+    <result column="ncqcgzyzhfsjszr" jdbcType="VARCHAR" property="ncqcgzyzhfsjszr" />
     <result column="yjkzyzhsj" jdbcType="INTEGER" property="yjkzyzhsj" />
     <result column="cgjs" jdbcType="VARCHAR" property="cgjs" />
     <result column="sfycghzxq" jdbcType="INTEGER" property="sfycghzxq" />
@@ -71,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" />
@@ -104,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 08:56:04 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -138,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 08:56:04 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -172,25 +174,25 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 08:56:04 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, 
     ndxmzyywsr19, ndxmjlr19, ndyftr, ndyftrzyysrbl, sfchyhdk, sfchyhdk_value, sfwgxjsqy, 
     sfwgxjsqy_value, sfwkjxzxqy, sfwkjxzxqy_value, zlsl, zlsl_fmzl, zlsl_syxx, sfchkjzxzj, 
-    sfycxyz, sfycxyz_value, sfyhjgtzztz, sfyhjgtzztz_value, 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
+    sfycxyz, sfycxyz_value, sfyhjgtzztz, sfyhjgtzztz_value, cgmc, cgly, cgsx, cgtxxs, 
+    cgtxxs_value, cgcsd, cgzscqxs, zscqqs, zlzt, cgdjqk, cgdjqk_value, ncqcgzyzhfszzzh, 
+    ncqcgzyzhfshzkf, ncqcgzyzhfsjszr, yjkzyzhsj, cgjs, sfycghzxq, sfyyxhzdw, sfyyxhzdw_value, 
+    yxhzfs, yxhzfs_value, yssdkjzc, yssdkjzc_value, nsqdsjxm, nsqdsjxm_value, sqskjzgbmxxdwgkfb, 
+    sqskjzgbmxxdwgkfb_value, tbr, tbrsj, jsfzr, jsfsj, xqmc, xqbl, jsxqlx, xqly, mqcpjsxz, 
+    yfnd, yqdddxg, yjzkdgz, xyyftjqk, mqhzdxqk, sfyxybhzxq, yxhzdx, yxhzdx_value, ncqdhzfs, 
+    ncqdhzfs_value, xqjjjzsj, xqsfkegk, wjjjsntntgdhzzj, zjyt, zjqk, xqjjfs, create_time
   </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 08:56:04 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     select
     <if test="distinct">
@@ -209,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 08:56:04 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -220,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 08:56:04 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     delete from demand_collection
     where id = #{id,jdbcType=INTEGER}
@@ -229,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 08:56:04 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     delete from demand_collection
     <if test="_parameter != null">
@@ -240,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 08:56:04 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, 
@@ -255,24 +257,24 @@
       sfwkjxzxqy_value, zlsl, zlsl_fmzl, 
       zlsl_syxx, sfchkjzxzj, sfycxyz, 
       sfycxyz_value, sfyhjgtzztz, sfyhjgtzztz_value, 
-      cgly, cgsx, cgtxxs, 
+      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
-      )
+      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}, 
@@ -285,31 +287,31 @@
       #{sfwgxjsqy,jdbcType=INTEGER}, #{sfwgxjsqyValue,jdbcType=VARCHAR}, #{sfwkjxzxqy,jdbcType=INTEGER}, 
       #{sfwkjxzxqyValue,jdbcType=VARCHAR}, #{zlsl,jdbcType=INTEGER}, #{zlslFmzl,jdbcType=INTEGER}, 
       #{zlslSyxx,jdbcType=INTEGER}, #{sfchkjzxzj,jdbcType=INTEGER}, #{sfycxyz,jdbcType=INTEGER}, 
-      #{sfycxyzValue,jdbcType=VARCHAR}, #{sfyhjgtzztz,jdbcType=VARCHAR}, #{sfyhjgtzztzValue,jdbcType=DECIMAL}, 
-      #{cgly,jdbcType=INTEGER}, #{cgsx,jdbcType=VARCHAR}, #{cgtxxs,jdbcType=INTEGER}, 
+      #{sfycxyzValue,jdbcType=VARCHAR}, #{sfyhjgtzztz,jdbcType=VARCHAR}, #{sfyhjgtzztzValue,jdbcType=VARCHAR}, 
+      #{cgmc,jdbcType=VARCHAR}, #{cgly,jdbcType=INTEGER}, #{cgsx,jdbcType=VARCHAR}, #{cgtxxs,jdbcType=INTEGER}, 
       #{cgtxxsValue,jdbcType=VARCHAR}, #{cgcsd,jdbcType=INTEGER}, #{cgzscqxs,jdbcType=INTEGER}, 
       #{zscqqs,jdbcType=INTEGER}, #{zlzt,jdbcType=INTEGER}, #{cgdjqk,jdbcType=INTEGER}, 
-      #{cgdjqkValue,jdbcType=VARCHAR}, #{ncqcgzyzhfszzzh,jdbcType=INTEGER}, #{ncqcgzyzhfshzkf,jdbcType=INTEGER}, 
-      #{ncqcgzyzhfsjszr,jdbcType=INTEGER}, #{yjkzyzhsj,jdbcType=INTEGER}, #{cgjs,jdbcType=VARCHAR}, 
+      #{cgdjqkValue,jdbcType=VARCHAR}, #{ncqcgzyzhfszzzh,jdbcType=VARCHAR}, #{ncqcgzyzhfshzkf,jdbcType=VARCHAR}, 
+      #{ncqcgzyzhfsjszr,jdbcType=VARCHAR}, #{yjkzyzhsj,jdbcType=INTEGER}, #{cgjs,jdbcType=VARCHAR}, 
       #{sfycghzxq,jdbcType=INTEGER}, #{sfyyxhzdw,jdbcType=INTEGER}, #{sfyyxhzdwValue,jdbcType=VARCHAR}, 
       #{yxhzfs,jdbcType=INTEGER}, #{yxhzfsValue,jdbcType=VARCHAR}, #{yssdkjzc,jdbcType=INTEGER}, 
-      #{yssdkjzcValue,jdbcType=VARCHAR}, #{nsqdsjxm,jdbcType=INTEGER}, #{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 08:56:04 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     insert into demand_collection
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -436,6 +438,9 @@
       <if test="sfyhjgtzztzValue != null">
         sfyhjgtzztz_value,
       </if>
+      <if test="cgmc != null">
+        cgmc,
+      </if>
       <if test="cgly != null">
         cgly,
       </if>
@@ -505,6 +510,9 @@
       <if test="nsqdsjxm != null">
         nsqdsjxm,
       </if>
+      <if test="nsqdsjxmValue != null">
+        nsqdsjxm_value,
+      </if>
       <if test="sqskjzgbmxxdwgkfb != null">
         sqskjzgbmxxdwgkfb,
       </if>
@@ -712,7 +720,10 @@
         #{sfyhjgtzztz,jdbcType=VARCHAR},
       </if>
       <if test="sfyhjgtzztzValue != null">
-        #{sfyhjgtzztzValue,jdbcType=DECIMAL},
+        #{sfyhjgtzztzValue,jdbcType=VARCHAR},
+      </if>
+      <if test="cgmc != null">
+        #{cgmc,jdbcType=VARCHAR},
       </if>
       <if test="cgly != null">
         #{cgly,jdbcType=INTEGER},
@@ -745,13 +756,13 @@
         #{cgdjqkValue,jdbcType=VARCHAR},
       </if>
       <if test="ncqcgzyzhfszzzh != null">
-        #{ncqcgzyzhfszzzh,jdbcType=INTEGER},
+        #{ncqcgzyzhfszzzh,jdbcType=VARCHAR},
       </if>
       <if test="ncqcgzyzhfshzkf != null">
-        #{ncqcgzyzhfshzkf,jdbcType=INTEGER},
+        #{ncqcgzyzhfshzkf,jdbcType=VARCHAR},
       </if>
       <if test="ncqcgzyzhfsjszr != null">
-        #{ncqcgzyzhfsjszr,jdbcType=INTEGER},
+        #{ncqcgzyzhfsjszr,jdbcType=VARCHAR},
       </if>
       <if test="yjkzyzhsj != null">
         #{yjkzyzhsj,jdbcType=INTEGER},
@@ -783,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>
@@ -873,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 08:56:04 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     select count(*) from demand_collection
     <if test="_parameter != null">
@@ -884,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 08:56:04 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1009,7 +1023,10 @@
         sfyhjgtzztz = #{record.sfyhjgtzztz,jdbcType=VARCHAR},
       </if>
       <if test="record.sfyhjgtzztzValue != null">
-        sfyhjgtzztz_value = #{record.sfyhjgtzztzValue,jdbcType=DECIMAL},
+        sfyhjgtzztz_value = #{record.sfyhjgtzztzValue,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cgmc != null">
+        cgmc = #{record.cgmc,jdbcType=VARCHAR},
       </if>
       <if test="record.cgly != null">
         cgly = #{record.cgly,jdbcType=INTEGER},
@@ -1042,13 +1059,13 @@
         cgdjqk_value = #{record.cgdjqkValue,jdbcType=VARCHAR},
       </if>
       <if test="record.ncqcgzyzhfszzzh != null">
-        ncqcgzyzhfszzzh = #{record.ncqcgzyzhfszzzh,jdbcType=INTEGER},
+        ncqcgzyzhfszzzh = #{record.ncqcgzyzhfszzzh,jdbcType=VARCHAR},
       </if>
       <if test="record.ncqcgzyzhfshzkf != null">
-        ncqcgzyzhfshzkf = #{record.ncqcgzyzhfshzkf,jdbcType=INTEGER},
+        ncqcgzyzhfshzkf = #{record.ncqcgzyzhfshzkf,jdbcType=VARCHAR},
       </if>
       <if test="record.ncqcgzyzhfsjszr != null">
-        ncqcgzyzhfsjszr = #{record.ncqcgzyzhfsjszr,jdbcType=INTEGER},
+        ncqcgzyzhfsjszr = #{record.ncqcgzyzhfsjszr,jdbcType=VARCHAR},
       </if>
       <if test="record.yjkzyzhsj != null">
         yjkzyzhsj = #{record.yjkzyzhsj,jdbcType=INTEGER},
@@ -1080,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>
@@ -1173,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 08:56:04 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     update demand_collection
     set id = #{record.id,jdbcType=INTEGER},
@@ -1216,7 +1236,8 @@
       sfycxyz = #{record.sfycxyz,jdbcType=INTEGER},
       sfycxyz_value = #{record.sfycxyzValue,jdbcType=VARCHAR},
       sfyhjgtzztz = #{record.sfyhjgtzztz,jdbcType=VARCHAR},
-      sfyhjgtzztz_value = #{record.sfyhjgtzztzValue,jdbcType=DECIMAL},
+      sfyhjgtzztz_value = #{record.sfyhjgtzztzValue,jdbcType=VARCHAR},
+      cgmc = #{record.cgmc,jdbcType=VARCHAR},
       cgly = #{record.cgly,jdbcType=INTEGER},
       cgsx = #{record.cgsx,jdbcType=VARCHAR},
       cgtxxs = #{record.cgtxxs,jdbcType=INTEGER},
@@ -1227,9 +1248,9 @@
       zlzt = #{record.zlzt,jdbcType=INTEGER},
       cgdjqk = #{record.cgdjqk,jdbcType=INTEGER},
       cgdjqk_value = #{record.cgdjqkValue,jdbcType=VARCHAR},
-      ncqcgzyzhfszzzh = #{record.ncqcgzyzhfszzzh,jdbcType=INTEGER},
-      ncqcgzyzhfshzkf = #{record.ncqcgzyzhfshzkf,jdbcType=INTEGER},
-      ncqcgzyzhfsjszr = #{record.ncqcgzyzhfsjszr,jdbcType=INTEGER},
+      ncqcgzyzhfszzzh = #{record.ncqcgzyzhfszzzh,jdbcType=VARCHAR},
+      ncqcgzyzhfshzkf = #{record.ncqcgzyzhfshzkf,jdbcType=VARCHAR},
+      ncqcgzyzhfsjszr = #{record.ncqcgzyzhfsjszr,jdbcType=VARCHAR},
       yjkzyzhsj = #{record.yjkzyzhsj,jdbcType=INTEGER},
       cgjs = #{record.cgjs,jdbcType=VARCHAR},
       sfycghzxq = #{record.sfycghzxq,jdbcType=INTEGER},
@@ -1240,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},
@@ -1276,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 08:56:04 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1398,7 +1420,10 @@
         sfyhjgtzztz = #{sfyhjgtzztz,jdbcType=VARCHAR},
       </if>
       <if test="sfyhjgtzztzValue != null">
-        sfyhjgtzztz_value = #{sfyhjgtzztzValue,jdbcType=DECIMAL},
+        sfyhjgtzztz_value = #{sfyhjgtzztzValue,jdbcType=VARCHAR},
+      </if>
+      <if test="cgmc != null">
+        cgmc = #{cgmc,jdbcType=VARCHAR},
       </if>
       <if test="cgly != null">
         cgly = #{cgly,jdbcType=INTEGER},
@@ -1431,13 +1456,13 @@
         cgdjqk_value = #{cgdjqkValue,jdbcType=VARCHAR},
       </if>
       <if test="ncqcgzyzhfszzzh != null">
-        ncqcgzyzhfszzzh = #{ncqcgzyzhfszzzh,jdbcType=INTEGER},
+        ncqcgzyzhfszzzh = #{ncqcgzyzhfszzzh,jdbcType=VARCHAR},
       </if>
       <if test="ncqcgzyzhfshzkf != null">
-        ncqcgzyzhfshzkf = #{ncqcgzyzhfshzkf,jdbcType=INTEGER},
+        ncqcgzyzhfshzkf = #{ncqcgzyzhfshzkf,jdbcType=VARCHAR},
       </if>
       <if test="ncqcgzyzhfsjszr != null">
-        ncqcgzyzhfsjszr = #{ncqcgzyzhfsjszr,jdbcType=INTEGER},
+        ncqcgzyzhfsjszr = #{ncqcgzyzhfsjszr,jdbcType=VARCHAR},
       </if>
       <if test="yjkzyzhsj != null">
         yjkzyzhsj = #{yjkzyzhsj,jdbcType=INTEGER},
@@ -1469,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>
@@ -1560,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 08:56:04 CST 2020.
+      This element was generated on Thu Jul 09 14:27:49 CST 2020.
     -->
     update demand_collection
     set dwmc = #{dwmc,jdbcType=VARCHAR},
@@ -1602,7 +1630,8 @@
       sfycxyz = #{sfycxyz,jdbcType=INTEGER},
       sfycxyz_value = #{sfycxyzValue,jdbcType=VARCHAR},
       sfyhjgtzztz = #{sfyhjgtzztz,jdbcType=VARCHAR},
-      sfyhjgtzztz_value = #{sfyhjgtzztzValue,jdbcType=DECIMAL},
+      sfyhjgtzztz_value = #{sfyhjgtzztzValue,jdbcType=VARCHAR},
+      cgmc = #{cgmc,jdbcType=VARCHAR},
       cgly = #{cgly,jdbcType=INTEGER},
       cgsx = #{cgsx,jdbcType=VARCHAR},
       cgtxxs = #{cgtxxs,jdbcType=INTEGER},
@@ -1613,9 +1642,9 @@
       zlzt = #{zlzt,jdbcType=INTEGER},
       cgdjqk = #{cgdjqk,jdbcType=INTEGER},
       cgdjqk_value = #{cgdjqkValue,jdbcType=VARCHAR},
-      ncqcgzyzhfszzzh = #{ncqcgzyzhfszzzh,jdbcType=INTEGER},
-      ncqcgzyzhfshzkf = #{ncqcgzyzhfshzkf,jdbcType=INTEGER},
-      ncqcgzyzhfsjszr = #{ncqcgzyzhfsjszr,jdbcType=INTEGER},
+      ncqcgzyzhfszzzh = #{ncqcgzyzhfszzzh,jdbcType=VARCHAR},
+      ncqcgzyzhfshzkf = #{ncqcgzyzhfshzkf,jdbcType=VARCHAR},
+      ncqcgzyzhfsjszr = #{ncqcgzyzhfsjszr,jdbcType=VARCHAR},
       yjkzyzhsj = #{yjkzyzhsj,jdbcType=INTEGER},
       cgjs = #{cgjs,jdbcType=VARCHAR},
       sfycghzxq = #{sfycghzxq,jdbcType=INTEGER},
@@ -1626,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},
@@ -1658,17 +1688,33 @@
   </update>
   
   <select id="findDemandCollectionList" resultType="com.goafanti.demandCollection.bo.OutDemandCollection">
-	  select a.id,dwmc,dwxz,htly,b.name ssszp,c.name ssszc,ssyq,yysjjyspt,tyshxydm,jjgm,rygm,clsj,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,sfyhjgtzztz_value sfyhjgtzztzValue,cgly,
-	cgsx,cgtxxs,cgtxxs_value cgtxxsValue,cgcsd,cgzscqxs,zscqqs,zlzt,cgdjqk,cgdjqk_value cgdjqkValue,ncqcgzyzhfszzzh,
-	ncqcgzyzhfshzkf,ncqcgzyzhfsjszr, yjkzyzhsj,cgjs,sfycghzxq,sfyyxhzdw,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,
-	value ncqdhzfsValue, xqjjjzsj,xqsfkegk,wjjjsntntgdhzzj,zjyt,zjqk,xqjjfs,sqskjzgbmxxdwgkfb_value sqskjzgbmxxdwgkfbValue,
-	date_format(create_time,'%Y-%m-%d %H:%i:%S') createTime
+	  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,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,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,value ncqdhzfsValue, xqjjjzsj,xqsfkegk,wjjjsntntgdhzzj,
+	  zjyt,zjqk,xqjjfs,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
+	where 1=1
+	<if test="dwmc !=null ">
+	and dwmc like concat('%',#{dwmc},'%')
+	</if>
+	<if test="dwxz !=null ">
+	and dwxz = #{dwxz}
+	</if>
+	<if test="ssszp !=null">
+	and a.ssszp= #{ssszp}
+	</if>
+	<if test="ssszc != null">
+	and a.ssszc= #{ssszc}
+	</if>
+	<if test="startTime !=null and endTime !=null">
+	and a.create_time between #{startTime} and #{endTime}
+	</if>
 	<if test="page_sql!=null">
 		${page_sql}
 	</if> 
@@ -1677,5 +1723,21 @@
 	  select count(*)
 	from demand_collection a left join district_glossory b on a.ssszp=b.id 
 	left join district_glossory c on a.ssszc=c.id
+	where 1=1
+	<if test="dwmc !=null ">
+	and dwmc like concat('%',#{dwmc},'%')
+	</if>
+	<if test="dwxz !=null ">
+	and dwxz = #{dwxz}
+	</if>
+	<if test="ssszp !=null">
+	and a.ssszp= #{ssszp}
+	</if>
+	<if test="ssszc != null">
+	and a.ssszc= #{ssszc}
+	</if>
+	<if test="startTime !=null and endTime !=null">
+	and a.create_time between #{startTime} and #{endTime}
+	</if>
   </select>
 </mapper>

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


+ 236 - 56
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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 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 08:56:04 CST 2020
+	 * @mbg.generated  Thu Jul 09 14:27:49 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2794,56 +2794,136 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andSfyhjgtzztzValueEqualTo(BigDecimal value) {
+		public Criteria andSfyhjgtzztzValueEqualTo(String value) {
 			addCriterion("sfyhjgtzztz_value =", value, "sfyhjgtzztzValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andSfyhjgtzztzValueNotEqualTo(BigDecimal value) {
+		public Criteria andSfyhjgtzztzValueNotEqualTo(String value) {
 			addCriterion("sfyhjgtzztz_value <>", value, "sfyhjgtzztzValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andSfyhjgtzztzValueGreaterThan(BigDecimal value) {
+		public Criteria andSfyhjgtzztzValueGreaterThan(String value) {
 			addCriterion("sfyhjgtzztz_value >", value, "sfyhjgtzztzValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andSfyhjgtzztzValueGreaterThanOrEqualTo(BigDecimal value) {
+		public Criteria andSfyhjgtzztzValueGreaterThanOrEqualTo(String value) {
 			addCriterion("sfyhjgtzztz_value >=", value, "sfyhjgtzztzValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andSfyhjgtzztzValueLessThan(BigDecimal value) {
+		public Criteria andSfyhjgtzztzValueLessThan(String value) {
 			addCriterion("sfyhjgtzztz_value <", value, "sfyhjgtzztzValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andSfyhjgtzztzValueLessThanOrEqualTo(BigDecimal value) {
+		public Criteria andSfyhjgtzztzValueLessThanOrEqualTo(String value) {
 			addCriterion("sfyhjgtzztz_value <=", value, "sfyhjgtzztzValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andSfyhjgtzztzValueIn(List<BigDecimal> values) {
+		public Criteria andSfyhjgtzztzValueLike(String value) {
+			addCriterion("sfyhjgtzztz_value like", value, "sfyhjgtzztzValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyhjgtzztzValueNotLike(String value) {
+			addCriterion("sfyhjgtzztz_value not like", value, "sfyhjgtzztzValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyhjgtzztzValueIn(List<String> values) {
 			addCriterion("sfyhjgtzztz_value in", values, "sfyhjgtzztzValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andSfyhjgtzztzValueNotIn(List<BigDecimal> values) {
+		public Criteria andSfyhjgtzztzValueNotIn(List<String> values) {
 			addCriterion("sfyhjgtzztz_value not in", values, "sfyhjgtzztzValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andSfyhjgtzztzValueBetween(BigDecimal value1, BigDecimal value2) {
+		public Criteria andSfyhjgtzztzValueBetween(String value1, String value2) {
 			addCriterion("sfyhjgtzztz_value between", value1, value2, "sfyhjgtzztzValue");
 			return (Criteria) this;
 		}
 
-		public Criteria andSfyhjgtzztzValueNotBetween(BigDecimal value1, BigDecimal value2) {
+		public Criteria andSfyhjgtzztzValueNotBetween(String value1, String value2) {
 			addCriterion("sfyhjgtzztz_value not between", value1, value2, "sfyhjgtzztzValue");
 			return (Criteria) this;
 		}
 
+		public Criteria andCgmcIsNull() {
+			addCriterion("cgmc is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCgmcIsNotNull() {
+			addCriterion("cgmc is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCgmcEqualTo(String value) {
+			addCriterion("cgmc =", value, "cgmc");
+			return (Criteria) this;
+		}
+
+		public Criteria andCgmcNotEqualTo(String value) {
+			addCriterion("cgmc <>", value, "cgmc");
+			return (Criteria) this;
+		}
+
+		public Criteria andCgmcGreaterThan(String value) {
+			addCriterion("cgmc >", value, "cgmc");
+			return (Criteria) this;
+		}
+
+		public Criteria andCgmcGreaterThanOrEqualTo(String value) {
+			addCriterion("cgmc >=", value, "cgmc");
+			return (Criteria) this;
+		}
+
+		public Criteria andCgmcLessThan(String value) {
+			addCriterion("cgmc <", value, "cgmc");
+			return (Criteria) this;
+		}
+
+		public Criteria andCgmcLessThanOrEqualTo(String value) {
+			addCriterion("cgmc <=", value, "cgmc");
+			return (Criteria) this;
+		}
+
+		public Criteria andCgmcLike(String value) {
+			addCriterion("cgmc like", value, "cgmc");
+			return (Criteria) this;
+		}
+
+		public Criteria andCgmcNotLike(String value) {
+			addCriterion("cgmc not like", value, "cgmc");
+			return (Criteria) this;
+		}
+
+		public Criteria andCgmcIn(List<String> values) {
+			addCriterion("cgmc in", values, "cgmc");
+			return (Criteria) this;
+		}
+
+		public Criteria andCgmcNotIn(List<String> values) {
+			addCriterion("cgmc not in", values, "cgmc");
+			return (Criteria) this;
+		}
+
+		public Criteria andCgmcBetween(String value1, String value2) {
+			addCriterion("cgmc between", value1, value2, "cgmc");
+			return (Criteria) this;
+		}
+
+		public Criteria andCgmcNotBetween(String value1, String value2) {
+			addCriterion("cgmc not between", value1, value2, "cgmc");
+			return (Criteria) this;
+		}
+
 		public Criteria andCglyIsNull() {
 			addCriterion("cgly is null");
 			return (Criteria) this;
@@ -3484,52 +3564,62 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfszzzhEqualTo(Integer value) {
+		public Criteria andNcqcgzyzhfszzzhEqualTo(String value) {
 			addCriterion("ncqcgzyzhfszzzh =", value, "ncqcgzyzhfszzzh");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfszzzhNotEqualTo(Integer value) {
+		public Criteria andNcqcgzyzhfszzzhNotEqualTo(String value) {
 			addCriterion("ncqcgzyzhfszzzh <>", value, "ncqcgzyzhfszzzh");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfszzzhGreaterThan(Integer value) {
+		public Criteria andNcqcgzyzhfszzzhGreaterThan(String value) {
 			addCriterion("ncqcgzyzhfszzzh >", value, "ncqcgzyzhfszzzh");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfszzzhGreaterThanOrEqualTo(Integer value) {
+		public Criteria andNcqcgzyzhfszzzhGreaterThanOrEqualTo(String value) {
 			addCriterion("ncqcgzyzhfszzzh >=", value, "ncqcgzyzhfszzzh");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfszzzhLessThan(Integer value) {
+		public Criteria andNcqcgzyzhfszzzhLessThan(String value) {
 			addCriterion("ncqcgzyzhfszzzh <", value, "ncqcgzyzhfszzzh");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfszzzhLessThanOrEqualTo(Integer value) {
+		public Criteria andNcqcgzyzhfszzzhLessThanOrEqualTo(String value) {
 			addCriterion("ncqcgzyzhfszzzh <=", value, "ncqcgzyzhfszzzh");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfszzzhIn(List<Integer> values) {
+		public Criteria andNcqcgzyzhfszzzhLike(String value) {
+			addCriterion("ncqcgzyzhfszzzh like", value, "ncqcgzyzhfszzzh");
+			return (Criteria) this;
+		}
+
+		public Criteria andNcqcgzyzhfszzzhNotLike(String value) {
+			addCriterion("ncqcgzyzhfszzzh not like", value, "ncqcgzyzhfszzzh");
+			return (Criteria) this;
+		}
+
+		public Criteria andNcqcgzyzhfszzzhIn(List<String> values) {
 			addCriterion("ncqcgzyzhfszzzh in", values, "ncqcgzyzhfszzzh");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfszzzhNotIn(List<Integer> values) {
+		public Criteria andNcqcgzyzhfszzzhNotIn(List<String> values) {
 			addCriterion("ncqcgzyzhfszzzh not in", values, "ncqcgzyzhfszzzh");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfszzzhBetween(Integer value1, Integer value2) {
+		public Criteria andNcqcgzyzhfszzzhBetween(String value1, String value2) {
 			addCriterion("ncqcgzyzhfszzzh between", value1, value2, "ncqcgzyzhfszzzh");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfszzzhNotBetween(Integer value1, Integer value2) {
+		public Criteria andNcqcgzyzhfszzzhNotBetween(String value1, String value2) {
 			addCriterion("ncqcgzyzhfszzzh not between", value1, value2, "ncqcgzyzhfszzzh");
 			return (Criteria) this;
 		}
@@ -3544,52 +3634,62 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfshzkfEqualTo(Integer value) {
+		public Criteria andNcqcgzyzhfshzkfEqualTo(String value) {
 			addCriterion("ncqcgzyzhfshzkf =", value, "ncqcgzyzhfshzkf");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfshzkfNotEqualTo(Integer value) {
+		public Criteria andNcqcgzyzhfshzkfNotEqualTo(String value) {
 			addCriterion("ncqcgzyzhfshzkf <>", value, "ncqcgzyzhfshzkf");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfshzkfGreaterThan(Integer value) {
+		public Criteria andNcqcgzyzhfshzkfGreaterThan(String value) {
 			addCriterion("ncqcgzyzhfshzkf >", value, "ncqcgzyzhfshzkf");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfshzkfGreaterThanOrEqualTo(Integer value) {
+		public Criteria andNcqcgzyzhfshzkfGreaterThanOrEqualTo(String value) {
 			addCriterion("ncqcgzyzhfshzkf >=", value, "ncqcgzyzhfshzkf");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfshzkfLessThan(Integer value) {
+		public Criteria andNcqcgzyzhfshzkfLessThan(String value) {
 			addCriterion("ncqcgzyzhfshzkf <", value, "ncqcgzyzhfshzkf");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfshzkfLessThanOrEqualTo(Integer value) {
+		public Criteria andNcqcgzyzhfshzkfLessThanOrEqualTo(String value) {
 			addCriterion("ncqcgzyzhfshzkf <=", value, "ncqcgzyzhfshzkf");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfshzkfIn(List<Integer> values) {
+		public Criteria andNcqcgzyzhfshzkfLike(String value) {
+			addCriterion("ncqcgzyzhfshzkf like", value, "ncqcgzyzhfshzkf");
+			return (Criteria) this;
+		}
+
+		public Criteria andNcqcgzyzhfshzkfNotLike(String value) {
+			addCriterion("ncqcgzyzhfshzkf not like", value, "ncqcgzyzhfshzkf");
+			return (Criteria) this;
+		}
+
+		public Criteria andNcqcgzyzhfshzkfIn(List<String> values) {
 			addCriterion("ncqcgzyzhfshzkf in", values, "ncqcgzyzhfshzkf");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfshzkfNotIn(List<Integer> values) {
+		public Criteria andNcqcgzyzhfshzkfNotIn(List<String> values) {
 			addCriterion("ncqcgzyzhfshzkf not in", values, "ncqcgzyzhfshzkf");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfshzkfBetween(Integer value1, Integer value2) {
+		public Criteria andNcqcgzyzhfshzkfBetween(String value1, String value2) {
 			addCriterion("ncqcgzyzhfshzkf between", value1, value2, "ncqcgzyzhfshzkf");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfshzkfNotBetween(Integer value1, Integer value2) {
+		public Criteria andNcqcgzyzhfshzkfNotBetween(String value1, String value2) {
 			addCriterion("ncqcgzyzhfshzkf not between", value1, value2, "ncqcgzyzhfshzkf");
 			return (Criteria) this;
 		}
@@ -3604,52 +3704,62 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfsjszrEqualTo(Integer value) {
+		public Criteria andNcqcgzyzhfsjszrEqualTo(String value) {
 			addCriterion("ncqcgzyzhfsjszr =", value, "ncqcgzyzhfsjszr");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfsjszrNotEqualTo(Integer value) {
+		public Criteria andNcqcgzyzhfsjszrNotEqualTo(String value) {
 			addCriterion("ncqcgzyzhfsjszr <>", value, "ncqcgzyzhfsjszr");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfsjszrGreaterThan(Integer value) {
+		public Criteria andNcqcgzyzhfsjszrGreaterThan(String value) {
 			addCriterion("ncqcgzyzhfsjszr >", value, "ncqcgzyzhfsjszr");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfsjszrGreaterThanOrEqualTo(Integer value) {
+		public Criteria andNcqcgzyzhfsjszrGreaterThanOrEqualTo(String value) {
 			addCriterion("ncqcgzyzhfsjszr >=", value, "ncqcgzyzhfsjszr");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfsjszrLessThan(Integer value) {
+		public Criteria andNcqcgzyzhfsjszrLessThan(String value) {
 			addCriterion("ncqcgzyzhfsjszr <", value, "ncqcgzyzhfsjszr");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfsjszrLessThanOrEqualTo(Integer value) {
+		public Criteria andNcqcgzyzhfsjszrLessThanOrEqualTo(String value) {
 			addCriterion("ncqcgzyzhfsjszr <=", value, "ncqcgzyzhfsjszr");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfsjszrIn(List<Integer> values) {
+		public Criteria andNcqcgzyzhfsjszrLike(String value) {
+			addCriterion("ncqcgzyzhfsjszr like", value, "ncqcgzyzhfsjszr");
+			return (Criteria) this;
+		}
+
+		public Criteria andNcqcgzyzhfsjszrNotLike(String value) {
+			addCriterion("ncqcgzyzhfsjszr not like", value, "ncqcgzyzhfsjszr");
+			return (Criteria) this;
+		}
+
+		public Criteria andNcqcgzyzhfsjszrIn(List<String> values) {
 			addCriterion("ncqcgzyzhfsjszr in", values, "ncqcgzyzhfsjszr");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfsjszrNotIn(List<Integer> values) {
+		public Criteria andNcqcgzyzhfsjszrNotIn(List<String> values) {
 			addCriterion("ncqcgzyzhfsjszr not in", values, "ncqcgzyzhfsjszr");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfsjszrBetween(Integer value1, Integer value2) {
+		public Criteria andNcqcgzyzhfsjszrBetween(String value1, String value2) {
 			addCriterion("ncqcgzyzhfsjszr between", value1, value2, "ncqcgzyzhfsjszr");
 			return (Criteria) this;
 		}
 
-		public Criteria andNcqcgzyzhfsjszrNotBetween(Integer value1, Integer value2) {
+		public Criteria andNcqcgzyzhfsjszrNotBetween(String value1, String value2) {
 			addCriterion("ncqcgzyzhfsjszr not between", value1, value2, "ncqcgzyzhfsjszr");
 			return (Criteria) this;
 		}
@@ -4294,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;
@@ -6187,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 08:56:04 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);

+ 14 - 1
src/main/java/com/goafanti/demandCollection/bo/InputDemandCollection.java

@@ -3,7 +3,8 @@ package com.goafanti.demandCollection.bo;
 import com.goafanti.common.model.DemandCollection;
 
 public class InputDemandCollection extends DemandCollection{
-	
+	private String startTime;
+	private String endTime;
 	private Integer pageSize;
 	private Integer pageNo;
 	public Integer getPageSize() {
@@ -24,5 +25,17 @@ public class InputDemandCollection extends DemandCollection{
 	public void setPageNo(Integer pageNo) {
 		this.pageNo = pageNo;
 	}
+	public String getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+	public String getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
 	
 }

+ 104 - 27
src/main/java/com/goafanti/demandCollection/bo/OutDemandCollection.java

@@ -42,6 +42,7 @@ public class OutDemandCollection {
 	private String sfycxyzValue;
 	private String sfyhjgtzztz;
 	private String sfyhjgtzztzValue;
+	private String cgmc;
 	private String cgly;
 	private String cgsx;
 	private String cgtxxs;
@@ -65,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;
@@ -107,8 +109,9 @@ public class OutDemandCollection {
 		this.dwmc = dwmc;
 	}
 	public String getDwxz() {
+		if(dwxz==null)return "";
 		if (dwxz.equals("0")) {
-			return "其他";
+			return dwxzValue;
 		}else if (dwxz.equals("1")) {
 			return "高等院校";
 		}else if (dwxz.equals("2")) {
@@ -132,6 +135,7 @@ public class OutDemandCollection {
 		this.dwxz = dwxz;
 	}
 	public String getHtly() {
+		if(htly==null)return "";
 		if(htly.equals("0"))return "其他";
 		else if(htly.equals("1"))return "新型材料";
 		else if(htly.equals("2"))return "电子信息";
@@ -270,10 +274,11 @@ public class OutDemandCollection {
 		this.ndxmjlr19 = ndxmjlr19;
 	}
 	public String getNdyftr() {
-		if(ndyftr.equals("1")) { return "1~50万元";}
-		else if(ndyftr.equals("2")) { return "50~500万元";}
-		else if(ndyftr.equals("3")) { return "500~1000万";}
-		else if(ndyftr.equals("4")) { return "1000万元以上 ";}
+		if(ndyftr==null)return "";
+		if(ndyftr.equals("1"))  return "1~50万元";
+		else if(ndyftr.equals("2"))  return "50~500万元";
+		else if(ndyftr.equals("3"))  return "500~1000万";
+		else if(ndyftr.equals("4"))  return "1000万元以上 ";
 		
 		return ndyftr;
 	}
@@ -281,17 +286,19 @@ public class OutDemandCollection {
 		this.ndyftr = ndyftr;
 	}
 	public String getNdyftrzyysrbl() {
-		if(ndyftrzyysrbl.equals("1")) { return "1%以内";}
-		else if(ndyftrzyysrbl.equals("2")) { return "1%~3%";}
-		else if(ndyftrzyysrbl.equals("3")) { return "3%~5%";}
-		else if(ndyftrzyysrbl.equals("4")) { return "5%~10%";}
-		else if(ndyftrzyysrbl.equals("5")) { return "10%以上";}
+		if(ndyftrzyysrbl==null)return "";
+		if(ndyftrzyysrbl.equals("1"))  return "1%以内";
+		else if(ndyftrzyysrbl.equals("2"))  return "1%~3%";
+		else if(ndyftrzyysrbl.equals("3"))  return "3%~5%";
+		else if(ndyftrzyysrbl.equals("4"))  return "5%~10%";
+		else if(ndyftrzyysrbl.equals("5"))  return "10%以上";
 		return ndyftrzyysrbl;
 	}
 	public void setNdyftrzyysrbl(String ndyftrzyysrbl) {
 		this.ndyftrzyysrbl = ndyftrzyysrbl;
 	}
 	public String getSfchyhdk() {
+		if(sfchyhdk==null)return "";
 		return sfchyhdk.equals("1")?"是":"否";
 	}
 	public void setSfchyhdk(String sfchyhdk) {
@@ -304,6 +311,7 @@ public class OutDemandCollection {
 		this.sfchyhdkValue = sfchyhdkValue;
 	}
 	public String getSfwgxjsqy() {
+		if(sfwgxjsqy==null)return "";
 		return sfwgxjsqy.equals("1")?"是":"否";
 	}
 	public void setSfwgxjsqy(String sfwgxjsqy) {
@@ -316,6 +324,7 @@ public class OutDemandCollection {
 		this.sfwgxjsqyValue = sfwgxjsqyValue;
 	}
 	public String getSfwkjxzxqy() {
+		if(sfwkjxzxqy==null)return "";
 		return sfwkjxzxqy.equals("1")?"是":"否";
 	}
 	public void setSfwkjxzxqy(String sfwkjxzxqy) {
@@ -328,6 +337,7 @@ public class OutDemandCollection {
 		this.sfwkjxzxqyValue = sfwkjxzxqyValue;
 	}
 	public String getZlsl() {
+		if(zlsl==null)return "";
 		return zlsl.equals("1")?"有":"无";
 	}
 	public void setZlsl(String zlsl) {
@@ -346,14 +356,14 @@ public class OutDemandCollection {
 		this.zlslSyxx = zlslSyxx;
 	}
 	public String getSfchkjzxzj() {
-		
+		if(sfchkjzxzj==null)return "";
 		return sfchkjzxzj.equals("1")?"是":"否";
 	}
 	public void setSfchkjzxzj(String sfchkjzxzj) {
 		this.sfchkjzxzj = sfchkjzxzj;
 	}
 	public String getSfycxyz() {
-		
+		if(sfycxyz==null)return "";
 		return sfycxyz.equals("1")?"是":"否";
 	}
 	public void setSfycxyz(String sfycxyz) {
@@ -366,6 +376,7 @@ public class OutDemandCollection {
 		this.sfycxyzValue = sfycxyzValue;
 	}
 	public String getSfyhjgtzztz() {
+		if(sfyhjgtzztz==null)return "";
 		return sfyhjgtzztz.equals("1")?"是":"否";
 	}
 	public void setSfyhjgtzztz(String sfyhjgtzztz) {
@@ -377,7 +388,16 @@ public class OutDemandCollection {
 	public void setSfyhjgtzztzValue(String sfyhjgtzztzValue) {
 		this.sfyhjgtzztzValue = sfyhjgtzztzValue;
 	}
+	
+	  
+	 public String getCgmc() {
+		return cgmc;
+	}
+	public void setCgmc(String cgmc) {
+		this.cgmc = cgmc;
+	}
 	public String getCgly() {
+		if(cgly==null)return "";
 		if(cgly.equals("0"))return "其他";
 		else if(cgly.equals("1"))return "新型材料";
 		else if(cgly.equals("2"))return "电子信息";
@@ -409,6 +429,7 @@ public class OutDemandCollection {
 	}
 	
 	public String getCgsx() {
+		if(cgsx==null)return "";
 		if(cgsx.equals("1"))return "原始性创新";
 		else if(cgsx.equals("2"))return "国外引进、消化吸收创新";
 		else if(cgsx.equals("3"))return "国内技术二次开发";
@@ -418,6 +439,7 @@ public class OutDemandCollection {
 		this.cgsx = cgsx;
 	}
 	public String getCgtxxs() {
+		if(cgtxxs==null)return "";
 		if(cgtxxs.equals("0"))return cgtxxsValue;
 		else if(cgtxxs.equals("1"))return "学术论文/专著";
 		else if(cgtxxs.equals("2"))return "标准";
@@ -442,6 +464,7 @@ public class OutDemandCollection {
 		this.cgtxxsValue = cgtxxsValue;
 	}
 	public String getCgcsd() {
+		if(cgcsd==null)return "";
 		if(cgcsd.equals("1"))return "实验室阶段";
 		else if(cgcsd.equals("2"))return "小试阶段 ";
 		else if(cgcsd.equals("3"))return "中试产品阶段";
@@ -452,6 +475,7 @@ public class OutDemandCollection {
 		this.cgcsd = cgcsd;
 	}
 	public String getCgzscqxs() {
+		if(cgzscqxs==null)return "";
 		if(cgzscqxs.equals("0"))return "其它";
 		else if(cgzscqxs.equals("1"))return "专利权";
 		else if(cgzscqxs.equals("2"))return "软件著作权";
@@ -465,6 +489,7 @@ public class OutDemandCollection {
 		this.cgzscqxs = cgzscqxs;
 	}
 	public String getZscqqs() {
+		if(zscqqs==null)return "";
 		if(zscqqs.equals("0"))return "其它";
 		else if(zscqqs.equals("1"))return "独占";
 		else if(zscqqs.equals("2"))return "共有";
@@ -474,6 +499,7 @@ public class OutDemandCollection {
 		this.zscqqs = zscqqs;
 	}
 	public String getZlzt() {
+		if(zlzt==null)return "";
 		if(zlzt.equals("1"))return "已受理";
 		else if(zlzt.equals("2"))return "已公示";
 		else if(zlzt.equals("3"))return "已授权";
@@ -484,6 +510,7 @@ public class OutDemandCollection {
 		this.zlzt = zlzt;
 	}
 	public String getCgdjqk() {
+		if(cgdjqk==null)return "";
 		if(cgdjqk.equals("0"))return "未登记";
 		else if(cgdjqk.equals("1"))return "已登记";
 		return cgdjqk;
@@ -498,21 +525,43 @@ public class OutDemandCollection {
 		this.cgdjqkValue = cgdjqkValue;
 	}
 	public String getNcqcgzyzhfszzzh() {
-		if(ncqcgzyzhfszzzh.equals("0")) return "其他";
-		else if(ncqcgzyzhfszzzh.equals("1"))return "执行投资";
-		else if(ncqcgzyzhfszzzh.equals("2"))return "银行贷款";
-		else if(ncqcgzyzhfszzzh.equals("3"))return "股权融资";
+		if (ncqcgzyzhfszzzh!=null) {
+			String str=ncqcgzyzhfszzzh;
+			String str2="";
+			String s[]=str.split(",");
+			for (String string : s) {
+				if(string.equals("0")) str2=str2+"其他,";
+				else if(string.equals("1"))str2=str2+"执行投资,";
+				else if(string.equals("2"))str2=str2+"银行贷款,";
+				else if(string.equals("3"))str2=str2+"股权融资,";
+			}
+			str2=str2.substring(0, str2.length()-1);
+			return str2;
+		}
 		return ncqcgzyzhfszzzh;
 	}
+	
+	
+	
+	
 	public void setNcqcgzyzhfszzzh(String ncqcgzyzhfszzzh) {
 		this.ncqcgzyzhfszzzh = ncqcgzyzhfszzzh;
 	}
 	
 	public String getNcqcgzyzhfshzkf() {
-		if(ncqcgzyzhfshzkf.equals("0")) return "其他";
-		else if(ncqcgzyzhfshzkf.equals("1"))return "产学研合作";
-		else if(ncqcgzyzhfshzkf.equals("2"))return "共建经济实体";
-		else if(ncqcgzyzhfshzkf.equals("3"))return "企-企联合开发";
+		if (ncqcgzyzhfshzkf!=null) {
+			String str=ncqcgzyzhfshzkf;
+			String str2="";
+			String s[]=str.split(",");
+			for (String string : s) {
+				if(string.equals("0")) str2=str2+"其他,";
+				else if(string.equals("1"))str2=str2+"产学研合作,";
+				else if(string.equals("2"))str2=str2+"共建经济实体,";
+				else if(string.equals("3"))str2=str2+"企-企联合开发,";
+			}
+			str2=str2.substring(0, str2.length()-1);
+			return str2;
+		}
 		return ncqcgzyzhfshzkf;
 	}
 	public void setNcqcgzyzhfshzkf(String ncqcgzyzhfshzkf) {
@@ -520,11 +569,20 @@ public class OutDemandCollection {
 	}
 	
 	public String getNcqcgzyzhfsjszr() {
-		if(ncqcgzyzhfsjszr.equals("0")) return "其他";
-		else if(ncqcgzyzhfsjszr.equals("1"))return "完全转让";
-		else if(ncqcgzyzhfsjszr.equals("2"))return "许可转让";
-		else if(ncqcgzyzhfsjszr.equals("3"))return "技术入股";
-		else if(ncqcgzyzhfsjszr.equals("4"))return "5年独占许可";
+		if (ncqcgzyzhfsjszr!=null) {
+			String str=ncqcgzyzhfsjszr;
+			String str2="";
+			String s[]=str.split(",");
+			for (String string : s) {
+				if(string.equals("0")) str2=str2+"其他,";
+				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+"5年独占许可,";
+			}
+			str2=str2.substring(0, str2.length()-1);
+			return str2;
+		}
 		return ncqcgzyzhfsjszr;
 	}
 	public void setNcqcgzyzhfsjszr(String ncqcgzyzhfsjszr) {
@@ -532,6 +590,7 @@ public class OutDemandCollection {
 	}
 	
 	public String getYjkzyzhsj() {
+		if(yjkzyzhsj==null)return "";
 		if(yjkzyzhsj.equals("0")) return "其他";
 		else if(yjkzyzhsj.equals("1"))return "已经可转化 ";
 		else if(yjkzyzhsj.equals("2"))return "1年内可转化";
@@ -550,13 +609,14 @@ public class OutDemandCollection {
 		this.cgjs = cgjs;
 	}
 	public String getSfycghzxq() {
+		if(sfycghzxq==null)return "";
 		return sfycghzxq.equals("1")?"是":"否";
 	}
 	public void setSfycghzxq(String sfycghzxq) {
 		this.sfycghzxq = sfycghzxq;
 	}
 	public String getSfyyxhzdw() {
-		
+		if(sfyyxhzdw==null)return "";
 		return sfyyxhzdw.equals("1")?"是":"否";
 	}
 	public void setSfyyxhzdw(String sfyyxhzdw) {
@@ -569,6 +629,7 @@ public class OutDemandCollection {
 		this.sfyyxhzdwValue = sfyyxhzdwValue;
 	}
 	public String getYxhzfs() {
+		if(yxhzfs==null)return "";
 		if(yxhzfs.equals("0")) return yxhzfsValue;
 		else if(yxhzfs.equals("1"))return "技术转让";
 		else if(yxhzfs.equals("2"))return "技术入股";
@@ -589,6 +650,7 @@ public class OutDemandCollection {
 		this.yxhzfsValue = yxhzfsValue;
 	}
 	public String getYssdkjzc() {
+		if(yssdkjzc==null)return "";
 		if(yssdkjzc.equals("0")) return yssdkjzcValue;
 		else if(yssdkjzc.equals("1"))return "研发奖补 ";
 		else if(yssdkjzc.equals("2"))return "省重点研发计划";
@@ -607,7 +669,8 @@ public class OutDemandCollection {
 		this.yssdkjzcValue = yssdkjzcValue;
 	}
 	public String getNsqdsjxm() {
-		if(nsqdsjxm.equals("0")) return "其他";
+		if(nsqdsjxm==null)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 "省科技人才计划";
@@ -619,6 +682,7 @@ public class OutDemandCollection {
 		this.nsqdsjxm = nsqdsjxm;
 	}
 	public String getSqskjzgbmxxdwgkfb() {
+		if(sqskjzgbmxxdwgkfb==null)return "";
 		if(sqskjzgbmxxdwgkfb.equals("1")) return "同意授权公开单位信息";
 		else if(sqskjzgbmxxdwgkfb.equals("2"))return "同意授权公开成果信息";
 		else if(sqskjzgbmxxdwgkfb.equals("3"))return "其他,请具体描述同意授权公开的范围内容";
@@ -660,6 +724,7 @@ public class OutDemandCollection {
 		this.xqmc = xqmc;
 	}
 	public String getXqbl() {
+		if(xqbl==null)return "";
 		if(xqbl.equals("1")) return "技术研发(关键技术)";
 		else if(xqbl.equals("2"))return "产品研发(产品升级、新产品研发)";
 		else if(xqbl.equals("3"))return "技术改造(设备、研发生产条件)";
@@ -676,6 +741,7 @@ public class OutDemandCollection {
 		this.jsxqlx = jsxqlx;
 	}
 	public String getXqly() {
+		if(xqly==null)return "";
 		if(xqly.equals("0"))return "其他";
 		else if(xqly.equals("1"))return "新型材料";
 		else if(xqly.equals("2"))return "电子信息";
@@ -742,12 +808,14 @@ public class OutDemandCollection {
 		this.mqhzdxqk = mqhzdxqk;
 	}
 	public String getSfyxybhzxq() {
+		if(sfyxybhzxq==null)return "";
 		return sfyxybhzxq.equals("1")?"有":"无";
 	}
 	public void setSfyxybhzxq(String sfyxybhzxq) {
 		this.sfyxybhzxq = sfyxybhzxq;
 	}
 	public String getYxhzdx() {
+		if(yxhzdx==null)return "";
 		return yxhzdx.equals("1")?"有":"无";
 	}
 	public void setYxhzdx(String yxhzdx) {
@@ -760,6 +828,7 @@ public class OutDemandCollection {
 		this.yxhzdxValue = yxhzdxValue;
 	}
 	public String getNcqdhzfs() {
+		if(ncqdhzfs==null)return "";
 		if(ncqdhzfs.equals("0")) return ncqdhzfsValue;
 		else if(ncqdhzfs.equals("1"))return "技术转让";
 		else if(ncqdhzfs.equals("2"))return "技术入股";
@@ -785,6 +854,7 @@ 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;
@@ -846,6 +916,13 @@ public class OutDemandCollection {
 	public void setClsj(String clsj) {
 		this.clsj = clsj;
 	}
+	public String getNsqdsjxmValue() {
+		return nsqdsjxmValue;
+	}
+	public void setNsqdsjxmValue(String nsqdsjxmValue) {
+		this.nsqdsjxmValue = nsqdsjxmValue;
+	}
+	
 	
 	
 }

+ 5 - 5
src/main/java/com/goafanti/demandCollection/controller/OpenDemandCollectionApiController.java

@@ -14,8 +14,8 @@ import com.goafanti.demandCollection.bo.InputDemandCollection;
 import com.goafanti.demandCollection.service.DemandCollectionService;
 
 @RestController
-@RequestMapping(value = "/open")
-public class OpenDemandCollectionApiController  extends CertifyApiController {
+@RequestMapping(value="/")
+public class DemandCollectionApiController  extends CertifyApiController {
 	@Resource
 	private DemandCollectionService		demandCollectionService;
 	
@@ -24,7 +24,7 @@ public class OpenDemandCollectionApiController  extends CertifyApiController {
 	 * @param d
 	 * @return
 	 */
-	@RequestMapping(value="/addDemandCollection",method = RequestMethod.POST)
+	@RequestMapping(value="/open/addDemandCollection",method = RequestMethod.POST)
 	public Result addDemandCollection(DemandCollection d){
 		Result res =new Result();
 		if (d.getDwmc()==null) {
@@ -40,7 +40,7 @@ public class OpenDemandCollectionApiController  extends CertifyApiController {
 	 * @param d
 	 * @return
 	 */
-	@RequestMapping(value="/demandCollectionList",method = RequestMethod.GET)
+	@RequestMapping(value="/open/demandCollectionList",method = RequestMethod.GET)
 	public Result demandCollectionList(InputDemandCollection i){
 		Result res =new Result();
 		res.data(demandCollectionService.demandCollectionList(i));
@@ -54,7 +54,7 @@ public class OpenDemandCollectionApiController  extends CertifyApiController {
      * @param response
      * @return
      */
-    @RequestMapping(value = "/exportDemandCollectionList" , method = RequestMethod.GET)
+    @RequestMapping(value = "/open/exportDemandCollectionList" , method = RequestMethod.GET)
     public Result exportDemandCollectionList(HttpServletResponse response,InputDemandCollection i)  {
     	Result res=new Result();
 			try {

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

@@ -24,7 +24,6 @@ import com.goafanti.common.model.DemandCollection;
 import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demandCollection.bo.InputDemandCollection;
 import com.goafanti.demandCollection.bo.OutDemandCollection;
 import com.goafanti.demandCollection.service.DemandCollectionService;
@@ -42,7 +41,15 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 	@Override
 	public Pagination<OutDemandCollection> demandCollectionList(InputDemandCollection i) {
 		Map<String, Object> map=new HashMap<>();
-		map.put("dwmc", i.getDwmc());
+		if(i.getDwmc()!=null)map.put("dwmc", i.getDwmc());
+		if(i.getDwxz()!=null)map.put("dwxz", i.getDwxz());
+		if(i.getStartTime()!=null&&i.getEndTime()!=null) {
+			map.put("startTime", i.getStartTime());
+			map.put("endTime", i.getEndTime()+" 23:59:59");
+		}
+		
+		if(i.getSsszp()!=null)map.put("ssszp", i.getSsszp());
+		if(i.getSsszc()!=null)map.put("ssszc", i.getSsszc());
 		return (Pagination<OutDemandCollection>) findPage("findDemandCollectionList","findDemandCollectionCount",
 				map, i.getPageNo(), i.getPageSize());
 	}
@@ -53,17 +60,17 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 		try {
 			List<OutDemandCollection>list=(List<OutDemandCollection>) demandCollectionList(idc).getList();
 					 
-			String[] comment = { "编号", "单位名称", "单位性质", "行业领域", "所属市州-省", "所属市州-市", "所属园区", "拥有的省级及以上平台", "统一社会信用代码",
-					"经济规模", "人员规模", "注册资本", "通讯地址", "邮编", "联系人", "联系电话", "email", "主营业务及核心产品(服务)", "2018年度项目主营业务收入(万元)",
-					"2018年度项目净利润(万元)", "2019年度项目主营业务收入(万元)", "2019年度项目净利润(万元)", "年度研发投入", "年度研发投入占营业收入比例", "是否曾获银行贷款",
-					"是否为高新技术企业编号 ", "是否为科技型中小企业", "专利数量", "发明专利", "实用新型", "是否曾获科技专项资金", "是否有产学研合作", "是否已获机构投资者投资 ",
-					"成果领域", "成果属性", "成果体现形式", "成果体现形式 ", "成果成熟度", "成果知识产权形式", "知识产权权属 ", "专利状态", "成果登记情况",
-					"拟采取成果转移转化方式自主转化 ", "拟采取成果转移转化方式合作开发 ", "拟采取成果转移转化方式技术转让 ", "预计可转移转化时间", "成果简述", "是否有成果合作需求",
-					"是否有意向合作单位", "是否有意向合作单位", "意向合作方式", "意向合作方式", "已享受的科技政策", "拟申请的省级项目", "是否授权省科技主管部门将上述有关信息对外公开发布",
-					"填报人", "填报人手机", "技术负责人", "技术负责人手机", "需求名称", "需求类别", "技术需求类型", "需求领域", "目前产品技术现状", "研发难点",
-					"预期达到的效果(主要技术指标、技术成熟度、条件、成本等)", "已经开展的工作", "现有研发条件情况(人员情况、仪器设备投入等)", "目前合作对象情况(合作对象、方式、已投入研发资金情况等)",
-					"是否有下一步合作需求", "意向合作对象", "拟采取的合作方式", "需求解决截止时间", "需求是否可以公开 ", "为解决技术难题能提供的合作资金", "资金用途", "资金缺口",
-					"需求解决方式", "创建时间"};
+			String[] comment = { "编号", "单位名称", "单位性质", "行业领域", "所属市州-省", "所属市州-市", "所属园区", "拥有的省级及以上平台", "法人代表",
+					"统一社会信用代码", "经济规模", "人员规模", "成立时间", "注册资本", "通讯地址", "邮编", "联系人", "联系电话", "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,"需求征集表");
@@ -84,10 +91,12 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				case "所属市州-省" : o = ob.getSsszp(); break; 
     				case "所属市州-市" : o = ob.getSsszc(); break; 
     				case "所属园区" : o = ob.getSsyq(); break; 
-    				case "拥有的省级及以上平台" : o = ob.getYysjjyspt(); break; 
+    				case "拥有的省级及以上平台" : o = ob.getYysjjyspt(); break;
+    				case "法人代表" : o = ob.getFrdb(); break; 
     				case "统一社会信用代码" : o = ob.getYysjjyspt(); break; 
     				case "经济规模" : o = ob.getJjgm(); break; 
-    				case "人员规模" : o = ob.getRygm(); break; 
+    				case "人员规模" : o = ob.getRygm(); break;
+    				case "成立时间" : o = ob.getClsj(); break; 
     				case "注册资本" : o = ob.getZczb(); break; 
     				case "通讯地址" : o = ob.getTxdz(); break; 
     				case "邮编" : o = ob.getYb(); break; 
@@ -102,11 +111,11 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				case "年度研发投入" : o = ob.getNdyftr(); break; 
     				case "年度研发投入占营业收入比例" : o = ob.getNdyftrzyysrbl(); break; 
     				case "是否曾获银行贷款" : o = ob.getSfchyhdk(); break;
-    				case "曾获银行贷款" : o = ob.getSfchyhdkValue(); break;
+    				case "银行贷款" : o = ob.getSfchyhdkValue(); break;
     				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; 
@@ -115,6 +124,7 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				case "产学研合作" : o = ob.getSfycxyzValue(); break;
     				case "是否已获机构投资者投资 " : o = ob.getSfyhjgtzztz(); break;
     				case "机构投资者投资 " : o = ob.getSfyhjgtzztzValue(); break;
+    				case "成果名称" : o = ob.getCgmc(); break;
     				case "成果领域" : o = ob.getCgly(); break; 
     				case "成果属性" : o = ob.getCgsx(); break; 
     				case "成果体现形式" : o = ob.getCgtxxs(); break; 

+ 1 - 0
src/main/resources/props/config_test.properties

@@ -58,6 +58,7 @@ template.cacheable=false
 
 static.host=//statics.jishutao.com/client/1.0.0
 portal.host=//statics.jishutao.com/portal/1.0.1
+skjt.host=//statics.jishutao.com/skjt
 avatar.host=//statics.jishutao.com
 avatar.upload.host=//statics.jishutao.com/upload
 

+ 3 - 3
src/main/webapp/WEB-INF/views/skjt/s_index.html

@@ -5,13 +5,13 @@
 <head>
 <meta charset=utf-8>
 <meta name=viewport content="width=device-width,initial-scale=1">
-<!-- <title>省科技厅技术需求征集</title> -->
-<title>版本升级,敬请期待!</title>
+<title>省科技厅技术需求征集</title>
+<!-- <title>版本升级,敬请期待!</title> -->
 
 <link th:href="${skjtHost+'/css/app.6c8ea938fcf6465811c4abac53341e96.css'}" rel=stylesheet>
 </head>
 <body>
-	 <h1>版本升级,敬请期待!</h1> 
+	 <!-- <h1>版本升级,敬请期待!</h1>  -->
 	<div id=app></div>
 	<script type=text/javascript
 		th:src="${skjtHost+'/js/manifest.2ae2e69a05c33dfc65f8.js'}"></script>