Browse Source

完成财务审核完成报销版本

anderx 2 years ago
parent
commit
9bdcb1ad46

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

@@ -439,12 +439,12 @@
     select a.id, a.create_id as createId, a.create_time as createTime, a.update_time as updateTime,a.retrial_finance_id retrialFinanceId,
            d.name retrialFinanceName, a.deleted_sign as deletedSign, a.name, a.type, a.manager_id as managerId, a.dep_no as depNo,
            a.super_id as superId, a.remarks, a.status, a.abbreviation, a.finance_id financeId,a.hide_sign hideSign,
-           a.expense_finance_id expenseFinanceId,f.name expenseFinanceName,
-           a.province, c.name financeName, a.working_hours_type workingHoursType, b.name as managerName,
+           a.expense_finance_id expenseFinanceId,f.name expenseFinanceName,a.expense_retrial_finance_id expenseRetrialFinanceId,
+           g.name expenseRetrialFinanceName, a.province, c.name financeName, a.working_hours_type workingHoursType, b.name as managerName,
            a.retrial_finance_id retrialFinanceId, d.name retrialFinanceName,a.approval,a.approval_aid approvalAid,e.name approvalName
     from department a left join admin b on a.manager_id = b.id left join admin c on a.finance_id = c.id
                       left join admin d on a.retrial_finance_id=d.id left join admin e on a.approval_aid =e.id
-                      left join admin f on a.expense_finance_id=f.id
+                      left join admin f on a.expense_finance_id=f.id left join admin g on a.expense_retrial_finance_id=g.id
     where a.id=#{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteById" parameterType="java.lang.String">

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

@@ -134,7 +134,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 eae.setAuditor(dep.getExpenseFinanceId());
                 eae.setAuditorname(dep.getExpenseFinanceName());
             }else if (i==4){
-
+                eae.setAuditor(dep.getExpenseRetrialFinanceId());
+                eae.setAuditorname(dep.getExpenseRetrialFinanceName());
             }
             if (eae.getAuditor().equals(aid))eae.setStatus(1);
             else  eae.setStatus(0);
@@ -479,31 +480,37 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             newEa.setAid(useEa.getAid());
             newEa.setCreateTime(useEa.getCreateTime());
             List<ExpenseAccountExamine> list=examineByprocess(newEa,admin);
-            StringBuffer aname =new StringBuffer();
-            for (ExpenseAccountExamine e : list) {
-                if (e.getProcessStatus()==newEa.getProcessStatus()&&e.getStatus()==0){
-                    Admin ad=adminMapper.selectByPrimaryKey(e.getAuditor());
-                    aids.add(ad);
-                    aname=aname.append(ad.getName()).append(",");
+            if(newEa.getProcessStatus()==4){
+                //完成后的流程
+                status =2;
+//                Admin finaceAdmin = adminMapper.selectByPrimaryKey(admin.getDepFinance());
+//                //同事添加通知财务管理员与公司副总
+//                List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.FINANCE_ADMIN);
+//                aids.addAll(admins);
+//                List<Admin> viceCEO = adminMapper.selectAdminByRoleType(AFTConstants.VICE_CEO);
+//                aids.addAll(viceCEO);
+//                aids.add(finaceAdmin);
+//                str.setLength(0);
+//                str=str.append("报销编号[").append(in.getCheckNo()).append("]审核已通过,请注意查看。");
+//                addNoticeAndEmail(in,  status,str.toString(),admin.getName(),aids);
+//                aids.clear();
+                aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
+                newEa.setStatus(status);
+                newEa.setExamineName("");
+            }else {
+                StringBuffer aname =new StringBuffer();
+                for (ExpenseAccountExamine e : list) {
+                    if (e.getProcessStatus()==newEa.getProcessStatus()&&e.getStatus()==0){
+                        Admin ad=adminMapper.selectByPrimaryKey(e.getAuditor());
+                        aids.add(ad);
+                        aname=aname.append(ad.getName()).append(",");
+
+                    }
                 }
+                newEa.setExamineName(aname.substring(0,aname.length()-1));
             }
-            newEa.setExamineName(aname.substring(0,aname.length()-1));
-            //完成后的流程
-//            status =2;
-//            Admin finaceAdmin = adminMapper.selectByPrimaryKey(admin.getDepFinance());
-//            //同事添加通知财务管理员与公司副总
-//            List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.FINANCE_ADMIN);
-//            aids.addAll(admins);
-//            List<Admin> viceCEO = adminMapper.selectAdminByRoleType(AFTConstants.VICE_CEO);
-//            aids.addAll(viceCEO);
-//            aids.add(finaceAdmin);
-//            str.setLength(0);
-//            str=str.append("报销编号[").append(in.getCheckNo()).append("]审核已通过,请注意查看。");
-//            addNoticeAndEmail(in,  status,str.toString(),admin.getName(),aids);
-//            aids.clear();
-//            aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
-//            newEa.setStatus(status);
-//            newEa.setExamineName("");
+
+
         }else {
             aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
             newEa.setStatus(3);
@@ -665,11 +672,12 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 
     @Override
     public Object selectByCheckNo(String checkNo) {
+        checkNo=checkNo.trim();
         OutExpenseAccount useEa = expenseAccountMapper.selectByCheckNo(checkNo);
         if (useEa==null){
             throw  new BusinessException("报销编号不存在,请客对后再查询。");
         }
-        if (useEa.getProcessStatus()<3){
+        if (useEa.getProcessStatus()<3||useEa.getStatus()!=2){
             throw  new BusinessException("报销单财务未审核,不可以根据编号查看打印。");
         }
         return useEa;

+ 19 - 0
src/main/java/com/goafanti/organization/bo/OrganizationListOut.java

@@ -45,6 +45,8 @@ public class OrganizationListOut {
 
 	private String expenseFinanceId;
 	private String expenseFinanceName;
+	private String expenseRetrialFinanceId;
+	private String expenseRetrialFinanceName;
 	private Integer approval;
 	private String approvalAid;
 	private String approvalName;
@@ -55,6 +57,23 @@ public class OrganizationListOut {
 	private Integer lvl;
 	private List<OrganizationListOut> list;
 
+
+	public String getExpenseRetrialFinanceId() {
+		return expenseRetrialFinanceId;
+	}
+
+	public void setExpenseRetrialFinanceId(String expenseRetrialFinanceId) {
+		this.expenseRetrialFinanceId = expenseRetrialFinanceId;
+	}
+
+	public String getExpenseRetrialFinanceName() {
+		return expenseRetrialFinanceName;
+	}
+
+	public void setExpenseRetrialFinanceName(String expenseRetrialFinanceName) {
+		this.expenseRetrialFinanceName = expenseRetrialFinanceName;
+	}
+
 	public String getExpenseFinanceId() {
 		return expenseFinanceId;
 	}