调整

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/AbstractIawManager.java

@@ -17,6 +17,7 @@ import cn.com.taiji.core.model.comm.protocol.ats.ocr.*;
 import cn.com.taiji.core.repo.jpa.comm.OcrResultRepo;
 import cn.com.taiji.core.repo.jpa.log.OperateLogRepo;
 import cn.com.taiji.core.repo.jpa.user.AccountInfoRepo;
+import cn.com.taiji.iaw.model.MyFinals;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -36,6 +37,13 @@ public abstract class AbstractIawManager extends AbstractCommManager {
     @Autowired
     protected MinioUtil minioUtil;
 
+    protected Boolean isManager(String identityType, String agencyId) throws ManagerException {
+        if ("MANAGER".equals(identityType) || MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
+            return true;
+        }
+        return false;
+    }
+
     /**
      * type:1-身份证-人像面 2-身份证-国徽面 3-行驶证前页 4-行驶证背页 5-营业执照
      * imagePath:图片地址

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/AbstractInvwManager.java

@@ -1,5 +1,6 @@
 package cn.com.taiji.invw.manager;
 
+import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.pub.IPTools;
 import cn.com.taiji.common.pub.TimeTools;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
@@ -8,6 +9,7 @@ import cn.com.taiji.core.entity.log.OperateLog;
 import cn.com.taiji.core.entity.user.AccountInfo;
 import cn.com.taiji.core.repo.jpa.log.OperateLogRepo;
 import cn.com.taiji.core.repo.jpa.user.AccountInfoRepo;
+import cn.com.taiji.invw.model.MyFinals;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -29,6 +31,13 @@ public abstract class AbstractInvwManager extends AbstractCommManager{
     @Autowired
     private AccountInfoRepo accountInfoRepo;
 
+    protected Boolean isManager(String identityType, String agencyId) throws ManagerException {
+        if ("MANAGER".equals(identityType) || MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
+            return true;
+        }
+        return false;
+    }
+
     //    操作日志记录
     protected void persistOperateLog(OperateType operateType, String operatorDataId, SourceType source,
                                   String openId, String msg) {

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/card/InvwCardDetailsManager.java

@@ -15,7 +15,7 @@ import cn.com.taiji.invw.dto.comm.CommExcelFileResponseDTO;
  */
 public interface InvwCardDetailsManager {
 
-    Pagination page(InvwCardDetailsPageRequestDTO dto) throws ServiceHandleException;
+    Pagination page(InvwCardDetailsPageRequestDTO dto) throws ManagerException;
 
     InvwCardDetailsRemoveResponseDTO remove(InvwCardDetailsRemoveRequestDTO dto) throws ManagerException;
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/card/InvwCardDetailsManagerImpl.java

@@ -61,12 +61,12 @@ public class InvwCardDetailsManagerImpl extends AbstractInvwManager implements I
 
 
     @Override
-    public Pagination page(InvwCardDetailsPageRequestDTO dto) throws ServiceHandleException {
+    public Pagination page(InvwCardDetailsPageRequestDTO dto) throws ManagerException {
         InvwCardDetailsPageRequest pageRequest = copyProperties(dto, new InvwCardDetailsPageRequest());
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(staff.getAgencyId())){
+            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/AbstractManagewManager.java

@@ -8,9 +8,12 @@ import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.entity.issue.IssueOrderinfo;
 import cn.com.taiji.core.entity.log.OperateLog;
 import cn.com.taiji.core.entity.user.AccountInfo;
+import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.repo.jpa.issue.IssueOrderinfoRepo;
 import cn.com.taiji.core.repo.jpa.log.OperateLogRepo;
 import cn.com.taiji.core.repo.jpa.user.AccountInfoRepo;
+import cn.com.taiji.core.repo.jpa.user.StaffRepo;
+import cn.com.taiji.managew.model.MyFinals;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -32,6 +35,13 @@ public abstract class AbstractManagewManager extends AbstractCommManager {
     @Autowired
     protected IssueOrderinfoRepo issueOrderinfoRepo;
 
+    protected Boolean isManager(String identityType, String agencyId) throws ManagerException {
+        if ("MANAGER".equals(identityType) || MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
+            return true;
+        }
+        return false;
+    }
+
     //异步记录操作日志
     protected void sysPersistOperateLog(OperateType operateType, String operatorDataId, SourceType source,
                                         String openId, String msg) {

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssRefundProgressInfoManagerImpl.java

@@ -9,13 +9,11 @@ import cn.com.taiji.core.entity.dict.ass.CheckStatus;
 import cn.com.taiji.core.entity.dict.ass.RefundProgress;
 import cn.com.taiji.core.entity.dict.basic.CardType;
 import cn.com.taiji.core.entity.dict.log.OperateType;
-import cn.com.taiji.core.entity.dmq.EtcTransaction;
 import cn.com.taiji.core.entity.user.Staff;
-import cn.com.taiji.core.model.comm.protocol.ias.ygz.YgzRefundUploadRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.ygz.YgzRefundUploadResponse;
 import cn.com.taiji.core.repo.jpa.ass.AssRefundApplyInfoRepo;
 import cn.com.taiji.core.repo.jpa.ass.AssRefundProgressInfoRepo;
 import cn.com.taiji.core.repo.jpa.dmq.EtcTransactionRepo;
+import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.core.repo.request.ass.AssRefundProgressInfoPageRequest;
 import cn.com.taiji.managew.dto.ass.etcTransaction.*;
 import cn.com.taiji.managew.manager.AbstractManagewManager;
@@ -26,7 +24,6 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 
 /**
  * @Auther: humh
@@ -44,7 +41,8 @@ public class AssRefundProgressInfoManagerImpl extends AbstractManagewManager imp
     private AssRefundApplyInfoRepo refundApplyInfoRepo;
     @Autowired
     private EtcTransactionRepo etcTransactionRepo;
-
+    @Autowired
+    private StaffRepo staffRepo;
 
     @Override
     public Pagination page(AssRefundProgressInfoPageRequestDTO dto) {

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/DeviceResumeManagerImpl.java

@@ -32,7 +32,6 @@ import cn.com.taiji.core.repo.jpa.basic.QtkCustomerInfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkObuInfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkVehicleInfoRepo;
 import cn.com.taiji.core.repo.jpa.user.AccountInfoRepo;
-import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.managew.dto.ass.DeviceResumeAddRequestDTO;
 import cn.com.taiji.managew.dto.ass.DeviceResumeAddResponseDTO;
 import cn.com.taiji.managew.dto.ass.DeviceResumeViewRequestDTO;
@@ -45,8 +44,6 @@ public class DeviceResumeManagerImpl extends AbstractCommManager implements Devi
     @Autowired
     private QtkVehicleInfoRepo vehicleInfoRepo;
     @Autowired
-    private StaffRepo staffRepo;
-    @Autowired
     private QtkCustomerInfoRepo customerInfoRepo;
     @Autowired
     private QtkCardInfoRepo cardInfoRepo;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/ReleasePlateManagerImpl.java

@@ -1,14 +1,13 @@
 package cn.com.taiji.managew.manager.ass;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
 import cn.com.taiji.core.entity.ass.AssVehicleRelieve;
-import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.*;
+import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.managew.dto.ass.releasePlate.*;
 import cn.com.taiji.managew.manager.AbstractManagewManager;
 import cn.com.taiji.managew.model.ass.releasePlate.*;
@@ -26,6 +25,9 @@ public class ReleasePlateManagerImpl extends AbstractManagewManager implements R
 
     @Autowired
     protected MinioUtil minioUtil;
+    @Autowired
+    private StaffRepo staffRepo;
+
 
 
     @Override