Browse Source

报销开发

anderx 2 years ago
parent
commit
355c44293c

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

@@ -399,8 +399,8 @@
         a.type_other typeOther , a.status,a.process_status processStatus,a.total_amount totalAmount,a.debit_id debitId,
         a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,a.district_name districtName,
         a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name appDepName,
-        c.name payDepName,d.name ,d.bank ,d.accounts ,a.settlement_amount settlementAmount,
-        a.liquidation_status liquidationStatus, a.remarks,a.check_no checkNo,
+        c.name payDepName,d.name ,d.bank ,d.accounts ,a.settlement_amount settlementAmount,a.secondary_type secondaryType,
+        a.liquidation_status liquidationStatus, a.remarks,a.check_no checkNo,a.secondary_type_other secondaryTypeOther,
            date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
             date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
             date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr
@@ -638,9 +638,6 @@
   <select id="selectByaidAndPrid" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccount">
     SELECT
     <include refid="selectDtailsSql"/>
-    FROM expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
-    left join expense_account_private d on a.eaaid=d.id left join t_order_new o on a.order_no =o.order_no
-    left join t_order_mid tm on a.order_no =tm.order_no
     WHERE a.status= #{status}
     and a.prid= #{prid} and a.aid = #{aid}
   </select>

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

@@ -13,6 +13,7 @@ public class MainExpenseAccount  {
     private BigDecimal totalAmount;
     private String orderNo;
     private String contractNo;
+    private String aid;
     private String aname;
     private String applyDep;
     private String payDep;
@@ -28,6 +29,14 @@ public class MainExpenseAccount  {
 
     private List<OutExpenseAccount> sonList;
 
+    public String getAid() {
+        return aid;
+    }
+
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
     public String getCreateTimeStr() {
         return createTimeStr;
     }

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

@@ -8,7 +8,7 @@ public class OutExpenseAccountBo {
     private Integer type;
     private String typeOther;
     private Integer secondaryType;
-    private Integer secondaryTypeOther;
+    private String secondaryTypeOther;
     private Integer processStatus;
     private Integer eaeType;
     private String examineName;
@@ -36,11 +36,11 @@ public class OutExpenseAccountBo {
         this.secondaryType = secondaryType;
     }
 
-    public Integer getSecondaryTypeOther() {
+    public String getSecondaryTypeOther() {
         return secondaryTypeOther;
     }
 
-    public void setSecondaryTypeOther(Integer secondaryTypeOther) {
+    public void setSecondaryTypeOther(String secondaryTypeOther) {
         this.secondaryTypeOther = secondaryTypeOther;
     }
 

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

@@ -195,7 +195,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     /**
      * 发起、驳回发起流程切换和日志站内信发送
      */
-    private void addExpenseAccountLogAndNoticEmail(InputExpenseAccount in, Integer status, String str) {
+    private void addExpenseAccountLogAndNoticEmail(ExpenseAccount in, Integer status, String str) {
         String aid=TokenManager.getAdminId();
         addExpenseAccountLog(in.getId(),status,in.getProcessStatus(),aid,str);
         Admin admin = adminMapper.selectByPrimaryKey(aid);
@@ -216,7 +216,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     /**
      * 判断审核流程与发送日志与邮件
      */
-    private void createExamineByProcess(InputExpenseAccount in) {
+    private void createExamineByProcess(ExpenseAccount in) {
         //审核流程推送到最新
         AdminListBo admin = adminMapper.getDeptNameByAid(in.getAid());
         examineByprocess(in,admin);
@@ -264,12 +264,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             in.setTotalAmount(expenseAccountDetailsMapper.selectAmountCountByEAid(in.getId()));
         }
         in.setProcessStatus(0);
-        if (useEA.getStatus()==0){
-            addExpenseAccountLogAndNoticEmail(in,0,"发起报销审核");
-        }else if (useEA.getStatus()==3){
-            addExpenseAccountLogAndNoticEmail(in,4,"修改并发起审核");
-        }
-
         if (in.getOrderNo()==null){
             in.setTargetType(0);
         }else {
@@ -286,8 +280,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 //并且要处理原编号的问题
                 pushresettingDebit(in,useEA.getDebitId());
             }
-
         }
+        in.setStatus(0);
         return expenseAccountMapper.updateByPrimaryKeySelective(in);
     }
 
@@ -624,7 +618,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         return str.substring(0,str.length()-1);
     }
 
-    private void addNoticeAndEmail(InputExpenseAccount in, Integer status, String str,String aname, List<Admin> aids) {
+    private void addNoticeAndEmail(ExpenseAccount in, Integer status, String str,String aname, List<Admin> aids) {
         Date date= new Date();
 
         Integer noticeStatus=NoticeStatus.EXPENSE_NOTICE.getCode();
@@ -754,8 +748,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             if (in.getApplyDep()!=null)update.setApplyDep(in.getApplyDep());
             if (in.getRemarks()!=null)update.setRemarks(in.getRemarks());
             if (in.getEaaid()!=null)update.setEaaid(in.getEaaid());
-            update.setProcessStatus(1);
             addExpenseAccountExamine(in.getId(),update);
+            update.setProcessStatus(1);
+            if (outExpenseAccount.getStatus()==0){
+                outExpenseAccount.setProcessStatus(1);
+                addExpenseAccountLogAndNoticEmail(outExpenseAccount,0,"发起报销审核");
+            }else if (outExpenseAccount.getStatus()==3){
+                addExpenseAccountLogAndNoticEmail(outExpenseAccount,4,"修改并发起审核");
+            }
         }else if (in.getStatus()==4){
             expenseAccountMapper.updateByMainId(in.getId(),0);
         }