Browse Source

变更列表修改

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

+ 2 - 2
GeneratorConfig.xml

@@ -4,8 +4,8 @@
    <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.39.jar" /> 
    <!-- <classPathEntry location="C:\Users\Administrator\.dbeaver-drivers\maven\maven-central\mysql\mysql-connector-java-5.1.44.jar" /> -->
   <context id="context1">	
-     <jdbcConnection connectionURL="jdbc:mysql://101.37.32.31:3306/aft"  
-    	driverClass="com.mysql.jdbc.Driver" password="dev123456" userId="dev" />
+     <jdbcConnection connectionURL="jdbc:mysql://localhost:3306/aft"  
+    	driverClass="com.mysql.jdbc.Driver" password="123456" userId="root" />
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />

+ 9 - 1
src/main/java/com/goafanti/common/dao/TChangeDunMapper.java

@@ -79,7 +79,15 @@ public interface TChangeDunMapper {
 
 	List<TChangeDunOut> selectByCid(Integer id);
 
+	/**
+	 * 
+	 * @param tid 变更项目id
+	 * @param type 处理类型
+	 * @return
+	 */
 	int updateByTid(@Param("tid")Integer tid,@Param("type")Integer type);
 
-	int deleteByTid(Integer tid);
+	
+
+	
 }

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

@@ -11,71 +11,91 @@ public interface TChangeTaskMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	int updateByPrimaryKey(TChangeTask record);
 
 	void insertSelectiveList(@Param("list")List<TChangeTask> list);
 
-	List<TChangeTaskOut> selectByCid(Integer id);
+	List<TChangeTaskOut> selectByCid(@Param("id")Integer id, @Param("splitStatus")Integer splitStatus);
+	
+	/**
+	 * 
+	 * @param tid 变更项目id
+	 * @param sid 变更拆分父项目id
+	 * @param type 处理类型
+	 * @return
+	 */
+	int updateByTid(@Param("tid")Integer tid,@Param("sid")Integer sid,@Param("type")Integer type);
+	
+	int deleteByTid(Integer tid);
+
+	/**
+	 *   获取变更子项�??
+	 * @param splitSuper
+	 * @param cid 
+	 * @return
+	 */
+	List<TChangeTask> selectBySuper(@Param("splitSuper")Integer splitSuper, @Param("cid")Integer cid);
+
 }

+ 7 - 4
src/main/java/com/goafanti/common/mapper/TChangeDunMapper.xml

@@ -497,11 +497,14 @@
   	  from t_change_dun a left join t_order_task b on a.tid=b.id left join t_change_task c on a.ctid=c.id
     	where a.cid= #{id} order by a.id
   </select>
+
   <update id="updateByTid">
-  		update t_change_dun set type= #{type} where tid= #{tid};
+  		update t_change_dun set type= #{type} 
+  		where 1=1 
+  		<if test="tid !=null">
+  		and tid= #{tid}
+  		</if>
   </update>
   
-  <update id="deleteByTid">
-  		delete from t_change_dun where tid= #{tid};
-  </update>
+ 
 </mapper>

+ 69 - 40
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 Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
@@ -20,14 +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" />
+    <result column="receiver_name" jdbcType="VARCHAR" property="receiverName" />
   </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 Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -61,7 +61,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -95,16 +95,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 CST 2020.
     -->
     id, tid, cid, order_no, main, commodity_id, commodity_name, commodity_quantity, commodity_price, 
-    task_comment, type, create_time, split_status, hours, split_super
+    task_comment, type, create_time, split_status, split_super, receiver_name
   </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 Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 CST 2020.
     -->
     select
     <if test="distinct">
@@ -123,7 +123,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -134,7 +134,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 CST 2020.
     -->
     delete from t_change_task
     where id = #{id,jdbcType=INTEGER}
@@ -143,7 +143,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 CST 2020.
     -->
     delete from t_change_task
     <if test="_parameter != null">
@@ -154,26 +154,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 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, hours, split_super
+      split_status, split_super, receiver_name
       )
     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}, #{hours,jdbcType=DOUBLE}, #{splitSuper,jdbcType=INTEGER}
