Просмотр исходного кода

3. 报销小程序无默认收款新增并设置修改
4. 报销小程序日志驳回后无需后续修改

anderx лет назад: 2
Родитель
Сommit
34d4612a9a

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

@@ -672,7 +672,7 @@
   </select>
 
   <sql id="mainAllSql">
-    select b.id,b.check_no,b.total_amount,b.order_no,o.contract_no,b.aname,b.apply_dep,b.pay_dep,b.real_amount,b.type_other ,
+    select b.id,b.check_no,b.total_amount,b.order_no,o.contract_no,b.aname,b.apply_dep,b.pay_dep,b.real_amount,b.type_other ,b.aid,
            date_format(b.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,b.examine_name, dep.name applyDepName,dep2.name payDepName,
            b.remarks,b.eaaid ,eap.name ,eap.bank ,eap.accounts ,b.status,b.process_status,
            c.id sonId,c.total_amount sonAmount,c.`type` sonType,c.type_other sonTypeOther,c.user_names ,c.release_start ,c.release_end ,
@@ -698,6 +698,7 @@
   <resultMap id="MainMap" type="com.goafanti.expenseAccount.bo.MainExpenseAccount">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="check_no" jdbcType="VARCHAR" property="checkNo" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
     <result column="type_other" jdbcType="VARCHAR" property="typeOther" />
     <result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
     <result column="real_amount" jdbcType="DECIMAL" property="realAmount" />

+ 2 - 1
src/main/java/com/goafanti/expenseAccount/bo/MainExpenseAccount.java

@@ -29,7 +29,8 @@ public class MainExpenseAccount  {
     private String createTimeStr;
     private String examineName;
     /**
-     * 0=非审核,1=当前审核
+     * 0=非审核,1=当前审核,2=我的订单
+     *  0和1判定能不能审核 2判定能不能撤销
      */
     private Integer examine;
 

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

@@ -752,6 +752,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         }else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)&&(res.getProcessStatus()==4)){
             res.setExamine(1);
         }
+        if (res.getAid().equals(TokenManager.getAdminId())){
+            res.setExamine(2);
+        }
         return res;
     }