Browse Source

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

anderx 5 years ago
parent
commit
d733bed7f1

+ 1 - 0
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -89,6 +89,7 @@ public class PortalController extends BaseController {
 		return modelview;
 	}
 	
+	
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
 	public ModelAndView index(HttpServletRequest request, ModelAndView modelview) {
 		return home(request, modelview);

+ 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
 	 */
 	int updateByPrimaryKey(DemandCollection record);
 }

+ 199 - 66
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 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="dwmc" jdbcType="VARCHAR" property="dwmc" />
@@ -14,8 +14,10 @@
     <result column="htly" jdbcType="VARCHAR" property="htly" />
     <result column="ssszp" jdbcType="INTEGER" property="ssszp" />
     <result column="ssszc" jdbcType="INTEGER" property="ssszc" />
+    <result column="sssza" jdbcType="INTEGER" property="sssza" />
     <result column="ssyq" jdbcType="VARCHAR" property="ssyq" />
-    <result column="yysjjyspt" jdbcType="VARCHAR" property="yysjjyspt" />
+    <result column="yysjjyspt" jdbcType="INTEGER" property="yysjjyspt" />
+    <result column="yysjjyspt_value" jdbcType="VARCHAR" property="yysjjysptValue" />
     <result column="frdb" jdbcType="VARCHAR" property="frdb" />
     <result column="tyshxydm" jdbcType="VARCHAR" property="tyshxydm" />
     <result column="jjgm" jdbcType="VARCHAR" property="jjgm" />
@@ -101,12 +103,18 @@
     <result column="zjqk" jdbcType="VARCHAR" property="zjqk" />
     <result column="xqjjfs" jdbcType="VARCHAR" property="xqjjfs" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="sfxwgw" jdbcType="VARCHAR" property="sfxwgw" />
+    <result column="sfyxck" jdbcType="VARCHAR" property="sfyxck" />
+    <result column="xqjjfs_value" jdbcType="VARCHAR" property="xqjjfsValue" />
+    <result column="zyhzfs" jdbcType="VARCHAR" property="zyhzfs" />
+    <result column="qyyzkdgjqykjcxhzqk" jdbcType="VARCHAR" property="qyyzkdgjqykjcxhzqk" />
+    <result column="zyhzfs_value" jdbcType="VARCHAR" property="zyhzfsValue" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -140,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -174,25 +182,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 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, cgmc, cgly, cgsx, cgtxxs, 
-    cgtxxs_value, cgcsd, cgzscqxs, zscqqs, zlzt, cgdjqk, cgdjqk_value, ncqcgzyzhfszzzh, 
+    id, dwmc, dwxz, dwxz_value, htly, ssszp, ssszc, sssza, ssyq, yysjjyspt, yysjjyspt_value, 
+    frdb, tyshxydm, jjgm, rygm, clsj, zczb, txdz, yb, lxr, lxdh, email, zyywjhxcp, ndxmzyywsr18, 
+    ndxmjlr18, ndxmzyywsr19, ndxmjlr19, ndyftr, ndyftrzyysrbl, sfchyhdk, sfchyhdk_value, 
+    sfwgxjsqy, sfwgxjsqy_value, sfwkjxzxqy, sfwkjxzxqy_value, zlsl, zlsl_fmzl, zlsl_syxx, 
+    sfchkjzxzj, sfycxyz, sfycxyz_value, sfyhjgtzztz, sfyhjgtzztz_value, cgmc, cgly, cgsx, 
+    cgtxxs, cgtxxs_value, cgcsd, cgzscqxs, zscqqs, zlzt, cgdjqk, cgdjqk_value, ncqcgzyzhfszzzh, 
     ncqcgzyzhfshzkf, ncqcgzyzhfsjszr, yjkzyzhsj, cgjs, sfycghzxq, sfyyxhzdw, sfyyxhzdw_value, 
     yxhzfs, yxhzfs_value, yssdkjzc, yssdkjzc_value, nsqdsjxm, nsqdsjxm_value, sqskjzgbmxxdwgkfb, 
     sqskjzgbmxxdwgkfb_value, tbr, tbrsj, jsfzr, jsfsj, xqmc, xqbl, jsxqlx, xqly, mqcpjsxz, 
     yfnd, yqdddxg, yjzkdgz, xyyftjqk, mqhzdxqk, sfyxybhzxq, yxhzdx, yxhzdx_value, ncqdhzfs, 
-    ncqdhzfs_value, xqjjjzsj, xqsfkegk, wjjjsntntgdhzzj, zjyt, zjqk, xqjjfs, create_time
+    ncqdhzfs_value, xqjjjzsj, xqsfkegk, wjjjsntntgdhzzj, zjyt, zjqk, xqjjfs, create_time, 
+    sfxwgw, sfyxck, xqjjfs_value, zyhzfs, qyyzkdgjqykjcxhzqk, zyhzfs_value
   </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 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     select
     <if test="distinct">
@@ -211,7 +220,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -222,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 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     delete from demand_collection
     where id = #{id,jdbcType=INTEGER}
@@ -231,7 +240,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     delete from demand_collection
     <if test="_parameter != null">
@@ -242,22 +251,23 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     insert into demand_collection (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, 
-      cgmc, cgly, cgsx, cgtxxs, 
+      ssszc, sssza, ssyq, 
+      yysjjyspt, yysjjyspt_value, frdb, 
+      tyshxydm, jjgm, rygm, 
+      clsj, zczb, txdz, yb, 
+      lxr, lxdh, email, zyywjhxcp, 
+      ndxmzyywsr18, ndxmjlr18, ndxmzyywsr19, 
+      ndxmjlr19, ndyftr, ndyftrzyysrbl, 
+      sfchyhdk, sfchyhdk_value, sfwgxjsqy, 
+      sfwgxjsqy_value, sfwkjxzxqy, sfwkjxzxqy_value, 
+      zlsl, zlsl_fmzl, zlsl_syxx, 
+      sfchkjzxzj, sfycxyz, sfycxyz_value, 
+      sfyhjgtzztz, sfyhjgtzztz_value, cgmc, 
+      cgly, cgsx, cgtxxs, 
       cgtxxs_value, cgcsd, cgzscqxs, 
       zscqqs, zlzt, cgdjqk, 
       cgdjqk_value, ncqcgzyzhfszzzh, ncqcgzyzhfshzkf, 
@@ -274,21 +284,24 @@
       yxhzdx, yxhzdx_value, ncqdhzfs, 
       ncqdhzfs_value, xqjjjzsj, xqsfkegk, 
       wjjjsntntgdhzzj, zjyt, zjqk, 
-      xqjjfs, create_time)
+      xqjjfs, create_time, sfxwgw, 
+      sfyxck, xqjjfs_value, zyhzfs, 
+      qyyzkdgjqykjcxhzqk, zyhzfs_value)
     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}, 
