Browse Source

变更完成时,自动删除旧催款

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

+ 113 - 111
src/main/java/com/goafanti/common/dao/TOrderDunMapper.java

@@ -1,112 +1,114 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.TOrderDun;
-import com.goafanti.common.model.TOrderDunExample;
-import com.goafanti.order.bo.OrderDunTaskBo;
-import com.goafanti.order.bo.TOrderNewBo;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface TOrderDunMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_dun
-     *
-     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
-     */
-    long countByExample(TOrderDunExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_dun
-     *
-     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
-     */
-    int deleteByExample(TOrderDunExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_dun
-     *
-     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
-     */
-    int deleteByPrimaryKey(String id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_dun
-     *
-     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
-     */
-    int insert(TOrderDun record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_dun
-     *
-     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
-     */
-    int insertSelective(TOrderDun record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_dun
-     *
-     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
-     */
-    List<TOrderDun> selectByExample(TOrderDunExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_dun
-     *
-     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
-     */
-    TOrderDun selectByPrimaryKey(String id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_dun
-     *
-     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
-     */
-    int updateByExampleSelective(@Param("record") TOrderDun record, @Param("example") TOrderDunExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_dun
-     *
-     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
-     */
-    int updateByExample(@Param("record") TOrderDun record, @Param("example") TOrderDunExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_dun
-     *
-     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
-     */
-    int updateByPrimaryKeySelective(TOrderDun record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_dun
-     *
-     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
-     */
-    int updateByPrimaryKey(TOrderDun record);
-
-
-    
-
-	List<TOrderDun> selectByOrderNoDunSubject(String orderNo);
-
-	List<TOrderNewBo> getOrderDunData(@Param("name")String name,@Param("orderNo") String orderNo,@Param("adminName") String adminName,@Param("depId") String depId, @Param("starTime")String starTime, @Param("endTime")String endTime);
-
-	List<OrderDunTaskBo> getTaskAllOrderDun();
-
-	int checkOrderDun(@Param("dunSubject")Integer dunSubject, @Param("orderNo")String orderNo);
-
-	List<TOrderDun> selectByOrderNo(String orderNo);
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TOrderDun;
+import com.goafanti.common.model.TOrderDunExample;
+import com.goafanti.order.bo.OrderDunTaskBo;
+import com.goafanti.order.bo.TOrderNewBo;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TOrderDunMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_dun
+     *
+     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
+     */
+    long countByExample(TOrderDunExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_dun
+     *
+     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
+     */
+    int deleteByExample(TOrderDunExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_dun
+     *
+     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_dun
+     *
+     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
+     */
+    int insert(TOrderDun record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_dun
+     *
+     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
+     */
+    int insertSelective(TOrderDun record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_dun
+     *
+     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
+     */
+    List<TOrderDun> selectByExample(TOrderDunExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_dun
+     *
+     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
+     */
+    TOrderDun selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_dun
+     *
+     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") TOrderDun record, @Param("example") TOrderDunExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_dun
+     *
+     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
+     */
+    int updateByExample(@Param("record") TOrderDun record, @Param("example") TOrderDunExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_dun
+     *
+     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
+     */
+    int updateByPrimaryKeySelective(TOrderDun record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table t_order_dun
+     *
+     * @mbg.generated Mon Nov 19 16:53:48 CST 2018
+     */
+    int updateByPrimaryKey(TOrderDun record);
+
+
+    
+
+	List<TOrderDun> selectByOrderNoDunSubject(String orderNo);
+
+	List<TOrderNewBo> getOrderDunData(@Param("name")String name,@Param("orderNo") String orderNo,@Param("adminName") String adminName,@Param("depId") String depId, @Param("starTime")String starTime, @Param("endTime")String endTime);
+
+	List<OrderDunTaskBo> getTaskAllOrderDun();
+
+	int checkOrderDun(@Param("dunSubject")Integer dunSubject, @Param("orderNo")String orderNo);
+
+	List<TOrderDun> selectByOrderNo(String orderNo);
+
+	int  deleteByOrderNo(String orderNo);
 }

+ 423 - 419
src/main/java/com/goafanti/common/mapper/TOrderDunMapper.xml

@@ -1,420 +1,424 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.TOrderDunMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TOrderDun">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 16:53:48 CST 2018.
-    -->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="start_time" jdbcType="DATE" property="startTime" />
-    <result column="end_time" jdbcType="DATE" property="endTime" />
-    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
-    <result column="dun_subject" jdbcType="INTEGER" property="dunSubject" />
-    <result column="dun_status" jdbcType="INTEGER" property="dunStatus" />
-    <result column="dun_by" jdbcType="VARCHAR" property="dunBy" />
-    <result column="dun_target" jdbcType="VARCHAR" property="dunTarget" />
-    <result column="money" jdbcType="DECIMAL" property="money" />
-    
-  </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 Mon Nov 19 16:53:48 CST 2018.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 16:53:48 CST 2018.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 16:53:48 CST 2018.
-    -->
-    id, create_time, start_time, end_time, order_no, dun_subject, dun_status, dun_by, 
-    dun_target,money
-  </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderDunExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 16:53:48 CST 2018.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from t_order_dun
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 16:53:48 CST 2018.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from t_order_dun
-    where id = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 16:53:48 CST 2018.
-    -->
-    delete from t_order_dun
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderDunExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 16:53:48 CST 2018.
-    -->
-    delete from t_order_dun
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.TOrderDun">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 16:53:48 CST 2018.
-    -->
-    insert into t_order_dun (id, create_time, start_time, 
-      end_time, order_no, dun_subject, 
-      dun_status, dun_by, dun_target,money
-      )
-    values (#{id,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=DATE}, 
-      #{endTime,jdbcType=DATE}, #{orderNo,jdbcType=VARCHAR}, #{dunSubject,jdbcType=INTEGER}, 
-      #{dunStatus,jdbcType=INTEGER}, #{dunBy,jdbcType=VARCHAR}, #{dunTarget,jdbcType=VARCHAR},
-      #{money,jdbcType=DECIMAL}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderDun">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 16:53:48 CST 2018.
-    -->
-    insert into t_order_dun
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="startTime != null">
-        start_time,
-      </if>
-      <if test="endTime != null">
-        end_time,
-      </if>
-      <if test="orderNo != null">
-        order_no,
-      </if>
-      <if test="dunSubject != null">
-        dun_subject,
-      </if>
-      <if test="dunStatus != null">
-        dun_status,
-      </if>
-      <if test="dunBy != null">
-        dun_by,
-      </if>
-      <if test="dunTarget != null">
-        dun_target,
-      </if>
-      <if test="money != null">
-      money,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="startTime != null">
-        #{startTime,jdbcType=DATE},
-      </if>
-      <if test="endTime != null">
-        #{endTime,jdbcType=DATE},
-      </if>
-      <if test="orderNo != null">
-        #{orderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="dunSubject != null">
-        #{dunSubject,jdbcType=INTEGER},
-      </if>
-      <if test="dunStatus != null">
-        #{dunStatus,jdbcType=INTEGER},
-      </if>
-      <if test="dunBy != null">
-        #{dunBy,jdbcType=VARCHAR},
-      </if>
-      <if test="dunTarget != null">
-        #{dunTarget,jdbcType=VARCHAR},
-      </if>
-        <if test="money != null">
-      #{money,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderDunExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 16:53:48 CST 2018.
-    -->
-    select count(*) from t_order_dun
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 16:53:48 CST 2018.
-    -->
-    update t_order_dun
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.startTime != null">
-        start_time = #{record.startTime,jdbcType=DATE},
-      </if>
-      <if test="record.endTime != null">
-        end_time = #{record.endTime,jdbcType=DATE},
-      </if>
-      <if test="record.orderNo != null">
-        order_no = #{record.orderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="record.dunSubject != null">
-        dun_subject = #{record.dunSubject,jdbcType=INTEGER},
-      </if>
-      <if test="record.dunStatus != null">
-        dun_status = #{record.dunStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.dunBy != null">
-        dun_by = #{record.dunBy,jdbcType=VARCHAR},
-      </if>
-      <if test="record.dunTarget != null">
-        dun_target = #{record.dunTarget,jdbcType=VARCHAR},
-      </if>
-      <if test="record.money != null">
-      	money = #{money,jdbcType=DECIMAL},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 16:53:48 CST 2018.
-    -->
-    update t_order_dun
-    set id = #{record.id,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      start_time = #{record.startTime,jdbcType=DATE},
-      end_time = #{record.endTime,jdbcType=DATE},
-      order_no = #{record.orderNo,jdbcType=VARCHAR},
-      dun_subject = #{record.dunSubject,jdbcType=INTEGER},
-      dun_status = #{record.dunStatus,jdbcType=INTEGER},
-      dun_by = #{record.dunBy,jdbcType=VARCHAR},
-      dun_target = #{record.dunTarget,jdbcType=VARCHAR},
-      money = #{money,jdbcType=DECIMAL}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderDun">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 16:53:48 CST 2018.
-    -->
-    update t_order_dun
-    <set>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="startTime != null">
-        start_time = #{startTime,jdbcType=DATE},
-      </if>
-      <if test="endTime != null">
-        end_time = #{endTime,jdbcType=DATE},
-      </if>
-      <if test="orderNo != null">
-        order_no = #{orderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="dunSubject != null">
-        dun_subject = #{dunSubject,jdbcType=INTEGER},
-      </if>
-      <if test="dunStatus != null">
-        dun_status = #{dunStatus,jdbcType=INTEGER},
-      </if>
-      <if test="dunBy != null">
-        dun_by = #{dunBy,jdbcType=VARCHAR},
-      </if>
-      <if test="dunTarget != null">
-        dun_target = #{dunTarget,jdbcType=VARCHAR},
-      </if>
-       <if test="money != null">
-      	money = #{money,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderDun">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 16:53:48 CST 2018.
-    -->
-    update t_order_dun
-    set create_time = #{createTime,jdbcType=TIMESTAMP},
-      start_time = #{startTime,jdbcType=DATE},
-      end_time = #{endTime,jdbcType=DATE},
-      order_no = #{orderNo,jdbcType=VARCHAR},
-      dun_subject = #{dunSubject,jdbcType=INTEGER},
-      dun_status = #{dunStatus,jdbcType=INTEGER},
-      dun_by = #{dunBy,jdbcType=VARCHAR},
-      dun_target = #{dunTarget,jdbcType=VARCHAR},
-      money = #{money,jdbcType=DECIMAL},
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByOrderNoDunSubject" resultType="com.goafanti.common.model.TOrderDun">
-  	select id,dun_subject as dunSubject,money,order_no as orderNo,dun_status as dunStatus from t_order_dun 
-    where order_no= #{orderNo,jdbcType=VARCHAR} order by dun_subject 
-  </select>
-  
-  <select id="selectByOrderNo" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from t_order_dun
-    where order_no= #{orderNo,jdbcType=VARCHAR} order by dun_subject 
-  </select>
-  <select id="getOrderDunData" resultType="com.goafanti.order.bo.TOrderNewBo">
-select a.id,a.order_no as orderNo,date_format(b.sign_time,'%Y-%m-%d') as signDate,
-    c.nickname as userName,b.order_status as orderStatus,b.total_amount as totalAmount,
-    b.project_status as projectStatus,b.liquidation_status as liquidationStatus,
-    b.settlement_amount as settlementAmount,d.name as salesmanName,a.dun_subject as dunSubject,
-    date_format(a.start_time, '%Y-%m-%d') as startDate,dep.name as depName,
-    a.money as accountsReceivable,(a.money-b.settlement_amount) as uncollectedAmount
-    from t_order_dun a left join t_order_new b on a.order_no=b.order_no
-    left join `user` c on b.buyer_id=c.id 
-    left join admin d on b.salesman_id=d.id
-    left join department dep on d.department_id=dep.id
-    where a.start_time is not null and b.delete_sign = 0
-    <if test="name != null and name != ''">
-  	and c.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
-  	</if>
-  		<if test="adminName != null">
-  	and d.name  like CONCAT('%',#{adminName,jdbcType=VARCHAR},'%')
-  	</if>
-  	<if test="depId != null">
-  	and dep.id= #{depId,jdbcType=VARCHAR}
-  	</if>
-  	<if test="orderNo != null and orderNo != ''">
-  	and a.order_no = #{orderNo,jdbcType=VARCHAR}
-  	</if>
-  	<if test="starTime !=null and endTime !=null and starTime !='' and endTime != '' ">
-  	and b.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
-  	</if>
-  	order by b.sign_time desc
-  </select>
-  
-  <select id="getTaskAllOrderDun" resultType="com.goafanti.order.bo.OrderDunTaskBo">
-    select a.id,a.order_no as orderNo,a.dun_subject as dunSubject,a.money,settlement_amount as settlementAmount,
- 	b.project_status as projectStatus,b.order_status as orderStatus from t_order_dun a
- 	left join t_order_new b on a.order_no=b.order_no
- 	where a.dun_status=0 and b.delete_sign=0
-    </select>
-    <select id="checkOrderDun" resultType="java.lang.Integer">
-    select count(*) from t_order_dun
-    where order_no=  #{orderNo,jdbcType=VARCHAR}
-    and dun_subject= #{dunSubject,jdbcType=VARCHAR}
-    </select>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.TOrderDunMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TOrderDun">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 16:53:48 CST 2018.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="start_time" jdbcType="DATE" property="startTime" />
+    <result column="end_time" jdbcType="DATE" property="endTime" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="dun_subject" jdbcType="INTEGER" property="dunSubject" />
+    <result column="dun_status" jdbcType="INTEGER" property="dunStatus" />
+    <result column="dun_by" jdbcType="VARCHAR" property="dunBy" />
+    <result column="dun_target" jdbcType="VARCHAR" property="dunTarget" />
+    <result column="money" jdbcType="DECIMAL" property="money" />
+    
+  </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 Mon Nov 19 16:53:48 CST 2018.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 16:53:48 CST 2018.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 16:53:48 CST 2018.
+    -->
+    id, create_time, start_time, end_time, order_no, dun_subject, dun_status, dun_by, 
+    dun_target,money
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderDunExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 16:53:48 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_order_dun
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 16:53:48 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from t_order_dun
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 16:53:48 CST 2018.
+    -->
+    delete from t_order_dun
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderDunExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 16:53:48 CST 2018.
+    -->
+    delete from t_order_dun
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TOrderDun">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 16:53:48 CST 2018.
+    -->
+    insert into t_order_dun (id, create_time, start_time, 
+      end_time, order_no, dun_subject, 
+      dun_status, dun_by, dun_target,money
+      )
+    values (#{id,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=DATE}, 
+      #{endTime,jdbcType=DATE}, #{orderNo,jdbcType=VARCHAR}, #{dunSubject,jdbcType=INTEGER}, 
+      #{dunStatus,jdbcType=INTEGER}, #{dunBy,jdbcType=VARCHAR}, #{dunTarget,jdbcType=VARCHAR},
+      #{money,jdbcType=DECIMAL}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderDun">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 16:53:48 CST 2018.
+    -->
+    insert into t_order_dun
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="startTime != null">
+        start_time,
+      </if>
+      <if test="endTime != null">
+        end_time,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="dunSubject != null">
+        dun_subject,
+      </if>
+      <if test="dunStatus != null">
+        dun_status,
+      </if>
+      <if test="dunBy != null">
+        dun_by,
+      </if>
+      <if test="dunTarget != null">
+        dun_target,
+      </if>
+      <if test="money != null">
+      money,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=DATE},
+      </if>
+      <if test="endTime != null">
+        #{endTime,jdbcType=DATE},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="dunSubject != null">
+        #{dunSubject,jdbcType=INTEGER},
+      </if>
+      <if test="dunStatus != null">
+        #{dunStatus,jdbcType=INTEGER},
+      </if>
+      <if test="dunBy != null">
+        #{dunBy,jdbcType=VARCHAR},
+      </if>
+      <if test="dunTarget != null">
+        #{dunTarget,jdbcType=VARCHAR},
+      </if>
+        <if test="money != null">
+      #{money,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderDunExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 16:53:48 CST 2018.
+    -->
+    select count(*) from t_order_dun
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 16:53:48 CST 2018.
+    -->
+    update t_order_dun
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.startTime != null">
+        start_time = #{record.startTime,jdbcType=DATE},
+      </if>
+      <if test="record.endTime != null">
+        end_time = #{record.endTime,jdbcType=DATE},
+      </if>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dunSubject != null">
+        dun_subject = #{record.dunSubject,jdbcType=INTEGER},
+      </if>
+      <if test="record.dunStatus != null">
+        dun_status = #{record.dunStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.dunBy != null">
+        dun_by = #{record.dunBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dunTarget != null">
+        dun_target = #{record.dunTarget,jdbcType=VARCHAR},
+      </if>
+      <if test="record.money != null">
+      	money = #{money,jdbcType=DECIMAL},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 16:53:48 CST 2018.
+    -->
+    update t_order_dun
+    set id = #{record.id,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      start_time = #{record.startTime,jdbcType=DATE},
+      end_time = #{record.endTime,jdbcType=DATE},
+      order_no = #{record.orderNo,jdbcType=VARCHAR},
+      dun_subject = #{record.dunSubject,jdbcType=INTEGER},
+      dun_status = #{record.dunStatus,jdbcType=INTEGER},
+      dun_by = #{record.dunBy,jdbcType=VARCHAR},
+      dun_target = #{record.dunTarget,jdbcType=VARCHAR},
+      money = #{money,jdbcType=DECIMAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderDun">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 16:53:48 CST 2018.
+    -->
+    update t_order_dun
+    <set>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=DATE},
+      </if>
+      <if test="endTime != null">
+        end_time = #{endTime,jdbcType=DATE},
+      </if>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="dunSubject != null">
+        dun_subject = #{dunSubject,jdbcType=INTEGER},
+      </if>
+      <if test="dunStatus != null">
+        dun_status = #{dunStatus,jdbcType=INTEGER},
+      </if>
+      <if test="dunBy != null">
+        dun_by = #{dunBy,jdbcType=VARCHAR},
+      </if>
+      <if test="dunTarget != null">
+        dun_target = #{dunTarget,jdbcType=VARCHAR},
+      </if>
+       <if test="money != null">
+      	money = #{money,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderDun">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Nov 19 16:53:48 CST 2018.
+    -->
+    update t_order_dun
+    set create_time = #{createTime,jdbcType=TIMESTAMP},
+      start_time = #{startTime,jdbcType=DATE},
+      end_time = #{endTime,jdbcType=DATE},
+      order_no = #{orderNo,jdbcType=VARCHAR},
+      dun_subject = #{dunSubject,jdbcType=INTEGER},
+      dun_status = #{dunStatus,jdbcType=INTEGER},
+      dun_by = #{dunBy,jdbcType=VARCHAR},
+      dun_target = #{dunTarget,jdbcType=VARCHAR},
+      money = #{money,jdbcType=DECIMAL},
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByOrderNoDunSubject" resultType="com.goafanti.common.model.TOrderDun">
+  	select id,dun_subject as dunSubject,money,order_no as orderNo,dun_status as dunStatus from t_order_dun 
+    where order_no= #{orderNo,jdbcType=VARCHAR} order by dun_subject 
+  </select>
+  
+  <select id="selectByOrderNo" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_order_dun
+    where order_no= #{orderNo,jdbcType=VARCHAR} order by dun_subject 
+  </select>
+  <select id="getOrderDunData" resultType="com.goafanti.order.bo.TOrderNewBo">
+select a.id,a.order_no as orderNo,date_format(b.sign_time,'%Y-%m-%d') as signDate,
+    c.nickname as userName,b.order_status as orderStatus,b.total_amount as totalAmount,
+    b.project_status as projectStatus,b.liquidation_status as liquidationStatus,
+    b.settlement_amount as settlementAmount,d.name as salesmanName,a.dun_subject as dunSubject,
+    date_format(a.start_time, '%Y-%m-%d') as startDate,dep.name as depName,
+    a.money as accountsReceivable,(a.money-b.settlement_amount) as uncollectedAmount
+    from t_order_dun a left join t_order_new b on a.order_no=b.order_no
+    left join `user` c on b.buyer_id=c.id 
+    left join admin d on b.salesman_id=d.id
+    left join department dep on d.department_id=dep.id
+    where a.start_time is not null and b.delete_sign = 0
+    <if test="name != null and name != ''">
+  	and c.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
+  	</if>
+  		<if test="adminName != null">
+  	and d.name  like CONCAT('%',#{adminName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="depId != null">
+  	and dep.id= #{depId,jdbcType=VARCHAR}
+  	</if>
+  	<if test="orderNo != null and orderNo != ''">
+  	and a.order_no = #{orderNo,jdbcType=VARCHAR}
+  	</if>
+  	<if test="starTime !=null and endTime !=null and starTime !='' and endTime != '' ">
+  	and b.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	</if>
+  	order by b.sign_time desc
+  </select>
+  
+  <select id="getTaskAllOrderDun" resultType="com.goafanti.order.bo.OrderDunTaskBo">
+    select a.id,a.order_no as orderNo,a.dun_subject as dunSubject,a.money,settlement_amount as settlementAmount,
+ 	b.project_status as projectStatus,b.order_status as orderStatus from t_order_dun a
+ 	left join t_order_new b on a.order_no=b.order_no
+ 	where a.dun_status=0 and b.delete_sign=0
+    </select>
+    <select id="checkOrderDun" resultType="java.lang.Integer">
+    select count(*) from t_order_dun
+    where order_no=  #{orderNo,jdbcType=VARCHAR}
+    and dun_subject= #{dunSubject,jdbcType=VARCHAR}
+    </select>
+    <update id="deleteByOrderNo">
+     delete from t_order_dun
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+    </update>
 </mapper>

+ 9 - 15
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -435,7 +435,8 @@ 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);//将原订单作废,只能查看
@@ -449,9 +450,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if(tOrderTaskBo.getSplitStatus()==2) {
 				tOrderTaskBo.setSplitSuper(map.get(tOrderTaskBo.getSplitSuper()));
 			}
-				tOrderTaskMapper.insertSelectiveGetId(tOrderTaskBo);
-				int y=tOrderTaskBo.getId();
-				tTaskMidMapper.insertSelective(new TTaskMid(y,new BigDecimal(0)));
+			tOrderTaskMapper.insertSelectiveGetId(tOrderTaskBo);
+			int y=tOrderTaskBo.getId();
+			tTaskMidMapper.insertSelective(new TTaskMid(y,new BigDecimal(0)));
 			if(tOrderTaskBo.getSplitStatus()==1) {
 				map.put(x, y);
 			}
@@ -477,9 +478,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		orderNew.setOrderNo(nb.getOrderNo());
 		orderNew.setDeleteSign(0);
 		orderNew.setPrimaryOrder(newOrderNo);
+		//删除旧订单旧项目
+		tOrderDunMapper.deleteByOrderNo(nb.getOrderNo());
 		tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
-		
 	}
+	
 	@Override
 	public boolean checkOderNo(String orderNo) {
 		int i=newOrderChangeMapper.checkOderNo(orderNo);
@@ -627,16 +630,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		orderNewService.pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), o.getOrderNo(), TokenManager.getAdminId(),0);
 		return 1;
 	}
-	/*private void addOrderRefund(NewOrderChangeBo nb) {
-		NewOrderRefund or=new NewOrderRefund();
-		or.setOrderNo(nb.getOrderNo());
-		or.setRefundAmount(nb.getChangeAmount());
-		or.setRefundStatus(1);//通过
-		or.setReason("变更退款,系统生成。");
-		newOrderRefundMapper.insert(or);
-		
-		
-	}*/
+	
 
 	/**
 	 * 修改订单数据