浏览代码

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 年之前
父节点
当前提交
39cc64850e

+ 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 CST 2020
 	 */
 	int updateByPrimaryKey(DemandCollection record);
 }

+ 99 - 76
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 Fri Jul 10 08:42:03 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="dwmc" jdbcType="VARCHAR" property="dwmc" />
@@ -14,6 +14,7 @@
     <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="frdb" jdbcType="VARCHAR" property="frdb" />
@@ -106,7 +107,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 Fri Jul 10 08:42:03 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -140,7 +141,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 Fri Jul 10 08:42:03 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -174,9 +175,9 @@
     <!--
       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 Fri Jul 10 08:42:03 CST 2020.
     -->
-    id, dwmc, dwxz, dwxz_value, htly, ssszp, ssszc, ssyq, yysjjyspt, frdb, tyshxydm, 
+    id, dwmc, dwxz, dwxz_value, htly, ssszp, ssszc, sssza, 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, 
@@ -192,7 +193,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 Fri Jul 10 08:42:03 CST 2020.
     -->
     select
     <if test="distinct">
@@ -211,7 +212,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 Fri Jul 10 08:42:03 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -222,7 +223,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 Fri Jul 10 08:42:03 CST 2020.
     -->
     delete from demand_collection
     where id = #{id,jdbcType=INTEGER}
@@ -231,7 +232,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 Fri Jul 10 08:42:03 CST 2020.
     -->
     delete from demand_collection
     <if test="_parameter != null">
@@ -242,76 +243,78 @@
     <!--
       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 Fri Jul 10 08:42:03 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, 
-      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)
+      ssszc, sssza, 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, 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
+      )
     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}, 
