Browse Source

Merge branch 'test' of jishutao/kede-server into prod

anderx 1 year ago
parent
commit
38a73f3479

+ 1 - 1
src/main/java/com/goafanti/admin/service/DepartmentService.java

@@ -28,7 +28,7 @@ public interface DepartmentService {
 
 
 
-
+	List<String> selectMyDeps(String depId);
 
 	/**
 	 * 查出部门,及下级部门

+ 17 - 0
src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java

@@ -82,6 +82,23 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 	public List<String> selectMyDeps() {
 		return selectCurrentDep(TokenManager.getAdminId());
 	}
+
+	@Override
+	public List<String> selectMyDeps(String depId) {
+		List<String>ls= new ArrayList<>();
+		ls.add(depId);
+		List<String> myAll=new ArrayList<>();
+		List<String> my=selectMyDeps();
+		if (ls!=null&&!my.isEmpty()){
+			for (String dep : ls) {
+				for (String dep2 : my) {
+					if (dep.equals(dep2))myAll.add(dep);
+				}
+			}
+		}
+		return myAll;
+	}
+
 	private List<String> selectCurrentDep(String managerId){
 		List<String> alldep = new ArrayList<>();
 		List<String> superData = departmentMapper.selectCurrentDeps(managerId);

+ 9 - 0
src/main/java/com/goafanti/common/bo/AdminNoticeBo.java

@@ -11,6 +11,15 @@ public class AdminNoticeBo {
     private String superEmail;
     private String superOpenId;
     private String superExpenseOpenId;
+    private Integer expenseSuperExamine;
+
+    public Integer getExpenseSuperExamine() {
+        return expenseSuperExamine;
+    }
+
+    public void setExpenseSuperExamine(Integer expenseSuperExamine) {
+        this.expenseSuperExamine = expenseSuperExamine;
+    }
 
     public String getId() {
         return id;

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

@@ -1168,7 +1168,7 @@
 
   <select id="selectMyAndSuperBySuperId" parameterType="java.lang.String" resultType="com.goafanti.common.bo.AdminNoticeBo">
     select
-      a.id,a.name,a.email,a.open_id openId,a.expense_open_id expenseOpenId,
+      a.id,a.name,a.email,a.open_id openId,a.expense_open_id expenseOpenId,a.expense_super_examine expenseSuperExamine,
       b.id superId,b.name superName,b.email superEmail,b.open_id superOpenId,b.expense_open_id superExpenseOpenId
     from admin a left join admin b on a.superior_id=b.id
     where  a.id=#{id}

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

@@ -952,6 +952,12 @@
     <if test=" status != null">
       and mea.status = #{status}
     </if>
+    <if test=" current != null">
+      and a.aid= #{current}
+    </if>
+    <if test=" aid != null">
+      and a.aid= #{aid}
+    </if>
     <if test="deps !=null">
       and ad.department_id  in
       <foreach collection="deps" item="dep" open="(" close=")" separator=",">

+ 5 - 5
src/main/java/com/goafanti/expenseAccount/bo/InputDetailsListBo.java

@@ -27,7 +27,7 @@ public class InputDetailsListBo {
     /**
      * 申请人
      */
-    private String aname;
+    private String aid;
     /**
      * 申请部门
      */
@@ -105,12 +105,12 @@ public class InputDetailsListBo {
         this.buyerName = buyerName;
     }
 
-    public String getAname() {
-        return aname;
+    public String getAid() {
+        return aid;
     }
 
-    public void setAname(String aname) {
-        this.aname = aname;
+    public void setAid(String aid) {
+        this.aid = aid;
     }
 
     public String getApplyDep() {

+ 2 - 2
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -431,13 +431,13 @@ public class ExpenseAccountController extends CertifyApiController {
      * @return
      */
     @RequestMapping(value = "/updateTypeOther",method = RequestMethod.POST)
-    public Result updateTypeOther(Integer id ,String typeOther,String remarks){
+    public Result updateTypeOther(Integer id ,String typeOther,String remarks,String orderNo){
         Result res =new Result();
         if (id==null){
             res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"编号"));
             return  res;
         }
-        return res.data(expenseAccountService.updateTypeOther(   id, typeOther,remarks));
+        return res.data(expenseAccountService.updateTypeOther(   id, typeOther,remarks,orderNo));
     }
 
     /**

+ 1 - 1
src/main/java/com/goafanti/expenseAccount/service/ExpenseAccountService.java

@@ -71,5 +71,5 @@ public interface ExpenseAccountService {
 
     Object getDepDetails(Integer id);
 
-    Object updateTypeOther(Integer id, String typeOther,String remarks);
+    Object updateTypeOther(Integer id, String typeOther,String remarks,String orderNo);
 }

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

@@ -116,20 +116,22 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         for (int i=1;i<4;i++){
                 ExpenseAccountExamine eae=new ExpenseAccountExamine(id,i);
             if (i==1){
-                //新增一级
-                String examineId=null;
-                String examineName=null;
-                //正常用上级,没有的情况下就是自己
-                if (a.getSuperId()!=null){
-                    examineId=a.getSuperId();
-                    examineName=a.getSuperName();
-                }else {
-                    examineId=a.getId();
-                    examineName=a.getName();
+                if (a.getExpenseSuperExamine()==1){
+                    //新增一级
+                    String examineId=null;
+                    String examineName=null;
+                    //正常用上级,没有的情况下就是自己
+                    if (a.getSuperId()!=null){
+                        examineId=a.getSuperId();
+                        examineName=a.getSuperName();
+                    }else {
+                        examineId=a.getId();
+                        examineName=a.getName();
+                    }
+                    eae.setAuditor(examineId);
+                    eae.setAuditorname(examineName);
+                    ea.setExamineName(examineName);
                 }
-                eae.setAuditor(examineId);
-                eae.setAuditorname(examineName);
-                ea.setExamineName(examineName);
             }else if (i==2){
                 if (StringUtils.isBlank(dep.getManagerName())){
                     throw new BusinessException("报销申请部门[管理员]不存在。");
@@ -200,7 +202,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             in.setProcessStatus(in.getProcessStatus()+1);
         }else {
             if (admin.getSuperiorId()==null||admin.getId().equals(admin.getSuperiorId())){
-                String str2=String.format("重复审核人跳过[%s]。",EAProcessStatus.getDesc(in.getProcessStatus()));
+
+                String str2=String.format("%s跳过[%s]。",admin.getSuperiorId()==null?"发起人无上级":"发起人与上级同人",EAProcessStatus.getDesc(in.getProcessStatus()));
                 Date date=new Date();
                 date.setTime(date.getTime()+1000L);
                 addExpenseAccountLog(in.getId(),1,in.getProcessStatus(),aid,str2,date,2);
@@ -376,11 +379,12 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     }
 
     @Override
-    public Object updateTypeOther(Integer id, String typeOther,String remarks) {
+    public Object updateTypeOther(Integer id, String typeOther,String remarks,String orderNo) {
         ExpenseAccount ea = new ExpenseAccount();
         ea.setId(id);
         if (StringUtils.isNotEmpty(typeOther))ea.setTypeOther(typeOther);
         if (StringUtils.isNotEmpty(remarks))ea.setRemarks(remarks);
+        if (StringUtils.isNotEmpty(orderNo))ea.setOrderNo(orderNo);
         expenseAccountMapper.updateByPrimaryKeySelective(ea);
         if (StringUtils.isNotEmpty(typeOther)){
             MainExpenseAccount mainExpenseAccount = expenseAccountMapper.selectbySonId(id);
@@ -726,6 +730,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             }else {
                 addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
                 newEa.setStatus(1);
+                //小于为固定单审核,大于可能被配置多人审核
                 if (useEa.getProcessStatus()<EAProcessStatus.CWFS.getCode()){
                     newEa.setProcessStatus(useEa.getProcessStatus()+1);
                 }else {
@@ -1270,10 +1275,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         Map<String,Object> params = new HashMap<>();
         if(in.getStatus()!=null)params.put("status",in.getStatus());
         if(in.getType()!=null)params.put("type",in.getType());
-        if (in.getDepId()!=null)params.put("depId",in.getDepId());
+        if (in.getDepId()!=null){
+            ArrayList<Object> deps = new ArrayList<>();
+            deps.add(in.getDepId());
+            params.put("deps",deps);
+        }
         if (in.getContractNo()!=null)params.put("contractNo",in.getContractNo());
         if (in.getBuyerName()!=null)params.put("buyerName",in.getBuyerName());
-        if (in.getAname()!=null)params.put("aname",in.getAname());
+        if (in.getAid()!=null)params.put("aid",in.getAid());
         if (in.getApplyDep()!=null)params.put("applyDep",in.getApplyDep());
         if (in.getPayDep() != null)params.put("payDep",in.getPayDep());
         if (in.getStartTime()!=null)params.put("startTime",in.getStartTime());
@@ -1284,10 +1293,10 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             params.put("roleType",3);
         }else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
             params.put("roleType",2);
-            params.put("aid",TokenManager.getAdminId());
+            params.put("current",TokenManager.getAdminId());
         }else if (TokenManager.hasRole(AFTConstants.FINANCE)){
             params.put("roleType",1);
-            params.put("aid",TokenManager.getAdminId());
+            params.put("current",TokenManager.getAdminId());
         }else{
             params.put("roleType",0);
         }