-      #{frdb,jdbcType=VARCHAR}, #{tyshxydm,jdbcType=VARCHAR}, #{jjgm,jdbcType=VARCHAR}, 
-      #{rygm,jdbcType=VARCHAR}, #{clsj,jdbcType=VARCHAR}, #{zczb,jdbcType=VARCHAR}, #{txdz,jdbcType=VARCHAR}, 
-      #{yb,jdbcType=VARCHAR}, #{lxr,jdbcType=VARCHAR}, #{lxdh,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 
-      #{zyywjhxcp,jdbcType=VARCHAR}, #{ndxmzyywsr18,jdbcType=DECIMAL}, #{ndxmjlr18,jdbcType=DECIMAL}, 
-      #{ndxmzyywsr19,jdbcType=DECIMAL}, #{ndxmjlr19,jdbcType=DECIMAL}, #{ndyftr,jdbcType=INTEGER}, 
-      #{ndyftrzyysrbl,jdbcType=INTEGER}, #{sfchyhdk,jdbcType=INTEGER}, #{sfchyhdkValue,jdbcType=VARCHAR}, 
-      #{sfwgxjsqy,jdbcType=INTEGER}, #{sfwgxjsqyValue,jdbcType=VARCHAR}, #{sfwkjxzxqy,jdbcType=INTEGER}, 
-      #{sfwkjxzxqyValue,jdbcType=VARCHAR}, #{zlsl,jdbcType=INTEGER}, #{zlslFmzl,jdbcType=INTEGER}, 
-      #{zlslSyxx,jdbcType=INTEGER}, #{sfchkjzxzj,jdbcType=INTEGER}, #{sfycxyz,jdbcType=INTEGER}, 
-      #{sfycxyzValue,jdbcType=VARCHAR}, #{sfyhjgtzztz,jdbcType=VARCHAR}, #{sfyhjgtzztzValue,jdbcType=VARCHAR}, 
-      #{cgmc,jdbcType=VARCHAR}, #{cgly,jdbcType=INTEGER}, #{cgsx,jdbcType=VARCHAR}, #{cgtxxs,jdbcType=INTEGER}, 
+      #{ssszc,jdbcType=INTEGER}, #{sssza,jdbcType=INTEGER}, #{ssyq,jdbcType=VARCHAR}, 
+      #{yysjjyspt,jdbcType=INTEGER}, #{yysjjysptValue,jdbcType=VARCHAR}, #{frdb,jdbcType=VARCHAR}, 
+      #{tyshxydm,jdbcType=VARCHAR}, #{jjgm,jdbcType=VARCHAR}, #{rygm,jdbcType=VARCHAR}, 
+      #{clsj,jdbcType=VARCHAR}, #{zczb,jdbcType=VARCHAR}, #{txdz,jdbcType=VARCHAR}, #{yb,jdbcType=VARCHAR}, 
+      #{lxr,jdbcType=VARCHAR}, #{lxdh,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{zyywjhxcp,jdbcType=VARCHAR}, 
+      #{ndxmzyywsr18,jdbcType=DECIMAL}, #{ndxmjlr18,jdbcType=DECIMAL}, #{ndxmzyywsr19,jdbcType=DECIMAL}, 
+      #{ndxmjlr19,jdbcType=DECIMAL}, #{ndyftr,jdbcType=INTEGER}, #{ndyftrzyysrbl,jdbcType=INTEGER}, 
+      #{sfchyhdk,jdbcType=INTEGER}, #{sfchyhdkValue,jdbcType=VARCHAR}, #{sfwgxjsqy,jdbcType=INTEGER}, 
+      #{sfwgxjsqyValue,jdbcType=VARCHAR}, #{sfwkjxzxqy,jdbcType=INTEGER}, #{sfwkjxzxqyValue,jdbcType=VARCHAR}, 
+      #{zlsl,jdbcType=INTEGER}, #{zlslFmzl,jdbcType=INTEGER}, #{zlslSyxx,jdbcType=INTEGER}, 
+      #{sfchkjzxzj,jdbcType=INTEGER}, #{sfycxyz,jdbcType=INTEGER}, #{sfycxyzValue,jdbcType=VARCHAR}, 
+      #{sfyhjgtzztz,jdbcType=VARCHAR}, #{sfyhjgtzztzValue,jdbcType=VARCHAR}, #{cgmc,jdbcType=VARCHAR}, 
+      #{cgly,jdbcType=INTEGER}, #{cgsx,jdbcType=VARCHAR}, #{cgtxxs,jdbcType=INTEGER}, 
       #{cgtxxsValue,jdbcType=VARCHAR}, #{cgcsd,jdbcType=INTEGER}, #{cgzscqxs,jdbcType=INTEGER}, 
       #{zscqqs,jdbcType=INTEGER}, #{zlzt,jdbcType=INTEGER}, #{cgdjqk,jdbcType=INTEGER}, 
       #{cgdjqkValue,jdbcType=VARCHAR}, #{ncqcgzyzhfszzzh,jdbcType=VARCHAR}, #{ncqcgzyzhfshzkf,jdbcType=VARCHAR}, 
@@ -305,13 +318,15 @@
       #{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})
+      #{xqjjfs,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{sfxwgw,jdbcType=VARCHAR}, 
+      #{sfyxck,jdbcType=VARCHAR}, #{xqjjfsValue,jdbcType=VARCHAR}, #{zyhzfs,jdbcType=VARCHAR}, 
+      #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR}, #{zyhzfsValue,jdbcType=VARCHAR})
   </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 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     insert into demand_collection
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -336,12 +351,18 @@
       <if test="ssszc != null">
         ssszc,
       </if>
+      <if test="sssza != null">
+        sssza,
+      </if>
       <if test="ssyq != null">
         ssyq,
       </if>
       <if test="yysjjyspt != null">
         yysjjyspt,
       </if>
+      <if test="yysjjysptValue != null">
+        yysjjyspt_value,
+      </if>
       <if test="frdb != null">
         frdb,
       </if>