-      #{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}, 
-      #{ncqcgzyzhfsjszr,jdbcType=VARCHAR}, #{yjkzyzhsj,jdbcType=INTEGER}, #{cgjs,jdbcType=VARCHAR}, 
-      #{sfycghzxq,jdbcType=INTEGER}, #{sfyyxhzdw,jdbcType=INTEGER}, #{sfyyxhzdwValue,jdbcType=VARCHAR}, 
-      #{yxhzfs,jdbcType=INTEGER}, #{yxhzfsValue,jdbcType=VARCHAR}, #{yssdkjzc,jdbcType=INTEGER}, 
-      #{yssdkjzcValue,jdbcType=VARCHAR}, #{nsqdsjxm,jdbcType=INTEGER}, #{nsqdsjxmValue,jdbcType=VARCHAR}, 
-      #{sqskjzgbmxxdwgkfb,jdbcType=INTEGER}, #{sqskjzgbmxxdwgkfbValue,jdbcType=VARCHAR}, 
-      #{tbr,jdbcType=VARCHAR}, #{tbrsj,jdbcType=VARCHAR}, #{jsfzr,jdbcType=VARCHAR}, 
-      #{jsfsj,jdbcType=VARCHAR}, #{xqmc,jdbcType=VARCHAR}, #{xqbl,jdbcType=INTEGER}, 
-      #{jsxqlx,jdbcType=VARCHAR}, #{xqly,jdbcType=VARCHAR}, #{mqcpjsxz,jdbcType=VARCHAR}, 
-      #{yfnd,jdbcType=VARCHAR}, #{yqdddxg,jdbcType=VARCHAR}, #{yjzkdgz,jdbcType=VARCHAR}, 
-      #{xyyftjqk,jdbcType=VARCHAR}, #{mqhzdxqk,jdbcType=VARCHAR}, #{sfyxybhzxq,jdbcType=INTEGER}, 
-      #{yxhzdx,jdbcType=INTEGER}, #{yxhzdxValue,jdbcType=VARCHAR}, #{ncqdhzfs,jdbcType=INTEGER}, 
-      #{ncqdhzfsValue,jdbcType=VARCHAR}, #{xqjjjzsj,jdbcType=VARCHAR}, #{xqsfkegk,jdbcType=INTEGER}, 
-      #{wjjjsntntgdhzzj,jdbcType=VARCHAR}, #{zjyt,jdbcType=VARCHAR}, #{zjqk,jdbcType=VARCHAR}, 
-      #{xqjjfs,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
+      #{ssszc,jdbcType=INTEGER}, #{sssza,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}, #{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}, #{ncqcgzyzhfsjszr,jdbcType=VARCHAR}, 
+      #{yjkzyzhsj,jdbcType=INTEGER}, #{cgjs,jdbcType=VARCHAR}, #{sfycghzxq,jdbcType=INTEGER}, 
+      #{sfyyxhzdw,jdbcType=INTEGER}, #{sfyyxhzdwValue,jdbcType=VARCHAR}, #{yxhzfs,jdbcType=INTEGER}, 
+      #{yxhzfsValue,jdbcType=VARCHAR}, #{yssdkjzc,jdbcType=INTEGER}, #{yssdkjzcValue,jdbcType=VARCHAR}, 
+      #{nsqdsjxm,jdbcType=INTEGER}, #{nsqdsjxmValue,jdbcType=VARCHAR}, #{sqskjzgbmxxdwgkfb,jdbcType=INTEGER}, 
+      #{sqskjzgbmxxdwgkfbValue,jdbcType=VARCHAR}, #{tbr,jdbcType=VARCHAR}, #{tbrsj,jdbcType=VARCHAR}, 
+      #{jsfzr,jdbcType=VARCHAR}, #{jsfsj,jdbcType=VARCHAR}, #{xqmc,jdbcType=VARCHAR}, 
+      #{xqbl,jdbcType=INTEGER}, #{jsxqlx,jdbcType=VARCHAR}, #{xqly,jdbcType=VARCHAR}, 
+      #{mqcpjsxz,jdbcType=VARCHAR}, #{yfnd,jdbcType=VARCHAR}, #{yqdddxg,jdbcType=VARCHAR}, 
+      #{yjzkdgz,jdbcType=VARCHAR}, #{xyyftjqk,jdbcType=VARCHAR}, #{mqhzdxqk,jdbcType=VARCHAR}, 
+      #{sfyxybhzxq,jdbcType=INTEGER}, #{yxhzdx,jdbcType=INTEGER}, #{yxhzdxValue,jdbcType=VARCHAR}, 
+      #{ncqdhzfs,jdbcType=INTEGER}, #{ncqdhzfsValue,jdbcType=VARCHAR}, #{xqjjjzsj,jdbcType=VARCHAR}, 
+      #{xqsfkegk,jdbcType=INTEGER}, #{wjjjsntntgdhzzj,jdbcType=VARCHAR}, #{zjyt,jdbcType=VARCHAR}, 
+      #{zjqk,jdbcType=VARCHAR}, #{xqjjfs,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.DemandCollection">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jul 09 14:27:49 CST 2020.
+      This element was generated on Fri Jul 10 08:42:03 CST 2020.
     -->
     insert into demand_collection
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -336,6 +339,9 @@
       <if test="ssszc != null">
         ssszc,
       </if>
+      <if test="sssza != null">
+        sssza,
+      </if>
       <if test="ssyq != null">
         ssyq,
       </if>
@@ -620,6 +626,9 @@
       <if test="ssszc != null">
         #{ssszc,jdbcType=INTEGER},
       </if>
+      <if test="sssza != null">
+        #{sssza,jdbcType=INTEGER},
+      </if>
       <if test="ssyq != null">
         #{ssyq,jdbcType=VARCHAR},
       </if>
@@ -887,7 +896,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 Fri Jul 10 08:42:03 CST 2020.
     -->
     select count(*) from demand_collection
     <if test="_parameter != null">
@@ -898,7 +907,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 Fri Jul 10 08:42:03 CST 2020.
     -->
     update demand_collection
     <set>
@@ -923,6 +932,9 @@
       <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>
@@ -1193,7 +1205,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 Fri Jul 10 08:42:03 CST 2020.
     -->
     update demand_collection
     set id = #{record.id,jdbcType=INTEGER},
@@ -1203,6 +1215,7 @@
       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},
       frdb = #{record.frdb,jdbcType=VARCHAR},
@@ -1298,7 +1311,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 Fri Jul 10 08:42:03 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1320,6 +1333,9 @@
       <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>
