Browse Source

科德报销小程序借支列表逻辑修改

anderx 2 years ago
parent
commit
b04fc2e38d

+ 9 - 8
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -1,16 +1,13 @@
 package com.goafanti.common.utils;
 
-import java.io.UnsupportedEncodingException;
-import java.util.*;
-
-import javax.mail.MessagingException;
-
 import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.bo.OrderExamineBo;
 import com.goafanti.common.bo.OrderOperator;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.enums.NoticeStatus;
+import com.goafanti.common.enums.NoticeTypes;
 import com.goafanti.common.model.*;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.NewOrderChangeBo;
@@ -19,13 +16,16 @@ import com.goafanti.order.enums.OrderChangeProcess;
 import com.goafanti.order.enums.OrderChangeType;
 import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.organization.bo.OrganizationListOut;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import com.goafanti.common.bo.EmailBo;
-import com.goafanti.common.enums.NoticeTypes;
+import javax.mail.MessagingException;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 
 @Component
 @Async
@@ -72,6 +72,7 @@ public class AsyncUtils {
 
 	public void send(EmailBo bo){
 		try {
+
 			SendEmailUtil.getInstance().send(bo);
 		} catch (UnsupportedEncodingException | MessagingException e) {
 			e.printStackTrace();

+ 7 - 9
src/main/java/com/goafanti/common/utils/WeChatUtils.java

@@ -1,21 +1,18 @@
 package com.goafanti.common.utils;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-
-import com.goafanti.common.bo.Result;
+import com.alibaba.fastjson.JSONObject;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
+import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Admin;
 import com.goafanti.core.shiro.token.TokenManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import com.alibaba.fastjson.JSONObject;
-import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.error.BusinessException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 
 @Component
@@ -110,6 +107,7 @@ public class WeChatUtils {
 	 * @param remarks 发送信息,不能大于十五个字
 	 */
 	public Integer addExpenseAccountWeChatNotice(String openid ,Integer type,Integer id, Date date, String aname,String remarks) {
+		if (openid==null )LoggerUtils.error(this.getClass(),"openId不能为空");
 		Map<String, Object> map=new HashMap<String, Object>();
 		String accessToken=getExpenseAccountAccessToken();
 		String url=send_url.replace("ACCESS_TOKEN", accessToken);

+ 17 - 2
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -141,7 +141,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     }
 
     /**
-     *
+     * 新增报销日志
      * @param eaid 报销编号
      * @param status 状态 0创建 1发起 2通过 3驳回 4修改
      * @param str 备注
@@ -151,7 +151,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     }
 
     /**
-     *
+     * 新增报销日志
      * @param eaid 报销编号
      * @param status 状态 0创建 1发起 2通过 3驳回 4修改
      * @param str 备注
@@ -168,6 +168,12 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         expenseAccountLogMapper.insertSelective(eaLog);
     }
 
+    /**
+     * 发起、驳回发起流程切换和日志站内信发送
+     * @param in
+     * @param status
+     * @param str
+     */
     private void addExpenseAccountLogAndNoticEmail(InputExpenseAccount in, Integer status, String str) {
         String aid=TokenManager.getAdminId();
         addExpenseAccountLog(in.getId(),status,in.getProcessStatus(),aid,str);
@@ -185,6 +191,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         createExamineByProcess(in);
     }
 
+
+    /**
+     * 判断审核流程与发送日志与邮件
+     * @param in
+     */
     private void createExamineByProcess(InputExpenseAccount in) {
         //审核流程推送到最新
         examineByprocess(in);
@@ -440,6 +451,10 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         }
     }
 
+    /**
+     * 审核流程推送,只要不是完成状态就继续判断是否跳过
+     * @param newEa
+     */
     private void examineByprocess( ExpenseAccount newEa) {
         List<ExpenseAccountExamine> list = expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), newEa.getProcessStatus());
         boolean flag=false;