Эх сурвалжийг харах

fix: 问问查询积分包-系统来源区分

lixuesong 1 жил өмнө
parent
commit
bc7f067134

+ 10 - 3
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -2651,7 +2651,8 @@ public class WmScorePackageController {
 									@RequestParam(value = "acceptUser", required = false) String acceptUser,
 									@RequestParam(value = "relationScoreId", required = false) String relationScoreId,
 									@RequestParam(value = "toApproval", required = false) Boolean toApproval,
-									@RequestParam(value = "packageUserScope", required = false) String packageUserScope
+									@RequestParam(value = "packageUserScope", required = false) String packageUserScope,
+									String sourceType
 	) {
 
 
@@ -2688,6 +2689,11 @@ public class WmScorePackageController {
 			queryWrapper.eq("p.package_user_scope", packageUserScope);
 		}
 
+		// 用于问问的系统来源
+		if (StrUtil.isNotBlank(sourceType)) {
+			queryWrapper.eq("p.source_type", sourceType);
+		}
+
 		if (userId != null) {
 			boolean onePersonScorePackageFlag = PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(String.valueOf(packageType1))
 					&& PackageTypeEnum.TYPE2_TASK_PACKAGE.val().equals(String.valueOf(packageType2));
@@ -2793,14 +2799,15 @@ public class WmScorePackageController {
 									@RequestParam(value = "acceptUser", required = false) String acceptUser,
 									@RequestParam(value = "relationScoreId", required = false) String relationScoreId,
 									@RequestParam(value = "toApproval", required = false) Boolean toApproval,
-									@RequestParam(value = "packageUserScope", required = false) String packageUserScope
+									@RequestParam(value = "packageUserScope", required = false) String packageUserScope,
+									String sourceType
 	) {
 
 		Integer sendDeptId = SecurityUtils.getUser().getDeptId();
 		Integer userId = SecurityUtils.getUser().getId();
 
 		return this.getScorePackagePageForBC(current, size, sendDeptId, userId, packageType1, packageType2, scorePackageName, scorePackageStatus,
-				typeId, monthStart, monthEnd, acceptUser, relationScoreId, toApproval, packageUserScope);
+				typeId, monthStart, monthEnd, acceptUser, relationScoreId, toApproval, packageUserScope, sourceType);
 	}
 
 	/**