Kaynağa Gözat

正常首付处理

Signed-off-by: anderx <312518615@qq.com>
anderx 6 yıl önce
ebeveyn
işleme
f0ec4036eb

+ 95 - 6
src/main/java/com/goafanti/common/bo/EmailBo.java

@@ -56,15 +56,18 @@ public class EmailBo {
 	 * @param patentNo
 	 * @param patentNo
 	 * @param amount
 	 * @param amount
 	 * @param date
 	 * @param date
+	 * @param type 0专利提醒 1催款提醒
 	 */
 	 */
 	public  EmailBo(String subject, String address, String addressee,
 	public  EmailBo(String subject, String address, String addressee,
-			String deptname, String sender,String patentName,String patentNo,String amount,String date ) {
+			String deptname, String sender,String patentName,String patentNo,String amount,String date) {
 		this.subject = subject;
 		this.subject = subject;
 		this.address = address;
 		this.address = address;
 		this.addressee = addressee;
 		this.addressee = addressee;
 		this.deptname = deptname;
 		this.deptname = deptname;
 		this.sender = sender;
 		this.sender = sender;
-		this.content=setPatentFormat( addressee, sender, patentName, patentNo, amount, date);
+		setPatentFormat( addressee, sender, patentName, patentNo, amount, date);
+		
+		
 	}
 	}
 	/**
 	/**
 	 *  
 	 *  
@@ -76,15 +79,15 @@ public class EmailBo {
 	 * @param content		内容
 	 * @param content		内容
 	 * @return 
 	 * @return 
 	 */
 	 */
-	public  EmailBo(String subject, String address,
-			String deptname, String sender,
-			String content) {
+	public  EmailBo(String subject, String address, String deptname, String sender,
+			String content , String orderNo,String date ,String dunStatusName,String userName,Integer type) {
 		this.subject = subject;
 		this.subject = subject;
 		this.address = address;
 		this.address = address;
 		this.addressee = "";
 		this.addressee = "";
 		this.deptname = deptname;
 		this.deptname = deptname;
 		this.sender = sender;
 		this.sender = sender;
-		this.content = setGeneralFormat();
+		if(type==0)this.content = setGeneralFormat();
+		if(type==1)this.content=setDunFormat( addressee, sender, deptname,orderNo, date , dunStatusName,userName);
 	}
 	}
 
 
 
 
@@ -133,6 +136,92 @@ public class EmailBo {
         		+ "<div>" + this.content + "</div>"
         		+ "<div>" + this.content + "</div>"
         		+ "<div>" + this.end + "</div>";
         		+ "<div>" + this.end + "</div>";
     }
     }
