Bläddra i källkod

报销列表、报销审核接口修改

anderx 2 år sedan
förälder
incheckning
01812771c9

+ 9 - 0
src/main/java/com/goafanti/expenseAccount/bo/InputExpenseAccount.java

@@ -14,6 +14,15 @@ public class InputExpenseAccount extends ExpenseAccount {
 
     private String startTimeStr;
     private String endTimeStr;
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
 
     public String getStartTimeStr() {
         return startTimeStr;

+ 1 - 1
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -150,7 +150,7 @@ public class ExpenseAccountController extends CertifyApiController {
     }
 
 
-    @RequestMapping(value = "/examine",method = RequestMethod.GET)
+    @RequestMapping(value = "/examine",method = RequestMethod.POST)
     public Result examine(InputExpenseAccount in,BindingResult bindingResult){
         Result res =new Result();
         if (bindingResult.hasErrors()) {

+ 5 - 3
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -86,6 +86,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             in.setReleaseEnd(DateUtils.StringToDate(in.getEndTimeStr(), AFTConstants.YYYYMMDDHHMMSS));
         }
         in.setStatus(1);
+        in.setProcessStatus(1);
         //计算总金额
         in.setTotalAmount(expenseAccountDetailsMapper.selectAmountCountByEAid(in.getId()));
         if (useEA.getStatus()==0){
@@ -162,12 +163,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             newEa.setStatus(status);
             str=new StringBuffer("您的报销审核已通过,请注意查看。");
         }
-        addLogAndNoticeAndEmail(useEa,status,str.toString(),aids);
+        addLogAndNoticeAndEmail(in,useEa,status,str.toString(),aids);
+        expenseAccountMapper.updateByPrimaryKeySelective(newEa);
         return 1;
     }
 
-    private void addLogAndNoticeAndEmail(ExpenseAccount useEa, Integer status, String str, List<Admin> aids) {
-        addExpenseAccountLog(useEa.getId(),status,str);
+    private void addLogAndNoticeAndEmail(InputExpenseAccount in, ExpenseAccount useEa, Integer status, String str, List<Admin> aids) {
+        addExpenseAccountLog(useEa.getId(),status,in.getReason());
         Date date= new Date();
         Integer noticeStatus=NoticeStatus.EXPENSE_NOTICE.getCode();
         if (status==2){