@@ -1588,7 +1604,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 Fri Jul 10 08:42:03 CST 2020.
     -->
     update demand_collection
     set dwmc = #{dwmc,jdbcType=VARCHAR},
@@ -1597,6 +1613,7 @@
       htly = #{htly,jdbcType=VARCHAR},
       ssszp = #{ssszp,jdbcType=INTEGER},
       ssszc = #{ssszc,jdbcType=INTEGER},
+      sssza = #{sssza,jdbcType=INTEGER},
       ssyq = #{ssyq,jdbcType=VARCHAR},
       yysjjyspt = #{yysjjyspt,jdbcType=VARCHAR},
       frdb = #{frdb,jdbcType=VARCHAR},
@@ -1688,7 +1705,7 @@
   </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,
+	  select a.id,dwmc,dwxz,dwxz_value dwxzValue ,htly,b.name ssszp,c.name ssszc,d.name sssza,ssyq,yysjjyspt,frdb,tyshxydm,jjgm,rygm,
 	  zczb,txdz,yb,lxr,lxdh,email,zyywjhxcp,ndxmzyywsr18,ndxmjlr18,ndxmzyywsr19,ndxmjlr19,ndyftr,ndyftrzyysrbl,sfchyhdk,
 	  sfchyhdk_value sfchyhdkValue,sfwgxjsqy,sfwgxjsqy_value sfwgxjsqyValue,sfwkjxzxqy,sfwkjxzxqy_value sfwkjxzxqyValue,
 	  zlsl,zlsl_fmzl zlslFmzl,zlsl_syxx zlslSyxx,sfchkjzxzj,sfycxyz,sfycxyz_value sfycxyzValue,sfyhjgtzztz,nsqdsjxm_value nsqdsjxmValue,
@@ -1699,7 +1716,7 @@
 	  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=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 +1729,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 +1756,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>

文件差异内容过多而无法显示
+ 305 - 282
src/main/java/com/goafanti/common/model/DemandCollection.java


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

@@ -8,23 +8,23 @@ import java.util.List;
 public class DemandCollectionExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Thu Jul 09 14:27:49 CST 2020
+	 * @mbg.generated  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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  Fri Jul 10 08:42:03 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;
@@ -6367,7 +6427,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  Fri Jul 10 08:42:03 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

文件差异内容过多而无法显示
+ 634 - 252
src/main/java/com/goafanti/demandCollection/bo/OutDemandCollection.java


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

@@ -50,6 +50,7 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 		
 		if(i.getSsszp()!=null)map.put("ssszp", i.getSsszp());
 		if(i.getSsszc()!=null)map.put("ssszc", i.getSsszc());
+		if(i.getSssza()!=null)map.put("sssza", i.getSssza());
 		return (Pagination<OutDemandCollection>) findPage("findDemandCollectionList","findDemandCollectionCount",
 				map, i.getPageNo(), i.getPageSize());
 	}
@@ -60,7 +61,7 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 		try {
 			List<OutDemandCollection>list=(List<OutDemandCollection>) demandCollectionList(idc).getList();
 					 
-			String[] comment = { "编号", "单位名称", "单位性质", "行业领域", "所属市州-省", "所属市州-市", "所属园区", "拥有的省级及以上平台", "法人代表",
+			String[] comment = { "编号", "单位名称", "单位性质", "行业领域", "所属市州", "所属园区", "拥有的省级及以上平台", "法人代表",
 					"统一社会信用代码", "经济规模", "人员规模", "成立时间", "注册资本", "通讯地址", "邮编", "联系人", "联系电话", "email", "主营业务及核心产品(服务)",
 					"2018年度项目主营业务收入(万元)", "2018年度项目净利润(万元)", "2019年度项目主营业务收入(万元)", "2019年度项目净利润(万元)", "年度研发投入",
 					"年度研发投入占营业收入比例", "是否曾获银行贷款", "银行贷款", "是否为高新技术企业编号 ", "高企证书编号 ", "是否为科技型中小企业", "科企证书编号", "专利数量",
@@ -88,8 +89,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;