Explorar o código

修改个人审核上级判定

anderx hai 1 ano
pai
achega
0fafbfed12

+ 9 - 0
src/main/java/com/goafanti/common/bo/AdminNoticeBo.java

@@ -11,6 +11,15 @@ public class AdminNoticeBo {
     private String superEmail;
     private String superOpenId;
     private String superExpenseOpenId;
+    private Integer expenseSuperExamine;
+
+    public Integer getExpenseSuperExamine() {
+        return expenseSuperExamine;
+    }
+
+    public void setExpenseSuperExamine(Integer expenseSuperExamine) {
+        this.expenseSuperExamine = expenseSuperExamine;
+    }
 
     public String getId() {
         return id;

+ 1 - 1
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -1168,7 +1168,7 @@
 
   <select id="selectMyAndSuperBySuperId" parameterType="java.lang.String" resultType="com.goafanti.common.bo.AdminNoticeBo">
     select
-      a.id,a.name,a.email,a.open_id openId,a.expense_open_id expenseOpenId,
+      a.id,a.name,a.email,a.open_id openId,a.expense_open_id expenseOpenId,a.expense_super_examine expenseSuperExamine,
       b.id superId,b.name superName,b.email superEmail,b.open_id superOpenId,b.expense_open_id superExpenseOpenId
     from admin a left join admin b on a.superior_id=b.id
     where  a.id=#{id}

+ 15 - 13
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -116,20 +116,22 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         for (int i=1;i<4;i++){
                 ExpenseAccountExamine eae=new ExpenseAccountExamine(id,i);
             if (i==1){
-                //新增一级
-                String examineId=null;
-                String examineName=null;
-                //正常用上级,没有的情况下就是自己
-                if (a.getSuperId()!=null){
-                    examineId=a.getSuperId();
-                    examineName=a.getSuperName();
-                }else {
-                    examineId=a.getId();
-                    examineName=a.getName();
+                if (a.getExpenseSuperExamine()==1){
+                    //新增一级
+                    String examineId=null;
+                    String examineName=null;
+                    //正常用上级,没有的情况下就是自己
+                    if (a.getSuperId()!=null){
+                        examineId=a.getSuperId();
+                        examineName=a.getSuperName();
+                    }else {
+                        examineId=a.getId();
+                        examineName=a.getName();
+                    }
+                    eae.setAuditor(examineId);
+                    eae.setAuditorname(examineName);
+                    ea.setExamineName(examineName);
                 }
-                eae.setAuditor(examineId);
-                eae.setAuditorname(examineName);
-                ea.setExamineName(examineName);
             }else if (i==2){
                 if (StringUtils.isBlank(dep.getManagerName())){
                     throw new BusinessException("报销申请部门[管理员]不存在。");