@@ -597,6 +618,24 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="sfxwgw != null">
+        sfxwgw,
+      </if>
+      <if test="sfyxck != null">
+        sfyxck,
+      </if>
+      <if test="xqjjfsValue != null">
+        xqjjfs_value,
+      </if>
+      <if test="zyhzfs != null">
+        zyhzfs,
+      </if>
+      <if test="qyyzkdgjqykjcxhzqk != null">
+        qyyzkdgjqykjcxhzqk,
+      </if>
+      <if test="zyhzfsValue != null">
+        zyhzfs_value,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -620,11 +659,17 @@
       <if test="ssszc != null">
         #{ssszc,jdbcType=INTEGER},
       </if>
+      <if test="sssza != null">
+        #{sssza,jdbcType=INTEGER},
+      </if>
       <if test="ssyq != null">
         #{ssyq,jdbcType=VARCHAR},
       </if>
       <if test="yysjjyspt != null">
-        #{yysjjyspt,jdbcType=VARCHAR},
+        #{yysjjyspt,jdbcType=INTEGER},
+      </if>
+      <if test="yysjjysptValue != null">
+        #{yysjjysptValue,jdbcType=VARCHAR},
       </if>
       <if test="frdb != null">
         #{frdb,jdbcType=VARCHAR},
@@ -881,13 +926,31 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="sfxwgw != null">
+        #{sfxwgw,jdbcType=VARCHAR},
+      </if>
+      <if test="sfyxck != null">
+        #{sfyxck,jdbcType=VARCHAR},
+      </if>
+      <if test="xqjjfsValue != null">
+        #{xqjjfsValue,jdbcType=VARCHAR},
+      </if>
+      <if test="zyhzfs != null">
+        #{zyhzfs,jdbcType=VARCHAR},
+      </if>
+      <if test="qyyzkdgjqykjcxhzqk != null">
+        #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
+      </if>
+      <if test="zyhzfsValue != null">
+        #{zyhzfsValue,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.DemandCollectionExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     select count(*) from demand_collection
     <if test="_parameter != null">
@@ -898,7 +961,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     update demand_collection
     <set>
@@ -923,11 +986,17 @@
       <if test="record.ssszc != null">
         ssszc = #{record.ssszc,jdbcType=INTEGER},
       </if>
+      <if test="record.sssza != null">
+        sssza = #{record.sssza,jdbcType=INTEGER},
+      </if>
       <if test="record.ssyq != null">
         ssyq = #{record.ssyq,jdbcType=VARCHAR},
       </if>
       <if test="record.yysjjyspt != null">
-        yysjjyspt = #{record.yysjjyspt,jdbcType=VARCHAR},
+        yysjjyspt = #{record.yysjjyspt,jdbcType=INTEGER},
+      </if>
+      <if test="record.yysjjysptValue != null">
+        yysjjyspt_value = #{record.yysjjysptValue,jdbcType=VARCHAR},
       </if>
       <if test="record.frdb != null">
         frdb = #{record.frdb,jdbcType=VARCHAR},
@@ -1184,6 +1253,24 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.sfxwgw != null">
+        sfxwgw = #{record.sfxwgw,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sfyxck != null">
+        sfyxck = #{record.sfyxck,jdbcType=VARCHAR},
+      </if>
+      <if test="record.xqjjfsValue != null">
+        xqjjfs_value = #{record.xqjjfsValue,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zyhzfs != null">
+        zyhzfs = #{record.zyhzfs,jdbcType=VARCHAR},
+      </if>
+      <if test="record.qyyzkdgjqykjcxhzqk != null">
+        qyyzkdgjqykjcxhzqk = #{record.qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zyhzfsValue != null">
+        zyhzfs_value = #{record.zyhzfsValue,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -1193,7 +1280,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     update demand_collection
     set id = #{record.id,jdbcType=INTEGER},
@@ -1203,8 +1290,10 @@
       htly = #{record.htly,jdbcType=VARCHAR},
       ssszp = #{record.ssszp,jdbcType=INTEGER},
       ssszc = #{record.ssszc,jdbcType=INTEGER},
+      sssza = #{record.sssza,jdbcType=INTEGER},
       ssyq = #{record.ssyq,jdbcType=VARCHAR},
-      yysjjyspt = #{record.yysjjyspt,jdbcType=VARCHAR},
+      yysjjyspt = #{record.yysjjyspt,jdbcType=INTEGER},
+      yysjjyspt_value = #{record.yysjjysptValue,jdbcType=VARCHAR},
       frdb = #{record.frdb,jdbcType=VARCHAR},
       tyshxydm = #{record.tyshxydm,jdbcType=VARCHAR},
       jjgm = #{record.jjgm,jdbcType=VARCHAR},
@@ -1289,7 +1378,13 @@
       zjyt = #{record.zjyt,jdbcType=VARCHAR},
       zjqk = #{record.zjqk,jdbcType=VARCHAR},
       xqjjfs = #{record.xqjjfs,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      sfxwgw = #{record.sfxwgw,jdbcType=VARCHAR},
+      sfyxck = #{record.sfyxck,jdbcType=VARCHAR},
+      xqjjfs_value = #{record.xqjjfsValue,jdbcType=VARCHAR},
+      zyhzfs = #{record.zyhzfs,jdbcType=VARCHAR},
+      qyyzkdgjqykjcxhzqk = #{record.qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
+      zyhzfs_value = #{record.zyhzfsValue,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1298,7 +1393,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1320,11 +1415,17 @@
       <if test="ssszc != null">
         ssszc = #{ssszc,jdbcType=INTEGER},
       </if>
+      <if test="sssza != null">
+        sssza = #{sssza,jdbcType=INTEGER},
+      </if>
       <if test="ssyq != null">
         ssyq = #{ssyq,jdbcType=VARCHAR},
       </if>
       <if test="yysjjyspt != null">
-        yysjjyspt = #{yysjjyspt,jdbcType=VARCHAR},
+        yysjjyspt = #{yysjjyspt,jdbcType=INTEGER},
+      </if>
+      <if test="yysjjysptValue != null">
+        yysjjyspt_value = #{yysjjysptValue,jdbcType=VARCHAR},
       </if>
       <if test="frdb != null">
         frdb = #{frdb,jdbcType=VARCHAR},
@@ -1581,6 +1682,24 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="sfxwgw != null">
+        sfxwgw = #{sfxwgw,jdbcType=VARCHAR},
+      </if>
+      <if test="sfyxck != null">
+        sfyxck = #{sfyxck,jdbcType=VARCHAR},
+      </if>
+      <if test="xqjjfsValue != null">
+        xqjjfs_value = #{xqjjfsValue,jdbcType=VARCHAR},
+      </if>
+      <if test="zyhzfs != null">
+        zyhzfs = #{zyhzfs,jdbcType=VARCHAR},
+      </if>
+      <if test="qyyzkdgjqykjcxhzqk != null">
+        qyyzkdgjqykjcxhzqk = #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
+      </if>
+      <if test="zyhzfsValue != null">
+        zyhzfs_value = #{zyhzfsValue,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1588,7 +1707,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 14:27:49 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     update demand_collection
     set dwmc = #{dwmc,jdbcType=VARCHAR},