+      #{splitStatus,jdbcType=INTEGER}, #{splitSuper,jdbcType=INTEGER}, #{receiverName,jdbcType=VARCHAR}
       )
   </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 Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 CST 2020.
     -->
     insert into t_change_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -216,12 +216,12 @@
       <if test="splitStatus != null">
         split_status,
       </if>
-      <if test="hours != null">
-        hours,
-      </if>
       <if test="splitSuper != null">
         split_super,
       </if>
+      <if test="receiverName != null">
+        receiver_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -263,19 +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>
+      <if test="receiverName != null">
+        #{receiverName,jdbcType=VARCHAR},
+      </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 Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 CST 2020.
     -->
     select count(*) from t_change_task
     <if test="_parameter != null">
@@ -286,7 +286,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 CST 2020.
     -->
     update t_change_task
     <set>
@@ -329,12 +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>
+      <if test="record.receiverName != null">
+        receiver_name = #{record.receiverName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -344,7 +344,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 CST 2020.
     -->
     update t_change_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -360,8 +360,8 @@
       type = #{record.type,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       split_status = #{record.splitStatus,jdbcType=INTEGER},
-      hours = #{record.hours,jdbcType=DOUBLE},
-      split_super = #{record.splitSuper,jdbcType=INTEGER}
+      split_super = #{record.splitSuper,jdbcType=INTEGER},
+      receiver_name = #{record.receiverName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -370,7 +370,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 CST 2020.
     -->
     update t_change_task
     <set>
@@ -410,12 +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>
+      <if test="receiverName != null">
+        receiver_name = #{receiverName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -423,7 +423,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Mar 20 15:22:56 CST 2020.
+      This element was generated on Mon Mar 30 15:38:22 CST 2020.
     -->
     update t_change_task
     set tid = #{tid,jdbcType=INTEGER},
@@ -438,8 +438,8 @@
       type = #{type,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       split_status = #{splitStatus,jdbcType=INTEGER},
-      hours = #{hours,jdbcType=DOUBLE},
-      split_super = #{splitSuper,jdbcType=INTEGER}
+      split_super = #{splitSuper,jdbcType=INTEGER},
+      receiver_name = #{receiverName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -447,21 +447,50 @@
     insert into t_change_task ( tid, cid, split_status,
       order_no, commodity_id, commodity_name, 
       commodity_quantity, commodity_price, task_comment, 
-      create_time)
+        split_super , receiver_name, create_time)
     values 
     <foreach collection="list" index="index" item="item" separator=",">
       ( #{item.tid,jdbcType=INTEGER}, #{item.cid,jdbcType=INTEGER}, #{item.splitStatus,jdbcType=INTEGER},
       #{item.orderNo,jdbcType=VARCHAR}, #{item.commodityId,jdbcType=VARCHAR}, #{item.commodityName,jdbcType=VARCHAR}, 
       #{item.commodityQuantity,jdbcType=INTEGER}, #{item.commodityPrice,jdbcType=DECIMAL}, #{item.taskComment,jdbcType=VARCHAR}, 
-      now())
+       #{item.splitSuper,jdbcType=INTEGER}, #{item.receiverName,jdbcType=VARCHAR}, now())
     </foreach>
   </insert>
   <select id="selectByCid" resultType="com.goafanti.order.bo.TChangeTaskOut">
      select a.id,a.order_no as orderNo,a.main, c.cname,c.sort cSort,a.commodity_name as commodityName,
-  	 a.commodity_quantity as commodityQuantity,i.price,a.commodity_id as commodityId,a.type,a.tid,
-  a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus
+  	 a.commodity_quantity as commodityQuantity,i.price,a.commodity_id as commodityId,a.type,a.tid,a.receiver_name receiverName,
+  a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus,a.split_super splitSuper
+    from t_change_task a left join business_project i on a.commodity_id=i.id
+  	left join business_category c on i.cid=c.id 
+  	where 1=1
+  	<if test="splitStatus !=null">
+  	and a.split_status=1
+  	</if>
+  	 and a.cid= #{id} order by a.id
+  </select>
+    <update id="updateByTid">
+  		update t_change_task set type= #{type} 
+  		where 1=1 
+  		<if test="tid !=null">
+  		and tid= #{tid}
+  		</if>
+  		<if test="sid !=null">
+  		and split_super= #{sid}
+  		</if>
+  </update>
+  
+   <update id="deleteByTid">
+  		delete from t_change_task where tid= #{tid};
+  </update>
+  
+  
+
+    <select id="selectBySuper" resultType="com.goafanti.order.bo.TChangeTaskOut">
+	select a.id,a.order_no as orderNo,a.main, c.cname,c.sort cSort,a.commodity_name as commodityName,
+  	a.commodity_quantity as commodityQuantity,i.price,a.commodity_id as commodityId,a.type,a.tid,a.receiver_name receiverName,
+	a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus,a.split_super splitSuper
     from t_change_task a left join business_project i on a.commodity_id=i.id
   	left join business_category c on i.cid=c.id 
