Browse Source

修改表格

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
e0f8b923c0

+ 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 CST 2020
 	 */
 	long countByExample(DemandCollectionExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 CST 2020
 	 */
 	int deleteByExample(DemandCollectionExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 CST 2020
 	 */
 	int insert(DemandCollection record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 CST 2020
 	 */
 	int insertSelective(DemandCollection record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 CST 2020
 	 */
 	DemandCollection selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 CST 2020
 	 */
 	int updateByPrimaryKeySelective(DemandCollection record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 CST 2020
 	 */
 	int updateByPrimaryKey(DemandCollection record);
 }

+ 40 - 25
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 Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="dwmc" jdbcType="VARCHAR" property="dwmc" />
@@ -105,12 +105,13 @@
     <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" />
   </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 Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -144,7 +145,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -178,7 +179,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     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, 
@@ -191,13 +192,13 @@
     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, 
-    sfxwgw, sfyxck
+    sfxwgw, sfyxck, xqjjfs_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 Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     select
     <if test="distinct">
@@ -216,7 +217,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -227,7 +228,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     delete from demand_collection
     where id = #{id,jdbcType=INTEGER}
@@ -236,7 +237,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     delete from demand_collection
     <if test="_parameter != null">
@@ -247,7 +248,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     insert into demand_collection (id, dwmc, dwxz, 
       dwxz_value, htly, ssszp, 
@@ -281,7 +282,7 @@
       ncqdhzfs_value, xqjjjzsj, xqsfkegk, 
       wjjjsntntgdhzzj, zjyt, zjqk, 
       xqjjfs, create_time, sfxwgw, 
-      sfyxck)
+      sfyxck, xqjjfs_value)
     values (#{id,jdbcType=INTEGER}, #{dwmc,jdbcType=VARCHAR}, #{dwxz,jdbcType=INTEGER}, 
       #{dwxzValue,jdbcType=VARCHAR}, #{htly,jdbcType=VARCHAR}, #{ssszp,jdbcType=INTEGER}, 
       #{ssszc,jdbcType=INTEGER}, #{sssza,jdbcType=INTEGER}, #{ssyq,jdbcType=VARCHAR}, 
@@ -314,13 +315,13 @@
       #{ncqdhzfsValue,jdbcType=VARCHAR}, #{xqjjjzsj,jdbcType=VARCHAR}, #{xqsfkegk,jdbcType=INTEGER}, 
       #{wjjjsntntgdhzzj,jdbcType=VARCHAR}, #{zjyt,jdbcType=VARCHAR}, #{zjqk,jdbcType=VARCHAR}, 
       #{xqjjfs,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{sfxwgw,jdbcType=VARCHAR}, 
-      #{sfyxck,jdbcType=VARCHAR})
+      #{sfyxck,jdbcType=VARCHAR}, #{xqjjfsValue,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 Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     insert into demand_collection
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -618,6 +619,9 @@
       <if test="sfyxck != null">
         sfyxck,
       </if>
+      <if test="xqjjfsValue != null">
+        xqjjfs_value,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -914,13 +918,16 @@
       <if test="sfyxck != null">
         #{sfyxck,jdbcType=VARCHAR},
       </if>
+      <if test="xqjjfsValue != null">
+        #{xqjjfsValue,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 Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     select count(*) from demand_collection
     <if test="_parameter != null">
@@ -931,7 +938,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1229,6 +1236,9 @@
       <if test="record.sfyxck != null">
         sfyxck = #{record.sfyxck,jdbcType=VARCHAR},
       </if>
+      <if test="record.xqjjfsValue != null">
+        xqjjfs_value = #{record.xqjjfsValue,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -1238,7 +1248,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     update demand_collection
     set id = #{record.id,jdbcType=INTEGER},
@@ -1338,7 +1348,8 @@
       xqjjfs = #{record.xqjjfs,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       sfxwgw = #{record.sfxwgw,jdbcType=VARCHAR},
-      sfyxck = #{record.sfyxck,jdbcType=VARCHAR}
+      sfyxck = #{record.sfyxck,jdbcType=VARCHAR},
+      xqjjfs_value = #{record.xqjjfsValue,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1347,7 +1358,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1642,6 +1653,9 @@
       <if test="sfyxck != null">
         sfyxck = #{sfyxck,jdbcType=VARCHAR},
       </if>
+      <if test="xqjjfsValue != null">
+        xqjjfs_value = #{xqjjfsValue,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1649,7 +1663,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jul 13 17:24:49 CST 2020.
+      This element was generated on Tue Jul 14 15:31:06 CST 2020.
     -->
     update demand_collection
     set dwmc = #{dwmc,jdbcType=VARCHAR},
@@ -1748,21 +1762,22 @@
       xqjjfs = #{xqjjfs,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       sfxwgw = #{sfxwgw,jdbcType=VARCHAR},
-      sfyxck = #{sfyxck,jdbcType=VARCHAR}
+      sfyxck = #{sfyxck,jdbcType=VARCHAR},
+      xqjjfs_value = #{xqjjfsValue,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,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,
+	  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,sfxwgw,sfyxck,
 	  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
+	  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
 	left join district_glossory d on a.sssza=d.id where 1=1
 	<if test="dwmc !=null ">

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


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

@@ -8,23 +8,23 @@ import java.util.List;
 public class DemandCollectionExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 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  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -6623,11 +6623,81 @@ public class DemandCollectionExample {
 			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;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table demand_collection
-	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
+	 * @mbg.generated  Tue Jul 14 15:31:06 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -1,7 +1,6 @@
 package com.goafanti.demandCollection.controller;
 
 
-import java.util.UUID;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;

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

@@ -177,6 +177,8 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				default: o = ""; break;
     				}
     				XSSFCell c = r.createCell(i);
+    				sheet.autoSizeColumn(i,true); 
+    			    sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 12 / 10);
     				c.setCellValue(o);
     			}
     		}