Browse Source

财务审核修改

anderx 2 years ago
parent
commit
2b29f61f3b

+ 14 - 2
src/main/java/com/goafanti/common/bo/EmailBo.java

@@ -1,10 +1,10 @@
 package com.goafanti.common.bo;
 
-import java.util.Date;
-
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.utils.DateUtils;
 
+import java.util.Date;
+
 public class EmailBo {
 
 	//收件地址
@@ -497,4 +497,16 @@ public class EmailBo {
 		this.end = end;
 	}
 
+	@Override
+	public String toString() {
+		return "EmailBo{" +
+				"subject='" + subject + '\'' +
+				", address='" + address + '\'' +
+				", addressee='" + addressee + '\'' +
+				", deptname='" + deptname + '\'' +
+				", sender='" + sender + '\'' +
+				", content='" + content + '\'' +
+				", end='" + end + '\'' +
+				'}';
+	}
 }

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

@@ -128,11 +128,11 @@
   </update>
 
   <insert id="insertBatch">
-    insert into t_order_examine (order_no, aid, `status`, aname)
+    insert into t_order_examine (order_no, aid, `status`, aname,type)
     values
     <foreach item="item" index="index" collection="list" separator=",">
       (#{item.orderNo,jdbcType=VARCHAR}, #{item.aid,jdbcType=VARCHAR}, #{item.status,jdbcType=INTEGER},
-       #{item.aname,jdbcType=VARCHAR})
+      #{item.aname,jdbcType=VARCHAR},#{item.type,jdbcType=INTEGER})
     </foreach>
   </insert>
   <select id="selectByOrderNoAndAid" resultType="java.lang.Integer">

+ 3 - 4
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -2074,14 +2074,13 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </select>
   <select id="getProcessName" resultType="com.goafanti.order.bo.OrderProcessName">
     select a.order_no orderNo,a.approval,a.process_status processStatus  ,b.name yxy,mg.name yxjl,
-        yxgly.name yxgly,d.name cwzy,zc.name zc, zxsgly.name zxsgly,dsz.name dsz,rf.name retrialFinanceName
+        yxgly.name yxgly,d.name cwzy,zc.name zc, zxsgly.name zxsgly,dsz.name dsz
     from t_order_new a left join admin b on a.salesman_id =b.id
     left join admin mg on b.manager_id =mg.id left join department c on a.order_dep =c.id
-     left join admin rf on c.retrial_finance_id=rf.id
      left join (select a.department_id depId,group_concat(a.name) name
         from admin a left join user_role b on a.id=b.uid left join `role` c on b.rid =c.id
         where c.role_type ='9996' and a.status ='0' group by a.department_id )yxgly on c.id =yxgly.depId
-     left join (select order_no ,group_concat(aname)name from t_order_examine group by order_no ) d on a.order_no=d.order_no
+     left join (select order_no ,group_concat(aname)name from t_order_examine WHERE type=0 group by order_no ) d on a.order_no=d.order_no
      left join (select group_concat(a.name) name
         from admin a left join user_role b on a.id=b.uid left join `role` c on b.rid =c.id
         where c.role_type in ('99998','99988') and a.status ='0' ) zc on 1=1
@@ -2157,7 +2156,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     </select>
   <select id="selectOrderFinance" resultType="com.goafanti.organization.bo.OrganizationListOut">
     select b.id,b.finance_id financeId,c.name financeName,b.retrial_finance_id retrialFinanceId,
-           d.retrialFinanceName
+           d.name retrialFinanceName
     from t_order_new a left join department b on a.order_dep = b.id
     left join admin c on b.finance_id=c.id
     left join admin d on b.retrial_finance_id=d.id

+ 1 - 0
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -129,6 +129,7 @@ public class AsyncUtils {
 	public void send(EmailBo bo){
 		try {
 			SendEmailUtil.getInstance().send(bo);
+			LoggerUtils.debug(getClass(),String.format("发送邮件==>%s===>%s",bo.getSubject(),bo.getAddress()));
 		} catch (UnsupportedEncodingException | MessagingException e) {
 			LoggerUtils.error(getClass(),"邮件发送错误");
 		}

+ 0 - 10
src/main/java/com/goafanti/order/bo/OrderProcessName.java

@@ -9,19 +9,9 @@ public class OrderProcessName {
     private String yxjl;
     private String yxgly;
     private String cwzy;
-    private String retrialFinanceName;
     private String zc;
     private String zxsgly;
     private String dsz;
-
-    public String getRetrialFinanceName() {
-        return retrialFinanceName;
-    }
-
-    public void setRetrialFinanceName(String retrialFinanceName) {
-        this.retrialFinanceName = retrialFinanceName;
-    }
-
     public String getYxjl() {
         return yxjl;
     }

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

@@ -1484,7 +1484,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	public void addNoticMember(Integer type,  String orderNo,Integer shiroType,Integer result) {
 		TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(orderNo);
-		addNoticMember(NoticeStatus.MENBER_START.getCode(),tn,null,0);
+		addNoticMember(type,tn,shiroType,result);
 	}
 
 	@Override