Browse Source

审核列表修改

anderx 2 years ago
parent
commit
2a8aefd9df

+ 15 - 3
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -356,6 +356,9 @@
 
   <select id="selectExpenseAccountList" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountBo">
     select a.id,a.total_amount totalAmount,a.`type`,a.process_status processStatus,a.status,a.examine_name examineName,
+    <if test="processStatus ==1">
+      eae.type eaeType,
+    </if>
     a.target_type targetType , e.contract_no contractNo,tm.buyer_name buyerName ,f.name depName,d2.name financeName,
     date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,a.aname, b.name appDepName, c.name payDepName
     from expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
@@ -372,7 +375,12 @@
     </if>
     <if test="processStatus ==1">
       and a.process_status>0
-      and a.process_status >=eae.`type`
+    <if test="examineStatus ==0">
+      and a.process_status =eae.`type`
+    </if>
+      <if test="examineStatus ==1">
+        and a.process_status >=eae.`type`
+      </if>
     </if>
     <if test="status != null">
       and a.status= #{status}
@@ -416,8 +424,12 @@
     </if>
     <if test="processStatus ==1">
       and a.process_status>0
-      and a.process_status >=eae.`type`
-      and eae.auditor = #{aid}
+      <if test="examineStatus ==0">
+        and a.process_status =eae.`type`
+      </if>
+      <if test="examineStatus ==1">
+        and a.process_status >=eae.`type`
+      </if>
     </if>
     <if test="status != null">
       and a.status= #{status}

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

@@ -4,6 +4,7 @@ public class InputPageListBo {
     private String startTime;
     private String endTime;
     private Integer status;
+    private Integer examineStatus;
     private Integer processStatus;
 
     //同编号搜索、按客户名称搜索 、按部门/公司搜索 、按报销类型搜索、按报销公司部门/公司、按支付部门/公司搜索、按审核状态(财务审核中-不同人员针对的审核状态不一样、已完成)、报销时间(按报销的时间段进行搜索)
@@ -17,6 +18,14 @@ public class InputPageListBo {
     private Integer pageNo;
     private Integer pageSize;
 
+    public Integer getExamineStatus() {
+        return examineStatus;
+    }
+
+    public void setExamineStatus(Integer examineStatus) {
+        this.examineStatus = examineStatus;
+    }
+
     public String getContractNo() {
         return contractNo;
     }

+ 9 - 1
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccount.java

@@ -15,10 +15,18 @@ public class OutExpenseAccount extends ExpenseAccount {
     private String contractNo;
     private String buyerName;
     private BigDecimal debitTotalAmount;
-
     private String name;
     private String bank;
     private String accounts;
+    private Integer examine;
+
+    public Integer getExamine() {
+        return examine;
+    }
+
+    public void setExamine(Integer examine) {
+        this.examine = examine;
+    }
 
     public BigDecimal getDebitTotalAmount() {
         return debitTotalAmount;

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

@@ -7,6 +7,7 @@ public class OutExpenseAccountBo {
     private BigDecimal totalAmount;
     private Integer type;
     private Integer processStatus;
+    private Integer eaeType;
     private String examineName;
     private String createTimeStr;
     private String aname;
@@ -20,6 +21,14 @@ public class OutExpenseAccountBo {
     private String depName;
     private String financeName;
 
+    public Integer getEaeType() {
+        return eaeType;
+    }
+
+    public void setEaeType(Integer eaeType) {
+        this.eaeType = eaeType;
+    }
+
     public Integer getTargetType() {
         return targetType;
     }

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

@@ -191,9 +191,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         AdminListBo admin = adminMapper.getDeptNameByAid(in.getAid());
         if(in.getProcessStatus()== EAProcessStatus.SJSH.getCode()){
             //获取上级
-            Admin superAdmin = adminMapper.selectByPrimaryKey(admin.getId());
+            Admin superAdmin = adminMapper.selectByPrimaryKey(admin.getSuperiorId());
             aids.add(superAdmin);
-            in.setUserNames(superAdmin.getName());
+            in.setExamineName(superAdmin.getName());
         }else if (in.getProcessStatus()== EAProcessStatus.CWSH.getCode()){
             //获取财务负责人
             Admin finaceAdmin = adminMapper.selectByPrimaryKey(admin.getDepFinance());
@@ -496,6 +496,19 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     @Override
     public Object selectById(Integer id) {
         OutExpenseAccount useEa = expenseAccountMapper.selectByid(id);
+        List<ExpenseAccountExamine> list = expenseAccountExamineMapper.selectByEaidAndType(id, useEa.getProcessStatus());
+        boolean flag=false;
+        for (ExpenseAccountExamine e : list) {
+                if (e.getAuditor().equals(TokenManager.getAdminId())){
+                    flag=true;
+                    break;
+                }
+        }
+        if (flag){
+            useEa.setExamine(1);
+        }else {
+            useEa.setExamine(0);
+        }
         if (useEa.getDebitId()!=null){
             ExpenseAccount debit = expenseAccountMapper.selectByPrimaryKey(useEa.getDebitId());
             if (debit!=null&&debit.getTotalAmount()!=null){
@@ -531,6 +544,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         }else {
             param.put("processStatus",in.getProcessStatus());
         }
+        if (in.getExamineStatus()!=null){
+            param.put("examineStatus",in.getExamineStatus());
+        }else {
+            param.put("examineStatus",0);
+        }
         if (in.getContractNo()!=null)param.put("contractNo",in.getContractNo());
         if (in.getDepId()!=null)param.put("depId",in.getDepId());
         if (in.getUsername()!=null)param.put("username",in.getUsername());