-  	where a.cid= #{id} order by a.id
+  	where a.split_status=2 and a.split_super= #{splitSuper} and a.cid= #{cid} order by a.id
   </select>
 </mapper>

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

@@ -1025,9 +1025,9 @@
   </select>
   
   <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,
+      	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.receiver_name receiverName,
 	  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,a.split_super splitSuper,a.split_aid splitAid,a.split_time splitTime

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

@@ -7,84 +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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	private Integer splitSuper;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.receiver_name
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
+	 */
+	private String receiverName;
 
 	/**
 	 * 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -93,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -102,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -111,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -120,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public Integer getCid() {
 		return cid;
@@ -129,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public void setCid(Integer cid) {
 		this.cid = cid;
@@ -138,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -147,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -156,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public Integer getMain() {
 		return main;
@@ -165,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public void setMain(Integer main) {
 		this.main = main;
@@ -174,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public String getCommodityId() {
 		return commodityId;
@@ -183,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public void setCommodityId(String commodityId) {
 		this.commodityId = commodityId;
@@ -192,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public String getCommodityName() {
 		return commodityName;
@@ -201,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public void setCommodityName(String commodityName) {
 		this.commodityName = commodityName;
@@ -210,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public Integer getCommodityQuantity() {
 		return commodityQuantity;
@@ -219,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public void setCommodityQuantity(Integer commodityQuantity) {
 		this.commodityQuantity = commodityQuantity;
@@ -228,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public BigDecimal getCommodityPrice() {
 		return commodityPrice;
@@ -237,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public void setCommodityPrice(BigDecimal commodityPrice) {
 		this.commodityPrice = commodityPrice;
@@ -246,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public String getTaskComment() {
 		return taskComment;
@@ -255,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public void setTaskComment(String taskComment) {
 		this.taskComment = taskComment;
@@ -264,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public Integer getType() {
 		return type;
@@ -273,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -282,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -291,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -300,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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public Integer getSplitStatus() {
 		return splitStatus;
@@ -309,34 +309,16 @@ 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 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  Fri Mar 20 15:22:56 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public Integer getSplitSuper() {
 		return splitSuper;
@@ -345,9 +327,27 @@ public class TChangeTask {
 	/**
 	 * 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public void setSplitSuper(Integer splitSuper) {
 		this.splitSuper = splitSuper;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.receiver_name
+	 * @return  the value of t_change_task.receiver_name
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
+	 */
+	public String getReceiverName() {
+		return receiverName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.receiver_name
+	 * @param receiverName  the value for t_change_task.receiver_name
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
+	 */
+	public void setReceiverName(String receiverName) {
+		this.receiverName = receiverName;
+	}
 }

