Browse Source

新增2个字段

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

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

+ 54 - 21
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 Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="dwmc" jdbcType="VARCHAR" property="dwmc" />
@@ -103,12 +103,14 @@
     <result column="zjqk" jdbcType="VARCHAR" property="zjqk" />
     <result column="xqjjfs" jdbcType="VARCHAR" property="xqjjfs" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="sfxwgw" jdbcType="VARCHAR" property="sfxwgw" />
+    <result column="sfyxck" jdbcType="VARCHAR" property="sfyxck" />
   </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 Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -142,7 +144,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -176,7 +178,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 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, 
@@ -188,13 +190,14 @@
     yxhzfs, yxhzfs_value, yssdkjzc, yssdkjzc_value, nsqdsjxm, nsqdsjxm_value, sqskjzgbmxxdwgkfb, 
     sqskjzgbmxxdwgkfb_value, tbr, tbrsj, jsfzr, jsfsj, xqmc, xqbl, jsxqlx, xqly, mqcpjsxz, 
     yfnd, yqdddxg, yjzkdgz, xyyftjqk, mqhzdxqk, sfyxybhzxq, yxhzdx, yxhzdx_value, ncqdhzfs, 
-    ncqdhzfs_value, xqjjjzsj, xqsfkegk, wjjjsntntgdhzzj, zjyt, zjqk, xqjjfs, create_time
+    ncqdhzfs_value, xqjjjzsj, xqsfkegk, wjjjsntntgdhzzj, zjyt, zjqk, xqjjfs, create_time, 
+    sfxwgw, sfyxck
   </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 Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 CST 2020.
     -->
     select
     <if test="distinct">
@@ -213,7 +216,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -224,7 +227,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 CST 2020.
     -->
     delete from demand_collection
     where id = #{id,jdbcType=INTEGER}
@@ -233,7 +236,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 CST 2020.
     -->
     delete from demand_collection
     <if test="_parameter != null">
@@ -244,7 +247,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 CST 2020.
     -->
     insert into demand_collection (id, dwmc, dwxz, 
       dwxz_value, htly, ssszp, 
@@ -277,7 +280,8 @@
       yxhzdx, yxhzdx_value, ncqdhzfs, 
       ncqdhzfs_value, xqjjjzsj, xqsfkegk, 
       wjjjsntntgdhzzj, zjyt, zjqk, 
-      xqjjfs, create_time)
+      xqjjfs, create_time, sfxwgw, 
+      sfyxck)
     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}, 
@@ -309,13 +313,14 @@
       #{yxhzdx,jdbcType=INTEGER}, #{yxhzdxValue,jdbcType=VARCHAR}, #{ncqdhzfs,jdbcType=INTEGER}, 
       #{ncqdhzfsValue,jdbcType=VARCHAR}, #{xqjjjzsj,jdbcType=VARCHAR}, #{xqsfkegk,jdbcType=INTEGER}, 
       #{wjjjsntntgdhzzj,jdbcType=VARCHAR}, #{zjyt,jdbcType=VARCHAR}, #{zjqk,jdbcType=VARCHAR}, 
-      #{xqjjfs,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
+      #{xqjjfs,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{sfxwgw,jdbcType=VARCHAR}, 
+      #{sfyxck,jdbcType=VARCHAR})
   </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 Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 CST 2020.
     -->
     insert into demand_collection
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -607,6 +612,12 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="sfxwgw != null">
+        sfxwgw,
+      </if>
+      <if test="sfyxck != null">
+        sfyxck,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -897,13 +908,19 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="sfxwgw != null">
+        #{sfxwgw,jdbcType=VARCHAR},
+      </if>
+      <if test="sfyxck != null">
+        #{sfyxck,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 Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 CST 2020.
     -->
     select count(*) from demand_collection
     <if test="_parameter != null">
@@ -914,7 +931,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1206,6 +1223,12 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.sfxwgw != null">
+        sfxwgw = #{record.sfxwgw,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sfyxck != null">
+        sfyxck = #{record.sfyxck,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -1215,7 +1238,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 CST 2020.
     -->
     update demand_collection
     set id = #{record.id,jdbcType=INTEGER},