@@ -1597,8 +1716,10 @@
       htly = #{htly,jdbcType=VARCHAR},
       ssszp = #{ssszp,jdbcType=INTEGER},
       ssszc = #{ssszc,jdbcType=INTEGER},
+      sssza = #{sssza,jdbcType=INTEGER},
       ssyq = #{ssyq,jdbcType=VARCHAR},
-      yysjjyspt = #{yysjjyspt,jdbcType=VARCHAR},
+      yysjjyspt = #{yysjjyspt,jdbcType=INTEGER},
+      yysjjyspt_value = #{yysjjysptValue,jdbcType=VARCHAR},
       frdb = #{frdb,jdbcType=VARCHAR},
       tyshxydm = #{tyshxydm,jdbcType=VARCHAR},
       jjgm = #{jjgm,jdbcType=VARCHAR},
@@ -1683,23 +1804,29 @@
       zjyt = #{zjyt,jdbcType=VARCHAR},
       zjqk = #{zjqk,jdbcType=VARCHAR},
       xqjjfs = #{xqjjfs,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      sfxwgw = #{sfxwgw,jdbcType=VARCHAR},
+      sfyxck = #{sfyxck,jdbcType=VARCHAR},
+      xqjjfs_value = #{xqjjfsValue,jdbcType=VARCHAR},
+      zyhzfs = #{zyhzfs,jdbcType=VARCHAR},
+      qyyzkdgjqykjcxhzqk = #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
+      zyhzfs_value = #{zyhzfsValue,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  
+   
   <select id="findDemandCollectionList" resultType="com.goafanti.demandCollection.bo.OutDemandCollection">
-	  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,
+	  select a.id,dwmc,dwxz,dwxz_value dwxzValue ,htly,b.name ssszp,c.name ssszc,d.name sssza,ssyq,yysjjyspt,yysjjyspt_value yysjjysptValue,
+	  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,ncqdhzfs_value ncqdhzfsValue, xqjjjzsj,xqsfkegk,wjjjsntntgdhzzj,
-	  zjyt,zjqk,xqjjfs,sqskjzgbmxxdwgkfb_value sqskjzgbmxxdwgkfbValue,date_format(create_time,'%Y-%m-%d %H:%i:%S') createTime
+	  cgdjqk_value cgdjqkValue,ncqcgzyzhfszzzh,ncqcgzyzhfshzkf,ncqcgzyzhfsjszr, yjkzyzhsj,cgjs,sfycghzxq,sfyyxhzdw,clsj,zyhzfs_value zyhzfsValue,
+	  sfyyxhzdw_value sfyyxhzdwValue,yxhzfs,yxhzfs_value yxhzfsValue,yssdkjzc,yssdkjzc_value yssdkjzcValue,nsqdsjxm,sfxwgw,sfyxck,
+	  sqskjzgbmxxdwgkfb,tbr,tbrsj,jsfzr,jsfsj,xqmc,xqbl,jsxqlx,xqly, mqcpjsxz,yfnd,yqdddxg,yjzkdgz,xyyftjqk,mqhzdxqk,zyhzfs,qyyzkdgjqykjcxhzqk,
+	  sfyxybhzxq,yxhzdx,yxhzdx_value yxhzdxValue,ncqdhzfs,ncqdhzfs_value ncqdhzfsValue, xqjjjzsj,xqsfkegk,wjjjsntntgdhzzj,zjyt,zjqk,
+	  xqjjfs,xqjjfs_value xqjjfsValue,sqskjzgbmxxdwgkfb_value sqskjzgbmxxdwgkfbValue,date_format(create_time,'%Y-%m-%d %H:%i:%S') createTime
 	from demand_collection a left join district_glossory b on a.ssszp=b.id left join district_glossory c on a.ssszc=c.id
