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

报销编号查询为空时,新增异常处理

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

+ 1 - 0
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -143,6 +143,7 @@ public interface AdminMapper {
     Admin selectFinanceAdminByOrderDep(String orderDep);
 
     Admin selectFinanceAdminByAid(String aid);
+    Admin selectExpenseFinanceByAid(String aid);
 
     String getPermission(String transferId);
 

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

@@ -1441,5 +1441,11 @@
       and  c.finance_id = #{aid}
       and a.start_time  between #{startTime} and #{endTime}
   </select>
+  <select id="selectExpenseFinanceByAid" resultType="com.goafanti.common.model.Admin">
+    select c.id,c.name,c.open_id openId,c.email
+    from admin  a left join department b on a.department_id=b.id
+                  left join admin c on b.finance_id=c.id
+    where a.id= #{aid}
+  </select>
 
 </mapper>

Разница между файлами не показана из-за своего большого размера
+ 616 - 610
src/main/java/com/goafanti/common/mapper/DepartmentMapper.xml


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

@@ -886,18 +886,18 @@
         and b.process_status &gt; eae.type
       </if>
     </if>
-    <if test="roleType == 2">
+    <if test="roleType == 3">
       <if test="listStatus ==0">
-        and b.process_status =2
+        and b.process_status =3
       </if>
       <if test="listStatus ==1">
-        and b.process_status &gt; 2
+        and b.process_status &gt; 3
       </if>
       and adDep.finance_id = #{aid}
     </if>
-    <if test="roleType == 4">
+    <if test="roleType == 5">
       <if test="listStatus ==0">
-        and b.process_status =4 and b.status=1
+        and b.process_status =5 and b.status=1
       </if>
       <if test="listStatus ==1">
         and b.process_status =5 and b.status=2

+ 31 - 21
src/main/java/com/goafanti/common/model/Department.java

@@ -6,7 +6,7 @@ import java.util.Date;
 
 /**
  * department
- * @author
+ * @author 
  */
 public class Department implements Serializable {
     /**
@@ -118,32 +118,23 @@ public class Department implements Serializable {
      * 复审财务id
      */
     private String retrialFinanceId;
+
     /**
      * 特批审核状态 0=无需特批,1=需要特批
      */
     private Integer approval;
+
     /**
      * 特批审核人
      */
     private String approvalAid;
 
-    private static final long serialVersionUID = 1L;
-
-    public Integer getApproval() {
-        return approval;
-    }
-
-    public void setApproval(Integer approval) {
-        this.approval = approval;
-    }
-
-    public String getApprovalAid() {
-        return approvalAid;
-    }
+    /**
+     * 报销财务审核人
+     */
+    private String expenseFinanceId;
 
-    public void setApprovalAid(String approvalAid) {
-        this.approvalAid = approvalAid;
-    }
+    private static final long serialVersionUID = 1L;
 
     public String getId() {
         return id;
@@ -321,8 +312,27 @@ public class Department implements Serializable {
         this.retrialFinanceId = retrialFinanceId;
     }
 
-    public Department() {}
-    public Department(String id) {
-        this.id = id;
+    public Integer getApproval() {
+        return approval;
+    }
+
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
+
+    public String getApprovalAid() {
+        return approvalAid;
+    }
+
+    public void setApprovalAid(String approvalAid) {
+        this.approvalAid = approvalAid;
+    }
+
+    public String getExpenseFinanceId() {
+        return expenseFinanceId;
+    }
+
+    public void setExpenseFinanceId(String expenseFinanceId) {
+        this.expenseFinanceId = expenseFinanceId;
     }
-}
+}

+ 9 - 2
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -148,8 +148,15 @@ public class AsyncUtils {
 
 	public void send(EmailBo bo){
 		try {
-			SendEmailUtil.getInstance().send(bo);
-			LoggerUtils.debug(getClass(),String.format("=============发送邮件==>%s===>%s",bo.getSubject(),bo.getAddress()));
+
+			if (bo.getAddress()==null){
+				LoggerUtils.debug(getClass(),String.format("====================" +
+						"邮件发送失败,发送地址={%s}",bo.getAddress()));
+			}else {
+				SendEmailUtil.getInstance().send(bo);
+				LoggerUtils.debug(getClass(),String.format("====================" +
+						"邮件发送成功,地址={%s},类型={%s}",bo.getAddress(),bo.getSubject()));
+			}
 		} catch (UnsupportedEncodingException | MessagingException e) {
 			LoggerUtils.error(getClass(),"邮件发送错误");
 		}

+ 9 - 5
src/main/java/com/goafanti/expenseAccount/Enums/EAProcessStatus.java

@@ -5,13 +5,17 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum EAProcessStatus {
-
+//流程状态 0=成员发起,1=上级审核,2=部门负责人审核,3=财务审核,4=财务复审,5=董事长,6=财务管理员,7=公司副总,8=出纳
     FQ(0,"发起"),
     SJSH(1,"上级审核"),
-    CWSH(2,"财务审核"),
-    ZJLSH(3,"总经理审核"),
-    DSZSH(4,"董事长审核"),
-    WCSH(5,"完成审核"),
+    BMFZRSH(2,"部门负责人审核"),
+    CWSH(3,"财务审核"),
+    CWFS(4,"财务复审"),
+    DSZSH(5,"董事长"),
+    CWGGLYSH(6,"财务管理员"),
+    GSFSSH(7,"公司副总"),
+    CNSH(8,"出纳"),
+    BXWC(9,"报销完成"),
     NOT(99,"未知");
 
     private Integer code;

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

@@ -24,6 +24,7 @@ import com.goafanti.expenseAccount.Enums.EATypes;
 import com.goafanti.expenseAccount.Enums.EAsecondaryTypes;
 import com.goafanti.expenseAccount.bo.*;
 import com.goafanti.expenseAccount.service.ExpenseAccountService;
+import com.goafanti.organization.bo.OrganizationListOut;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -62,6 +63,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     private ExpenseRelationshipMapper expenseRelationshipMapper;
     @Autowired
     private DepartmentService departmentService;
+    @Autowired
+    private DepartmentMapper departmentMapper;
 
 
 
@@ -102,12 +105,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     private void addExpenseAccountExamine(Integer id,ExpenseAccount ea) {
         List<ExpenseAccountExamine> list=new ArrayList<>();
         String aid = TokenManager.getAdminId();
-        Admin admin = adminMapper.selectByPrimaryKey(aid);
-        for (int i=1;i<5;i++){
+        OrganizationListOut dep = departmentMapper.selectAllById(ea.getApplyDep());
+        AdminNoticeBo a = adminMapper.selectMyAndSuperBySuperId(aid);
+        //暂时只发起到财务
+        for (int i=1;i<4;i++){
+                ExpenseAccountExamine eae=new ExpenseAccountExamine(id,i);
             if (i==1){
                 //新增一级
-                ExpenseAccountExamine eae=new ExpenseAccountExamine(id,i);
-                AdminNoticeBo a = adminMapper.selectMyAndSuperBySuperId(aid);
                 String examineId=null;
                 String examineName=null;
                 //正常用上级,没有的情况下就是自己
@@ -121,42 +125,20 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 eae.setAuditor(examineId);
                 eae.setAuditorname(examineName);
                 ea.setExamineName(examineName);
-                if (eae.getAuditor().equals(aid))eae.setStatus(1);
-                else  eae.setStatus(0);
-                list.add(eae);
             }else if (i==2){
-                ExpenseAccountExamine eae=new ExpenseAccountExamine(id,i);
-                Admin admin2 = adminMapper.selectFinanceAdminByAid(aid);
-                if (admin2==null){
-                    throw new BusinessException("发起人部门财务专员不存在。");
-                }
-                eae.setAuditor(admin2.getId());
-                eae.setAuditorname(admin2.getName());
-                if (eae.getAuditor().equals(aid))eae.setStatus(1);
-                else  eae.setStatus(0);
-                list.add(eae);
+                if (dep.getManagerId()==null)throw new BusinessException("报销申请部门管理员不存在。");
+                    eae.setAuditor(dep.getManagerId());
+                    eae.setAuditorname(dep.getManagerName());
             }else if (i==3){
-                List<Admin> admins = adminMapper.listAdminBydepIdAndRoleType(admin.getDepartmentId(), AFTConstants.SALESMAN_ADMIN);
-                if (admins.isEmpty())throw new BusinessException("发起人部门营销管理员不存在。");
-                for (Admin e : admins) {
-                    ExpenseAccountExamine eae=new ExpenseAccountExamine(id,i);
-                    eae.setAuditor(e.getId());
-                    eae.setAuditorname(e.getName());
-                    if (eae.getAuditor().equals(aid))eae.setStatus(1);
-                    else  eae.setStatus(0);
-                    list.add(eae);
-                }
+                if (dep.getExpenseFinanceName()==null)throw new BusinessException("报销部门财务审核人不存在。");
+                eae.setAuditor(dep.getExpenseFinanceId());
+                eae.setAuditorname(dep.getExpenseFinanceName());
             }else if (i==4){
-                List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.APPROVAL_DECISION);
-                for (Admin e : admins) {
-                    ExpenseAccountExamine eae=new ExpenseAccountExamine(id,i);
-                    eae.setAuditor(e.getId());
-                    eae.setAuditorname(e.getName());
-                    if (eae.getAuditor().equals(aid))eae.setStatus(1);
-                    else  eae.setStatus(0);
-                    list.add(eae);
-                }
+
             }
+            if (eae.getAuditor().equals(aid))eae.setStatus(1);
+            else  eae.setStatus(0);
+            list.add(eae);
 
         }
         expenseAccountExamineMapper.insertBatch(list);
@@ -215,30 +197,17 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     private void createExamineByProcess(ExpenseAccount in) {
         //审核流程推送到最新
         AdminListBo admin = adminMapper.getDeptNameByAid(in.getAid());
-        examineByprocess(in,admin);
+        List<ExpenseAccountExamine> list=examineByprocess(in,admin);
         List<Admin> aids=new ArrayList<>();
-        if(in.getProcessStatus()== EAProcessStatus.SJSH.getCode()){
-            //获取上级
-            Admin superAdmin = adminMapper.selectByPrimaryKey(admin.getSuperiorId());
-            aids.add(superAdmin);
-            in.setExamineName(superAdmin.getName());
-        }else if (in.getProcessStatus()== EAProcessStatus.CWSH.getCode()){
-            //获取财务负责人
-            Admin finaceAdmin = adminMapper.selectByPrimaryKey(admin.getDepFinance());
-            aids.add(finaceAdmin);
-            in.setExamineName(finaceAdmin.getName());
-            addFinanceCount( admin.getDepFinance(), new Date());
-        }else if (in.getProcessStatus()== EAProcessStatus.ZJLSH.getCode()){
-            //获取部门负责人
-            List<Admin> list = adminMapper.listAdminBydepIdAndRoleType(admin.getDepartmentId(), AFTConstants.SALESMAN_ADMIN);
-            if (!list.isEmpty())aids.addAll(list);
-            in.setExamineName(getAdmins(list));
-        }else if (in.getProcessStatus()== EAProcessStatus.DSZSH.getCode()){
-            //获取总裁、董事长等审核
-            List<Admin> list = adminMapper.selectAdminByRoleType(AFTConstants.All_CED_AND_CHAIRMAN);
-            if (!list.isEmpty())aids.addAll(list);
-            in.setExamineName(getAdmins(list));
+        StringBuffer aname =new StringBuffer();
+        for (ExpenseAccountExamine e : list) {
+            if (e.getProcessStatus()==in.getProcessStatus()&&e.getStatus()==0){
+                Admin ad = adminMapper.selectByPrimaryKey(e.getAuditor());
+                aids.add(ad);
+                aname=aname.append(ad.getName()).append(",");
+            }
         }
+        in.setExamineName(aname.substring(0,aname.length()-1));
         StringBuffer str=new StringBuffer().append("编号[").append(in.getCheckNo()).append("]需要审核").append(",请查看并审核。");
         addNoticeAndEmail(in,  EAProcessStatus.SJSH.getCode(),str.toString(), admin.getName(),aids);
     }
@@ -391,6 +360,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         ExpenseAccount newEa=new ExpenseAccount();
         newEa.setId(useEa.getId());
         in.setCheckNo(useEa.getCheckNo());
+        in.setProcessStatus(useEa.getProcessStatus());
         //审核通知 获取发送人
         AdminListBo admin = adminMapper.getDeptNameByAid(useEa.getAid());
         addExamineExpenseAccountLog(admin,in, useEa, newEa);
@@ -427,7 +397,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 expenseAccountMapper.updateByPrimaryKeySelective(updateSon);
             }
         }else if (newEa.getStatus()==1){
-            if (newEa.getProcessStatus()==EAProcessStatus.CWSH.getCode()){
+            if (newEa.getProcessStatus()==EAProcessStatus.BMFZRSH.getCode()){
                 pushFinanceCount(admin.getDepFinance(),useEa.getCreateTime(),0);
                 //处理金额修改
                 if(in.getRealList()!=null){
@@ -450,13 +420,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                         }
                     }
                 }
-            }else if (newEa.getProcessStatus()==EAProcessStatus.ZJLSH.getCode()){
+            }else if (newEa.getProcessStatus()==EAProcessStatus.CWSH.getCode()){
                 pushFinanceCount(admin.getDepFinance(),useEa.getCreateTime(),1);
             }
         }else if (newEa.getStatus()==3){
-            if (useEa.getProcessStatus()==EAProcessStatus.CWSH.getCode()){
+            if (useEa.getProcessStatus()==EAProcessStatus.BMFZRSH.getCode()){
                 pushFinanceCount(admin.getDepFinance(),useEa.getCreateTime(),2);
-            }else if (newEa.getProcessStatus()>EAProcessStatus.ZJLSH.getCode()){
+            }else if (newEa.getProcessStatus()>EAProcessStatus.CWSH.getCode()){
                 pushFinanceCount(admin.getDepFinance(),useEa.getCreateTime(),3);
             }
         }
@@ -508,41 +478,32 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             newEa.setProcessStatus(useEa.getProcessStatus()+1);
             newEa.setAid(useEa.getAid());
             newEa.setCreateTime(useEa.getCreateTime());
-            pushExamineProcess(newEa,admin);
-            if (newEa.getProcessStatus()== EAProcessStatus.CWSH.getCode()){
-                //获取财务负责人
-                Admin finaceAdmin = adminMapper.selectByPrimaryKey(admin.getDepFinance());
-                aids.add(finaceAdmin);
-                newEa.setExamineName(finaceAdmin.getName());
-            }else if (newEa.getProcessStatus()== EAProcessStatus.ZJLSH.getCode()){
-                //获取部门负责人
-                List<Admin> list = adminMapper.listAdminBydepIdAndRoleType(admin.getDepartmentId(), AFTConstants.SALESMAN_ADMIN);
-                if (!list.isEmpty())aids.addAll(list);
-                newEa.setExamineName(getAdmins(list));
-            }else if (newEa.getProcessStatus()== EAProcessStatus.DSZSH.getCode()){
-                //获取总裁、董事长等审核
-                List<Admin> list = adminMapper.selectAdminByRoleType(AFTConstants.APPROVAL_DECISION);
-                if (!list.isEmpty())aids.addAll(list);
-                newEa.setExamineName(getAdmins(list));
-            }else if (newEa.getProcessStatus()== EAProcessStatus.WCSH.getCode()){
-                //获取报销申请人
-                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("");
-
+            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(",");
+                }
             }
+            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);
@@ -591,7 +552,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 
     private void pushExamineProcess( ExpenseAccount newEa,AdminListBo admin) {
         //如果到了董事长审核,无需判断了
-        if (newEa.getProcessStatus()<EAProcessStatus.WCSH.getCode()){
+        if (newEa.getProcessStatus()<EAProcessStatus.CWSH.getCode()){
             //判断没一个流程是否可以跳过
              examineByprocess(newEa,admin);
         }
@@ -601,7 +562,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
      * 审核流程推送,只要不是完成状态就继续判断是否跳过
      * @param newEa
      */
-    private void examineByprocess( ExpenseAccount newEa,AdminListBo admin) {
+    private List<ExpenseAccountExamine> examineByprocess( ExpenseAccount newEa,AdminListBo admin) {
         //获取当前流程审核人,如果有已审核则跳过当前审核
         List<ExpenseAccountExamine> list = expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), newEa.getProcessStatus());
         boolean flag=false;
@@ -623,13 +584,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             Date date=new Date();
             date.setTime(date.getTime()+1000l);
             addExpenseAccountLog(newEa.getId(),1,newEa.getProcessStatus(),aid,str,date);
-            if (newEa.getProcessStatus()==EAProcessStatus.CWSH.getCode()){
+            if (newEa.getProcessStatus()==EAProcessStatus.BMFZRSH.getCode()){
                 addFinanceCount(admin.getDepFinance(),newEa.getCreateTime());
             }
             newEa.setProcessStatus(newEa.getProcessStatus()+1);
-            if (newEa.getProcessStatus()<EAProcessStatus.WCSH.getCode())examineByprocess(newEa,admin);
+            if (newEa.getProcessStatus()<EAProcessStatus.CWSH.getCode())examineByprocess(newEa,admin);
         }
-
+        return list;
     }
 
     private String getAdmins(List<Admin> list) {
@@ -831,17 +792,17 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         //1-3s是不同人的审核
         if (in.getProcessStatus()!=null&&in.getProcessStatus()==1){
              if (TokenManager.hasRole(AFTConstants.FINANCE)){
-                in.setProcessStatus(2);
+                in.setProcessStatus(3);
             }else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)||TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
                 in.setProcessStatus(1);
             }else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)){
                 in.setProcessStatus(4);
             }else if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
                 //财务经理查看权限
-                in.setProcessStatus(5);
+                in.setProcessStatus(6);
             }else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.SUPERADMIN)){
                 //财务管理员和超级管理员查看全部
-                in.setProcessStatus(6);
+                in.setProcessStatus(5);
             }
         }else {
                 in.setProcessStatus(0);

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

@@ -42,6 +42,9 @@ public class OrganizationListOut {
 
 	private String retrialFinanceId;
 	private String retrialFinanceName;
+
+	private String expenseFinanceId;
+	private String expenseFinanceName;
 	private Integer approval;
 	private String approvalAid;
 	private String approvalName;
@@ -52,6 +55,22 @@ public class OrganizationListOut {
 	private Integer lvl;
 	private List<OrganizationListOut> list;
 
+	public String getExpenseFinanceId() {
+		return expenseFinanceId;
+	}
+
+	public void setExpenseFinanceId(String expenseFinanceId) {
+		this.expenseFinanceId = expenseFinanceId;
+	}
+
+	public String getExpenseFinanceName() {
+		return expenseFinanceName;
+	}
+
+	public void setExpenseFinanceName(String expenseFinanceName) {
+		this.expenseFinanceName = expenseFinanceName;
+	}
+
 	public String getApprovalName() {
 		return approvalName;
 	}

+ 3 - 2
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -95,7 +95,8 @@ public class AdminOrganizationController extends BaseApiController{
 	@RequestMapping(value = "/updateOrganization" , method = RequestMethod.POST)
 	public Result updateOrganization(String name, String type, String managerId, String superId, String status,Integer province,String retrialFinanceId,
 									 String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,
-									 Integer hideSign,String depNo,Integer approval,String approvalAid){
+									 Integer hideSign,String depNo,Integer approval,String approvalAid,
+									 String expenseFinanceId){
 		Result res = new Result();
 		if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
 				|| StringUtils.isBlank(managerId)|| StringUtils.isBlank(superId)
@@ -116,7 +117,7 @@ public class AdminOrganizationController extends BaseApiController{
 			return res;
 		}
 		int i=organizationService.updateOrganization(name, type, managerId, superId, status, province,
-				retrialFinanceId,remarks,id, abbreviation,financeId,workingHoursType,hideSign,depNo, approval, approvalAid);
+				retrialFinanceId,remarks,id, abbreviation,financeId,workingHoursType,hideSign,depNo, approval, approvalAid,expenseFinanceId);
 		return res.data(i);
 	}
 

+ 1 - 1
src/main/java/com/goafanti/organization/service/OrganizationService.java

@@ -45,7 +45,7 @@ public interface OrganizationService {
 
 	int updateOrganization(String name,String type,String managerId,String superId,String status,Integer province,String retrialFinanceId,
 			String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign,String depNo,
-						   Integer approval,String approvalAid);
+						   Integer approval,String approvalAid,String expenseFinanceId);
 
 	boolean checkDepNo(String depNo,Integer type);
 

+ 6 - 3
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -1,7 +1,10 @@
 package com.goafanti.organization.service.impl;
 
 import com.goafanti.admin.bo.AdminListBo;
-import com.goafanti.common.dao.*;
+import com.goafanti.common.dao.DepartmentMapper;
+import com.goafanti.common.dao.FinanceCountMapper;
+import com.goafanti.common.dao.TOrderMidMapper;
+import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.model.Department;
 import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.StringUtils;
@@ -15,7 +18,6 @@ import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
 import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -193,7 +195,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 	@Override
 	public int updateOrganization(String name, String type, String managerId, String superId, String status,Integer province,String retrialFinanceId,
 			String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign,String depNo,
-								  Integer approval,String approvalAid) {
+								  Integer approval,String approvalAid,String expenseFinanceId) {
 		//获取上级编号
 		Department superDep=departmentMapper.selectByPrimaryKey(superId);
 		Date now=new Date();
@@ -216,6 +218,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 		dep.setWorkingHoursType(workingHoursType);
 		dep.setApproval(approval);
 		dep.setApprovalAid(approvalAid);
+		dep.setExpenseFinanceId(expenseFinanceId);
 		checkFinaceUpdate(id,financeId);
 		int x=departmentMapper.updateByPrimaryKeySelective(dep);
 		return x;