Browse Source

催款列表新增新旧催款选择

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

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

@@ -10,67 +10,67 @@ 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	int updateByPrimaryKey(NewOrderDun record);
 

+ 39 - 22
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 Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -18,12 +18,13 @@
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+    <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 Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -57,7 +58,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -91,16 +92,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     id, order_no, tid, project_type, dun_type, wait_day, effective_count, aid, status, 
-    create_time, start_time
+    create_time, start_time, money
   </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 Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     select
     <if test="distinct">
@@ -119,7 +120,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -130,7 +131,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     delete from new_order_dun
     where id = #{id,jdbcType=INTEGER}
@@ -139,7 +140,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     delete from new_order_dun
     <if test="_parameter != null">
@@ -150,22 +151,24 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     insert into new_order_dun (id, order_no, tid, 
       project_type, dun_type, wait_day, 
       effective_count, aid, status, 
-      create_time, start_time)
+      create_time, start_time, money
+      )
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, 
       #{projectType,jdbcType=INTEGER}, #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER}, 
       #{effectiveCount,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=TIMESTAMP})
+      #{createTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=TIMESTAMP}, #{money,jdbcType=DECIMAL}
+      )
   </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 Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     insert into new_order_dun
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -202,6 +205,9 @@
       <if test="startTime != null">
         start_time,
       </if>
+      <if test="money != null">
+        money,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -237,13 +243,16 @@
       <if test="startTime != null">
         #{startTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="money != null">
+        #{money,jdbcType=DECIMAL},
+      </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 Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     select count(*) from new_order_dun
     <if test="_parameter != null">
@@ -254,7 +263,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     update new_order_dun
     <set>
@@ -291,6 +300,9 @@
       <if test="record.startTime != null">
         start_time = #{record.startTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.money != null">
+        money = #{record.money,jdbcType=DECIMAL},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -300,7 +312,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     update new_order_dun
     set id = #{record.id,jdbcType=INTEGER},
@@ -313,7 +325,8 @@
       aid = #{record.aid,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      start_time = #{record.startTime,jdbcType=TIMESTAMP}
+      start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      money = #{record.money,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -322,7 +335,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     update new_order_dun
     <set>
@@ -356,6 +369,9 @@
       <if test="startTime != null">
         start_time = #{startTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="money != null">
+        money = #{money,jdbcType=DECIMAL},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -363,7 +379,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 05 14:06:46 CST 2019.
+      This element was generated on Fri Dec 06 08:46:15 CST 2019.
     -->
     update new_order_dun
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -375,12 +391,13 @@
       aid = #{aid,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      start_time = #{startTime,jdbcType=TIMESTAMP}
+      start_time = #{startTime,jdbcType=TIMESTAMP},
+      money = #{money,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectListNewOrderDun" 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_count effectiveCount, a.aid, a.create_time createTime ,b.commodity_name commodityName
+  a.effective_count effectiveCount, a.aid, a.create_time createTime ,b.commodity_name commodityName,a.money,a.status
   from new_order_dun a left join t_order_task b on a.tid=b.id where 1=1
   <if test="orderNo != null">
   and  a.order_no= #{orderNo}
@@ -392,7 +409,7 @@
   </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_count effectiveCount, a.aid, a.create_time createTime
+  a.effective_count effectiveCount, a.aid, a.create_time createTime,b.approval
   from new_order_dun a left join  t_order_new b on a.order_no=b.order_no
   where 1=1 and a.status=0
   </select>

+ 22 - 6
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1371,12 +1371,22 @@ where super_id is null ) e on e.order_no=a.order_no
   </select>
   
   <select id="selectDunOrderNewListByPage" resultType="com.goafanti.order.bo.TOrderNewBo">
-  	 		select a.id, b.contract_no contractNo,a.order_no as orderNo,c.nickname as userName,d.name as salesmanName,b.project_status projectStatus,
+    	select a.id, b.contract_no contractNo,a.order_no as orderNo,c.nickname as userName,d.name as salesmanName,b.project_status projectStatus,
 	b.total_amount as totalAmount,b.liquidation_status as liquidationStatus,b.settlement_amount as settlementAmount,a.money as accountsReceivable,
