卡签信息查询

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/basic/QtkCardInfoPageRequest.java

@@ -25,6 +25,9 @@ public class QtkCardInfoPageRequest extends JpaDateTimePageableDataRequest<QtkCa
 	private String vehicleId;
 	// 用户编号
 	private String customerId;
+	// 渠道编号
+	private String agencyId;
+
 	@Override
 	public HqlBuilder toSelectHql(){
 		HqlBuilder hql = new HqlBuilder("from "+ QtkCardInfo.class.getName() +" where 1=1 ");
@@ -32,6 +35,7 @@ public class QtkCardInfoPageRequest extends JpaDateTimePageableDataRequest<QtkCa
 		hql.append(" and customerId=:customerId", customerId);
 		hql.append(" and cardId=:cardId", cardId);
 		hql.append(" and cardStatus=:cardStatus", cardStatus);
+		hql.append(" and agencyId=:agencyId", agencyId);
 		return hql;
 	}
 

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/basic/QtkObuInfoPageRequest.java

@@ -32,6 +32,9 @@ public class QtkObuInfoPageRequest extends JpaDateTimePageableDataRequest<QtkObu
 	// 用户编号
 	private String customerId;
 
+	// 渠道编号
+	private String agencyId;
+
 	@Override
 	public HqlBuilder toSelectHql(){
 		HqlBuilder hql = new HqlBuilder("from "+ QtkObuInfo.class.getName() +" where 1=1 ");
@@ -39,6 +42,7 @@ public class QtkObuInfoPageRequest extends JpaDateTimePageableDataRequest<QtkObu
 		hql.append(" and customerId=:customerId", customerId);
 		hql.append(" and obuId=:obuId", obuId);
 		hql.append(" and obuStatus=:obuStatus", obuStatus);
+		hql.append(" and agencyId=:agencyId", agencyId);
 		return hql;
 	}
 

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

@@ -17,6 +17,7 @@ import cn.com.taiji.core.repo.request.basic.QtkObuInfoPageRequest;
 import cn.com.taiji.core.repo.request.basic.QtkVehicleInfoPageRequest;
 import cn.com.taiji.managew.dto.basic.basicInfo.*;
 import cn.com.taiji.managew.manager.AbstractCommManager;
+import cn.com.taiji.managew.manager.AbstractManagewManager;
 import cn.com.taiji.managew.model.basic.BasicInfoCardModel;
 import cn.com.taiji.managew.model.basic.BasicInfoCustomerModel;
 import cn.com.taiji.managew.model.basic.BasicInfoObuModel;
@@ -28,7 +29,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 @Service
-public class BasicInfoManagerImpl extends AbstractCommManager implements BasicInfoManager {
+public class BasicInfoManagerImpl extends AbstractManagewManager implements BasicInfoManager {
 
     @Autowired
     private QtkCustomerInfoRepo customerInfoRepo;
@@ -79,6 +80,10 @@ public class BasicInfoManagerImpl extends AbstractCommManager implements BasicIn
             request.setVehicleId(req.getVehiclePlate() + "_" + req.getVehiclePlateColor());
         }
         BeanUtils.copyProperties(req, request);
+        request.setAgencyId(findAgencyIdByToken(req.getAccessToken()));
+        if (isManager(findAgencyIdByToken(req.getAccessToken()))){
+            request.setAgencyId(null);
+        }
         return cardInfoRepo.page(request).convertResult(this::coverCard);
     }
 
@@ -91,6 +96,10 @@ public class BasicInfoManagerImpl extends AbstractCommManager implements BasicIn
             request.setVehicleId(req.getVehiclePlate() + "_" + req.getVehiclePlateColor());
         }
         BeanUtils.copyProperties(req, request);
+        request.setAgencyId(findAgencyIdByToken(req.getAccessToken()));
+        if (isManager(findAgencyIdByToken(req.getAccessToken()))){
+            request.setAgencyId(null);
+        }
         return obuInfoRepo.page(request).convertResult(this::coverObu);
     }