@@ -1313,7 +1336,9 @@
       zjyt = #{record.zjyt,jdbcType=VARCHAR},
       zjqk = #{record.zjqk,jdbcType=VARCHAR},
       xqjjfs = #{record.xqjjfs,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      sfxwgw = #{record.sfxwgw,jdbcType=VARCHAR},
+      sfyxck = #{record.sfyxck,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1322,7 +1347,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 CST 2020.
     -->
     update demand_collection
     <set>
@@ -1611,6 +1636,12 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="sfxwgw != null">
+        sfxwgw = #{sfxwgw,jdbcType=VARCHAR},
+      </if>
+      <if test="sfyxck != null">
+        sfyxck = #{sfyxck,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1618,7 +1649,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun Jul 12 16:18:44 CST 2020.
+      This element was generated on Mon Jul 13 17:24:49 CST 2020.
     -->
     update demand_collection
     set dwmc = #{dwmc,jdbcType=VARCHAR},
@@ -1715,7 +1746,9 @@
       zjyt = #{zjyt,jdbcType=VARCHAR},
       zjqk = #{zjqk,jdbcType=VARCHAR},
       xqjjfs = #{xqjjfs,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      sfxwgw = #{sfxwgw,jdbcType=VARCHAR},
+      sfyxck = #{sfyxck,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -1726,7 +1759,7 @@
 	  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,
+	  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

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