-	where 1=1
+	left join district_glossory d on a.sssza=d.id where 1=1
 	<if test="dwmc !=null ">
 	and dwmc like concat('%',#{dwmc},'%')
 	</if>
@@ -1712,6 +1839,9 @@
 	<if test="ssszc != null">
 	and a.ssszc= #{ssszc}
 	</if>
+	<if test="sssza != null">
+	and a.sssza= #{sssza}
+	</if>
 	<if test="startTime !=null and endTime !=null">
 	and a.create_time between #{startTime} and #{endTime}
 	</if>
@@ -1736,6 +1866,9 @@
 	<if test="ssszc != null">
 	and a.ssszc= #{ssszc}
 	</if>
+	<if test="sssza != null">
+	and a.sssza= #{sssza}
+	</if>
 	<if test="startTime !=null and endTime !=null">
 	and a.create_time between #{startTime} and #{endTime}
 	</if>

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


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

@@ -8,23 +8,23 @@ import java.util.List;
 public class DemandCollectionExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Thu Jul 09 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 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 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -614,6 +614,66 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
+		public Criteria andSsszaIsNull() {
+			addCriterion("sssza is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSsszaIsNotNull() {
+			addCriterion("sssza is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSsszaEqualTo(Integer value) {
+			addCriterion("sssza =", value, "sssza");
+			return (Criteria) this;
+		}
+
+		public Criteria andSsszaNotEqualTo(Integer value) {
+			addCriterion("sssza <>", value, "sssza");
+			return (Criteria) this;
+		}
+
+		public Criteria andSsszaGreaterThan(Integer value) {
+			addCriterion("sssza >", value, "sssza");
+			return (Criteria) this;
+		}
+
+		public Criteria andSsszaGreaterThanOrEqualTo(Integer value) {
+			addCriterion("sssza >=", value, "sssza");
+			return (Criteria) this;
+		}
+
+		public Criteria andSsszaLessThan(Integer value) {
+			addCriterion("sssza <", value, "sssza");
+			return (Criteria) this;
+		}
+
+		public Criteria andSsszaLessThanOrEqualTo(Integer value) {
+			addCriterion("sssza <=", value, "sssza");
+			return (Criteria) this;
+		}
+
+		public Criteria andSsszaIn(List<Integer> values) {
+			addCriterion("sssza in", values, "sssza");
+			return (Criteria) this;
+		}
+
+		public Criteria andSsszaNotIn(List<Integer> values) {
+			addCriterion("sssza not in", values, "sssza");
+			return (Criteria) this;
+		}
+
+		public Criteria andSsszaBetween(Integer value1, Integer value2) {
+			addCriterion("sssza between", value1, value2, "sssza");
+			return (Criteria) this;
+		}
+
+		public Criteria andSsszaNotBetween(Integer value1, Integer value2) {
+			addCriterion("sssza not between", value1, value2, "sssza");
+			return (Criteria) this;
+		}
+
 		public Criteria andSsyqIsNull() {
 			addCriterion("ssyq is null");
 			return (Criteria) this;
@@ -694,63 +754,123 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptEqualTo(String value) {
+		public Criteria andYysjjysptEqualTo(Integer value) {
 			addCriterion("yysjjyspt =", value, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptNotEqualTo(String value) {
+		public Criteria andYysjjysptNotEqualTo(Integer value) {
 			addCriterion("yysjjyspt <>", value, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptGreaterThan(String value) {
+		public Criteria andYysjjysptGreaterThan(Integer value) {
 			addCriterion("yysjjyspt >", value, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptGreaterThanOrEqualTo(String value) {
+		public Criteria andYysjjysptGreaterThanOrEqualTo(Integer value) {
 			addCriterion("yysjjyspt >=", value, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptLessThan(String value) {
+		public Criteria andYysjjysptLessThan(Integer value) {
 			addCriterion("yysjjyspt <", value, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptLessThanOrEqualTo(String value) {
+		public Criteria andYysjjysptLessThanOrEqualTo(Integer value) {
 			addCriterion("yysjjyspt <=", value, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptLike(String value) {
-			addCriterion("yysjjyspt like", value, "yysjjyspt");
+		public Criteria andYysjjysptIn(List<Integer> values) {
+			addCriterion("yysjjyspt in", values, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptNotLike(String value) {
-			addCriterion("yysjjyspt not like", value, "yysjjyspt");
+		public Criteria andYysjjysptNotIn(List<Integer> values) {
+			addCriterion("yysjjyspt not in", values, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptIn(List<String> values) {
-			addCriterion("yysjjyspt in", values, "yysjjyspt");
+		public Criteria andYysjjysptBetween(Integer value1, Integer value2) {
+			addCriterion("yysjjyspt between", value1, value2, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptNotIn(List<String> values) {
-			addCriterion("yysjjyspt not in", values, "yysjjyspt");
+		public Criteria andYysjjysptNotBetween(Integer value1, Integer value2) {
+			addCriterion("yysjjyspt not between", value1, value2, "yysjjyspt");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptBetween(String value1, String value2) {
-			addCriterion("yysjjyspt between", value1, value2, "yysjjyspt");
+		public Criteria andYysjjysptValueIsNull() {
+			addCriterion("yysjjyspt_value is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andYysjjysptNotBetween(String value1, String value2) {
-			addCriterion("yysjjyspt not between", value1, value2, "yysjjyspt");
+		public Criteria andYysjjysptValueIsNotNull() {
+			addCriterion("yysjjyspt_value is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueEqualTo(String value) {
+			addCriterion("yysjjyspt_value =", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueNotEqualTo(String value) {
+			addCriterion("yysjjyspt_value <>", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueGreaterThan(String value) {
+			addCriterion("yysjjyspt_value >", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueGreaterThanOrEqualTo(String value) {
+			addCriterion("yysjjyspt_value >=", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueLessThan(String value) {
+			addCriterion("yysjjyspt_value <", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueLessThanOrEqualTo(String value) {
+			addCriterion("yysjjyspt_value <=", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueLike(String value) {
+			addCriterion("yysjjyspt_value like", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueNotLike(String value) {
+			addCriterion("yysjjyspt_value not like", value, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueIn(List<String> values) {
+			addCriterion("yysjjyspt_value in", values, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueNotIn(List<String> values) {
+			addCriterion("yysjjyspt_value not in", values, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueBetween(String value1, String value2) {
+			addCriterion("yysjjyspt_value between", value1, value2, "yysjjysptValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andYysjjysptValueNotBetween(String value1, String value2) {
+			addCriterion("yysjjyspt_value not between", value1, value2, "yysjjysptValue");
 			return (Criteria) this;
 		}
 
@@ -6363,11 +6483,431 @@ public class DemandCollectionExample {
 			addCriterion("create_time not between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
+
+		public Criteria andSfxwgwIsNull() {
+			addCriterion("sfxwgw is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwIsNotNull() {
+			addCriterion("sfxwgw is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwEqualTo(String value) {
+			addCriterion("sfxwgw =", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwNotEqualTo(String value) {
+			addCriterion("sfxwgw <>", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwGreaterThan(String value) {
+			addCriterion("sfxwgw >", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwGreaterThanOrEqualTo(String value) {
+			addCriterion("sfxwgw >=", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwLessThan(String value) {
+			addCriterion("sfxwgw <", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwLessThanOrEqualTo(String value) {
+			addCriterion("sfxwgw <=", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwLike(String value) {
+			addCriterion("sfxwgw like", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwNotLike(String value) {
+			addCriterion("sfxwgw not like", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwIn(List<String> values) {
+			addCriterion("sfxwgw in", values, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwNotIn(List<String> values) {
+			addCriterion("sfxwgw not in", values, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwBetween(String value1, String value2) {
+			addCriterion("sfxwgw between", value1, value2, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwNotBetween(String value1, String value2) {
+			addCriterion("sfxwgw not between", value1, value2, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckIsNull() {
+			addCriterion("sfyxck is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckIsNotNull() {
+			addCriterion("sfyxck is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckEqualTo(String value) {
+			addCriterion("sfyxck =", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckNotEqualTo(String value) {
+			addCriterion("sfyxck <>", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckGreaterThan(String value) {
+			addCriterion("sfyxck >", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckGreaterThanOrEqualTo(String value) {
+			addCriterion("sfyxck >=", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckLessThan(String value) {
+			addCriterion("sfyxck <", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckLessThanOrEqualTo(String value) {
+			addCriterion("sfyxck <=", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckLike(String value) {
+			addCriterion("sfyxck like", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckNotLike(String value) {
+			addCriterion("sfyxck not like", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckIn(List<String> values) {
+			addCriterion("sfyxck in", values, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckNotIn(List<String> values) {
+			addCriterion("sfyxck not in", values, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckBetween(String value1, String value2) {
+			addCriterion("sfyxck between", value1, value2, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckNotBetween(String value1, String value2) {
+			addCriterion("sfyxck not between", value1, value2, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andXqjjfsValueIsNull() {
+			addCriterion("xqjjfs_value is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andXqjjfsValueIsNotNull() {
+			addCriterion("xqjjfs_value is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andXqjjfsValueEqualTo(String value) {
+			addCriterion("xqjjfs_value =", value, "xqjjfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andXqjjfsValueNotEqualTo(String value) {
+			addCriterion("xqjjfs_value <>", value, "xqjjfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andXqjjfsValueGreaterThan(String value) {
+			addCriterion("xqjjfs_value >", value, "xqjjfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andXqjjfsValueGreaterThanOrEqualTo(String value) {
+			addCriterion("xqjjfs_value >=", value, "xqjjfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andXqjjfsValueLessThan(String value) {
+			addCriterion("xqjjfs_value <", value, "xqjjfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andXqjjfsValueLessThanOrEqualTo(String value) {
+			addCriterion("xqjjfs_value <=", value, "xqjjfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andXqjjfsValueLike(String value) {
+			addCriterion("xqjjfs_value like", value, "xqjjfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andXqjjfsValueNotLike(String value) {
+			addCriterion("xqjjfs_value not like", value, "xqjjfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andXqjjfsValueIn(List<String> values) {
+			addCriterion("xqjjfs_value in", values, "xqjjfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andXqjjfsValueNotIn(List<String> values) {
+			addCriterion("xqjjfs_value not in", values, "xqjjfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andXqjjfsValueBetween(String value1, String value2) {
+			addCriterion("xqjjfs_value between", value1, value2, "xqjjfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andXqjjfsValueNotBetween(String value1, String value2) {
+			addCriterion("xqjjfs_value not between", value1, value2, "xqjjfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsIsNull() {
+			addCriterion("zyhzfs is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsIsNotNull() {
+			addCriterion("zyhzfs is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsEqualTo(String value) {
+			addCriterion("zyhzfs =", value, "zyhzfs");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsNotEqualTo(String value) {
+			addCriterion("zyhzfs <>", value, "zyhzfs");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsGreaterThan(String value) {
+			addCriterion("zyhzfs >", value, "zyhzfs");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsGreaterThanOrEqualTo(String value) {
+			addCriterion("zyhzfs >=", value, "zyhzfs");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsLessThan(String value) {
+			addCriterion("zyhzfs <", value, "zyhzfs");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsLessThanOrEqualTo(String value) {
+			addCriterion("zyhzfs <=", value, "zyhzfs");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsLike(String value) {
+			addCriterion("zyhzfs like", value, "zyhzfs");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsNotLike(String value) {
+			addCriterion("zyhzfs not like", value, "zyhzfs");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsIn(List<String> values) {
+			addCriterion("zyhzfs in", values, "zyhzfs");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsNotIn(List<String> values) {
+			addCriterion("zyhzfs not in", values, "zyhzfs");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsBetween(String value1, String value2) {
+			addCriterion("zyhzfs between", value1, value2, "zyhzfs");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsNotBetween(String value1, String value2) {
+			addCriterion("zyhzfs not between", value1, value2, "zyhzfs");
+			return (Criteria) this;
+		}
+
+		public Criteria andQyyzkdgjqykjcxhzqkIsNull() {
+			addCriterion("qyyzkdgjqykjcxhzqk is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andQyyzkdgjqykjcxhzqkIsNotNull() {
+			addCriterion("qyyzkdgjqykjcxhzqk is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andQyyzkdgjqykjcxhzqkEqualTo(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk =", value, "qyyzkdgjqykjcxhzqk");
+			return (Criteria) this;
+		}
+
+		public Criteria andQyyzkdgjqykjcxhzqkNotEqualTo(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk <>", value, "qyyzkdgjqykjcxhzqk");
+			return (Criteria) this;
+		}
+
+		public Criteria andQyyzkdgjqykjcxhzqkGreaterThan(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk >", value, "qyyzkdgjqykjcxhzqk");
+			return (Criteria) this;
+		}
+
+		public Criteria andQyyzkdgjqykjcxhzqkGreaterThanOrEqualTo(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk >=", value, "qyyzkdgjqykjcxhzqk");
+			return (Criteria) this;
+		}
+
+		public Criteria andQyyzkdgjqykjcxhzqkLessThan(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk <", value, "qyyzkdgjqykjcxhzqk");
+			return (Criteria) this;
+		}
+
+		public Criteria andQyyzkdgjqykjcxhzqkLessThanOrEqualTo(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk <=", value, "qyyzkdgjqykjcxhzqk");
+			return (Criteria) this;
+		}
+
+		public Criteria andQyyzkdgjqykjcxhzqkLike(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk like", value, "qyyzkdgjqykjcxhzqk");
+			return (Criteria) this;
+		}
+
+		public Criteria andQyyzkdgjqykjcxhzqkNotLike(String value) {
+			addCriterion("qyyzkdgjqykjcxhzqk not like", value, "qyyzkdgjqykjcxhzqk");
+			return (Criteria) this;
+		}
+
+		public Criteria andQyyzkdgjqykjcxhzqkIn(List<String> values) {
+			addCriterion("qyyzkdgjqykjcxhzqk in", values, "qyyzkdgjqykjcxhzqk");
+			return (Criteria) this;
+		}
+
+		public Criteria andQyyzkdgjqykjcxhzqkNotIn(List<String> values) {
+			addCriterion("qyyzkdgjqykjcxhzqk not in", values, "qyyzkdgjqykjcxhzqk");
+			return (Criteria) this;
+		}
+
+		public Criteria andQyyzkdgjqykjcxhzqkBetween(String value1, String value2) {
+			addCriterion("qyyzkdgjqykjcxhzqk between", value1, value2, "qyyzkdgjqykjcxhzqk");
+			return (Criteria) this;
+		}
+
+		public Criteria andQyyzkdgjqykjcxhzqkNotBetween(String value1, String value2) {
+			addCriterion("qyyzkdgjqykjcxhzqk not between", value1, value2, "qyyzkdgjqykjcxhzqk");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsValueIsNull() {
+			addCriterion("zyhzfs_value is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsValueIsNotNull() {
+			addCriterion("zyhzfs_value is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsValueEqualTo(String value) {
+			addCriterion("zyhzfs_value =", value, "zyhzfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsValueNotEqualTo(String value) {
+			addCriterion("zyhzfs_value <>", value, "zyhzfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsValueGreaterThan(String value) {
+			addCriterion("zyhzfs_value >", value, "zyhzfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsValueGreaterThanOrEqualTo(String value) {
+			addCriterion("zyhzfs_value >=", value, "zyhzfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsValueLessThan(String value) {
+			addCriterion("zyhzfs_value <", value, "zyhzfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsValueLessThanOrEqualTo(String value) {
+			addCriterion("zyhzfs_value <=", value, "zyhzfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsValueLike(String value) {
+			addCriterion("zyhzfs_value like", value, "zyhzfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsValueNotLike(String value) {
+			addCriterion("zyhzfs_value not like", value, "zyhzfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsValueIn(List<String> values) {
+			addCriterion("zyhzfs_value in", values, "zyhzfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsValueNotIn(List<String> values) {
+			addCriterion("zyhzfs_value not in", values, "zyhzfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsValueBetween(String value1, String value2) {
+			addCriterion("zyhzfs_value between", value1, value2, "zyhzfsValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andZyhzfsValueNotBetween(String value1, String value2) {
+			addCriterion("zyhzfs_value not between", value1, value2, "zyhzfsValue");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table demand_collection
-	 * @mbg.generated  Thu Jul 09 14:27:49 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -20,7 +20,7 @@ public class ExportExcelUtil {
 		XSSFFont font = workbook.createFont();  
 		// font.setColor(HSSFFont.COLOR_RED);  
 		font.setFontName("微软雅黑");
-		font.setFontHeightInPoints((short) 14);//字体大小  
+		font.setFontHeightInPoints((short) 24);//字体大小  
 		  
 		// 设置样式  
 		XSSFCellStyle cellStyle = workbook.createCellStyle();  
@@ -77,6 +77,7 @@ public class ExportExcelUtil {
 		//设置其他单位格式
 		//创建表头
 		XSSFRow row2 = sheet.createRow(1);
+		//设置换行
 		for(int i = 0; i < comment.length; i++){
 			if (i==0) {
 				sheet.setColumnWidth(i, 1000);//设置列宽	
@@ -86,6 +87,9 @@ public class ExportExcelUtil {
 			XSSFCell c = row2.createCell(i);
 			c.setCellValue(comment[i]);
 			c.setCellStyle(style2);
+			
+
+
 		}
 		return wb;
 	}

File diff suppressed because it is too large
+ 2228 - 2
src/main/java/com/goafanti/demandCollection/bo/InputDemandCollection.java


File diff suppressed because it is too large
+ 765 - 258
src/main/java/com/goafanti/demandCollection/bo/OutDemandCollection.java


+ 27 - 1
src/main/java/com/goafanti/demandCollection/controller/DemandCollectionApiController.java

@@ -1,9 +1,12 @@
 package com.goafanti.demandCollection.controller;
 
 
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,6 +22,12 @@ public class DemandCollectionApiController  extends CertifyApiController {
 	@Resource
 	private DemandCollectionService		demandCollectionService;
 	
+	@Value(value = "${skjt.userName}")
+	private String	username			= null;
+	
+	@Value(value = "${skjt.password}")
+	private String	password			= null;
+	
 	/**
 	 * 新增需求收集
 	 * @param d
@@ -27,7 +36,7 @@ public class DemandCollectionApiController  extends CertifyApiController {
 	@RequestMapping(value="/open/addDemandCollection",method = RequestMethod.POST)
 	public Result addDemandCollection(DemandCollection d){
 		Result res =new Result();
-		if (d.getDwmc()==null) {
+		if (StringUtils.isBlank(d.getDwmc())) {
 			res.getError().add(buildError("名称必须指定","名称必须指定"));
 			return res;
 		}
@@ -47,6 +56,23 @@ public class DemandCollectionApiController  extends CertifyApiController {
 		return res;
 		
 	}
+	/**
+	   *模拟登陆
+	 * @param d
+	 * @return
+	 */
+	@RequestMapping(value="/open/login",method = RequestMethod.POST)
+	public Result demandCollectionList(String userName ,String password){
+		Result res =new Result();
+		//模拟登陆
+		if (username==null||password==null||!userName.equals(this.username)||!password.equals(this.password)) {
+			res.getError().add(buildError("账号密码不匹配!","账号密码不匹配!"));
+			return  res ;
+		}
+		res.data("jdasjdoisahoi-@djsaldjslajdasklsjdoiusername=12312387password='312321321312kdpsa'912739lasjdsaljd198e@dkasjdlsasldjlsa");
+		return res;
+		
+	}
 	
 	/**
 	 * 	导出变更列表

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

@@ -1,5 +1,6 @@
 package com.goafanti.demandCollection.service.impl;
 
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
@@ -8,9 +9,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -31,6 +38,7 @@ import com.goafanti.demandCollection.service.DemandCollectionService;
 @Service
 public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollectionMapper> implements DemandCollectionService {
 
+	protected final Log logger = LogFactory.getLog(DemandCollectionServiceImpl.class);
 	@Autowired
 	private DemandCollectionMapper	demandCollectionMapper;
 	@Override
@@ -41,15 +49,15 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 	@Override
 	public Pagination<OutDemandCollection> demandCollectionList(InputDemandCollection i) {
 		Map<String, Object> map=new HashMap<>();
-		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) {
+		if(StringUtils.isNotBlank(i.getDwmc()))map.put("dwmc", i.getDwmc());
+		if(StringUtils.isNotBlank(i.getDwxz()))map.put("dwxz", i.getDwxz());
+		if(StringUtils.isNotBlank(i.getStartTime())&&StringUtils.isNotBlank(i.getEndTime())) {
 			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());
+		if(StringUtils.isNotBlank(i.getSsszp()))map.put("ssszp", i.getSsszp());
+		if(StringUtils.isNotBlank(i.getSsszc()))map.put("ssszc", i.getSsszc());
+		if(StringUtils.isNotBlank(i.getSssza()))map.put("sssza", i.getSssza());
 		return (Pagination<OutDemandCollection>) findPage("findDemandCollectionList","findDemandCollectionCount",
 				map, i.getPageNo(), i.getPageSize());
 	}
@@ -59,23 +67,25 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 		OutputStream out = response.getOutputStream();
 		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,"需求征集表");
     		//根据列表编写文档
     		XSSFSheet sheet =wb.getSheetAt(0);
+    		XSSFCellStyle styleTitle = wb.createCellStyle();
+			styleTitle.setAlignment(HorizontalAlignment.CENTER);
+			styleTitle.setWrapText(true);
     		for (OutDemandCollection ob : (List<OutDemandCollection>)list) {
     			//新增一行
     			XSSFRow r = sheet.createRow(sheet.getLastRowNum()+1);
@@ -88,8 +98,7 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				case "单位名称" : o = ob.getDwmc(); break; 
     				case "单位性质" : o = ob.getDwxz(); break; 
     				case "行业领域" : o = ob.getHtly(); break; 
-    				case "所属市州-省" : o = ob.getSsszp(); break; 
-    				case "所属市州-市" : o = ob.getSsszc(); break; 
+    				case "所属市州" : o = ob.getSsszc()+"-"+ob.getSssza(); break; 
     				case "所属园区" : o = ob.getSsyq(); break; 
     				case "拥有的省级及以上平台" : o = ob.getYysjjyspt(); break;
     				case "法人代表" : o = ob.getFrdb(); break; 
@@ -143,6 +152,8 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				case "是否有意向合作单位" : o = ob.getSfyyxhzdw(); break;
     				case "意向合作单位" : o = ob.getSfyyxhzdwValue(); break;
     				case "意向合作方式" : o = ob.getYxhzfs(); break;
+    				case "企业已展开的国际与区域科技创新合作方式" : o = ob.getQyyzkdgjqykjcxhzqk(); break;
+    				case "主要合作方式 " : o = ob.getZyhzfs(); break;
     				case "已享受的科技政策" : o = ob.getYssdkjzc(); break;
     				case "拟申请的省级项目" : o = ob.getNsqdsjxm(); break; 
     				case "是否授权省科技主管部门将上述有关信息对外公开发布" : o = ob.getSqskjzgbmxxdwgkfb(); break;
@@ -171,13 +182,24 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				case "资金用途" : o = ob.getZjyt(); break; 
     				case "资金缺口" : o = ob.getZjqk(); break; 
     				case "需求解决方式" : o = ob.getXqjjfs(); break; 
+    				case "企业产品是否有销往国外": o = ob.getSfxwgw(); break;
+    				case "企业产品是否有意向出口": o = ob.getSfyxck(); break;
     				case "创建时间": o = ob.getCreateTime(); break;
     				default: o = ""; break;
     				}
     				XSSFCell c = r.createCell(i);
+    				sheet.autoSizeColumn(i,true); 
+    				
+    				c.setCellStyle(styleTitle);
+    				if (sheet.getColumnWidth(i)>10000) {
+    					sheet.setColumnWidth(i, 10000);
+					}else {
+						sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 12 / 10);
+					}
     				c.setCellValue(o);
     			}
     		}
+    		logger.debug("导出传参ok");    		
     		//返回名称及参数
 			 response.addHeader("Content-Disposition", "attachment;filename="  + new String(fileName.getBytes(),"iso-8859-1"));  
 			 response.setContentType("application/octet-stream;charset=utf-8");

+ 2 - 0
src/main/resources/props/config_local.properties

@@ -41,6 +41,8 @@ template.cacheable=false
 static.host=//ss.jishutao.com/client/1.2.5
 portal.host=//ss.jishutao.com/portal/1.2.5
 skjt.host=//statics.jishutao.com/skjt
+skjt.userName=admin
+skjt.password=asd123..
 #本地
 #static.host=//sclient.jishutao.com:8088/client/1.0.2
 #portal.host=//sportal.jishutao.com:80/portal/1.0.2

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

@@ -59,6 +59,9 @@ 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
+skjt.userName=admin
+skjt.password=asd123..
+
 avatar.host=//statics.jishutao.com
 avatar.upload.host=//statics.jishutao.com/upload
 

+ 1 - 0
src/main/resources/shiro_base_auth.ini

@@ -11,6 +11,7 @@
 /mlogin=anon
 /signin=anon
 /skjt=anon
+/skjt/**=anon
 /managesignin=anon
 /register=anon
 /mregister=anon

+ 25 - 0
src/main/webapp/WEB-INF/views/skjt/list.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+<meta charset=utf-8>
+<meta name=viewport content="width=device-width,initial-scale=1">
+<title>省科技厅技术需求征集</title>
+<!-- <title>版本升级,敬请期待!</title> -->
+
+<link
+	th:href="${skjtHost+'/css/app.e035a91cdd7eb912b643a42d46905f6d.css'}"
+	rel=stylesheet>
+</head>
+<body>
+	<!-- <h1>版本升级,敬请期待!</h1>  -->
+	<div id=app></div>
+	<script type=text/javascript
+		th:src="${skjtHost+'/js/manifest.1.js'}"></script>
+	<script type=text/javascript
+		th:src="${skjtHost+'/js/vendor.1.js'}"></script>
+	<script type=text/javascript
+		th:src="${skjtHost+'/js/app.1.js'}"></script>
+
+</html>

+ 25 - 0
src/main/webapp/WEB-INF/views/skjt/login.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+<meta charset=utf-8>
+<meta name=viewport content="width=device-width,initial-scale=1">
+<title>省科技厅技术需求征集</title>
+<!-- <title>版本升级,敬请期待!</title> -->
+
+<link
+	th:href="${skjtHost+'/css/app.e035a91cdd7eb912b643a42d46905f6d.css'}"
+	rel=stylesheet>
+</head>
+<body>
+	<!-- <h1>版本升级,敬请期待!</h1>  -->
+	<div id=app></div>
+	<script type=text/javascript
+		th:src="${skjtHost+'/js/manifest.1.js'}"></script>
+	<script type=text/javascript
+		th:src="${skjtHost+'/js/vendor.1.js'}"></script>
+	<script type=text/javascript
+		th:src="${skjtHost+'/js/app.1.js'}"></script>
+
+</html>

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html  xmlns="http://www.w3.org/1999/xhtml"
+<html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
@@ -8,16 +8,18 @@
 <title>省科技厅技术需求征集</title>
 <!-- <title>版本升级,敬请期待!</title> -->
 
-<link th:href="${skjtHost+'/css/app.6c8ea938fcf6465811c4abac53341e96.css'}" rel=stylesheet>
+<link
+	th:href="${skjtHost+'/css/app.1.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>
+		th:src="${skjtHost+'/js/manifest.1.js'}"></script>
 	<script type=text/javascript
-		th:src="${skjtHost+'/js/vendor.00db0a27f9c97eca50a9.js'}"></script>
-	<script type=text/javascript 
-		th:src="${skjtHost+'/js/app.a8fb8f5916058bce58de.js'}"></script>
-</body>
+		th:src="${skjtHost+'/js/vendor.1.js'}"></script>
+	<script type=text/javascript
+		th:src="${skjtHost+'/js/app.1.js'}"></script>
+
 </html>