Browse Source

特批催款开发

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

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

@@ -10,70 +10,72 @@ import org.apache.ibatis.annotations.Param;
 public interface NewOrderDunMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	long countByExample(NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	int deleteByExample(NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	int insert(NewOrderDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	int insertSelective(NewOrderDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	List<NewOrderDun> selectByExample(NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	NewOrderDun selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") NewOrderDun record, @Param("example") NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	int updateByExample(@Param("record") NewOrderDun record, @Param("example") NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	int updateByPrimaryKeySelective(NewOrderDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	int updateByPrimaryKey(NewOrderDun record);
 
 	List<OutNewOrderDunBo> selectListNewOrderDun(@Param("orderNo")String orderNo,@Param("aid") String aid,@Param("status")Integer status);
 
+	List<OutNewOrderDunBo> selectAllOrderDun();
+
 }

+ 41 - 20
src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -17,12 +17,13 @@
     <result column="aid" jdbcType="VARCHAR" property="aid" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -56,7 +57,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -90,16 +91,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     id, order_no, tid, project_type, dun_type, wait_day, effective_year, aid, status, 
-    create_time
+    create_time, start_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.NewOrderDunExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     select
     <if test="distinct">
@@ -118,7 +119,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -129,7 +130,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     delete from new_order_dun
     where id = #{id,jdbcType=INTEGER}
@@ -138,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     delete from new_order_dun
     <if test="_parameter != null">
@@ -149,22 +150,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     insert into new_order_dun (id, order_no, tid, 
       project_type, dun_type, wait_day, 
       effective_year, aid, status, 
-      create_time)
+      create_time, start_time)
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, 
       #{projectType,jdbcType=INTEGER}, #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER}, 
       #{effectiveYear,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP})
+      #{createTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.NewOrderDun">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     insert into new_order_dun
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -198,6 +199,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="startTime != null">
+        start_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -230,13 +234,16 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.NewOrderDunExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     select count(*) from new_order_dun
     <if test="_parameter != null">
@@ -247,7 +254,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     update new_order_dun
     <set>
@@ -281,6 +288,9 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.startTime != null">
+        start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -290,7 +300,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     update new_order_dun
     set id = #{record.id,jdbcType=INTEGER},
@@ -302,7 +312,8 @@
       effective_year = #{record.effectiveYear,jdbcType=INTEGER},
       aid = #{record.aid,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      start_time = #{record.startTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -311,7 +322,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     update new_order_dun
     <set>
@@ -342,6 +353,9 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -349,7 +363,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 11:01:29 CST 2019.
+      This element was generated on Tue Dec 03 17:56:47 CST 2019.
     -->
     update new_order_dun
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -360,7 +374,8 @@
       effective_year = #{effectiveYear,jdbcType=INTEGER},
       aid = #{aid,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      start_time = #{startTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectListNewOrderDun" resultType="com.goafanti.order.bo.OutNewOrderDunBo">
@@ -378,4 +393,10 @@
   and  aid= #{aid}
   </if>
   </select>
+  <select id="selectAllOrderDun" resultType="com.goafanti.order.bo.OutNewOrderDunBo"> 
+  select a.id, a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 
+  a.effective_year effectiveYear, a.aid, a.create_time createTime
+  from new_order_dun a left join  t_order_new b on a.order_no=b.order_no
+  where 1=1 and b.approval=2
+  </select>
 </mapper>

+ 53 - 30
src/main/java/com/goafanti/common/model/NewOrderDun.java

@@ -6,59 +6,64 @@ public class NewOrderDun {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.id
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.order_no
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.tid
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	private Integer tid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.project_type
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	private Integer projectType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.dun_type
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	private Integer dunType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.wait_day
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	private Integer waitDay;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.effective_year
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	private Integer effectiveYear;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.aid
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.status
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.create_time
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.start_time
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 */
+	private Date startTime;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.id
 	 * @return  the value of new_order_dun.id
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -67,7 +72,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.id
 	 * @param id  the value for new_order_dun.id
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -76,7 +81,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.order_no
 	 * @return  the value of new_order_dun.order_no
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -85,7 +90,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.order_no
 	 * @param orderNo  the value for new_order_dun.order_no
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -94,7 +99,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.tid
 	 * @return  the value of new_order_dun.tid
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public Integer getTid() {
 		return tid;
@@ -103,7 +108,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.tid
 	 * @param tid  the value for new_order_dun.tid
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -112,7 +117,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.project_type
 	 * @return  the value of new_order_dun.project_type
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public Integer getProjectType() {
 		return projectType;
@@ -121,7 +126,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.project_type
 	 * @param projectType  the value for new_order_dun.project_type
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public void setProjectType(Integer projectType) {
 		this.projectType = projectType;
@@ -130,7 +135,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.dun_type
 	 * @return  the value of new_order_dun.dun_type
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public Integer getDunType() {
 		return dunType;
@@ -139,7 +144,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.dun_type
 	 * @param dunType  the value for new_order_dun.dun_type
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public void setDunType(Integer dunType) {
 		this.dunType = dunType;
@@ -148,7 +153,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.wait_day
 	 * @return  the value of new_order_dun.wait_day
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public Integer getWaitDay() {
 		return waitDay;
@@ -157,7 +162,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.wait_day
 	 * @param waitDay  the value for new_order_dun.wait_day
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public void setWaitDay(Integer waitDay) {
 		this.waitDay = waitDay;
@@ -166,7 +171,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.effective_year
 	 * @return  the value of new_order_dun.effective_year
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public Integer getEffectiveYear() {
 		return effectiveYear;
@@ -175,7 +180,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.effective_year
 	 * @param effectiveYear  the value for new_order_dun.effective_year
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public void setEffectiveYear(Integer effectiveYear) {
 		this.effectiveYear = effectiveYear;
@@ -184,7 +189,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.aid
 	 * @return  the value of new_order_dun.aid
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public String getAid() {
 		return aid;
@@ -193,7 +198,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.aid
 	 * @param aid  the value for new_order_dun.aid
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -202,7 +207,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.status
 	 * @return  the value of new_order_dun.status
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public Integer getStatus() {
 		return status;
@@ -211,7 +216,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.status
 	 * @param status  the value for new_order_dun.status
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -220,7 +225,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.create_time
 	 * @return  the value of new_order_dun.create_time
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -229,9 +234,27 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.create_time
 	 * @param createTime  the value for new_order_dun.create_time
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.start_time
+	 * @return  the value of new_order_dun.start_time
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 */
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.start_time
+	 * @param startTime  the value for new_order_dun.start_time
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 */
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
 }

+ 76 - 16
src/main/java/com/goafanti/common/model/NewOrderDunExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class NewOrderDunExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public NewOrderDunExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -782,11 +782,71 @@ public class NewOrderDunExample {
 			addCriterion("create_time not between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
+
+		public Criteria andStartTimeIsNull() {
+			addCriterion("start_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTimeIsNotNull() {
+			addCriterion("start_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTimeEqualTo(Date value) {
+			addCriterion("start_time =", value, "startTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTimeNotEqualTo(Date value) {
+			addCriterion("start_time <>", value, "startTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTimeGreaterThan(Date value) {
+			addCriterion("start_time >", value, "startTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("start_time >=", value, "startTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTimeLessThan(Date value) {
+			addCriterion("start_time <", value, "startTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTimeLessThanOrEqualTo(Date value) {
+			addCriterion("start_time <=", value, "startTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTimeIn(List<Date> values) {
+			addCriterion("start_time in", values, "startTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTimeNotIn(List<Date> values) {
+			addCriterion("start_time not in", values, "startTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTimeBetween(Date value1, Date value2) {
+			addCriterion("start_time between", value1, value2, "startTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTimeNotBetween(Date value1, Date value2) {
+			addCriterion("start_time not between", value1, value2, "startTime");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 11:01:29 CST 2019
+	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 58 - 1
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -2,6 +2,8 @@ package com.goafanti.common.task;
 
 
 import java.io.UnsupportedEncodingException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -19,14 +21,20 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.enums.NoticeStatus;
+import com.goafanti.common.model.NewOrderDun;
 import com.goafanti.common.model.TOrderDun;
+import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.order.bo.InputNewOrderDunBo;
 import com.goafanti.order.bo.OrderDunTaskBo;
+import com.goafanti.order.bo.OutNewOrderDunBo;
 import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.ProjectNewStage;
+import com.goafanti.order.service.NewOrderDunService;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.impl.OrderNewServiceImpl;
 @Component
@@ -34,9 +42,15 @@ import com.goafanti.order.service.impl.OrderNewServiceImpl;
 public class OrderDunTask {
 	@Autowired
 	private OrderNewService orderNewService;
+	@Autowired
+	private NewOrderDunService  newOrderDunService;
+	@Autowired
+	private TOrderNewMapper	tOrderNewMapper;
 	
 	Logger							logger	= LoggerFactory.getLogger(OrderDunTask.class);
 	
+	
+	
 	/**
 	 * 每天凌晨2点轮询处理需要催款的信息
 	 */
@@ -46,6 +60,49 @@ public class OrderDunTask {
 	public void updateorderDun(){
   		try {
   			LoggerUtils.debug(logger, "======================催款任务轮询启动===================");
+  		
+  		List<OutNewOrderDunBo> list= newOrderDunService.selectAllOrderDun();
+  		Calendar calendar=Calendar.getInstance();   
+  		calendar.setTime(new Date()); 
+  		for (OutNewOrderDunBo o : list) {
+  			Calendar calendar2=Calendar.getInstance();   
+  	  		calendar2.setTime(o.getCreateTime());
+  	  		calendar2.add(Calendar.DATE, o.getWaitDay());
+  	  		if (calendar.getTimeInMillis() > calendar2.getTimeInMillis()) {//当前时间大于计算后时间则触发
+  	  			updateOrderDun( o);
+  	  			Thread.sleep(2000);
+			}
+  	  		
+		}
+  		LoggerUtils.debug(logger, "======================催款任务轮询结束===================");
+  		} catch (Exception e) {
+  			LoggerUtils.error(getClass(), "=============================================");
+			LoggerUtils.error(getClass(), "催款的信息处理失败", e);
+			LoggerUtils.error(getClass(), "=============================================");
+		}
+  		
+  	}
+	
+	private void updateOrderDun(OutNewOrderDunBo t) throws UnsupportedEncodingException, MessagingException {
+		LoggerUtils.debug(logger, "======================修改催款任务===================");
+		InputNewOrderDunBo o=new InputNewOrderDunBo();
+		o.setId(t.getId());
+		o.setStatus(1);
+		o.setStartTime(new Date());
+		newOrderDunService.updateDun(o);
+		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		orderNewService.newDunAddNoticAndSendEmail(t2, t);;
+	}
+	
+	/**
+	 * 每天凌晨2点轮询处理需要催款的信息
+	
+	@Scheduled(cron = "0 0 2  * * ?") 
+	//@RequestMapping(value = "/open/updateorderDun", method = RequestMethod.GET)
+  	@Transactional(rollbackFor=Exception.class)
+	public void updateorderDun(){
+  		try {
+  			LoggerUtils.debug(logger, "======================催款任务轮询启动===================");
   		List<OrderDunTaskBo> list=orderNewService.selectAllOrderDun();
   		for (OrderDunTaskBo t : list) {
 			if (t.getDunSubject()/10==1) {//1则为订单催款信息否则为项目催款信息
@@ -79,5 +136,5 @@ public class OrderDunTask {
 		 orderNewService.updateOrderDun(tDun);
 		orderNewService.addNoticAndSendEmail(t.getOrderNo(),t,NoticeStatus.ORDER_DUN.getCode());
 	}
- 
+  */
 }

+ 6 - 0
src/main/java/com/goafanti/order/service/NewOrderDunService.java

@@ -17,5 +17,11 @@ public interface NewOrderDunService {
 
 	OutNewOrderDunBo selectDun(Integer id);
 
+	/**
+	   *     获取特批订单催款信息
+	 * @return
+	 */
+	List<OutNewOrderDunBo> selectAllOrderDun();
+
 
 }

+ 3 - 0
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -17,8 +17,10 @@ import com.goafanti.common.model.TOrderOutsource;
 import com.goafanti.common.model.TOrderRefundWithBLOBs;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.order.bo.InputNewOrderDunBo;
 import com.goafanti.order.bo.OrderDunTaskBo;
 import com.goafanti.order.bo.OrderRefundDetailBo;
+import com.goafanti.order.bo.OutNewOrderDunBo;
 import com.goafanti.order.bo.TDunLogListBo;
 import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderNewBo;
@@ -170,6 +172,7 @@ public interface OrderNewService {
 	List<OrderDunTaskBo> selectAllOrderDun();
 	void updateOrderDun(TOrderDun tDun);
 	void addNoticAndSendEmail(String orderNo, OrderDunTaskBo t, Integer code)throws UnsupportedEncodingException, MessagingException;
+	void newDunAddNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o);
 	boolean checkORderDun(String orderNo);
 	
 	int updateFinance(String orderNo, String newFinance);

+ 4 - 0
src/main/java/com/goafanti/order/service/impl/NewOrderDunServiceImpl.java

@@ -48,5 +48,9 @@ public class NewOrderDunServiceImpl extends BaseMybatisDao<NewOrderDunMapper> im
 		}
 		return ob;
 	}
+	@Override
+	public List<OutNewOrderDunBo> selectAllOrderDun() {
+		return newOrderDunMapper.selectAllOrderDun();
+	}
 
 }

+ 13 - 10
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -510,8 +510,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			tl.setProcess(OrderLogProcess.SH.getCode());
 			//增加日志
 			addOrderLog(tl);
-			//增加催款信息
-			pushOrderDun(t2);
+			//非特批增加催款信息
+			if(t2.getApproval()==0)pushOrderDun(t2);
 		}else if (orderStatus==OrderNewState.QDSHJJ.getCode()) {//如果不通过新增驳回
 				if (outsource==0) {//非外包
 				t.setProcessStatus(ProcessStatus.YPYXY.getCode());
@@ -532,12 +532,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 	private void pushOrderDun(TOrderNew t2) {
-		List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(t2.getOrderNo(),null,0);
-		for (OutNewOrderDunBo o : list) {
-			if (o.getDunType()==1) {
-				o.setStatus(1);
-				newOrderDunMapper.updateByPrimaryKeySelective(o);
-				NewDunAddNoticAndSendEmail(t2,o);
+		if(t2.getApproval()==0) {
+			List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(t2.getOrderNo(),null,0);
+			for (OutNewOrderDunBo o : list) {
+				if (o.getDunType()==1) {
+					o.setStatus(1);
+					newOrderDunMapper.updateByPrimaryKeySelective(o);
+					newDunAddNoticAndSendEmail(t2,o);
+				}
 			}
 		}
 		
@@ -545,7 +547,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 
-	private void NewDunAddNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o) {
+	public void newDunAddNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o) {
 		AdminListBo a = adminMapper.getDeptNameByAid(t2.getSalesmanId());
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
 		addNotic(t2.getOrderNo(),NoticeStatus.ORDER_DUN.getCode(),a, b);
@@ -560,7 +562,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public void  NewDunsendEmail(String orderNo,Integer dunId,AdminListBo a,TOrderNewBo b) throws UnsupportedEncodingException, MessagingException{
 		LoggerUtils.debug(logger, "======================邮件信息发送===================");
 		String content = "<div>客户名称: "+ b.getUserName() +"</div><div>订单编号: " + orderNo + "</div>";
-		String tite="订单驳回";
 		OutNewOrderDunBo ob=new OutNewOrderDunBo();
 			if(dunId!=null) {
 				try {
@@ -701,6 +702,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		addOrderLog(tl);
 		pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
+		//新增特批催款信息
+		
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}