Bladeren bron

报销明细报销人,报销人部门搜索无效修改

anderx 1 jaar geleden
bovenliggende
commit
2a554c4491

+ 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);

+ 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() {

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

@@ -1273,10 +1273,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());
@@ -1287,10 +1291,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);
         }