feat: 小程序领包界面只展示手动上传的积分包

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -1204,25 +1204,12 @@ public class ApiController {
 	public R getUserScorePackageList2(Page page, int selType, String packageName, String selDate, String activeId) {
 
 		UserVO userVO = sysUserService.selectUserVoById(SecurityUtils.getUser().getId());
-//		Page scorePage = null;
 
-		List<WmScorePackageApiOutput> scorePackageList = new ArrayList<>();
+		List<WmScorePackageApiOutput> scorePackageList;
 		if (1 == selType && isZbRole(userVO.getRoleList(), 5)) {
 			return R.ok();
 		}
 
-
-//		LambdaQueryWrapper<WmScorePackage> scoreQuery = Wrappers.lambdaQuery(query);
-//		Boolean inFlag = false;
-
-
-		List<Map<String, Object>> resultList = new ArrayList<>();
-
-//		String packageType2 = "1";
-//		if("1".equals(userVO.getUserType())){
-//			packageType2 = "2";
-//		}
-
 		IPage<WmScorePackageApiOutput> scorePage;
 		// 小程序角色:5-全职学术信息沟通专员, 6-兼职学术信息沟通专员, 10-兼职CRC, 13-HCP
 		if (1 == selType && (isZbRole(userVO.getRoleList(), 6) || isZbRole(userVO.getRoleList(), 10)
@@ -1233,19 +1220,13 @@ public class ApiController {
 			query.setScorePackageName(packageName);
 			query.setBelongDate(selDate);
 			query.setZbId(userVO.getUserId() + "");
-//			query.setPackageType2(packageType2);
-
-//			scorePage = wmScorePackageService.page(page, scoreQuery);
+			// 0: 平台手动，1：系统对接
+			query.setSourceType("0");
 			scorePage = wmScorePackageService.getPackageListForReceive(page, query);
 			scorePackageList = scorePage.getRecords();
 
 			for (WmScorePackageApiOutput item : scorePackageList) {
-//				Map<String, Object> map = new HashMap<>();
-//				map.put("id", item.getId());
-//				map.put("packageName", item.getScorePackageName());
-//				map.put("score", item.getScore());
-//				map.put("packageEntName", item.getPackageEntName());
-//				map.put("userNum", item.getUserNum());
+
 				WmScorePackageStatus queryGetUser = new WmScorePackageStatus();
 				queryGetUser.setPackageId(item.getId());
 				queryGetUser.setStatus("2");
@@ -1258,35 +1239,16 @@ public class ApiController {
 					item.setScore(String.format("%.2f", Integer.parseInt(item.getScore()) / 100.0));
 				}
 
-//				map.put("taskNum", item.getTaskNum());
-//				map.put("createTime", item.getCreateTime());
-//				map.put("description", item.getDescription());
-//				map.put("packageType1", item.getPackageType1());
-//				if ("1".equals(item.getPackageType1())) {
-//					map.put("type1", "定额");
-//				} else if ("2".equals(item.getPackageType1())) {
-//					map.put("type1", "定量");
-//				} else if ("3".equals(item.getPackageType1())) {
-//					map.put("type1", "通用");
-//				}
-
-//				resultList.add(map);
 			}
-//			scorePage.setRecords(resultList);
 			return R.ok(scorePage);
 		}
 
-//		WmScorePackageStatus status = new WmScorePackageStatus();
-//		status.setDeptId(userVO.getDeptId() + "");
-//		status.setUserId(userVO.getUserId() + "");
-//		LambdaQueryWrapper<WmScorePackageStatus> statusQuery = Wrappers.lambdaQuery(status);
 
 		if (2 == selType) {
 			WmScorePackageApiInput input = new WmScorePackageApiInput();
 			input.setScorePackageName(packageName);
 			input.setSelDate(selDate);
 			input.setUserId(userVO.getUserId() + "");
-//			input.setPackageType2(packageType2);
 			if (isZbRole(userVO.getRoleList(), 5)) {
 				input.setTypeid("3");
 
@@ -1317,47 +1279,14 @@ public class ApiController {
 			} else {
 				return R.ok();
 			}
-//			if(inFlag){
-//				List<WmScorePackage> inList =  wmScorePackageService.list(scoreQuery);
-//				List<String> ids = inList.stream().map(WmScorePackage::getId).collect(Collectors.toList());
-//				System.err.println("-----"+inList.size());
-//				if (CollectionUtils.isNotEmpty(ids)) {
-//					statusQuery.in(WmScorePackageStatus::getPackageId,ids);
-//				}else {
-//					statusQuery.eq(WmScorePackageStatus::getPackageId,"-1");
-//				}
-//			}
 
 
 			scorePage = wmScorePackageStatusService.getReceivedPackageList(page, input);
 
 			scorePackageList = scorePage.getRecords();
 			if (CollectionUtils.isNotEmpty(scorePackageList)) {
-//				Map<String, Object> map = new HashMap<>();
 				for (WmScorePackageApiOutput item : scorePackageList) {
-//					WmScorePackage item = wmScorePackageService.getById(status1.getPackageId());
-//					map.put("id", item.getId());
-//					map.put("packageName", item.getScorePackageName());
-//					map.put("score", item.getScore());
-////					map.put("packageEntName", sysDeptService.getById(item.getSendPackageDeptId()).getName());
-//					map.put("packageEntName", item.getPackageEntName());
-//					map.put("userNum", item.getUserNum());
-//					map.put("taskNum", item.getTaskNum());
-//					map.put("createTime", item.getCreateTime());
-//					map.put("description", item.getDescription());
-//					map.put("packageType1", item.getPackageType1());
-
-//					if ("1".equals(item.getStatus())) {
-//						item.setStatusLabel("审核中");
-//					} else if ("2".equals(item.getStatus())) {
-//						item.setStatusLabel("审核通过");
-//					} else if ("3".equals(item.getStatus())) {
-//						item.setStatusLabel("审核不通过");
-//					}
-//					if (!"0".equals(item.getEnableType())) {
-//						item.setStatusLabel("已终止");
-//					}
-//					map.put("taskAddFlag", item.getTaskAddFlag());
+
 
 					WmScorePackageStatus queryGetUser = new WmScorePackageStatus();
 					queryGetUser.setPackageId(item.getId());
@@ -1378,10 +1307,6 @@ public class ApiController {
 					wmTask.setRealFlag("0");
 					List<WmTask> wmTaskList = wmTaskService.list(Wrappers.query(wmTask)
 							.lambda().ne(WmTask::getTaskStatus, "4"));
-//							.ne(WmTask::getRealFlag, "1").ne(WmTask::getTaskStatus, "4"));
-
-//					map.put("taskFinishNum", wmTaskList.size());
-//					map.put("speedProgress", "0");
 					item.setTaskFinishNum(wmTaskList.size());
 					item.setSpeedProgress(0);
 					item.setFinishScore(0);
@@ -1408,11 +1333,9 @@ public class ApiController {
 							if (d > 100) {
 								d = 100;
 							}
-//							map.put("speedProgress", new Double(d).intValue());
 							item.setSpeedProgress(new Double(d).intValue());
 						}
 					} else {
-//					} else if ("2".equals(item.getPackageType1())) {
 						Integer waitApprovalTaskNum = 0;
 						double d = Math.ceil(wmTaskList.size() * 100 / item.getTaskNum());
 						if (d > 100) {
@@ -1424,19 +1347,12 @@ public class ApiController {
 							}
 						}
 						item.setWaitApprovalTaskNum(waitApprovalTaskNum);
-//						map.put("speedProgress", new Double(d).intValue());
 						item.setSpeedProgress(new Double(d).intValue());
 					}
-
-//					resultList.add(map);
-
 				}
 			}
-//			scorePage.setRecords(resultList);
 			return R.ok(scorePage);
-
 		}
-
 		return R.ok();
 
 	}

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -1060,6 +1060,9 @@
 		<if test="query.packageType2 != null and query.packageType2 != ''">
 			AND p.package_type2= #{query.packageType2}
 		</if>
+		<if test="query.sourceType != null and query.query.sourceType != ''">
+			AND p.source_type= #{query.sourceType}
+		</if>
 		and p.id not in (
 		select s.package_id from wm_score_package_status s where s.user_id = #{query.zbId} and s.status != 3
 		)
@@ -1079,6 +1082,9 @@
 		<if test="query.packageType2 != null and query.packageType2 != ''">
 			AND p.package_type2= #{query.packageType2}
 		</if>
+		<if test="query.sourceType != null and query.query.sourceType != ''">
+			AND p.source_type= #{query.sourceType}
+		</if>
 		and p.id not in (
 		select s.package_id from wm_score_package_status s where s.user_id = #{query.zbId} and s.status != 3
 		)