Переглянути джерело

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 роки тому
батько
коміт
97153b5dfc

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

+ 70 - 23
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 Tue Jul 14 15:31:06 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" />
@@ -106,12 +106,15 @@
     <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 Tue Jul 14 15:31:06 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -145,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 14 15:31:06 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -179,7 +182,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 14 15:31:06 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 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, 
@@ -192,13 +195,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, xqjjfs_value
+    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 Tue Jul 14 15:31:06 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     select
     <if test="distinct">
@@ -217,7 +220,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 14 15:31:06 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -228,7 +231,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 14 15:31:06 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     delete from demand_collection
     where id = #{id,jdbcType=INTEGER}
@@ -237,7 +240,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 14 15:31:06 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     delete from demand_collection
     <if test="_parameter != null">
@@ -248,7 +251,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 14 15:31:06 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, 
@@ -282,7 +285,8 @@
       ncqdhzfs_value, xqjjjzsj, xqsfkegk, 
       wjjjsntntgdhzzj, zjyt, zjqk, 
       xqjjfs, create_time, sfxwgw, 
-      sfyxck, xqjjfs_value)
+      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}, #{sssza,jdbcType=INTEGER}, #{ssyq,jdbcType=VARCHAR}, 
@@ -315,13 +319,14 @@
       #{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}, #{xqjjfsValue,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 Tue Jul 14 15:31:06 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     insert into demand_collection
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -622,6 +627,15 @@
       <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">
@@ -921,13 +935,22 @@
       <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 Tue Jul 14 15:31:06 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     select count(*) from demand_collection
     <if test="_parameter != null">
@@ -938,7 +961,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 14 15:31:06 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1239,6 +1262,15 @@
       <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" />
@@ -1248,7 +1280,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 14 15:31:06 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     update demand_collection
     set id = #{record.id,jdbcType=INTEGER},
@@ -1349,7 +1381,10 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       sfxwgw = #{record.sfxwgw,jdbcType=VARCHAR},
       sfyxck = #{record.sfyxck,jdbcType=VARCHAR},
-      xqjjfs_value = #{record.xqjjfsValue,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>
@@ -1358,7 +1393,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 14 15:31:06 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1656,6 +1691,15 @@
       <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>
@@ -1663,7 +1707,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 14 15:31:06 CST 2020.
+      This element was generated on Wed Jul 15 09:30:29 CST 2020.
     -->
     update demand_collection
     set dwmc = #{dwmc,jdbcType=VARCHAR},
@@ -1763,19 +1807,22 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       sfxwgw = #{sfxwgw,jdbcType=VARCHAR},
       sfyxck = #{sfyxck,jdbcType=VARCHAR},
-      xqjjfs_value = #{xqjjfsValue,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,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,
+	  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,
+	  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

Різницю між файлами не показано, бо вона завелика
+ 366 - 297
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  Tue Jul 14 15:31:06 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  Tue Jul 14 15:31:06 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  Tue Jul 14 15:31:06 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  Tue Jul 14 15:31:06 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  Tue Jul 14 15:31:06 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  Tue Jul 14 15:31:06 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  Tue Jul 14 15:31:06 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  Tue Jul 14 15:31:06 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  Tue Jul 14 15:31:06 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  Tue Jul 14 15:31:06 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  Tue Jul 14 15:31:06 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  Tue Jul 14 15:31:06 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  Tue Jul 14 15:31:06 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  Tue Jul 14 15:31:06 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  Tue Jul 14 15:31:06 CST 2020
+	 * @mbg.generated  Wed Jul 15 09:30:29 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -6693,11 +6693,221 @@ public class DemandCollectionExample {
 			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  Tue Jul 14 15:31:06 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) 36);//字体大小  
 		  
 		// 设置样式  
 		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;
 	}

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

