Browse Source

update

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

+ 1 - 1
GeneratorConfig.xml

@@ -9,6 +9,6 @@
    <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="jitao-server" />
    <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="jitao-server" />
    <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="jitao-server" />
    <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="jitao-server" />
    <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="jitao-server" type="XMLMAPPER" />
    <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="jitao-server" type="XMLMAPPER" />
-   <table schema="aft" tableName="skjt_role_permission"/>
+   <table schema="aft" tableName="demand_collection"/>
   </context>
   </context>
 </generatorConfiguration>
 </generatorConfiguration>

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

@@ -1,76 +1,76 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.DemandCollection;
-import com.goafanti.common.model.DemandCollectionExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface DemandCollectionMapper {
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
-	 */
-	long countByExample(DemandCollectionExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
-	 */
-	int deleteByExample(DemandCollectionExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
-	 */
-	int deleteByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
-	 */
-	int insert(DemandCollection record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
-	 */
-	int insertSelective(DemandCollection record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
-	 */
-	List<DemandCollection> selectByExample(DemandCollectionExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
-	 */
-	DemandCollection selectByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
-	 */
-	int updateByExampleSelective(@Param("record") DemandCollection record,
-			@Param("example") DemandCollectionExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
-	 */
-	int updateByExample(@Param("record") DemandCollection record, @Param("example") DemandCollectionExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
-	 */
-	int updateByPrimaryKeySelective(DemandCollection record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
-	 * @mbg.generated  Wed Jul 15 17:30:16 CST 2020
-	 */
-	int updateByPrimaryKey(DemandCollection record);
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.DemandCollection;
+import com.goafanti.common.model.DemandCollectionExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface DemandCollectionMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table demand_collection
+	 * @mbg.generated  Thu Jul 23 09:20:14 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 23 09:20:14 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 23 09:20:14 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 23 09:20:14 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 23 09:20:14 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 23 09:20:14 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 23 09:20:14 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 23 09:20:14 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 23 09:20:14 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 23 09:20:14 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 23 09:20:14 CST 2020
+	 */
+	int updateByPrimaryKey(DemandCollection record);
 }
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/SkjtUserMapper.java

@@ -101,4 +101,6 @@ public interface SkjtUserMapper {
 	Set<String> findRoleByUserId(String userId);
 	Set<String> findRoleByUserId(String userId);
 
 
 	Set<String> findPermissionByUserId(String userId);
 	Set<String> findPermissionByUserId(String userId);
+
+	void setUserRole(String id);
 }
 }

+ 55 - 20
src/main/java/com/goafanti/common/mapper/DemandCollectionMapper.xml

@@ -5,7 +5,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="dwmc" jdbcType="VARCHAR" property="dwmc" />
     <result column="dwmc" jdbcType="VARCHAR" property="dwmc" />
@@ -106,12 +106,13 @@
     <result column="zyhzfs" jdbcType="VARCHAR" property="zyhzfs" />
     <result column="zyhzfs" jdbcType="VARCHAR" property="zyhzfs" />
     <result column="zyhzfs_value" jdbcType="VARCHAR" property="zyhzfsValue" />
     <result column="zyhzfs_value" jdbcType="VARCHAR" property="zyhzfsValue" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
   </resultMap>
   </resultMap>
   <sql id="Example_Where_Clause">
   <sql id="Example_Where_Clause">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     <where>
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -145,7 +146,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     <where>
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -179,7 +180,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     id, dwmc, dwxz, dwxz_value, htly, ssszp, ssszc, sssza, ssyq, yysjjyspt, yysjjyspt_value, 
     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, 
     frdb, tyshxydm, jjgm, rygm, clsj, zczb, txdz, yb, lxr, lxdh, email, zyywjhxcp, ndxmzyywsr18, 
@@ -192,13 +193,13 @@
     sqskjzgbmxxdwgkfb_value, jsfzr, jsfsj, xqmc, xqbl, jsxqlx, xqly, mqcpjsxz, yfnd, 
     sqskjzgbmxxdwgkfb_value, jsfzr, jsfsj, xqmc, xqbl, jsxqlx, xqly, mqcpjsxz, yfnd, 
     yqdddxg, yjzkdgz, xyyftjqk, mqhzdxqk, sfyxybhzxq, yxhzdx, yxhzdx_value, ncqdhzfs, 
     yqdddxg, yjzkdgz, xyyftjqk, mqhzdxqk, sfyxybhzxq, yxhzdx, yxhzdx_value, ncqdhzfs, 
     ncqdhzfs_value, xqjjjzsj, wjjjsntntgdhzzj, zjyt, zjqk, xqjjfs, xqjjfs_value, sfxwgw, 
     ncqdhzfs_value, xqjjjzsj, wjjjsntntgdhzzj, zjyt, zjqk, xqjjfs, xqjjfs_value, sfxwgw, 
-    sfyxck, qyyzkdgjqykjcxhzqk, zyhzfs, zyhzfs_value, create_time
+    sfyxck, qyyzkdgjqykjcxhzqk, zyhzfs, zyhzfs_value, create_time, aid
   </sql>
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.DemandCollectionExample" resultMap="BaseResultMap">
   <select id="selectByExample" parameterType="com.goafanti.common.model.DemandCollectionExample" resultMap="BaseResultMap">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     select
     select
     <if test="distinct">
     <if test="distinct">
@@ -217,7 +218,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     select 
     select 
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
@@ -228,7 +229,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     delete from demand_collection
     delete from demand_collection
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
@@ -237,7 +238,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     delete from demand_collection
     delete from demand_collection
     <if test="_parameter != null">
     <if test="_parameter != null">
@@ -248,7 +249,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     insert into demand_collection (id, dwmc, dwxz, 
     insert into demand_collection (id, dwmc, dwxz, 
       dwxz_value, htly, ssszp, 
       dwxz_value, htly, ssszp, 
@@ -282,7 +283,8 @@
       wjjjsntntgdhzzj, zjyt, zjqk, 
       wjjjsntntgdhzzj, zjyt, zjqk, 
       xqjjfs, xqjjfs_value, sfxwgw, 
       xqjjfs, xqjjfs_value, sfxwgw, 
       sfyxck, qyyzkdgjqykjcxhzqk, zyhzfs, 
       sfyxck, qyyzkdgjqykjcxhzqk, zyhzfs, 
-      zyhzfs_value, create_time)
+      zyhzfs_value, create_time, aid
+      )
     values (#{id,jdbcType=INTEGER}, #{dwmc,jdbcType=VARCHAR}, #{dwxz,jdbcType=INTEGER}, 
     values (#{id,jdbcType=INTEGER}, #{dwmc,jdbcType=VARCHAR}, #{dwxz,jdbcType=INTEGER}, 
       #{dwxzValue,jdbcType=VARCHAR}, #{htly,jdbcType=VARCHAR}, #{ssszp,jdbcType=INTEGER}, 
       #{dwxzValue,jdbcType=VARCHAR}, #{htly,jdbcType=VARCHAR}, #{ssszp,jdbcType=INTEGER}, 
       #{ssszc,jdbcType=INTEGER}, #{sssza,jdbcType=INTEGER}, #{ssyq,jdbcType=VARCHAR}, 
       #{ssszc,jdbcType=INTEGER}, #{sssza,jdbcType=INTEGER}, #{ssyq,jdbcType=VARCHAR}, 
@@ -315,13 +317,14 @@
       #{wjjjsntntgdhzzj,jdbcType=VARCHAR}, #{zjyt,jdbcType=VARCHAR}, #{zjqk,jdbcType=VARCHAR}, 
       #{wjjjsntntgdhzzj,jdbcType=VARCHAR}, #{zjyt,jdbcType=VARCHAR}, #{zjqk,jdbcType=VARCHAR}, 
       #{xqjjfs,jdbcType=INTEGER}, #{xqjjfsValue,jdbcType=VARCHAR}, #{sfxwgw,jdbcType=VARCHAR}, 
       #{xqjjfs,jdbcType=INTEGER}, #{xqjjfsValue,jdbcType=VARCHAR}, #{sfxwgw,jdbcType=VARCHAR}, 
       #{sfyxck,jdbcType=VARCHAR}, #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR}, #{zyhzfs,jdbcType=VARCHAR}, 
       #{sfyxck,jdbcType=VARCHAR}, #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR}, #{zyhzfs,jdbcType=VARCHAR}, 
-      #{zyhzfsValue,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
+      #{zyhzfsValue,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{aid,jdbcType=VARCHAR}
+      )
   </insert>
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.DemandCollection">
   <insert id="insertSelective" parameterType="com.goafanti.common.model.DemandCollection">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     insert into demand_collection
     insert into demand_collection
     <trim prefix="(" suffix=")" suffixOverrides=",">
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -622,6 +625,9 @@
       <if test="createTime != null">
       <if test="createTime != null">
         create_time,
         create_time,
       </if>
       </if>
+      <if test="aid != null">
+        aid,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
       <if test="id != null">
@@ -921,13 +927,16 @@
       <if test="createTime != null">
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
         #{createTime,jdbcType=TIMESTAMP},
       </if>
       </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.DemandCollectionExample" resultType="java.lang.Long">
   <select id="countByExample" parameterType="com.goafanti.common.model.DemandCollectionExample" resultType="java.lang.Long">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     select count(*) from demand_collection
     select count(*) from demand_collection
     <if test="_parameter != null">
     <if test="_parameter != null">
@@ -938,7 +947,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     update demand_collection
     update demand_collection
     <set>
     <set>
@@ -1239,6 +1248,9 @@
       <if test="record.createTime != null">
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
       </if>
+      <if test="record.aid != null">
+        aid = #{record.aid,jdbcType=VARCHAR},
+      </if>
     </set>
     </set>
     <if test="_parameter != null">
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
       <include refid="Update_By_Example_Where_Clause" />
@@ -1248,7 +1260,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     update demand_collection
     update demand_collection
     set id = #{record.id,jdbcType=INTEGER},
     set id = #{record.id,jdbcType=INTEGER},
@@ -1349,7 +1361,8 @@
       qyyzkdgjqykjcxhzqk = #{record.qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
       qyyzkdgjqykjcxhzqk = #{record.qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
       zyhzfs = #{record.zyhzfs,jdbcType=VARCHAR},
       zyhzfs = #{record.zyhzfs,jdbcType=VARCHAR},
       zyhzfs_value = #{record.zyhzfsValue,jdbcType=VARCHAR},
       zyhzfs_value = #{record.zyhzfsValue,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      aid = #{record.aid,jdbcType=VARCHAR}
     <if test="_parameter != null">
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
       <include refid="Update_By_Example_Where_Clause" />
     </if>
     </if>
@@ -1358,7 +1371,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     update demand_collection
     update demand_collection
     <set>
     <set>
@@ -1656,6 +1669,9 @@
       <if test="createTime != null">
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
       </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
     </set>
     </set>
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>
@@ -1663,7 +1679,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 15 17:30:16 CST 2020.
+      This element was generated on Thu Jul 23 09:20:14 CST 2020.
     -->
     -->
     update demand_collection
     update demand_collection
     set dwmc = #{dwmc,jdbcType=VARCHAR},
     set dwmc = #{dwmc,jdbcType=VARCHAR},
@@ -1763,7 +1779,8 @@
       qyyzkdgjqykjcxhzqk = #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
       qyyzkdgjqykjcxhzqk = #{qyyzkdgjqykjcxhzqk,jdbcType=VARCHAR},
       zyhzfs = #{zyhzfs,jdbcType=VARCHAR},
       zyhzfs = #{zyhzfs,jdbcType=VARCHAR},
       zyhzfs_value = #{zyhzfsValue,jdbcType=VARCHAR},
       zyhzfs_value = #{zyhzfsValue,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      aid = #{aid,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>
    
    
@@ -1786,6 +1803,15 @@
 	<if test="region !=null ">
 	<if test="region !=null ">
 	and a.ssszc = #{region}
 	and a.ssszc = #{region}
 	</if>
 	</if>
+	<if test="dwxz !=null ">
+	and dwxz = #{dwxz}
+	</if>
+	<if test="yypt !=null ">
+	and yysjjyspt = #{yypt}
+	</if>
+	<if test="htly !=null ">
+	and htly = #{htly}
+	</if>
 	<if test="dwmc !=null ">
 	<if test="dwmc !=null ">
 	and dwmc like concat('%',#{dwmc},'%')
 	and dwmc like concat('%',#{dwmc},'%')
 	</if>
 	</if>
@@ -1819,6 +1845,15 @@
 	<if test="region !=null ">
 	<if test="region !=null ">
 	and a.ssszc = #{region}
 	and a.ssszc = #{region}
 	</if>
 	</if>
+	<if test="dwxz !=null ">
+	and dwxz = #{dwxz}
+	</if>
+	<if test="yypt !=null ">
+	and yysjjyspt = #{yypt}
+	</if>
+	<if test="htly !=null ">
+	and htly = #{htly}
+	</if>
 	<if test="dwmc !=null ">
 	<if test="dwmc !=null ">
 	and dwmc like concat('%',#{dwmc},'%')
 	and dwmc like concat('%',#{dwmc},'%')
 	</if>
 	</if>

+ 9 - 5
src/main/java/com/goafanti/common/mapper/SkjtUserMapper.xml

@@ -344,10 +344,14 @@
     where tur.uid = #{userId,jdbcType=VARCHAR}
     where tur.uid = #{userId,jdbcType=VARCHAR}
   </select>
   </select>
     <select id="findPermissionByUserId" parameterType="java.lang.String" resultType="java.lang.String">
     <select id="findPermissionByUserId" parameterType="java.lang.String" resultType="java.lang.String">
-    select tp.url
-    from permission tp
-    left join role_permission trp on tp.id=trp.pid
-    left join user_role tur on tur.rid=trp.rid
-    where tur.uid = #{userId,jdbcType=VARCHAR}
+   	  select tp.url
+    from skjt_permission tp
+    left join skjt_role_permission trp on tp.id=trp.pid
+    left join skjt_user_role tur on tur.rid=trp.rid
+    where tur.uid= #{userId,jdbcType=VARCHAR}
+  </select>
+  <select id="setUserRole" >
+   insert into skjt_user_role set uid= #{id} ,
+ rid =(select id from skjt_role where role_name='一般用户');
   </select>
   </select>
 </mapper>
 </mapper>

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


File diff suppressed because it is too large
+ 6872 - 6802
src/main/java/com/goafanti/common/model/DemandCollectionExample.java


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

@@ -3,12 +3,14 @@ package com.goafanti.demandCollection.service.impl;
 import java.io.IOException;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.UUID;
 
 
-import javax.security.auth.Subject;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -20,7 +22,6 @@ import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -31,6 +32,7 @@ import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.DemandCollection;
 import com.goafanti.common.model.DemandCollection;
 import com.goafanti.common.model.SkjtUser;
 import com.goafanti.common.model.SkjtUser;
 import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.common.utils.ExportExcelUtil;
+import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -50,8 +52,24 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 	@Autowired
 	@Autowired
 	private SkjtUserMapper	skjtUserMapper;
 	private SkjtUserMapper	skjtUserMapper;
 	
 	
+	@Resource(name = "passwordUtil")
+	private PasswordUtil	passwordUtil;
+	
 	@Override
 	@Override
 	public int addDemandCollection(DemandCollection d) {
 	public int addDemandCollection(DemandCollection d) {
+		String aid=UUID.randomUUID().toString();
+		SkjtUser su=new SkjtUser();
+		su.setId(aid);
+		su.setAccount(d.getDwmc());
+		su.setPassword("123456");
+		Calendar c=Calendar.getInstance();
+		c.set(Calendar.MILLISECOND, 0);
+		su.setCreateTime(c.getTime());
+		su.setNickname(d.getDwmc());
+		su.setPassword(passwordUtil.getEncryptPwd(su));
+		skjtUserMapper.insertSelective(su);
+		skjtUserMapper.setUserRole(su.getId());
+		d.setAid(aid);
 		return demandCollectionMapper.insertSelective(d);
 		return demandCollectionMapper.insertSelective(d);
 	}
 	}
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
@@ -60,6 +78,8 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 		Map<String, Object> map=new HashMap<>();
 		Map<String, Object> map=new HashMap<>();
 		if(StringUtils.isNotBlank(i.getDwmc()))map.put("dwmc", i.getDwmc());
 		if(StringUtils.isNotBlank(i.getDwmc()))map.put("dwmc", i.getDwmc());
 		if(StringUtils.isNotBlank(i.getDwxz()))map.put("dwxz", i.getDwxz());
 		if(StringUtils.isNotBlank(i.getDwxz()))map.put("dwxz", i.getDwxz());
+		if(StringUtils.isNotBlank(i.getYysjjyspt()))map.put("yypt", i.getYysjjyspt());
+		if(StringUtils.isNotBlank(i.getHtly()))map.put("htly", i.getHtly());
 		if(StringUtils.isNotBlank(i.getStartTime())&&StringUtils.isNotBlank(i.getEndTime())) {
 		if(StringUtils.isNotBlank(i.getStartTime())&&StringUtils.isNotBlank(i.getEndTime())) {
 			map.put("startTime", i.getStartTime());
 			map.put("startTime", i.getStartTime());
 			map.put("endTime", i.getEndTime()+" 23:59:59");
 			map.put("endTime", i.getEndTime()+" 23:59:59");