Browse Source

财务复审修改开发

anderx 2 years ago
parent
commit
56b8b385a5

+ 8 - 2
src/main/java/com/goafanti/common/model/ExpenseConfigDetails.java

@@ -1,11 +1,15 @@
 package com.goafanti.common.model;
 
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.utils.Param;
+
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * expense_config_details
- * @author 
+ * @author
  */
 public class ExpenseConfigDetails implements Serializable {
     private Integer id;
@@ -18,6 +22,8 @@ public class ExpenseConfigDetails implements Serializable {
     /**
      * 管理员编号
      */
+    @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
+    @Param(name = "管理员编号")
     private String aid;
 
     /**
@@ -84,4 +90,4 @@ public class ExpenseConfigDetails implements Serializable {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-}
+}

+ 4 - 4
src/main/java/com/goafanti/common/utils/Param.java

@@ -1,11 +1,11 @@
 package com.goafanti.common.utils;
 
 import com.goafanti.common.constant.ErrorConstants;
-import org.springframework.context.annotation.Import;
 
-import javax.validation.Payload;
-import javax.validation.constraints.NotNull;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)

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

@@ -3,8 +3,11 @@ package com.goafanti.expenseAccount.controller;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.model.ExpenseConfigDetails;
+import com.goafanti.common.utils.ParamUtils;
 import com.goafanti.expenseAccount.service.ExpenseConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -22,8 +25,13 @@ public class ExpenseConfigController extends CertifyApiController {
      * @return
      */
     @RequestMapping(value = "/addDeTails",method= RequestMethod.POST)
-    public Result add(ExpenseConfigDetails details){
+    public Result add(@Validated ExpenseConfigDetails details, BindingResult bindingResult){
         Result res =new Result();
+        if (bindingResult.hasErrors()) {
+            res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+                    ParamUtils.getParamName(details,bindingResult.getFieldError().getField())));
+            return res;
+        }
         return  res.data(expenseConfigService.addDeTails(details));
     }
 

+ 7 - 6
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -618,7 +618,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             boolean flag2= false;
             Date date2=new Date();
             date2.setTime(date2.getTime()+1000l);
-            String tip="";
+            String tip=null;
             if (newEa.getProcessStatus()==EAProcessStatus.CWFS.getCode()){
                 //财务复审财务复审
                 if (dep.getExpenseRetrialFinanceExamine()==0){
@@ -628,7 +628,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                     boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.CWFS.getCode());
                     if (expenseExamine){
                         flag2=true;
-                        str=String.format("[%s]通过审核,步入下个流程",EAProcessStatus.CWGGLYSH.getDesc());
+                        str=String.format("[%s]通过审核,步入下个流程",EAProcessStatus.CWFS.getDesc());
                     }
                 }
             }else if (newEa.getProcessStatus()==EAProcessStatus.DSZSH.getCode()){
@@ -637,10 +637,10 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                         flag2=true;
                         tip="特批(财务选择)";
                     }else {
-                        boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.CWFS.getCode());
+                        boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.DSZSH.getCode());
                         if (expenseExamine){
                             flag2=true;
-                            str=String.format("[%s]通过审核,步入下个流程",EAProcessStatus.CWGGLYSH.getDesc());
+                            str=String.format("[%s]通过审核,步入下个流程",EAProcessStatus.DSZSH.getDesc());
                         }
                     }
                 }else {
@@ -653,7 +653,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                     flag2=true;
                     tip=EAProcessStatus.CWGGLYSH.getDesc();
                 }else {
-                    boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.CWFS.getCode());
+                    boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.CWGGLYSH.getCode());
                     if (expenseExamine){
                         flag2=true;
                         str=String.format("[%s]通过审核,步入下个流程",EAProcessStatus.CWGGLYSH.getDesc());
@@ -683,12 +683,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 }
             }
             if (flag2){
+                if (str==null)str=String.format("未设置[%s]审核,跳过此流程",tip);
                 if (newEa.getProcessStatus()<EAProcessStatus.CNSH.getCode()){
-                    if (str==null)str=String.format("未设置[%s]审核,跳过此流程",tip);
                     addExpenseAccountLog(newEa.getId(),1,newEa.getProcessStatus(),"1",str,date2);
                     newEa.setProcessStatus(newEa.getProcessStatus()+1);
                     examineByprocess(newEa,admin,dep,list);
                 }else {
+                    addExpenseAccountLog(newEa.getId(),2,newEa.getProcessStatus(),"1",str,date2);
                     newEa.setProcessStatus(newEa.getProcessStatus());
                     newEa.setStatus(2);
                 }