-	if((a.money-b.settlement_amount) &lt; 1,0,(a.money-b.settlement_amount)) as uncollectedAmount,a.dun_subject as dunSubject,b.order_status as orderStatus,
-	date_format(a.start_time, '%Y-%m-%d') as startDate,dep.name as depName,date_format(b.sign_time,'%Y-%m-%d') as signDate,b.project_status as projectStatus
-    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 != 1
+	if((a.money-b.settlement_amount) &lt; 1,0,(a.money-b.settlement_amount)) as uncollectedAmount,b.order_status as orderStatus,b.project_status as projectStatus,
+	date_format(a.start_time, '%Y-%m-%d') as startDate,dep.name as depName,date_format(b.sign_time,'%Y-%m-%d') as signDate,
+	<if test="newStatus == 0 ">
+	a.dun_subject as dunSubject
+	from t_order_dun a  
+	</if>
+	<if test="newStatus == 1 ">
+	a.project_type projectType,
+	a.dun_type dunType 
+	from new_order_dun a 
+	</if>
+	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 != 1
     <if test="name != null">
   	and c.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
@@ -1405,7 +1415,13 @@ where super_id is null ) e on e.order_no=a.order_no
    <select id="selectDunOrderNewListCount" resultType="java.lang.Integer">
   	select 
 		count(*)
-    from t_order_dun a left join t_order_new b on a.order_no=b.order_no
+	<if test="newStatus == 0 ">
+	from t_order_dun a  
+	</if>
+	<if test="newStatus == 1 ">
+	from new_order_dun a 
+	</if>
+	 left join t_order_new b on a.order_no=b.order_no
     left join `user` c on b.buyer_id=c.id 
     where a.start_time is not null and b.delete_sign != 1
     <if test="name != null">

+ 57 - 33
src/main/java/com/goafanti/common/model/NewOrderDun.java

@@ -1,69 +1,75 @@
 package com.goafanti.common.model;
 
 import java.util.Date;