+ 156 - 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  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table demand_collection
-	 * @mbg.generated  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 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  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 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  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 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  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 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  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 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  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 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  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 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  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 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  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 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  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 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  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 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  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -6483,11 +6483,151 @@ public class DemandCollectionExample {
 			addCriterion("create_time not between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
+
+		public Criteria andSfxwgwIsNull() {
+			addCriterion("sfxwgw is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwIsNotNull() {
+			addCriterion("sfxwgw is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwEqualTo(String value) {
+			addCriterion("sfxwgw =", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwNotEqualTo(String value) {
+			addCriterion("sfxwgw <>", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwGreaterThan(String value) {
+			addCriterion("sfxwgw >", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwGreaterThanOrEqualTo(String value) {
+			addCriterion("sfxwgw >=", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwLessThan(String value) {
+			addCriterion("sfxwgw <", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwLessThanOrEqualTo(String value) {
+			addCriterion("sfxwgw <=", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwLike(String value) {
+			addCriterion("sfxwgw like", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwNotLike(String value) {
+			addCriterion("sfxwgw not like", value, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwIn(List<String> values) {
+			addCriterion("sfxwgw in", values, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwNotIn(List<String> values) {
+			addCriterion("sfxwgw not in", values, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwBetween(String value1, String value2) {
+			addCriterion("sfxwgw between", value1, value2, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfxwgwNotBetween(String value1, String value2) {
+			addCriterion("sfxwgw not between", value1, value2, "sfxwgw");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckIsNull() {
+			addCriterion("sfyxck is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckIsNotNull() {
+			addCriterion("sfyxck is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckEqualTo(String value) {
+			addCriterion("sfyxck =", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckNotEqualTo(String value) {
+			addCriterion("sfyxck <>", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckGreaterThan(String value) {
+			addCriterion("sfyxck >", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckGreaterThanOrEqualTo(String value) {
+			addCriterion("sfyxck >=", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckLessThan(String value) {
+			addCriterion("sfyxck <", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckLessThanOrEqualTo(String value) {
+			addCriterion("sfyxck <=", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckLike(String value) {
+			addCriterion("sfyxck like", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckNotLike(String value) {
+			addCriterion("sfyxck not like", value, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckIn(List<String> values) {
+			addCriterion("sfyxck in", values, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckNotIn(List<String> values) {
+			addCriterion("sfyxck not in", values, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckBetween(String value1, String value2) {
+			addCriterion("sfyxck between", value1, value2, "sfyxck");
+			return (Criteria) this;
+		}
+
+		public Criteria andSfyxckNotBetween(String value1, String value2) {
+			addCriterion("sfyxck not between", value1, value2, "sfyxck");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table demand_collection
-	 * @mbg.generated  Sun Jul 12 16:18:44 CST 2020
+	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 23 - 0
src/main/java/com/goafanti/demandCollection/bo/InputDemandCollection.java

@@ -489,6 +489,13 @@ public class InputDemandCollection {
 	 * @mbg.generated  Fri Jul 10 08:42:03 CST 2020
 	 */
 	private Date createTime;
+	
+	private String sfxwgw;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column demand_collection.sfyxck
+	 * @mbg.generated  Mon Jul 13 17:24:49 CST 2020
+	 */
+	private String sfyxck;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column demand_collection.id
@@ -2240,5 +2247,21 @@ public class InputDemandCollection {
 	public void setYysjjysptValue(String yysjjysptValue) {
 		this.yysjjysptValue = yysjjysptValue;
 	}
+
+	public String getSfxwgw() {
+		return sfxwgw;
+	}
+
+	public void setSfxwgw(String sfxwgw) {
+		this.sfxwgw = sfxwgw;
+	}
+
+	public String getSfyxck() {
+		return sfyxck;
+	}
+
+	public void setSfyxck(String sfyxck) {
+		this.sfyxck = sfyxck;
+	}
 	
 }

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

@@ -100,6 +100,8 @@ public class OutDemandCollection {
 	private String xqjjfs;
 	private String xqjjfsValue;
 	private String createTime;
+	private String sfxwgw;
+	private String sfyxck;
 
 	public String getId() {
 		return id;
@@ -1362,4 +1364,20 @@ public class OutDemandCollection {
 	public void setXqjjfsValue(String xqjjfsValue) {
 		this.xqjjfsValue = xqjjfsValue;
 	}
+
+	public String getSfxwgw() {
+		return sfxwgw;
+	}
+
+	public void setSfxwgw(String sfxwgw) {
+		this.sfxwgw = sfxwgw;
+	}
+
+	public String getSfyxck() {
+		return sfyxck;
+	}
+
+	public void setSfyxck(String sfyxck) {
+		this.sfyxck = sfyxck;
+	}
 }

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

@@ -71,7 +71,7 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 					"是否授权省科技主管部门将上述有关信息对外公开发布","同意授权公开的范围内容", "填报人", "填报人手机", "技术负责人", "技术负责人手机", "需求名称", "需求类别", "技术需求类型", "需求领域",
 					"目前产品技术现状", "研发难点", "预期达到的效果(主要技术指标、技术成熟度、条件、成本等)", "已经开展的工作", "现有研发条件情况(人员情况、仪器设备投入等)",
 					"目前合作对象情况(合作对象、方式、已投入研发资金情况等)", "是否有下一步合作需求", "意向合作对象", "合作单位名称", "拟采取的合作方式", "需求解决截止时间",
-					"需求是否可以公开 ", "为解决技术难题能提供的合作资金", "资金用途", "资金缺口", "需求解决方式", "创建时间" };
+					"需求是否可以公开 ", "为解决技术难题能提供的合作资金", "资金用途", "资金缺口", "需求解决方式","企业产品是否有销往国外","企业产品是否有意向出口", "创建时间" };
     		String fileName ="需求征集表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
     		//type 0 变更
     		XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"需求征集表");
@@ -171,6 +171,8 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
     				case "资金用途" : o = ob.getZjyt(); break; 
     				case "资金缺口" : o = ob.getZjqk(); break; 
     				case "需求解决方式" : o = ob.getXqjjfs(); break; 
+    				case "企业产品是否有销往国外": o = ob.getSfxwgw(); break;
+    				case "企业产品是否有意向出口": o = ob.getSfyxck(); break;
     				case "创建时间": o = ob.getCreateTime(); break;
     				default: o = ""; break;
     				}