Bladeren bron

新增需求征集

Signed-off-by: anderx <312518615@qq.com>
anderx 5 jaren geleden
bovenliggende
commit
54a0da134f

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

@@ -9,68 +9,68 @@ public interface DemandCollectionMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	long countByExample(DemandCollectionExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	int deleteByExample(DemandCollectionExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	int insert(DemandCollection record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	int insertSelective(DemandCollection record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	List<DemandCollection> selectByExample(DemandCollectionExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	DemandCollection selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") DemandCollection record,
 			@Param("example") DemandCollectionExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	int updateByExample(@Param("record") DemandCollection record, @Param("example") DemandCollectionExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	int updateByPrimaryKeySelective(DemandCollection record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	int updateByPrimaryKey(DemandCollection record);
 }

+ 83 - 36
src/main/java/com/goafanti/common/mapper/DemandCollectionMapper.xml

@@ -5,19 +5,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="dwmc" jdbcType="VARCHAR" property="dwmc" />
     <result column="dwxz" jdbcType="INTEGER" property="dwxz" />
+    <result column="dwxz_value" jdbcType="VARCHAR" property="dwxzValue" />
     <result column="htly" jdbcType="VARCHAR" property="htly" />
     <result column="ssszp" jdbcType="INTEGER" property="ssszp" />
     <result column="ssszc" jdbcType="INTEGER" property="ssszc" />
     <result column="ssyq" jdbcType="VARCHAR" property="ssyq" />
     <result column="yysjjyspt" jdbcType="VARCHAR" property="yysjjyspt" />
+    <result column="frdb" jdbcType="VARCHAR" property="frdb" />
     <result column="tyshxydm" jdbcType="VARCHAR" property="tyshxydm" />
     <result column="jjgm" jdbcType="VARCHAR" property="jjgm" />
     <result column="rygm" jdbcType="VARCHAR" property="rygm" />
+    <result column="clsj" jdbcType="VARCHAR" property="clsj" />
     <result column="zczb" jdbcType="VARCHAR" property="zczb" />
     <result column="txdz" jdbcType="VARCHAR" property="txdz" />
     <result column="yb" jdbcType="VARCHAR" property="yb" />
@@ -101,7 +104,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -135,7 +138,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -169,25 +172,25 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
-    id, dwmc, dwxz, htly, ssszp, ssszc, ssyq, yysjjyspt, tyshxydm, jjgm, rygm, 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
+    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
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.DemandCollectionExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
     select
     <if test="distinct">
@@ -206,7 +209,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -217,7 +220,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
     delete from demand_collection
     where id = #{id,jdbcType=INTEGER}
@@ -226,7 +229,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
     delete from demand_collection
     <if test="_parameter != null">
@@ -237,12 +240,13 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
     insert into demand_collection (id, dwmc, dwxz, 
-      htly, ssszp, ssszc, 
-      ssyq, yysjjyspt, tyshxydm, 
-      jjgm, rygm, zczb, txdz, 
+      dwxz_value, htly, ssszp, 
+      ssszc, ssyq, yysjjyspt, 
+      frdb, tyshxydm, jjgm, 
+      rygm, clsj, zczb, txdz, 
       yb, lxr, lxdh, email, 
       zyywjhxcp, ndxmzyywsr18, ndxmjlr18, 
       ndxmzyywsr19, ndxmjlr19, ndyftr, 
@@ -270,9 +274,10 @@
       zjqk, xqjjfs, create_time
       )
     values (#{id,jdbcType=INTEGER}, #{dwmc,jdbcType=VARCHAR}, #{dwxz,jdbcType=INTEGER}, 
-      #{htly,jdbcType=VARCHAR}, #{ssszp,jdbcType=INTEGER}, #{ssszc,jdbcType=INTEGER}, 
-      #{ssyq,jdbcType=VARCHAR}, #{yysjjyspt,jdbcType=VARCHAR}, #{tyshxydm,jdbcType=VARCHAR}, 
-      #{jjgm,jdbcType=VARCHAR}, #{rygm,jdbcType=VARCHAR}, #{zczb,jdbcType=VARCHAR}, #{txdz,jdbcType=VARCHAR}, 
+      #{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}, 
@@ -304,7 +309,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
     insert into demand_collection
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -317,6 +322,9 @@
       <if test="dwxz != null">
         dwxz,
       </if>
+      <if test="dwxzValue != null">
+        dwxz_value,
+      </if>
       <if test="htly != null">
         htly,
       </if>
@@ -332,6 +340,9 @@
       <if test="yysjjyspt != null">
         yysjjyspt,
       </if>
+      <if test="frdb != null">
+        frdb,
+      </if>
       <if test="tyshxydm != null">
         tyshxydm,
       </if>
@@ -341,6 +352,9 @@
       <if test="rygm != null">
         rygm,
       </if>
+      <if test="clsj != null">
+        clsj,
+      </if>
       <if test="zczb != null">
         zczb,
       </if>
@@ -586,6 +600,9 @@
       <if test="dwxz != null">
         #{dwxz,jdbcType=INTEGER},
       </if>
+      <if test="dwxzValue != null">
+        #{dwxzValue,jdbcType=VARCHAR},
+      </if>
       <if test="htly != null">
         #{htly,jdbcType=VARCHAR},
       </if>
@@ -601,6 +618,9 @@
       <if test="yysjjyspt != null">
         #{yysjjyspt,jdbcType=VARCHAR},
       </if>
+      <if test="frdb != null">
+        #{frdb,jdbcType=VARCHAR},
+      </if>
       <if test="tyshxydm != null">
         #{tyshxydm,jdbcType=VARCHAR},
       </if>
@@ -610,6 +630,9 @@
       <if test="rygm != null">
         #{rygm,jdbcType=VARCHAR},
       </if>
+      <if test="clsj != null">
+        #{clsj,jdbcType=VARCHAR},
+      </if>
       <if test="zczb != null">
         #{zczb,jdbcType=VARCHAR},
       </if>
@@ -850,7 +873,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
     select count(*) from demand_collection
     <if test="_parameter != null">
@@ -861,7 +884,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
     update demand_collection
     <set>
@@ -874,6 +897,9 @@
       <if test="record.dwxz != null">
         dwxz = #{record.dwxz,jdbcType=INTEGER},
       </if>
+      <if test="record.dwxzValue != null">
+        dwxz_value = #{record.dwxzValue,jdbcType=VARCHAR},
+      </if>
       <if test="record.htly != null">
         htly = #{record.htly,jdbcType=VARCHAR},
       </if>
@@ -889,6 +915,9 @@
       <if test="record.yysjjyspt != null">
         yysjjyspt = #{record.yysjjyspt,jdbcType=VARCHAR},
       </if>
+      <if test="record.frdb != null">
+        frdb = #{record.frdb,jdbcType=VARCHAR},
+      </if>
       <if test="record.tyshxydm != null">
         tyshxydm = #{record.tyshxydm,jdbcType=VARCHAR},
       </if>
@@ -898,6 +927,9 @@
       <if test="record.rygm != null">
         rygm = #{record.rygm,jdbcType=VARCHAR},
       </if>
+      <if test="record.clsj != null">
+        clsj = #{record.clsj,jdbcType=VARCHAR},
+      </if>
       <if test="record.zczb != null">
         zczb = #{record.zczb,jdbcType=VARCHAR},
       </if>
@@ -1141,20 +1173,23 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
     update demand_collection
     set id = #{record.id,jdbcType=INTEGER},
       dwmc = #{record.dwmc,jdbcType=VARCHAR},
       dwxz = #{record.dwxz,jdbcType=INTEGER},
+      dwxz_value = #{record.dwxzValue,jdbcType=VARCHAR},
       htly = #{record.htly,jdbcType=VARCHAR},
       ssszp = #{record.ssszp,jdbcType=INTEGER},
       ssszc = #{record.ssszc,jdbcType=INTEGER},
       ssyq = #{record.ssyq,jdbcType=VARCHAR},
       yysjjyspt = #{record.yysjjyspt,jdbcType=VARCHAR},
+      frdb = #{record.frdb,jdbcType=VARCHAR},
       tyshxydm = #{record.tyshxydm,jdbcType=VARCHAR},
       jjgm = #{record.jjgm,jdbcType=VARCHAR},
       rygm = #{record.rygm,jdbcType=VARCHAR},
+      clsj = #{record.clsj,jdbcType=VARCHAR},
       zczb = #{record.zczb,jdbcType=VARCHAR},
       txdz = #{record.txdz,jdbcType=VARCHAR},
       yb = #{record.yb,jdbcType=VARCHAR},
@@ -1241,7 +1276,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1251,6 +1286,9 @@
       <if test="dwxz != null">
         dwxz = #{dwxz,jdbcType=INTEGER},
       </if>
+      <if test="dwxzValue != null">
+        dwxz_value = #{dwxzValue,jdbcType=VARCHAR},
+      </if>
       <if test="htly != null">
         htly = #{htly,jdbcType=VARCHAR},
       </if>
@@ -1266,6 +1304,9 @@
       <if test="yysjjyspt != null">
         yysjjyspt = #{yysjjyspt,jdbcType=VARCHAR},
       </if>
+      <if test="frdb != null">
+        frdb = #{frdb,jdbcType=VARCHAR},
+      </if>
       <if test="tyshxydm != null">
         tyshxydm = #{tyshxydm,jdbcType=VARCHAR},
       </if>
@@ -1275,6 +1316,9 @@
       <if test="rygm != null">
         rygm = #{rygm,jdbcType=VARCHAR},
       </if>
+      <if test="clsj != null">
+        clsj = #{clsj,jdbcType=VARCHAR},
+      </if>
       <if test="zczb != null">
         zczb = #{zczb,jdbcType=VARCHAR},
       </if>
@@ -1516,19 +1560,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 16:40:41 CST 2020.
+      This element was generated on Thu Jul 09 08:56:04 CST 2020.
     -->
     update demand_collection
     set dwmc = #{dwmc,jdbcType=VARCHAR},
       dwxz = #{dwxz,jdbcType=INTEGER},
+      dwxz_value = #{dwxzValue,jdbcType=VARCHAR},
       htly = #{htly,jdbcType=VARCHAR},
       ssszp = #{ssszp,jdbcType=INTEGER},
       ssszc = #{ssszc,jdbcType=INTEGER},
       ssyq = #{ssyq,jdbcType=VARCHAR},
       yysjjyspt = #{yysjjyspt,jdbcType=VARCHAR},
+      frdb = #{frdb,jdbcType=VARCHAR},
       tyshxydm = #{tyshxydm,jdbcType=VARCHAR},
       jjgm = #{jjgm,jdbcType=VARCHAR},
       rygm = #{rygm,jdbcType=VARCHAR},
+      clsj = #{clsj,jdbcType=VARCHAR},
       zczb = #{zczb,jdbcType=VARCHAR},
       txdz = #{txdz,jdbcType=VARCHAR},
       yb = #{yb,jdbcType=VARCHAR},
@@ -1611,7 +1658,7 @@
   </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,zczb,txdz,yb,lxr,lxdh,email,zyywjhxcp,
+	  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,
@@ -1621,14 +1668,14 @@
 	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
-	from demand_collection a left join district_glossory b on a.ssszp=b.id left join district_glossory c on a.ssszc=b.id
+	from demand_collection a left join district_glossory b on a.ssszp=b.id left join district_glossory c on a.ssszc=c.id
 	<if test="page_sql!=null">
 		${page_sql}
 	</if> 
   </select>
-  <select id="findDemandCollectionCount" resultType="com.goafanti.demandCollection.bo.OutDemandCollection">
+  <select id="findDemandCollectionCount" resultType="java.lang.Integer">
 	  select count(*)
 	from demand_collection a left join district_glossory b on a.ssszp=b.id 
-	left join district_glossory c on a.ssszc=b.id
+	left join district_glossory c on a.ssszc=c.id
   </select>
 </mapper>

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


+ 226 - 16
src/main/java/com/goafanti/common/model/DemandCollectionExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class DemandCollectionExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	public DemandCollectionExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -354,6 +354,76 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
+		public Criteria andDwxzValueIsNull() {
+			addCriterion("dwxz_value is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDwxzValueIsNotNull() {
+			addCriterion("dwxz_value is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDwxzValueEqualTo(String value) {
+			addCriterion("dwxz_value =", value, "dwxzValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andDwxzValueNotEqualTo(String value) {
+			addCriterion("dwxz_value <>", value, "dwxzValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andDwxzValueGreaterThan(String value) {
+			addCriterion("dwxz_value >", value, "dwxzValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andDwxzValueGreaterThanOrEqualTo(String value) {
+			addCriterion("dwxz_value >=", value, "dwxzValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andDwxzValueLessThan(String value) {
+			addCriterion("dwxz_value <", value, "dwxzValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andDwxzValueLessThanOrEqualTo(String value) {
+			addCriterion("dwxz_value <=", value, "dwxzValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andDwxzValueLike(String value) {
+			addCriterion("dwxz_value like", value, "dwxzValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andDwxzValueNotLike(String value) {
+			addCriterion("dwxz_value not like", value, "dwxzValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andDwxzValueIn(List<String> values) {
+			addCriterion("dwxz_value in", values, "dwxzValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andDwxzValueNotIn(List<String> values) {
+			addCriterion("dwxz_value not in", values, "dwxzValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andDwxzValueBetween(String value1, String value2) {
+			addCriterion("dwxz_value between", value1, value2, "dwxzValue");
+			return (Criteria) this;
+		}
+
+		public Criteria andDwxzValueNotBetween(String value1, String value2) {
+			addCriterion("dwxz_value not between", value1, value2, "dwxzValue");
+			return (Criteria) this;
+		}
+
 		public Criteria andHtlyIsNull() {
 			addCriterion("htly is null");
 			return (Criteria) this;
@@ -684,6 +754,76 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
+		public Criteria andFrdbIsNull() {
+			addCriterion("frdb is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andFrdbIsNotNull() {
+			addCriterion("frdb is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andFrdbEqualTo(String value) {
+			addCriterion("frdb =", value, "frdb");
+			return (Criteria) this;
+		}
+
+		public Criteria andFrdbNotEqualTo(String value) {
+			addCriterion("frdb <>", value, "frdb");
+			return (Criteria) this;
+		}
+
+		public Criteria andFrdbGreaterThan(String value) {
+			addCriterion("frdb >", value, "frdb");
+			return (Criteria) this;
+		}
+
+		public Criteria andFrdbGreaterThanOrEqualTo(String value) {
+			addCriterion("frdb >=", value, "frdb");
+			return (Criteria) this;
+		}
+
+		public Criteria andFrdbLessThan(String value) {
+			addCriterion("frdb <", value, "frdb");
+			return (Criteria) this;
+		}
+
+		public Criteria andFrdbLessThanOrEqualTo(String value) {
+			addCriterion("frdb <=", value, "frdb");
+			return (Criteria) this;
+		}
+
+		public Criteria andFrdbLike(String value) {
+			addCriterion("frdb like", value, "frdb");
+			return (Criteria) this;
+		}
+
+		public Criteria andFrdbNotLike(String value) {
+			addCriterion("frdb not like", value, "frdb");
+			return (Criteria) this;
+		}
+
+		public Criteria andFrdbIn(List<String> values) {
+			addCriterion("frdb in", values, "frdb");
+			return (Criteria) this;
+		}
+
+		public Criteria andFrdbNotIn(List<String> values) {
+			addCriterion("frdb not in", values, "frdb");
+			return (Criteria) this;
+		}
+
+		public Criteria andFrdbBetween(String value1, String value2) {
+			addCriterion("frdb between", value1, value2, "frdb");
+			return (Criteria) this;
+		}
+
+		public Criteria andFrdbNotBetween(String value1, String value2) {
+			addCriterion("frdb not between", value1, value2, "frdb");
+			return (Criteria) this;
+		}
+
 		public Criteria andTyshxydmIsNull() {
 			addCriterion("tyshxydm is null");
 			return (Criteria) this;
@@ -894,6 +1034,76 @@ public class DemandCollectionExample {
 			return (Criteria) this;
 		}
 
+		public Criteria andClsjIsNull() {
+			addCriterion("clsj is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andClsjIsNotNull() {
+			addCriterion("clsj is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andClsjEqualTo(String value) {
+			addCriterion("clsj =", value, "clsj");
+			return (Criteria) this;
+		}
+
+		public Criteria andClsjNotEqualTo(String value) {
+			addCriterion("clsj <>", value, "clsj");
+			return (Criteria) this;
+		}
+
+		public Criteria andClsjGreaterThan(String value) {
+			addCriterion("clsj >", value, "clsj");
+			return (Criteria) this;
+		}
+
+		public Criteria andClsjGreaterThanOrEqualTo(String value) {
+			addCriterion("clsj >=", value, "clsj");
+			return (Criteria) this;
+		}
+
+		public Criteria andClsjLessThan(String value) {
+			addCriterion("clsj <", value, "clsj");
+			return (Criteria) this;
+		}
+
+		public Criteria andClsjLessThanOrEqualTo(String value) {
+			addCriterion("clsj <=", value, "clsj");
+			return (Criteria) this;
+		}
+
+		public Criteria andClsjLike(String value) {
+			addCriterion("clsj like", value, "clsj");
+			return (Criteria) this;
+		}
+
+		public Criteria andClsjNotLike(String value) {
+			addCriterion("clsj not like", value, "clsj");
+			return (Criteria) this;
+		}
+
+		public Criteria andClsjIn(List<String> values) {
+			addCriterion("clsj in", values, "clsj");
+			return (Criteria) this;
+		}
+
+		public Criteria andClsjNotIn(List<String> values) {
+			addCriterion("clsj not in", values, "clsj");
+			return (Criteria) this;
+		}
+
+		public Criteria andClsjBetween(String value1, String value2) {
+			addCriterion("clsj between", value1, value2, "clsj");
+			return (Criteria) this;
+		}
+
+		public Criteria andClsjNotBetween(String value1, String value2) {
+			addCriterion("clsj not between", value1, value2, "clsj");
+			return (Criteria) this;
+		}
+
 		public Criteria andZczbIsNull() {
 			addCriterion("zczb is null");
 			return (Criteria) this;
@@ -5977,7 +6187,7 @@ public class DemandCollectionExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 08 16:40:41 CST 2020
+	 * @mbg.generated  Thu Jul 09 08:56:04 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -1,6 +1,9 @@
 package com.goafanti.demandCollection.bo;
 
-public class InputDemandCollection {
+import com.goafanti.common.model.DemandCollection;
+
+public class InputDemandCollection extends DemandCollection{
+	
 	private Integer pageSize;
 	private Integer pageNo;
 	public Integer getPageSize() {
@@ -21,4 +24,5 @@ public class InputDemandCollection {
 	public void setPageNo(Integer pageNo) {
 		this.pageNo = pageNo;
 	}
+	
 }

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

@@ -4,14 +4,17 @@ public class OutDemandCollection {
 	private String id;
 	private String dwmc;
 	private String dwxz;
+	private String dwxzValue;
 	private String htly;
 	private String ssszp;
 	private String ssszc;
 	private String ssyq;
 	private String yysjjyspt;
+	private String frdb;
 	private String tyshxydm;
 	private String jjgm;
 	private String rygm;
+	private String clsj;
 	private String zczb;
 	private String txdz;
 	private String yb;
@@ -825,6 +828,24 @@ public class OutDemandCollection {
 	public void setSqskjzgbmxxdwgkfbValue(String sqskjzgbmxxdwgkfbValue) {
 		this.sqskjzgbmxxdwgkfbValue = sqskjzgbmxxdwgkfbValue;
 	}
+	public String getDwxzValue() {
+		return dwxzValue;
+	}
+	public void setDwxzValue(String dwxzValue) {
+		this.dwxzValue = dwxzValue;
+	}
+	public String getFrdb() {
+		return frdb;
+	}
+	public void setFrdb(String frdb) {
+		this.frdb = frdb;
+	}
+	public String getClsj() {
+		return clsj;
+	}
+	public void setClsj(String clsj) {
+		this.clsj = clsj;
+	}
 	
 	
 }

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

@@ -42,7 +42,7 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 	@Override
 	public Pagination<OutDemandCollection> demandCollectionList(InputDemandCollection i) {
 		Map<String, Object> map=new HashMap<>();
-		
+		map.put("dwmc", i.getDwmc());
 		return (Pagination<OutDemandCollection>) findPage("findDemandCollectionList","findDemandCollectionCount",
 				map, i.getPageNo(), i.getPageSize());
 	}

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

@@ -5,12 +5,13 @@
 <head>
 <meta charset=utf-8>
 <meta name=viewport content="width=device-width,initial-scale=1">
-<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>