+ 74 - 64
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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 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  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -984,130 +984,140 @@ public class TChangeTaskExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andHoursIsNull() {
-			addCriterion("hours is null");
+		public Criteria andSplitSuperIsNull() {
+			addCriterion("split_super is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andHoursIsNotNull() {
-			addCriterion("hours is not null");
+		public Criteria andSplitSuperIsNotNull() {
+			addCriterion("split_super is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andHoursEqualTo(Double value) {
-			addCriterion("hours =", value, "hours");
+		public Criteria andSplitSuperEqualTo(Integer value) {
+			addCriterion("split_super =", value, "splitSuper");
 			return (Criteria) this;
 		}
 
-		public Criteria andHoursNotEqualTo(Double value) {
-			addCriterion("hours <>", value, "hours");
+		public Criteria andSplitSuperNotEqualTo(Integer value) {
+			addCriterion("split_super <>", value, "splitSuper");
 			return (Criteria) this;
 		}
 
-		public Criteria andHoursGreaterThan(Double value) {
-			addCriterion("hours >", value, "hours");
+		public Criteria andSplitSuperGreaterThan(Integer value) {
+			addCriterion("split_super >", value, "splitSuper");
 			return (Criteria) this;
 		}
 
-		public Criteria andHoursGreaterThanOrEqualTo(Double value) {
-			addCriterion("hours >=", value, "hours");
+		public Criteria andSplitSuperGreaterThanOrEqualTo(Integer value) {
+			addCriterion("split_super >=", value, "splitSuper");
 			return (Criteria) this;
 		}
 
-		public Criteria andHoursLessThan(Double value) {
-			addCriterion("hours <", value, "hours");
+		public Criteria andSplitSuperLessThan(Integer value) {
+			addCriterion("split_super <", value, "splitSuper");
 			return (Criteria) this;
 		}
 
-		public Criteria andHoursLessThanOrEqualTo(Double value) {
-			addCriterion("hours <=", value, "hours");
+		public Criteria andSplitSuperLessThanOrEqualTo(Integer value) {
+			addCriterion("split_super <=", value, "splitSuper");
 			return (Criteria) this;
 		}
 
-		public Criteria andHoursIn(List<Double> values) {
-			addCriterion("hours in", values, "hours");
+		public Criteria andSplitSuperIn(List<Integer> values) {
+			addCriterion("split_super in", values, "splitSuper");
 			return (Criteria) this;
 		}
 
-		public Criteria andHoursNotIn(List<Double> values) {
-			addCriterion("hours not in", values, "hours");
+		public Criteria andSplitSuperNotIn(List<Integer> values) {
+			addCriterion("split_super not in", values, "splitSuper");
 			return (Criteria) this;
 		}
 
-		public Criteria andHoursBetween(Double value1, Double value2) {
-			addCriterion("hours between", value1, value2, "hours");
+		public Criteria andSplitSuperBetween(Integer value1, Integer value2) {
+			addCriterion("split_super between", value1, value2, "splitSuper");
 			return (Criteria) this;
 		}
 
-		public Criteria andHoursNotBetween(Double value1, Double value2) {
-			addCriterion("hours not between", value1, value2, "hours");
+		public Criteria andSplitSuperNotBetween(Integer value1, Integer value2) {
+			addCriterion("split_super not between", value1, value2, "splitSuper");
 			return (Criteria) this;
 		}
 
-		public Criteria andSplitSuperIsNull() {
-			addCriterion("split_super is null");
+		public Criteria andReceiverNameIsNull() {
+			addCriterion("receiver_name is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andSplitSuperIsNotNull() {
-			addCriterion("split_super is not null");
+		public Criteria andReceiverNameIsNotNull() {
+			addCriterion("receiver_name is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andSplitSuperEqualTo(Integer value) {
-			addCriterion("split_super =", value, "splitSuper");
+		public Criteria andReceiverNameEqualTo(String value) {
+			addCriterion("receiver_name =", value, "receiverName");
 			return (Criteria) this;
 		}
 
-		public Criteria andSplitSuperNotEqualTo(Integer value) {
-			addCriterion("split_super <>", value, "splitSuper");
+		public Criteria andReceiverNameNotEqualTo(String value) {
+			addCriterion("receiver_name <>", value, "receiverName");
 			return (Criteria) this;
 		}
 
-		public Criteria andSplitSuperGreaterThan(Integer value) {
-			addCriterion("split_super >", value, "splitSuper");
+		public Criteria andReceiverNameGreaterThan(String value) {
+			addCriterion("receiver_name >", value, "receiverName");
 			return (Criteria) this;
 		}
 
-		public Criteria andSplitSuperGreaterThanOrEqualTo(Integer value) {
-			addCriterion("split_super >=", value, "splitSuper");
+		public Criteria andReceiverNameGreaterThanOrEqualTo(String value) {
+			addCriterion("receiver_name >=", value, "receiverName");
 			return (Criteria) this;
 		}
 
-		public Criteria andSplitSuperLessThan(Integer value) {
-			addCriterion("split_super <", value, "splitSuper");
+		public Criteria andReceiverNameLessThan(String value) {
+			addCriterion("receiver_name <", value, "receiverName");
 			return (Criteria) this;
 		}
 
-		public Criteria andSplitSuperLessThanOrEqualTo(Integer value) {
-			addCriterion("split_super <=", value, "splitSuper");
+		public Criteria andReceiverNameLessThanOrEqualTo(String value) {
+			addCriterion("receiver_name <=", value, "receiverName");
 			return (Criteria) this;
 		}
 
-		public Criteria andSplitSuperIn(List<Integer> values) {
-			addCriterion("split_super in", values, "splitSuper");
+		public Criteria andReceiverNameLike(String value) {
+			addCriterion("receiver_name like", value, "receiverName");
 			return (Criteria) this;
 		}
 
-		public Criteria andSplitSuperNotIn(List<Integer> values) {
-			addCriterion("split_super not in", values, "splitSuper");
+		public Criteria andReceiverNameNotLike(String value) {
+			addCriterion("receiver_name not like", value, "receiverName");
 			return (Criteria) this;
 		}
 
-		public Criteria andSplitSuperBetween(Integer value1, Integer value2) {
-			addCriterion("split_super between", value1, value2, "splitSuper");
+		public Criteria andReceiverNameIn(List<String> values) {
+			addCriterion("receiver_name in", values, "receiverName");
 			return (Criteria) this;
 		}
 
-		public Criteria andSplitSuperNotBetween(Integer value1, Integer value2) {
-			addCriterion("split_super not between", value1, value2, "splitSuper");
+		public Criteria andReceiverNameNotIn(List<String> values) {
+			addCriterion("receiver_name not in", values, "receiverName");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameBetween(String value1, String value2) {
+			addCriterion("receiver_name between", value1, value2, "receiverName");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameNotBetween(String value1, String value2) {
+			addCriterion("receiver_name not between", value1, value2, "receiverName");
 			return (Criteria) this;
 		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Mar 20 15:22:56 CST 2020
+	 * @mbg.generated  Mon Mar 30 15:38:22 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 20 - 0
src/main/java/com/goafanti/order/bo/InputTChangeTask.java

@@ -0,0 +1,20 @@
+package com.goafanti.order.bo;
+
+
+
+import com.goafanti.common.model.TChangeTask;
+
+public class InputTChangeTask  extends TChangeTask{
+	
+	private Integer  splitStatus;
+
+	public Integer getSplitStatus() {
+		return splitStatus;
+	}
+
+	public void setSplitStatus(Integer splitStatus) {
+		this.splitStatus = splitStatus;
+	}
+	
+	
+}

+ 18 - 0
src/main/java/com/goafanti/order/bo/TChangeTaskOut.java

@@ -1,10 +1,16 @@
 package com.goafanti.order.bo;
 
+import java.util.List;
+
+import org.apache.poi.ss.formula.functions.T;
+
 import com.goafanti.common.model.TChangeTask;
 
 public class TChangeTaskOut extends TChangeTask{
 	private String cname;
+	private String receiverName;
 	private Integer cSort;
+	private List<?> list;
 	public Integer getcSort() {
 		return cSort;
 	}
@@ -17,6 +23,18 @@ public class TChangeTaskOut extends TChangeTask{
 	public void setCname(String cname) {
 		this.cname = cname;
 	}
+	public List<?> getList() {
+		return list;
+	}
+	public void setList(List<?> list2) {
+		this.list = list2;
+	}
+	public String getReceiverName() {
+		return receiverName;
+	}
+	public void setReceiverName(String receiverName) {
+		this.receiverName = receiverName;
+	}
 	
 	
 }

+ 2 - 1
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -19,6 +19,7 @@ import com.goafanti.common.model.TChangeDun;
 import com.goafanti.common.model.TChangeTask;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.order.bo.InputNewOrderRefund;
+import com.goafanti.order.bo.InputTChangeTask;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.service.OrderChangeService;
 
@@ -127,7 +128,7 @@ public class OrderChangeApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/updateChangeTask", method = RequestMethod.POST)
-	public Result updateChangeTask(TChangeTask t){
+	public Result updateChangeTask(InputTChangeTask t){
 		Result res = new Result();
 		if (null==t.getId()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更项目id"));

+ 3 - 2
src/main/java/com/goafanti/order/enums/ReceivablesStatus.java

@@ -10,10 +10,11 @@ import java.util.Map;
 public enum ReceivablesStatus {
 	ZC(0,"正常"),
 	CF(1,"重复"),
-	DCYC(2,"订单异常"),
+	DDYC(2,"订单异常"),
 	JEYC(3,"金额异常"),
 	MCYC(4,"名称异常"),
-	YSK(5,"已收款");
+	YSK(5,"已收款"),
+	DDSDBGZ(6,"订单锁定变更中");
 	
 	private ReceivablesStatus(Integer code, String desc) {
 		this.code = code;

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

@@ -11,6 +11,7 @@ import com.goafanti.common.model.TChangeDun;
 import com.goafanti.common.model.TChangeTask;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.InputNewOrderRefund;
+import com.goafanti.order.bo.InputTChangeTask;
 import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
@@ -66,7 +67,7 @@ public interface OrderChangeService {
 	
 	List<TChangeDunOut> selectChangeDun(Integer cid);
 
-	int updateChangeTask(TChangeTask t);
+	int updateChangeTask(InputTChangeTask t);
 
 	int updateChangeDun(TChangeDun t);
 

+ 46 - 12
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -64,6 +64,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.BillBo;
 import com.goafanti.order.bo.InputNewOrderRefund;
+import com.goafanti.order.bo.InputTChangeTask;
 import com.goafanti.order.bo.InvoiceBo;
 import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
@@ -182,6 +183,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					ck.setTaskComment(tt.getTaskComment());
 					ck.setSplitStatus(tt.getSplitStatus());
 					ck.setSplitSuper(tt.getSplitSuper());
+					ck.setReceiverName(tt.getReceiverName());
 					ck.setMain(tt.getMain());
 					ck.setTid(tt.getId());
 					listck.add(ck);
@@ -415,8 +417,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		List<TOrderDun> td1=tOrderDunMapper.selectByOrderNo(nb.getOrderNo());
 		List<OutNewOrderDunBo> td2=newOrderDunMapper.selectListNewOrderDun(nb.getOrderNo(), null, null);
 		List<TOrderTaskBo> tt1=tOrderTaskMapper.selectOrderTaskAll(nb.getOrderNo());
-		List<TOrderLogBo> tl1=tOrderLogMapper.selectOrderByNo(nb.getOrderNo());
-		String newOrderNo=idGenerator.generateId().toString();
+		List<TOrderLogBo> tl1=tOrderLogMapper.selectOrderByNo(nb.getOrderNo());		String newOrderNo=idGenerator.generateId().toString();
 		t1.setOrderNo(newOrderNo);
 		nb.setUsedOrder(newOrderNo);
 		t1.setDeleteSign(1);//将原订单作废,只能查看
@@ -505,8 +506,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		NewOrderChange  noc=new NewOrderChange();
 		t.setProcessState(1);
 		noc.setId(t.getId());
-		chekeChangeTaskNumber(noc);
 		if (changeType==0) {
+			chekeChangeTaskNumber(noc);
 			noc.setRemarks(t.getRemarks());
 			noc.setType(t.getType());
 			noc.setVoucherUrl(t.getVoucherUrl());
@@ -524,12 +525,15 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			ocl.setChangeId(noc.getId());
 			ocl.setStatus(0);
 			orderChangeLogMapper.insertSelective(ocl);
+			TOrderNew ton=new TOrderNew();
+			ton.setOrderNo(noc.getOrderNo());
+			ton.setDeleteSign(3);
+			tOrderNewMapper.updateByPrimaryKeySelective(ton);
 			sendNotice(0, t);
 		}else  if (changeType==2) {
 			noc.setCwCost(t.getCwCost());
 			noc.setRefundableAmount(t.getRefundableAmount());
 		}
-		
 		if(changeType!=1)newOrderChangeMapper.updateByPrimaryKeySelective(noc);
 		return 1; 
 	}
@@ -539,14 +543,14 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	 * @param noc
 	 */
 	private void chekeChangeTaskNumber(NewOrderChange noc) {
-		List<TChangeTaskOut> list=tChangeTaskMapper.selectByCid(noc.getId());
+		List<TChangeTaskOut> list=tChangeTaskMapper.selectByCid(noc.getId(),null);
 		//x记录父值y记录子值
 		int x=0;
 		int y=0;
 		
 		for (TChangeTaskOut tcto : list) {
 			if (tcto.getSplitStatus()==1) {
-				x=tcto.getCommodityQuantity();
+				x+=tcto.getCommodityQuantity();
 			}else if (tcto.getSplitStatus()==2) {
 				y+=tcto.getCommodityQuantity();
 			}
@@ -638,7 +642,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 
 	private void pushTaskAndDun(Integer id,String orderNo) {
-		List<TChangeTaskOut> listct=tChangeTaskMapper.selectByCid(id);
+		List<TChangeTaskOut> listct=tChangeTaskMapper.selectByCid(id,null);
 		for (TChangeTaskOut cd : listct) {
 			TOrderTask ot=new TOrderTask();
 			if (cd.getType()==1) {
@@ -833,7 +837,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 			@Override
 			public List<TChangeTaskOut> selectChangeTask(Integer cid) {
-				return tChangeTaskMapper.selectByCid(cid);
+				List<TChangeTaskOut> list=tChangeTaskMapper.selectByCid(cid,1);
+				for (TChangeTaskOut tChangeTaskOut : list) {
+					List<TChangeTask> list2=tChangeTaskMapper.selectBySuper(tChangeTaskOut.getTid(),cid);
+					tChangeTaskOut.setList(list2);
+				}
+				return list;
 			}
 
 			@Override
@@ -842,18 +851,43 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}
 
 			@Override
-			public int updateChangeTask(TChangeTask t) {
+			public int updateChangeTask(InputTChangeTask t) {
 				//有tid是订单复制项目
 				if(t.getTid()!=null) {
 					//type 0正常 1新增 2修改 3删除
+					TChangeTask tt=tChangeTaskMapper.selectByPrimaryKey(t.getId());
 					if (t.getType()==3) {
-						tChangeDunMapper.updateByTid(t.getTid(),3);
+						//删除首先将项目删除,然后将所属催款做删除
+						tChangeTaskMapper.updateByTid(t.getTid(),null,3);
+						if (tt.getSplitStatus()==1) {
+							tChangeTaskMapper.updateByTid(null,tt.getTid(),3);
+							tChangeDunMapper.updateByTid(tt.getTid(),3);
+						}else if(tt.getSplitStatus()==2) {
+							List<TChangeTask> list=tChangeTaskMapper.selectBySuper(tt.getSplitSuper(),t.getCid());
+							boolean flag=true;
+							for (TChangeTask tc : list) {
+								if (tc.getType()!=3) {
+									flag=false;
+									break;
+								}
+							}
+							if (flag) {
+								tChangeTaskMapper.updateByTid(tt.getSplitSuper(),null,3);
+								tChangeDunMapper.updateByTid(tt.getSplitSuper(),3);
+							}
+						}
 					}else if(t.getType()==2){
-						tChangeDunMapper.updateByTid(t.getTid(),2);
+						tChangeTaskMapper.updateByTid(t.getTid(),null,2);
+						if (tt.getSplitStatus()==1) {
+							tChangeTaskMapper.updateByTid(null,tt.getTid(),2);
+						}else if(tt.getSplitStatus()==2) {
+								tChangeTaskMapper.updateByTid(tt.getSplitSuper(),null,2);
+						}
 					}
 				}else {
 					if (t.getType()==3) {
-						tChangeDunMapper.deleteByTid(t.getTid());
+						tChangeTaskMapper.deleteByTid(t.getTid());
+						
 					}
 				}
 				return tChangeTaskMapper.updateByPrimaryKeySelective(t);

+ 6 - 2
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -150,8 +150,12 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 			//获取总金额
 			TOrderNewBo t=tOrderNewMapper.getOrderNewDetail(tr.getOrderNo());
 			//订单匹配不到
-			if(t==null||t.getOrderNo()==null) {
-				tr.setStatus(ReceivablesStatus.DCYC.getCode());
+			 if(t==null||t.getOrderNo()==null) {
+				tr.setStatus(ReceivablesStatus.DDYC.getCode());
+				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
+				continue;
+			}else if(t.getDeleteSign()==2||t.getDeleteSign()==3) {
+				tr.setStatus(ReceivablesStatus.DDSDBGZ.getCode());
 				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
 				continue;
 			}else if(!tr.getCorporateName().equals(t.getUserName())) {