Browse Source

修改管理员注销查看

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

+ 11 - 11
src/main/java/com/goafanti/common/dao/TChangeTaskMapper.java

@@ -11,67 +11,67 @@ public interface TChangeTaskMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	long countByExample(TChangeTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	int deleteByExample(TChangeTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	int insert(TChangeTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	int insertSelective(TChangeTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	List<TChangeTask> selectByExample(TChangeTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	TChangeTask selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") TChangeTask record, @Param("example") TChangeTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	int updateByExample(@Param("record") TChangeTask record, @Param("example") TChangeTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TChangeTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	int updateByPrimaryKey(TChangeTask record);
 

+ 0 - 2
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -746,7 +746,6 @@
     left join user_role ur on a.id=ur.uid
     left join `role` y on ur.rid=y.id
     where a.id <![CDATA[ <> ]]> '1'
-    and (a.status != '注销' or a.status is null)
     <if test="roleName != null"> 
     	and y.role_name= #{roleName,jdbcType=VARCHAR}
     </if>
@@ -786,7 +785,6 @@
    	left join user_role ur on a.id=ur.uid
    	 left join `role` y on ur.rid=y.id
     where a.id <![CDATA[ <> ]]> '1'
-    and (a.status != '注销' or a.status is null)
     <if test="roleName != null"> 
     	and y.role_name= #{roleName,jdbcType=VARCHAR}
     </if>

+ 52 - 20
src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.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 Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
@@ -20,12 +20,14 @@
     <result column="type" jdbcType="INTEGER" property="type" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="split_status" jdbcType="INTEGER" property="splitStatus" />
+    <result column="hours" jdbcType="DOUBLE" property="hours" />
+    <result column="split_super" jdbcType="INTEGER" property="splitSuper" />
   </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 Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -59,7 +61,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -93,16 +95,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     id, tid, cid, order_no, main, commodity_id, commodity_name, commodity_quantity, commodity_price, 
-    task_comment, type, create_time, split_status
+    task_comment, type, create_time, split_status, hours, split_super
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TChangeTaskExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     select
     <if test="distinct">
@@ -121,7 +123,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -132,7 +134,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     delete from t_change_task
     where id = #{id,jdbcType=INTEGER}
@@ -141,7 +143,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     delete from t_change_task
     <if test="_parameter != null">
@@ -152,24 +154,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     insert into t_change_task (id, tid, cid, 
       order_no, main, commodity_id, 
       commodity_name, commodity_quantity, commodity_price, 
       task_comment, type, create_time, 
-      split_status)
+      split_status, hours, split_super
+      )
     values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, 
       #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, #{commodityId,jdbcType=VARCHAR}, 
       #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER}, #{commodityPrice,jdbcType=DECIMAL}, 
       #{taskComment,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{splitStatus,jdbcType=INTEGER})
+      #{splitStatus,jdbcType=INTEGER}, #{hours,jdbcType=DOUBLE}, #{splitSuper,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TChangeTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     insert into t_change_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -212,6 +216,12 @@
       <if test="splitStatus != null">
         split_status,
       </if>
+      <if test="hours != null">
+        hours,
+      </if>
+      <if test="splitSuper != null">
+        split_super,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -253,13 +263,19 @@
       <if test="splitStatus != null">
         #{splitStatus,jdbcType=INTEGER},
       </if>
+      <if test="hours != null">
+        #{hours,jdbcType=DOUBLE},
+      </if>
+      <if test="splitSuper != null">
+        #{splitSuper,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TChangeTaskExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     select count(*) from t_change_task
     <if test="_parameter != null">
@@ -270,7 +286,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     update t_change_task
     <set>
@@ -313,6 +329,12 @@
       <if test="record.splitStatus != null">
         split_status = #{record.splitStatus,jdbcType=INTEGER},
       </if>
+      <if test="record.hours != null">
+        hours = #{record.hours,jdbcType=DOUBLE},
+      </if>
+      <if test="record.splitSuper != null">
+        split_super = #{record.splitSuper,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -322,7 +344,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     update t_change_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -337,7 +359,9 @@
       task_comment = #{record.taskComment,jdbcType=VARCHAR},
       type = #{record.type,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      split_status = #{record.splitStatus,jdbcType=INTEGER}
+      split_status = #{record.splitStatus,jdbcType=INTEGER},
+      hours = #{record.hours,jdbcType=DOUBLE},
+      split_super = #{record.splitSuper,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -346,7 +370,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     update t_change_task
     <set>
@@ -386,6 +410,12 @@
       <if test="splitStatus != null">
         split_status = #{splitStatus,jdbcType=INTEGER},
       </if>
+      <if test="hours != null">
+        hours = #{hours,jdbcType=DOUBLE},
+      </if>
+      <if test="splitSuper != null">
+        split_super = #{splitSuper,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -393,7 +423,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 17 17:10:55 CST 2020.
+      This element was generated on Thu Mar 19 10:11:39 CST 2020.
     -->
     update t_change_task
     set tid = #{tid,jdbcType=INTEGER},
@@ -407,7 +437,9 @@
       task_comment = #{taskComment,jdbcType=VARCHAR},
       type = #{type,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      split_status = #{splitStatus,jdbcType=INTEGER}
+      split_status = #{splitStatus,jdbcType=INTEGER},
+      hours = #{hours,jdbcType=DOUBLE},
+      split_super = #{splitSuper,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1027,7 +1027,7 @@
   <select id="selectOrderTaskAll" resultType="com.goafanti.order.bo.TOrderTaskBo">
         select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,a.outsource_name outsourceName,a.outsource,
   a.outsource_price outsourcePrice,g.name depName,e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
-  c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,i.price,a.certificate_number as certificateNumber,
+  c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,i.price,a.certificate_number as certificateNumber,a.split_super splitSuper,
   a.commodity_id as commodityId,a.manager_id managerId,a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,
   a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,  a.task_receiver as taskReceiver ,a.split_status splitStatus
   	 from t_order_task a left join business_project b on a.commodity_id=b.id left join t_order_new e on a.order_no=e.order_no
@@ -1376,7 +1376,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id left joi
      select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.project_status as projectStatus,e.contract_no contractNo,a.task_receiver taskReceiver,
     a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate, a.commodity_quantity as commodityQuantity,e.approval,l.refund_status outsourceStatus,
     ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName, j.name as outsourceName ,ifnull(k.hours,0) hours,a.split_status splitStatus,
-    a.split_super splitSuper,date_format(a.split_time,'%Y-%m-%d %H:%i:%S') splitTimes,ad.name splitAname
+    a.split_super splitSuper,date_format(a.split_time,'%Y-%m-%d %H:%i:%S') splitTimes,ad.name splitAname,a.split_id splitId
     from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id 
   	left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
     left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress 

+ 85 - 39
src/main/java/com/goafanti/common/model/TChangeTask.java

@@ -7,74 +7,84 @@ public class TChangeTask {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.id
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.tid
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	private Integer tid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.cid
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	private Integer cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.order_no
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.main
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	private Integer main;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.commodity_id
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	private String commodityId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.commodity_name
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	private String commodityName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.commodity_quantity
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	private Integer commodityQuantity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.commodity_price
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	private BigDecimal commodityPrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.task_comment
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	private String taskComment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.type
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.create_time
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.split_status
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	private Integer splitStatus;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.hours
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
+	 */
+	private Double hours;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.split_super
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
+	 */
+	private Integer splitSuper;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.id
 	 * @return  the value of t_change_task.id
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -83,7 +93,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.id
 	 * @param id  the value for t_change_task.id
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -92,7 +102,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.tid
 	 * @return  the value of t_change_task.tid
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -101,7 +111,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.tid
 	 * @param tid  the value for t_change_task.tid
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -110,7 +120,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.cid
 	 * @return  the value of t_change_task.cid
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public Integer getCid() {
 		return cid;
@@ -119,7 +129,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.cid
 	 * @param cid  the value for t_change_task.cid
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setCid(Integer cid) {
 		this.cid = cid;
@@ -128,7 +138,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.order_no
 	 * @return  the value of t_change_task.order_no
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -137,7 +147,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.order_no
 	 * @param orderNo  the value for t_change_task.order_no
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -146,7 +156,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.main
 	 * @return  the value of t_change_task.main
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public Integer getMain() {
 		return main;
@@ -155,7 +165,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.main
 	 * @param main  the value for t_change_task.main
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setMain(Integer main) {
 		this.main = main;
@@ -164,7 +174,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.commodity_id
 	 * @return  the value of t_change_task.commodity_id
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public String getCommodityId() {
 		return commodityId;
@@ -173,7 +183,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.commodity_id
 	 * @param commodityId  the value for t_change_task.commodity_id
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setCommodityId(String commodityId) {
 		this.commodityId = commodityId;
@@ -182,7 +192,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.commodity_name
 	 * @return  the value of t_change_task.commodity_name
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public String getCommodityName() {
 		return commodityName;
@@ -191,7 +201,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.commodity_name
 	 * @param commodityName  the value for t_change_task.commodity_name
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setCommodityName(String commodityName) {
 		this.commodityName = commodityName;
@@ -200,7 +210,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.commodity_quantity
 	 * @return  the value of t_change_task.commodity_quantity
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public Integer getCommodityQuantity() {
 		return commodityQuantity;
@@ -209,7 +219,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.commodity_quantity
 	 * @param commodityQuantity  the value for t_change_task.commodity_quantity
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setCommodityQuantity(Integer commodityQuantity) {
 		this.commodityQuantity = commodityQuantity;
@@ -218,7 +228,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.commodity_price
 	 * @return  the value of t_change_task.commodity_price
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public BigDecimal getCommodityPrice() {
 		return commodityPrice;
@@ -227,7 +237,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.commodity_price
 	 * @param commodityPrice  the value for t_change_task.commodity_price
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setCommodityPrice(BigDecimal commodityPrice) {
 		this.commodityPrice = commodityPrice;
@@ -236,7 +246,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.task_comment
 	 * @return  the value of t_change_task.task_comment
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public String getTaskComment() {
 		return taskComment;
@@ -245,7 +255,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.task_comment
 	 * @param taskComment  the value for t_change_task.task_comment
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setTaskComment(String taskComment) {
 		this.taskComment = taskComment;
@@ -254,7 +264,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.type
 	 * @return  the value of t_change_task.type
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public Integer getType() {
 		return type;
@@ -263,7 +273,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.type
 	 * @param type  the value for t_change_task.type
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -272,7 +282,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.create_time
 	 * @return  the value of t_change_task.create_time
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -281,7 +291,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.create_time
 	 * @param createTime  the value for t_change_task.create_time
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -290,7 +300,7 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.split_status
 	 * @return  the value of t_change_task.split_status
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public Integer getSplitStatus() {
 		return splitStatus;
@@ -299,9 +309,45 @@ public class TChangeTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.split_status
 	 * @param splitStatus  the value for t_change_task.split_status
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setSplitStatus(Integer splitStatus) {
 		this.splitStatus = splitStatus;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.hours
+	 * @return  the value of t_change_task.hours
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
+	 */
+	public Double getHours() {
+		return hours;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.hours
+	 * @param hours  the value for t_change_task.hours
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
+	 */
+	public void setHours(Double hours) {
+		this.hours = hours;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.split_super
+	 * @return  the value of t_change_task.split_super
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
+	 */
+	public Integer getSplitSuper() {
+		return splitSuper;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.split_super
+	 * @param splitSuper  the value for t_change_task.split_super
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
+	 */
+	public void setSplitSuper(Integer splitSuper) {
+		this.splitSuper = splitSuper;
+	}
 }

+ 136 - 16
src/main/java/com/goafanti/common/model/TChangeTaskExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class TChangeTaskExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public TChangeTaskExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TChangeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TChangeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TChangeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TChangeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TChangeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TChangeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TChangeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TChangeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TChangeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TChangeTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TChangeTaskExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -983,11 +983,131 @@ public class TChangeTaskExample {
 			addCriterion("split_status not between", value1, value2, "splitStatus");
 			return (Criteria) this;
 		}
+
+		public Criteria andHoursIsNull() {
+			addCriterion("hours is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andHoursIsNotNull() {
+			addCriterion("hours is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andHoursEqualTo(Double value) {
+			addCriterion("hours =", value, "hours");
+			return (Criteria) this;
+		}
+
+		public Criteria andHoursNotEqualTo(Double value) {
+			addCriterion("hours <>", value, "hours");
+			return (Criteria) this;
+		}
+
+		public Criteria andHoursGreaterThan(Double value) {
+			addCriterion("hours >", value, "hours");
+			return (Criteria) this;
+		}
+
+		public Criteria andHoursGreaterThanOrEqualTo(Double value) {
+			addCriterion("hours >=", value, "hours");
+			return (Criteria) this;
+		}
+
+		public Criteria andHoursLessThan(Double value) {
+			addCriterion("hours <", value, "hours");
+			return (Criteria) this;
+		}
+
+		public Criteria andHoursLessThanOrEqualTo(Double value) {
+			addCriterion("hours <=", value, "hours");
+			return (Criteria) this;
+		}
+
+		public Criteria andHoursIn(List<Double> values) {
+			addCriterion("hours in", values, "hours");
+			return (Criteria) this;
+		}
+
+		public Criteria andHoursNotIn(List<Double> values) {
+			addCriterion("hours not in", values, "hours");
+			return (Criteria) this;
+		}
+
+		public Criteria andHoursBetween(Double value1, Double value2) {
+			addCriterion("hours between", value1, value2, "hours");
+			return (Criteria) this;
+		}
+
+		public Criteria andHoursNotBetween(Double value1, Double value2) {
+			addCriterion("hours not between", value1, value2, "hours");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperIsNull() {
+			addCriterion("split_super is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperIsNotNull() {
+			addCriterion("split_super is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperEqualTo(Integer value) {
+			addCriterion("split_super =", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperNotEqualTo(Integer value) {
+			addCriterion("split_super <>", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperGreaterThan(Integer value) {
+			addCriterion("split_super >", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperGreaterThanOrEqualTo(Integer value) {
+			addCriterion("split_super >=", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperLessThan(Integer value) {
+			addCriterion("split_super <", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperLessThanOrEqualTo(Integer value) {
+			addCriterion("split_super <=", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperIn(List<Integer> values) {
+			addCriterion("split_super in", values, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperNotIn(List<Integer> values) {
+			addCriterion("split_super not in", values, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperBetween(Integer value1, Integer value2) {
+			addCriterion("split_super between", value1, value2, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperNotBetween(Integer value1, Integer value2) {
+			addCriterion("split_super not between", value1, value2, "splitSuper");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_change_task
-	 * @mbg.generated  Tue Mar 17 17:10:55 CST 2020
+	 * @mbg.generated  Thu Mar 19 10:11:39 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 7 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java

@@ -33,6 +33,7 @@ public class TOrderTaskListBo {
 	private Integer outsourceStatus;
 	private Integer splitStatus;
 	private String	splitSuper;
+	private Integer splitId;
 	private String splitTimes;
 	private String splitAname;
 	private String taskReceiver;
@@ -227,6 +228,12 @@ public class TOrderTaskListBo {
 	public void setTaskReceiver(String taskReceiver) {
 		this.taskReceiver = taskReceiver;
 	}
+	public Integer getSplitId() {
+		return splitId;
+	}
+	public void setSplitId(Integer splitId) {
+		this.splitId = splitId;
+	}
 	
 	
 }

+ 2 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -187,6 +187,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					ck.setCommodityQuantity(tt.getCommodityQuantity());
 					ck.setTaskComment(tt.getTaskComment());
 					ck.setSplitStatus(tt.getSplitStatus());
+					ck.setSplitSuper(tt.getSplitSuper());
 					ck.setMain(tt.getMain());
 					ck.setTid(tt.getId());
 					listck.add(ck);
@@ -210,7 +211,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	 * 新增审核流程中的
 	 */
 	private void insertOrderExamine(String orderNo) {
-		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(orderNo);
+		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTaskAll(orderNo);
 		for (TOrderTaskBo t : list) {
 			if (t.getConsultantId()!=null) {
 				OrderExamine o=new OrderExamine();

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -665,7 +665,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			for (String string : str) {
 				x+=Integer.parseInt(string);
 			}
-			if (task.getCommodityQuantity()!=x) {
+			if (task.getCommodityQuantity()!=x||str.length==1) {
 				return -1;
 			}
 			int i=1;

+ 6 - 6
src/main/resources/props/config_local.properties

@@ -1,13 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-#jdbc.username=dev
-#jdbc.password=123456
+jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.username=dev
+jdbc.password=123456
 #测试
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=aftdev
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570