+import java.math.BigDecimal;
 
 public class NewOrderDun {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.id
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	private Integer waitDay;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.effective_count
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	private Integer effectiveCount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.aid
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	private Date startTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.money
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
+	 */
+	private BigDecimal money;
 
 	/**
 	 * 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -72,7 +78,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -81,7 +87,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -90,7 +96,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -99,7 +105,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public Integer getTid() {
 		return tid;
@@ -108,7 +114,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -117,7 +123,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public Integer getProjectType() {
 		return projectType;
@@ -126,7 +132,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void setProjectType(Integer projectType) {
 		this.projectType = projectType;
@@ -135,7 +141,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public Integer getDunType() {
 		return dunType;
@@ -144,7 +150,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void setDunType(Integer dunType) {
 		this.dunType = dunType;
@@ -153,7 +159,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public Integer getWaitDay() {
 		return waitDay;
@@ -162,7 +168,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void setWaitDay(Integer waitDay) {
 		this.waitDay = waitDay;
@@ -171,7 +177,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.effective_count
 	 * @return  the value of new_order_dun.effective_count
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public Integer getEffectiveCount() {
 		return effectiveCount;
@@ -180,7 +186,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.effective_count
 	 * @param effectiveCount  the value for new_order_dun.effective_count
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void setEffectiveCount(Integer effectiveCount) {
 		this.effectiveCount = effectiveCount;
@@ -189,7 +195,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public String getAid() {
 		return aid;
@@ -198,7 +204,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -207,7 +213,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public Integer getStatus() {
 		return status;
@@ -216,7 +222,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -225,7 +231,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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -234,7 +240,7 @@ 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -243,7 +249,7 @@ public class NewOrderDun {
 	/**
 	 * 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public Date getStartTime() {
 		return startTime;
@@ -252,9 +258,27 @@ public class NewOrderDun {
 	/**
 	 * 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.money
+	 * @return  the value of new_order_dun.money
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
+	 */
+	public BigDecimal getMoney() {
+		return money;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.money
+	 * @param money  the value for new_order_dun.money
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
+	 */
+	public void setMoney(BigDecimal money) {
+		this.money = money;
+	}
 }

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

@@ -3,27 +3,28 @@ package com.goafanti.common.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.math.BigDecimal;
 
 public class NewOrderDunExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 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  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public NewOrderDunExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +32,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +40,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +48,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +56,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +64,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +72,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +80,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +90,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +102,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +111,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +121,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -842,11 +843,71 @@ public class NewOrderDunExample {
 			addCriterion("start_time not between", value1, value2, "startTime");
 			return (Criteria) this;
 		}
+
+		public Criteria andMoneyIsNull() {
+			addCriterion("money is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andMoneyIsNotNull() {
+			addCriterion("money is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andMoneyEqualTo(BigDecimal value) {
+			addCriterion("money =", value, "money");
+			return (Criteria) this;
+		}
+
+		public Criteria andMoneyNotEqualTo(BigDecimal value) {
+			addCriterion("money <>", value, "money");
+			return (Criteria) this;
+		}
+
+		public Criteria andMoneyGreaterThan(BigDecimal value) {
+			addCriterion("money >", value, "money");
+			return (Criteria) this;
+		}
+
+		public Criteria andMoneyGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("money >=", value, "money");
+			return (Criteria) this;
+		}
+
+		public Criteria andMoneyLessThan(BigDecimal value) {
+			addCriterion("money <", value, "money");
+			return (Criteria) this;
+		}
+
+		public Criteria andMoneyLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("money <=", value, "money");
+			return (Criteria) this;
+		}
+
+		public Criteria andMoneyIn(List<BigDecimal> values) {
+			addCriterion("money in", values, "money");
+			return (Criteria) this;
+		}
+
+		public Criteria andMoneyNotIn(List<BigDecimal> values) {
+			addCriterion("money not in", values, "money");
+			return (Criteria) this;
+		}
+
+		public Criteria andMoneyBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("money between", value1, value2, "money");
+			return (Criteria) this;
+		}
+
+		public Criteria andMoneyNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("money not between", value1, value2, "money");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
+	 * @mbg.generated  Fri Dec 06 08:46:15 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 14 - 6
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -13,7 +13,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.model.TOrderNew;
@@ -41,9 +45,10 @@ public class OrderDunTask {
 	/**
 	 * 每天凌晨2点轮询处理需要催款的信息
 	 */
+//	@RequestMapping(value = "/open/updateorderDun", method = RequestMethod.GET)
+//	@ResponseBody
 	@Scheduled(cron = "0 0 2  * * ?") 
-	//@RequestMapping(value = "/open/updateorderDun", method = RequestMethod.GET)
-  	@Transactional(rollbackFor=Exception.class)
+  @Transactional(rollbackFor=Exception.class)
 	public void updateorderDun(){
   		try {
   			LoggerUtils.debug(logger, "======================催款任务轮询启动===================");
@@ -54,7 +59,7 @@ public class OrderDunTask {
   		Calendar calendar2=Calendar.getInstance();   
   		for (OutNewOrderDunBo o : list) {
   			calendar2.setTime(o.getCreateTime());
-  			if (o.getApproval()==2) {
+  			if (o!=null&&o.getApproval()!=null&&o.getApproval()==2) {
   	  	  		calendar2.add(Calendar.DATE, o.getWaitDay());
   	  	  		if (calendar.getTimeInMillis() > calendar2.getTimeInMillis()) {//当前时间大于计算后时间则触发
   	  	  			updateOrderDun(o);
@@ -71,13 +76,16 @@ public class OrderDunTask {
   			}
   			if(o.getProjectType()==OrderDunProjectType.CS.getCode()&&o.getDunType()==2) {
   				//获取年
-  				int year = calendar.get(Calendar.YEAR);  
+  				int year = calendar2.get(Calendar.YEAR);  
   		        //获取月份,0表示1月份
-  		        int month = calendar.get(Calendar.MONTH) + 1;
+  		        int month = calendar2.get(Calendar.MONTH) + 1;
   		        if(month<10)year=year+1;
   		        if(month>9)year=year+2;
-  		        calendar2.set(year, 6, 1);
+  		        calendar2.set(year, 5, 1);
   		        CalendarTimeCleared(calendar2);
+  		        System.out.println(calendar.getTime());
+  		      System.out.println(calendar2.getTime());
+  		      System.out.println(calendar.getTimeInMillis() > calendar2.getTimeInMillis()?1:0);
   				if (calendar.getTimeInMillis() > calendar2.getTimeInMillis()) {//当前时间大于计算后时间则触发
   	  	  			updateOrderDun(o);
   	  	  			Thread.sleep(2000);

+ 21 - 0
src/main/java/com/goafanti/order/bo/OutNewOrderDunBo.java

@@ -1,12 +1,19 @@
 package com.goafanti.order.bo;
 
+import java.util.Calendar;
+import java.util.Date;
+
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.model.NewOrderDun;
+import com.goafanti.common.utils.DateUtils;
 import com.goafanti.order.enums.NewOrderDunType;
 
 public class OutNewOrderDunBo extends NewOrderDun {
 	private String dunTypeName;
 	private Integer approval;
 	private String commodityName;
+	private String startDate;
+	
 	
 	public String getDunTypeName() {
 		if(super.getDunType()!=null&&super.getProjectType()!=null) {
@@ -35,4 +42,18 @@ public class OutNewOrderDunBo extends NewOrderDun {
 		this.approval = approval;
 	}
 
+	public String getStartDate() {
+		if(super.getCreateTime()!=null&&super.getEffectiveCount()!=null) {
+			Calendar calendar=Calendar.getInstance();   
+	  		calendar.setTime(super.getCreateTime());
+	  		calendar.add(Calendar.DATE, super.getEffectiveCount()*180);
+	  		return DateUtils.formatDate(calendar.getTime(), AFTConstants.YYYYMMDD);
+		}
+		return startDate;
+	}
+
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
+
 }

+ 24 - 2
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -7,6 +7,8 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.model.TOrderNew;
+import com.goafanti.order.enums.NewOrderDunType;
+import com.goafanti.order.enums.OrderDunSubject;
 
 public class TOrderNewBo extends TOrderNew{
 	private String id;
@@ -37,6 +39,14 @@ public class TOrderNewBo extends TOrderNew{
 	private String  NowFinanceMobile;
 	private String oldSalesmanName;
 	private String oldSalesmanMobile;
+	private Integer projectType;
+	private Integer dunType;
+	
+	public String getDunSubject() {
+		if(dunSubject!=null)return OrderDunSubject.getValueByCode(Integer.valueOf(dunSubject));
+		if(getDunType()!=null&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));
+		return dunSubject;
+	}
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}
@@ -128,9 +138,9 @@ public class TOrderNewBo extends TOrderNew{
 		this.startDate = startDate;
 	}
 
-	public String getDunSubject() {
+	/*public String getDunSubject() {
 		return dunSubject;
-	}
+	}*/
 
 	public void setDunSubject(String dunSubject) {
 		this.dunSubject = dunSubject;
@@ -278,5 +288,17 @@ public class TOrderNewBo extends TOrderNew{
 	public void setOldSalesmanMobile(String oldSalesmanMobile) {
 		this.oldSalesmanMobile = oldSalesmanMobile;
 	}
+	public Integer getProjectType() {
+		return projectType;
+	}
+	public void setProjectType(Integer projectType) {
+		this.projectType = projectType;
+	}
+	public Integer getDunType() {
+		return dunType;
+	}
+	public void setDunType(Integer dunType) {
+		this.dunType = dunType;
+	}
 	
 }

+ 6 - 5
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -275,9 +275,10 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * 催款统计列表
 	 */
 	@RequestMapping(value="/dunOrderNewList", method = RequestMethod.GET)
-	public Result dunOrderNewList(String name,String orderNo,String starTime,String endTime,Integer specially,String adminName,String depId,Integer pageNo,Integer pageSize){
+	public Result dunOrderNewList(String name,String orderNo,String starTime,String endTime,Integer specially,
+			String adminName,String depId,Integer newStatus,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.data(orderNewService.dunOrderNewList(name, orderNo, starTime, endTime,specially,  adminName, depId,pageNo, pageSize));
+		res.data(orderNewService.dunOrderNewList(name, orderNo, starTime, endTime,specially,  adminName, depId,newStatus,pageNo, pageSize));
 		return res;
 	}
 	/**
@@ -480,11 +481,11 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * @throws IOException 
 	 */
 	@RequestMapping(value = "/exportOrderDunData", method = RequestMethod.GET)
-	public Result exportOrderDunData(String name,String orderNo,String starTime,String endTime,Integer specially,String adminName,String depId,
-			Integer pageNo,Integer pageSize,HttpServletResponse response) throws IOException{
+	public Result exportOrderDunData(String name,String orderNo,String starTime,String endTime,Integer specially,String adminName,
+			String depId,Integer newStatus,Integer pageNo,Integer pageSize,HttpServletResponse response) throws IOException{
 		 Result res = new Result();
  		try {
- 			orderNewService.exportOrderDunData( name, orderNo, starTime, endTime, specially, adminName, depId, pageNo, pageSize, response);
+ 			orderNewService.exportOrderDunData( name, orderNo, starTime, endTime, specially, adminName, depId,newStatus, pageNo, pageSize, response);
 		} catch (Exception e) {
 			res.getError().add(buildError("格式不正确"));
 			e.printStackTrace();

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

@@ -113,7 +113,7 @@ public interface OrderNewService {
 	 * @return
 	 */
 	Pagination<TOrderNewBo> dunOrderNewList(String name, String orderNo, String starTime, String endTime, Integer specially,String adminName,String depId,
-			Integer pageNo, Integer pageSize);
+			Integer newStatus,Integer pageNo, Integer pageSize);
 	/**
 	 * 新增催款记录
 	 * @return
@@ -164,7 +164,7 @@ public interface OrderNewService {
 	boolean checkOderSettlementAmount(String orderNo);
 	boolean checkORderTask(String orderNo);
 	void exportOrderDunData(String name,String orderNo,String starTime,String endTime,Integer specially,String adminName,
-			String depId,Integer pageNo,Integer pageSize,HttpServletResponse response) throws IOException ;
+			String depId,Integer newStatus,Integer pageNo,Integer pageSize,HttpServletResponse response) throws IOException ;
 	int updateOrderOver(String orderNo);
 	OrderRefundDetailBo orderRefundDetail(String id);
 	int updateOrderRefund(TOrderRefundWithBLOBs t);

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

@@ -551,20 +551,19 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 	public void addNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o) {
-		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
+		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
 		addNotic(t2.getOrderNo(),NoticeStatus.ORDER_DUN.getCode(),a, b);
 		try {
 			NewDunsendEmail(t2.getOrderNo(),o.getId(), a, b);
 		} catch (UnsupportedEncodingException | MessagingException e) {
-			new BusinessException("邮件发送错误。");
+			throw new BusinessException(new Error("邮件发送错误。"));
 		}
 	}
 	
 	
 	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>";
 		OutNewOrderDunBo ob=new OutNewOrderDunBo();
 		if(dunId!=null)
 			try {
@@ -577,8 +576,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			//发送驳回邮件
 							//String subject, String address, String deptname, String sender,
 			//String content , String orderNo,String date ,String dunStatusName,Integer type
-			EmailBo bo = new EmailBo("催收通知", b.getEmail(),   a.getDepartmentName(), a.getName(),
-					content, orderNo,new SimpleDateFormat("yyyy-MM-dd").format(ob.getCreateTime()),ob.getDunTypeName(),a2.getName(),b.getUserName(),1);
+			EmailBo bo = new EmailBo("催收通知", b.getEmail(), a.getDepartmentName(), a.getName(),
+					"", orderNo,new SimpleDateFormat("yyyy-MM-dd").format(ob.getCreateTime()),ob.getDunTypeName(),a2.getName(),b.getUserName(),1);
 			if(StringUtils.isNotBlank(b.getEmail())) {
 				SendEmailUtil.getInstance().patentSend(bo);
 			}
@@ -586,7 +585,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	}
 
-
 	private void addBackOrder(String orderNo, String reason) {
 		TOrderBack ob=new TOrderBack();
 		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
@@ -608,13 +606,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TOrderNewBo> dunOrderNewList(String name, String orderNo, String starTime, String endTime,
-			Integer specially, String adminName,String depId,Integer pageNo, Integer pageSize) {
+			Integer specially, String adminName,String depId,Integer newStatus,Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
+		params.put("newStatus", newStatus==null?0:1);
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
 		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
-		if(specially!=null&&specially==1) params.put("aid", TokenManager.getAdminId());;
+		if(specially!=null&&specially==1) params.put("aid", TokenManager.getAdminId());
 		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
@@ -865,12 +864,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	 */
 	@Override
 	public void exportOrderDunData(String name,String orderNo,String starTime,String endTime,Integer specially,String adminName,
-			String depId,Integer pageNo,Integer pageSize,HttpServletResponse response) throws IOException {
+			String depId,Integer newStatus,Integer pageNo,Integer pageSize,HttpServletResponse response) throws IOException {
 		OutputStream out = response.getOutputStream();
 		try {
 			@SuppressWarnings("unchecked")
 			List<TOrderNewBo> list=(List<TOrderNewBo>) dunOrderNewList( name,  orderNo,  starTime,  endTime,
-					 specially,  adminName, depId, pageNo,  pageSize).getList();
+					 specially,  adminName, depId,newStatus, pageNo,  pageSize).getList();
     		String[] comment = {"合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","签单金额","结算状态","应收款","已收款","未收款","项目状态","催收科目","催款启动时间","签单时间"};
     		String fileName ="催款信息记录表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
     		//type 0 变更
@@ -897,7 +896,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
     				case "已收款": o = ob.getSettlementAmount().toString(); break;
     				case "未收款": o = ob.getUncollectedAmount().toString(); break;
     				case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); break;
-    				case "催收科目": o = OrderDunSubject.getValueByCode(Integer.valueOf(ob.getDunSubject())); break;
+    				case "催收科目": o = ob.getDunSubject(); break;
     				case "催款启动时间": o = ob.getStartDate(); break;
     				case "签单时间": o = ob.getSignDate(); break;
     				default: o = ""; break;

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

@@ -348,6 +348,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 						if (bp.getType()==1&&t.getProjectStatus()==OrderProjectStatus.XMYTJ.getCode()) {
 							flag=true;
 						}
+						if (bp.getType()==2&&t.getProjectStatus()==OrderProjectStatus.XMXZ.getCode()) {
+							flag=true;
+						}
 						
 					}
 				}