@@ -102,6 +102,9 @@ public class OutDemandCollection {
 	private String createTime;
 	private String sfxwgw;
 	private String sfyxck;
+	private String zyhzfs;
+	private String qyyzkdgjqykjcxhzqk;
+	private String zyhzfsValue;
 
 	public String getId() {
 		return id;
@@ -1380,4 +1383,53 @@ public class OutDemandCollection {
 	public void setSfyxck(String sfyxck) {
 		this.sfyxck = sfyxck;
 	}
+
+	public String getZyhzfs() {
+		if (zyhzfs != null) {
+			String str = zyhzfs;
+			String str2 = "";
+			String s[] = str.split(",");
+			//1人员交流 2引进、联合培养人3技术转移 4信息资料交流 5合作研发 6设立联合研发机构/平台/网络
+			for (String string : s) {
+				if (string.equals("0"))
+					str2 = str2 + zyhzfsValue + ",";
+				else if (string.equals("1"))
+					str2 = str2 + "人员交流,";
+				else if (string.equals("2"))
+					str2 = str2 + "引进、联合培养人,";
+				else if (string.equals("3"))
+					str2 = str2 + "技术转移,";
+				else if (string.equals("4"))
+					str2 = str2 + "信息资料交流 ,";
+				else if (string.equals("5"))
+					str2 = str2 + "合作研发,";
+				else if (string.equals("6"))
+					str2 = str2 + "设立联合研发机构/平台/网络,";
+				
+			}
+			str2 = str2.substring(0, str2.length() - 1);
+			return str2;
+		}
+		return zyhzfs;
+	}
+
+	public void setZyhzfs(String zyhzfs) {
+		this.zyhzfs = zyhzfs;
+	}
+
+	public String getQyyzkdgjqykjcxhzqk() {
+		return qyyzkdgjqykjcxhzqk;
+	}
+
+	public void setQyyzkdgjqykjcxhzqk(String qyyzkdgjqykjcxhzqk) {
+		this.qyyzkdgjqykjcxhzqk = qyyzkdgjqykjcxhzqk;
+	}
+
+	public String getZyhzfsValue() {
+		return zyhzfsValue;
+	}
+
+	public void setZyhzfsValue(String zyhzfsValue) {
+		this.zyhzfsValue = zyhzfsValue;
+	}
 }

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

@@ -11,7 +11,9 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
+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;
@@ -61,22 +63,26 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 		try {
 			List<OutDemandCollection>list=(List<OutDemandCollection>) demandCollectionList(idc).getList();
 					 
-			String[] comment = { "编号", "单位名称", "单位性质", "行业领域", "所属市州", "所属园区", "拥有的省级及以上平台", "法人代表",
-					"统一社会信用代码", "经济规模", "人员规模", "成立时间", "注册资本", "通讯地址", "邮编", "联系人", "联系电话", "email", "主营业务及核心产品(服务)",
-					"2018年度项目主营业务收入(万元)", "2018年度项目净利润(万元)", "2019年度项目主营业务收入(万元)", "2019年度项目净利润(万元)", "年度研发投入",
-					"年度研发投入占营业收入比例", "是否曾获银行贷款", "银行贷款", "是否为高新技术企业编号 ", "高企证书编号 ", "是否为科技型中小企业", "科企证书编号", "专利数量",
-					"发明专利", "实用新型", "是否曾获科技专项资金", "是否有产学研合作", "是否已获机构投资者投资 ", "成果名称", "成果领域", "成果属性", "成果体现形式", "成果成熟度",
-					"成果知识产权形式", "知识产权权属 ", "专利状态", "成果登记情况", "拟采取成果转移转化方式自主转化 ", "拟采取成果转移转化方式合作开发 ", "拟采取成果转移转化方式技术转让 ",
-					"预计可转移转化时间", "成果简述", "是否有成果合作需求", "是否有意向合作单位", "意向合作单位", "意向合作方式", "已享受的科技政策", "拟申请的省级项目",
-					"是否授权省科技主管部门将上述有关信息对外公开发布","同意授权公开的范围内容", "填报人", "填报人手机", "技术负责人", "技术负责人手机", "需求名称", "需求类别", "技术需求类型", "需求领域",
-					"目前产品技术现状", "研发难点", "预期达到的效果(主要技术指标、技术成熟度、条件、成本等)", "已经开展的工作", "现有研发条件情况(人员情况、仪器设备投入等)",
-					"目前合作对象情况(合作对象、方式、已投入研发资金情况等)", "是否有下一步合作需求", "意向合作对象", "合作单位名称", "拟采取的合作方式", "需求解决截止时间",
-					"需求是否可以公开 ", "为解决技术难题能提供的合作资金", "资金用途", "资金缺口", "需求解决方式","企业产品是否有销往国外","企业产品是否有意向出口", "创建时间" };
+			String[] comment = { "编号", "单位名称", "单位性质", "行业领域", "所属市州", "所属园区", "拥有的省级及以上平台", "法人代表", "统一社会信用代码", "经济规模",
+					"人员规模", "成立时间", "注册资本", "通讯地址", "邮编", "联系人", "联系电话", "email", "主营业务及核心产品(服务)", "2018年度项目主营业务收入(万元)",
+					"2018年度项目净利润(万元)", "2019年度项目主营业务收入(万元)", "2019年度项目净利润(万元)", "年度研发投入", "年度研发投入占营业收入比例", "是否曾获银行贷款",
+					"银行贷款", "是否为高新技术企业编号 ", "高企证书编号 ", "是否为科技型中小企业", "科企证书编号", "专利数量", "发明专利", "实用新型", "是否曾获科技专项资金",
+					"是否有产学研合作", "是否已获机构投资者投资 ", "成果名称", "成果领域", "成果属性", "成果体现形式", "成果成熟度", "成果知识产权形式", "知识产权权属 ",
+					"专利状态", "成果登记情况", "拟采取成果转移转化方式自主转化 ", "拟采取成果转移转化方式合作开发 ", "拟采取成果转移转化方式技术转让 ", "预计可转移转化时间", "成果简述",
+					"是否有成果合作需求", "是否有意向合作单位", "意向合作单位", "意向合作方式", "企业已展开的国际与区域科技创新合作方式", "主要合作方式 ", "已享受的科技政策",
+					"拟申请的省级项目", "是否授权省科技主管部门将上述有关信息对外公开发布", "同意授权公开的范围内容", "填报人", "填报人手机", "技术负责人", "技术负责人手机", "需求名称",
+					"需求类别", "技术需求类型", "需求领域", "目前产品技术现状", "研发难点", "预期达到的效果(主要技术指标、技术成熟度、条件、成本等)", "已经开展的工作",
+					"现有研发条件情况(人员情况、仪器设备投入等)", "目前合作对象情况(合作对象、方式、已投入研发资金情况等)", "是否有下一步合作需求", "意向合作对象", "合作单位名称",
+					"拟采取的合作方式", "需求解决截止时间", "需求是否可以公开 ", "为解决技术难题能提供的合作资金", "资金用途", "资金缺口", "需求解决方式", "企业产品是否有销往国外",
+					"企业产品是否有意向出口", "创建时间" };
     		String fileName ="需求征集表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
     		//type 0 变更
     		XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"需求征集表");
     		//根据列表编写文档
     		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);
@@ -143,6 +149,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;
@@ -178,7 +186,13 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				}
     				XSSFCell c = r.createCell(i);
     				sheet.autoSizeColumn(i,true); 
-    			    sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 12 / 10);
+    				
+    				c.setCellStyle(styleTitle);
+    				if (sheet.getColumnWidth(i)>10000) {
+    					sheet.setColumnWidth(i, 10000);
+					}else {
+						sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 12 / 10);
+					}
     				c.setCellValue(o);
     			}
     		}