+	public String setDunFormat(String addressee,String sender,String deptname,String orderNo,String date ,String dunStatusName,
+			String userName) {
+		String str="<table width=\"800\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\" bgcolor=\"#ffffff\" style=\"font-family:'Microsoft YaHei';\">\r\n" + 
+				"    		<tbody><tr>\r\n" + 
+				"		        <td>\r\n" + 
+				"		             <table width=\"800\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\" height=\"40\"></table>\r\n" + 
+				"		        </td>\r\n" + 
+				"		    </tr>\r\n" + 
+				"			\r\n" + 
+				"    		<tr>\r\n" + 
+				"        		<td>\r\n" + 
+				"            		\r\n" + 
+				"            		<table width=\"800\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\" bgcolor=\"#1C5299\" height=\"48\" style=\"font-family:'Microsoft YaHei';\">\r\n" + 
+				"              			<tbody><tr>\r\n" + 
+				"                			<td height=\"48\" border=\"0\" align=\"center\" valign=\"middle\" style=\"padding-left:20px; color: white; font-size: 20px;\">\r\n" + 
+				"                				催收通知\r\n" + 
+				"        					</td>\r\n" + 
+				"              			</tr>\r\n" + 
+				"		            </tbody></table>\r\n" + 
+				"		            \r\n" + 
+				"        		</td>\r\n" + 
+				"		    </tr>\r\n" + 
+				"		    \r\n" + 
+				"   			<tr>\r\n" + 
+				"        		<td>\r\n" + 
+				"		            \r\n" + 
+				"		        <table width=\"800\" border=\"0\" align=\"left\" cellpadding=\"0\" cellspacing=\"0\" style=\" border:1px solid #edecec; border-top:none; padding:0 20px;font-size:14px;color:#333333;\">\r\n" + 
+				"	               		<tbody><tr>\r\n" + 
+				"                <td width=\"760\" height=\"56\" border=\"0\" align=\"left\" colspan=\"2\" style=\" font-size:16px;vertical-align:bottom;\">亲爱的"+sender+":</td>\r\n" + 
+				"              </tr>\r\n" + 
+				"               <tr>\r\n" + 
+				"                <td width=\"760\" height=\"30\" border=\"0\" align=\"left\" colspan=\"2\" style=\"text-indent: 2em\">您好!</td>\r\n" + 
+				"              </tr>\r\n" + 
+				"                      <tr>\r\n" + 
+				"                <td width=\"40\" height=\"32\" border=\"0\" align=\"left\" valign=\"middle\" style=\" width:40px; text-align:left;vertical-align:middle; line-height:32px; float:left;\">&nbsp;</td>\r\n" + 
+				"                <td width=\"720\" height=\"32\" border=\"0\" align=\"left\" style=\" width:720px; text-align:left;vertical-align:middle;line-height:32px;\"><span style=\"font-weight: 900\">您收到一条由["+deptname+"] 的 ["+sender+"] 发起的 [催收通知] !</span></td>\r\n" + 
+				"              </tr>\r\n" + 
+				"              <tr>\r\n" + 
+				"                <td width=\"720\" height=\"24\" colspan=\"2\" style=\"padding-left:40px; font-size: 12px;\"><span style=\"color: red;\">如已缴费,请您忽略此短信!</span></td>\r\n" + 
+				"              </tr>\r\n" + 
+				"              \r\n" + 
+				"              <tr>\r\n" + 
+				"                <td width=\"720\" height=\"24\" colspan=\"2\" style=\"padding-left:40px; font-weight: 900; padding-top: 10px;\">催收信息:</td>\r\n" + 
+				"              </tr>\r\n" + 
+				"              <tr>\r\n" + 
+				"                <td width=\"720\" height=\"24\" colspan=\"2\" style=\"padding-left:40px;\">客户名称:"+userName+"</td>\r\n" + 
+				"              </tr>\r\n" + 
+				"               <tr>\r\n" + 
+				"                <td width=\"720\" height=\"24\" colspan=\"2\" style=\"padding-left:40px;\">订单编号:"+orderNo+"</td>\r\n" + 
+				"              </tr>\r\n" + 
+				"               <tr>\r\n" + 
+				"                <td width=\"720\" height=\"24\" colspan=\"2\" style=\"padding-left:40px;\">催收时间:"+date+"</td>\r\n" + 
+				"              </tr>\r\n" + 
+				"               <tr>\r\n" + 
+				"                <td width=\"720\" height=\"24\" colspan=\"2\" style=\"padding-left:40px;\">催收科目:"+dunStatusName+"</td>\r\n" + 
+				"              </tr>\r\n" + 
+				"               <tr>\r\n" + 
+				"                <td width=\"720\" height=\"24\" colspan=\"2\" style=\"padding-left:40px;\">催收情况:已启动</td>\r\n" + 
+				"              </tr>\r\n" + 
+				"               <tr>\r\n" + 
+				"                <td width=\"720\" height=\"24\" colspan=\"2\" style=\"padding-left:40px;\">&nbsp;</td>\r\n" + 
+				"              </tr>\r\n" + 
+				"              <tr>\r\n" + 
+				"                <td width=\"720\" height=\"24\" colspan=\"2\" style=\"padding-left:40px;\"><span style=\"font-weight: 900\">温馨提示:</span></td>\r\n" + 
+				"              </tr>\r\n" + 
+				"              <tr>\r\n" + 
+				"                <td width=\"720\" height=\"24\" colspan=\"2\" style=\"padding-left:40px;\"><span>详情请登录<a href=\"http://bm.jishutao.com/admin/login\">科德业务管理系统</a>查看,谢谢!</span></td>\r\n" + 
+				"              </tr>\r\n" +  
+				"              <tr>\r\n" + 
+				"                <td width=\"720\" height=\"24\" colspan=\"2\" style=\"padding-left:40px;\"></td>\r\n" + 
+				"              </tr>\r\n" + 
+				"              \r\n" + 
+				"		               	<tr>\r\n" + 
+				"		                	<td width=\"720\" height=\"14\" colspan=\"2\" style=\"padding-bottom:16px; border-bottom:1px dashed #e5e5e5;font-family:'Microsoft YaHei';\"><a href=\"http://www.kedexinxi.com/\">湖南科德信息咨询有限公司</a></td>\r\n" + 
+				"		              	</tr>\r\n" + 
+				"		               	<tr>\r\n" + 
+				"		                	<td width=\"720\" height=\"14\" colspan=\"2\" style=\"padding:8px 0 28px;color:#999999; font-size:12px;font-family:'Microsoft YaHei';\">此为系统邮件请勿回复</td>\r\n" + 
+				"		              	</tr>\r\n" + 
+				"		            </tbody></table>\r\n" + 
+				"		            \r\n" + 
+				"        		</td>\r\n" + 
+				"		    </tr>\r\n" + 
+				"		</tbody></table>";
+		return str;
+	}
+	
 	public String setGeneralFormat() {
 	public String setGeneralFormat() {
 		String str="<table width=\"800\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\" bgcolor=\"#ffffff\" style=\"font-family:'Microsoft YaHei';\">\r\n" + 
 		String str="<table width=\"800\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\" bgcolor=\"#ffffff\" style=\"font-family:'Microsoft YaHei';\">\r\n" + 
 				"    		<tbody><tr>\r\n" + 
 				"    		<tbody><tr>\r\n" + 

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

@@ -9,92 +9,71 @@ import org.apache.ibatis.annotations.Param;
 
 
 public interface NewOrderDunMapper {
 public interface NewOrderDunMapper {
     /**
     /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table new_order_dun
-     *
-     * @mbg.generated Mon Dec 02 14:11:03 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
+	 */
+	long countByExample(NewOrderDunExample example);
 
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table new_order_dun
-     *
-     * @mbg.generated Mon Dec 02 14:11:03 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
+	 */
+	int deleteByExample(NewOrderDunExample example);
 
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table new_order_dun
-     *
-     * @mbg.generated Mon Dec 02 14:11:03 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
+	 */
+	int deleteByPrimaryKey(Integer id);
 
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table new_order_dun
-     *
-     * @mbg.generated Mon Dec 02 14:11:03 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
+	 */
+	int insert(NewOrderDun record);
 
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table new_order_dun
-     *
-     * @mbg.generated Mon Dec 02 14:11:03 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
+	 */
+	int insertSelective(NewOrderDun record);
 
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table new_order_dun
-     *
-     * @mbg.generated Mon Dec 02 14:11:03 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
+	 */
+	List<NewOrderDun> selectByExample(NewOrderDunExample example);
 
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table new_order_dun
-     *
-     * @mbg.generated Mon Dec 02 14:11:03 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
+	 */
+	NewOrderDun selectByPrimaryKey(Integer id);
 
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table new_order_dun
-     *
-     * @mbg.generated Mon Dec 02 14:11:03 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
+	 */
+	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 Mon Dec 02 14:11:03 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
+	 */
+	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 Mon Dec 02 14:11:03 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
+	 */
+	int updateByPrimaryKeySelective(NewOrderDun record);
 
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table new_order_dun
-     *
-     * @mbg.generated Mon Dec 02 14:11:03 CST 2019
-     */
-    int updateByPrimaryKey(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
+	 */
+	int updateByPrimaryKey(NewOrderDun record);
+
+	List<OutNewOrderDunBo> selectListNewOrderDun(@Param("orderNo")String orderNo,@Param("aid") String aid,@Param("status")Integer status);
 
 
-	List<OutNewOrderDunBo> selectListNewOrderDun(@Param("orderNo")String orderNo,@Param("aid") String aid);
 }
 }

+ 42 - 22
src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml

@@ -5,7 +5,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -15,13 +15,14 @@
     <result column="wait_day" jdbcType="INTEGER" property="waitDay" />
     <result column="wait_day" jdbcType="INTEGER" property="waitDay" />
     <result column="effective_year" jdbcType="INTEGER" property="effectiveYear" />
     <result column="effective_year" jdbcType="INTEGER" property="effectiveYear" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   </resultMap>
   <sql id="Example_Where_Clause">
   <sql id="Example_Where_Clause">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
     <where>
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -55,7 +56,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
     <where>
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -89,15 +90,16 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
-    id, order_no, tid, project_type, dun_type, wait_day, effective_year, aid, create_time
+    id, order_no, tid, project_type, dun_type, wait_day, effective_year, aid, status, 
+    create_time
   </sql>
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.NewOrderDunExample" resultMap="BaseResultMap">
   <select id="selectByExample" parameterType="com.goafanti.common.model.NewOrderDunExample" resultMap="BaseResultMap">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
     select
     select
     <if test="distinct">
     <if test="distinct">
@@ -116,7 +118,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
     select 
     select 
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
@@ -127,7 +129,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
     delete from new_order_dun
     delete from new_order_dun
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
@@ -136,7 +138,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
     delete from new_order_dun
     delete from new_order_dun
     <if test="_parameter != null">
     <if test="_parameter != null">
@@ -147,22 +149,22 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
     insert into new_order_dun (id, order_no, tid, 
     insert into new_order_dun (id, order_no, tid, 
       project_type, dun_type, wait_day, 
       project_type, dun_type, wait_day, 
-      effective_year, aid, create_time
-      )
+      effective_year, aid, status, 
+      create_time)
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, 
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, 
       #{projectType,jdbcType=INTEGER}, #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER}, 
       #{projectType,jdbcType=INTEGER}, #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER}, 
-      #{effectiveYear,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
-      )
+      #{effectiveYear,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP})
   </insert>
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.NewOrderDun">
   <insert id="insertSelective" parameterType="com.goafanti.common.model.NewOrderDun">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
     insert into new_order_dun
     insert into new_order_dun
     <trim prefix="(" suffix=")" suffixOverrides=",">
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -190,6 +192,9 @@
       <if test="aid != null">
       <if test="aid != null">
         aid,
         aid,
       </if>
       </if>
+      <if test="status != null">
+        status,
+      </if>
       <if test="createTime != null">
       <if test="createTime != null">
         create_time,
         create_time,
       </if>
       </if>
@@ -219,6 +224,9 @@
       <if test="aid != null">
       <if test="aid != null">
         #{aid,jdbcType=VARCHAR},
         #{aid,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
       <if test="createTime != null">
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
         #{createTime,jdbcType=TIMESTAMP},
       </if>
       </if>
@@ -228,7 +236,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
     select count(*) from new_order_dun
     select count(*) from new_order_dun
     <if test="_parameter != null">
     <if test="_parameter != null">
@@ -239,7 +247,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
     update new_order_dun
     update new_order_dun
     <set>
     <set>
@@ -267,6 +275,9 @@
       <if test="record.aid != null">
       <if test="record.aid != null">
         aid = #{record.aid,jdbcType=VARCHAR},
         aid = #{record.aid,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
       <if test="record.createTime != null">
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
       </if>
@@ -279,7 +290,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
     update new_order_dun
     update new_order_dun
     set id = #{record.id,jdbcType=INTEGER},
     set id = #{record.id,jdbcType=INTEGER},
@@ -290,6 +301,7 @@
       wait_day = #{record.waitDay,jdbcType=INTEGER},
       wait_day = #{record.waitDay,jdbcType=INTEGER},
       effective_year = #{record.effectiveYear,jdbcType=INTEGER},
       effective_year = #{record.effectiveYear,jdbcType=INTEGER},
       aid = #{record.aid,jdbcType=VARCHAR},
       aid = #{record.aid,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP}
       create_time = #{record.createTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
       <include refid="Update_By_Example_Where_Clause" />
@@ -299,7 +311,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
     update new_order_dun
     update new_order_dun
     <set>
     <set>
@@ -324,6 +336,9 @@
       <if test="aid != null">
       <if test="aid != null">
         aid = #{aid,jdbcType=VARCHAR},
         aid = #{aid,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
       <if test="createTime != null">
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
       </if>
@@ -334,7 +349,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 02 14:11:03 CST 2019.
+      This element was generated on Tue Dec 03 11:01:29 CST 2019.
     -->
     -->
     update new_order_dun
     update new_order_dun
     set order_no = #{orderNo,jdbcType=VARCHAR},
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -344,6 +359,7 @@
       wait_day = #{waitDay,jdbcType=INTEGER},
       wait_day = #{waitDay,jdbcType=INTEGER},
       effective_year = #{effectiveYear,jdbcType=INTEGER},
       effective_year = #{effectiveYear,jdbcType=INTEGER},
       aid = #{aid,jdbcType=VARCHAR},
       aid = #{aid,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP}
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>
@@ -351,10 +367,14 @@
   select id, order_no orderNo, tid, project_type projectType, dun_type dunType, wait_day waitDay, 
   select id, order_no orderNo, tid, project_type projectType, dun_type dunType, wait_day waitDay, 
   effective_year effectiveYear, aid, create_time createTime
   effective_year effectiveYear, aid, create_time createTime
   from new_order_dun where 1=1
   from new_order_dun where 1=1
-  <if test="orderNo!=null and orderNo!=''">
+  <if test="orderNo != null">
   and  order_no= #{orderNo}
   and  order_no= #{orderNo}
   </if>
   </if>
-  <if test="aid != null and aid != ''">
+  <if test="status != null">
+  and  status= #{status}
+  </if>
+  
+  <if test="aid != null">
   and  aid= #{aid}
   and  aid= #{aid}
   </if>
   </if>
   </select>
   </select>

+ 230 - 295
src/main/java/com/goafanti/common/model/NewOrderDun.java

@@ -3,300 +3,235 @@ package com.goafanti.common.model;
 import java.util.Date;
 import java.util.Date;
 
 
 public class NewOrderDun {
 public class NewOrderDun {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column new_order_dun.id
-     *
-     * @mbg.generated Mon Dec 02 14:11:03 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 Mon Dec 02 14:11:03 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 Mon Dec 02 14:11:03 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 Mon Dec 02 14:11:03 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 Mon Dec 02 14:11:03 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 Mon Dec 02 14:11:03 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 Mon Dec 02 14:11:03 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    private String aid;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column new_order_dun.create_time
-     *
-     * @mbg.generated Mon Dec 02 14:11:03 CST 2019
-     */
-    private Date createTime;
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public Integer getTid() {
-        return tid;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public void setTid(Integer tid) {
-        this.tid = tid;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public Integer getProjectType() {
-        return projectType;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public void setProjectType(Integer projectType) {
-        this.projectType = projectType;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public Integer getDunType() {
-        return dunType;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public void setDunType(Integer dunType) {
-        this.dunType = dunType;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public Integer getWaitDay() {
-        return waitDay;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public void setWaitDay(Integer waitDay) {
-        this.waitDay = waitDay;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public Integer getEffectiveYear() {
-        return effectiveYear;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public void setEffectiveYear(Integer effectiveYear) {
-        this.effectiveYear = effectiveYear;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public String getAid() {
-        return aid;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public void setAid(String aid) {
-        this.aid = aid;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 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 Mon Dec 02 14:11:03 CST 2019
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
+	/**
+	 * 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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	private Date createTime;
+
+	/**
+	 * 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
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getTid() {
+		return tid;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setTid(Integer tid) {
+		this.tid = tid;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getProjectType() {
+		return projectType;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setProjectType(Integer projectType) {
+		this.projectType = projectType;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getDunType() {
+		return dunType;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setDunType(Integer dunType) {
+		this.dunType = dunType;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getWaitDay() {
+		return waitDay;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setWaitDay(Integer waitDay) {
+		this.waitDay = waitDay;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getEffectiveYear() {
+		return effectiveYear;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setEffectiveYear(Integer effectiveYear) {
+		this.effectiveYear = effectiveYear;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getAid() {
+		return aid;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	/**
+	 * 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
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
 }
 }

Dosya farkı çok büyük olduğundan ihmal edildi
+ 862 - 843
src/main/java/com/goafanti/common/model/NewOrderDunExample.java


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

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.error.BusinessException;
+import com.goafanti.common.model.NewOrderDun;
 import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderOutsource;
 import com.goafanti.common.model.TOrderOutsource;
@@ -177,5 +178,4 @@ public interface OrderNewService {
 	void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,String OrderNo,String adminId);
 	void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,String OrderNo,String adminId);
 	void exportOrderTaskData(String orderNo, HttpServletResponse response)throws IOException,BusinessException ;
 	void exportOrderTaskData(String orderNo, HttpServletResponse response)throws IOException,BusinessException ;
 	
 	
-	
 }
 }

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

@@ -36,7 +36,7 @@ public class NewOrderDunServiceImpl extends BaseMybatisDao<NewOrderDunMapper> im
 	@Override
 	@Override
 	public List<OutNewOrderDunBo> selectListNewOrderDun(String orderNo) {
 	public List<OutNewOrderDunBo> selectListNewOrderDun(String orderNo) {
 		String aid=TokenManager.getAdminId();
 		String aid=TokenManager.getAdminId();
-		return newOrderDunMapper.selectListNewOrderDun(orderNo,aid);
+		return newOrderDunMapper.selectListNewOrderDun(orderNo,aid,null);
 	}
 	}
 	@Override
 	@Override
 	public OutNewOrderDunBo selectDun(Integer id) {
 	public OutNewOrderDunBo selectDun(Integer id) {

+ 78 - 23
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -4,6 +4,7 @@ package com.goafanti.order.service.impl;
 import java.io.IOException;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
@@ -19,6 +20,7 @@ import java.util.UUID;
 import javax.mail.MessagingException;
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -40,6 +42,7 @@ import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.IdleContractNoMapper;
 import com.goafanti.common.dao.IdleContractNoMapper;
+import com.goafanti.common.dao.NewOrderDunMapper;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.OrganizationManagementMapper;
@@ -57,6 +60,7 @@ import com.goafanti.common.enums.OrderLogProcess;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.IdleContractNo;
 import com.goafanti.common.model.IdleContractNo;
+import com.goafanti.common.model.NewOrderDun;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.OrganizationManagement;
 import com.goafanti.common.model.OrganizationManagement;
@@ -78,6 +82,7 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.order.bo.OrderDunTaskBo;
 import com.goafanti.order.bo.OrderDunTaskBo;
 import com.goafanti.order.bo.OrderRefundDetailBo;
 import com.goafanti.order.bo.OrderRefundDetailBo;
+import com.goafanti.order.bo.OutNewOrderDunBo;
 import com.goafanti.order.bo.TDunLogListBo;
 import com.goafanti.order.bo.TDunLogListBo;
 import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.bo.TOrderNewBo;
@@ -105,6 +110,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Autowired
 	@Autowired
 	private TOrderTaskMapper tOrderTaskMapper;
 	private TOrderTaskMapper tOrderTaskMapper;
 	@Autowired
 	@Autowired
+	private NewOrderDunMapper	newOrderDunMapper;
+	@Autowired
 	private TOrderDunMapper tOrderDunMapper;
 	private TOrderDunMapper tOrderDunMapper;
 	@Autowired
 	@Autowired
 	private TDunLogMapper tDunLogMapper;
 	private TDunLogMapper tDunLogMapper;
@@ -501,7 +508,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			type=NoticeStatus.ORDER_YES.getCode();
 			type=NoticeStatus.ORDER_YES.getCode();
 			tl.setOrderNo(orderNo);
 			tl.setOrderNo(orderNo);
 			tl.setProcess(OrderLogProcess.SH.getCode());
 			tl.setProcess(OrderLogProcess.SH.getCode());
+			//增加日志
 			addOrderLog(tl);
 			addOrderLog(tl);
+			//增加催款信息
+			pushOrderDun(t2);
 		}else if (orderStatus==OrderNewState.QDSHJJ.getCode()) {//如果不通过新增驳回
 		}else if (orderStatus==OrderNewState.QDSHJJ.getCode()) {//如果不通过新增驳回
 				if (outsource==0) {//非外包
 				if (outsource==0) {//非外包
 				t.setProcessStatus(ProcessStatus.YPYXY.getCode());
 				t.setProcessStatus(ProcessStatus.YPYXY.getCode());
@@ -521,6 +531,57 @@ 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);
+			}
+		}
+		
+	}
+
+
+
+	private 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);
+		try {
+			NewDunsendEmail(t2.getOrderNo(),o.getId(), a, b);
+		} catch (UnsupportedEncodingException | MessagingException e) {
+			new BusinessException("邮件发送错误。");
+		}
+	}
+	
+	
+	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 {
+					BeanUtils.copyProperties(ob, newOrderDunMapper.selectByPrimaryKey(dunId));
+				} catch (IllegalAccessException | InvocationTargetException e) {
+					e.printStackTrace();
+				}
+			}
+			//发送驳回邮件
+							//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(),b.getUserName(),1);
+			if(StringUtils.isNotBlank(b.getEmail())) {
+				SendEmailUtil.getInstance().patentSend(bo);
+			}
+			LoggerUtils.debug(logger, "=========================================发送邮件成功");
+	}
+
+
+
 	private void addBackOrder(String orderNo, String reason) {
 	private void addBackOrder(String orderNo, String reason) {
 		TOrderBack ob=new TOrderBack();
 		TOrderBack ob=new TOrderBack();
 		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
 		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
@@ -539,11 +600,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 	}
 
 
 
 
-
-	
-
-
-
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
 	public Pagination<TOrderNewBo> dunOrderNewList(String name, String orderNo, String starTime, String endTime,
 	public Pagination<TOrderNewBo> dunOrderNewList(String name, String orderNo, String starTime, String endTime,
@@ -929,9 +985,23 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public void updateOrderDun(TOrderDun tDun) {
 	public void updateOrderDun(TOrderDun tDun) {
 		 tOrderDunMapper.updateByPrimaryKeySelective(tDun);
 		 tOrderDunMapper.updateByPrimaryKeySelective(tDun);
 	}
 	}
+	
 
 
+
+	
+	
+	@Override
+	public void addNoticAndSendEmail(String orderNo,OrderDunTaskBo t,Integer type)
+			throws UnsupportedEncodingException, MessagingException {
+		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(type==NoticeStatus.ORDER_DUN.getCode()?t.getOrderNo():orderNo);
+		 String id="1";
+		if (type==NoticeStatus.ORDER_DUN.getCode())  id=b.getSalesmanId();
+		if (type==NoticeStatus.ORDER_BACK.getCode())  id=TokenManager.getAdminId()==null?"1":TokenManager.getAdminId();
+		AdminListBo a = adminMapper.getDeptNameByAid(id);
+		 sendEmail(type==NoticeStatus.ORDER_DUN.getCode()?t.getOrderNo():orderNo, t==null?null:t.getId(), a, b);
+		 addNotic(type==NoticeStatus.ORDER_DUN.getCode()?t.getOrderNo():orderNo,type,a, b);
+	}
 	public void addNotic(String orderNo,Integer type,AdminListBo a,TOrderNewBo b) {
 	public void addNotic(String orderNo,Integer type,AdminListBo a,TOrderNewBo b) {
-		LoggerUtils.debug(logger, "======================站内消息发送启动===================");
 		String str=NoticeStatus.getValueByCode(type)+": 订单编号 -"+orderNo+", 操作人:"+a.getDepartmentName()+"-"+a.getName()+"。";
 		String str=NoticeStatus.getValueByCode(type)+": 订单编号 -"+orderNo+", 操作人:"+a.getDepartmentName()+"-"+a.getName()+"。";
 		Notice n =new Notice();
 		Notice n =new Notice();
 		n.setId(UUID.randomUUID().toString());
 		n.setId(UUID.randomUUID().toString());
@@ -962,22 +1032,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 	}
 
 
 
 
-	
-	
-	@Override
-	public void addNoticAndSendEmail(String orderNo,OrderDunTaskBo t,Integer type)
-			throws UnsupportedEncodingException, MessagingException {
-		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(type==NoticeStatus.ORDER_DUN.getCode()?t.getOrderNo():orderNo);
-		 String id="1";
-		if (type==NoticeStatus.ORDER_DUN.getCode())  id=b.getSalesmanId();
-		if (type==NoticeStatus.ORDER_BACK.getCode())  id=TokenManager.getAdminId()==null?"1":TokenManager.getAdminId();
-		AdminListBo a = adminMapper.getDeptNameByAid(id);
-		 sendEmail(type==NoticeStatus.ORDER_DUN.getCode()?t.getOrderNo():orderNo, t==null?null:t.getId(), a, b);
-		 addNotic(type==NoticeStatus.ORDER_DUN.getCode()?t.getOrderNo():orderNo,type,a, b);
-	}
-
-
-
 	@Override
 	@Override
 	public int updateFinance(String orderNo, String newFinance) {
 	public int updateFinance(String orderNo, String newFinance) {
 		String aid=TokenManager.getAdminId();
 		String aid=TokenManager.getAdminId();
@@ -1020,7 +1074,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if(!nlist.isEmpty())noticeMapper.insertBatch(nlist);
 		if(!nlist.isEmpty())noticeMapper.insertBatch(nlist);
 		if(StringUtils.isNotBlank(adminIds)) {
 		if(StringUtils.isNotBlank(adminIds)) {
 			adminIds=adminIds.substring(0, adminIds.length()-1);
 			adminIds=adminIds.substring(0, adminIds.length()-1);
-			EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), adminIds, a.getDepartmentName(), a.getName(), "请登录查看");
+			EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), adminIds, a.getDepartmentName(), a.getName(), "请登录查看"
+					,null,null,null,null,0);
 				try {
 				try {
 					//使用专利邮件模板
 					//使用专利邮件模板
 					SendEmailUtil.getInstance().patentSend(bo);
 					SendEmailUtil.getInstance().patentSend(bo);