Merge branch 'hotfix-20231208-usertasklist'

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

@@ -300,6 +300,12 @@ public class ApiController {
 				// 库存调研、竞品调研、培训、使用情况调查 都取47
 				configMap = getTaskContentConfigByTaskTypeId("47");
 				break;
+			case "51":
+			case "52":
+			case "53":
+				// 信用管理A/B/C 都取51
+				configMap = getTaskContentConfigByTaskTypeId("51");
+				break;
 			case "56":
 			case "57":
 				// 56首营管理-诊所
@@ -2345,12 +2351,50 @@ public class ApiController {
 
 
 	/**
-	 * 获取药企列表
+	 * 小程序查询当前人的任务记录
 	 *
-	 * @return 角色列表
+	 * @param page 分页参数
+	 * @param wmTask 条件
+	 * @return 任务分页列表
 	 */
 	@GetMapping("/getHistoryTaskList")
-	public R getHistoryTaskList(Page page, WmTask wmTask) {
+	public R<IPage<WmTask>> getNewHistoryTaskList(Page<WmTask> page, WmTask wmTask) {
+		Integer userId = SecurityUtils.getUser().getId();
+
+		LambdaQueryWrapper<WmTask> queryWrapper = Wrappers.lambdaQuery();
+		queryWrapper.eq(WmTask::getTaskUserId, userId);
+		queryWrapper.ne(WmTask::getScore, 0);
+		queryWrapper.orderByDesc(WmTask::getCreateTime);
+		if (StrUtil.isNotBlank(wmTask.getTaskRuleId())) {
+			queryWrapper.like(WmTask::getLookintoDate, wmTask.getTaskRuleId());
+		}
+
+		wmTaskService.page(page, queryWrapper);
+
+		if (CollUtil.isNotEmpty(page.getRecords())) {
+			Set<String> tasktypeIds = page.getRecords().stream().map(WmTask::getTaskTypeId).collect(Collectors.toSet());
+			List<WmTaskType> taskTypes = wmTaskTypeService.listByIds(tasktypeIds);
+			Map<String, String> taskTypeMap = taskTypes.stream().collect(Collectors.toMap(WmTaskType::getId, WmTaskType::getTaskTypeName));
+
+			page.getRecords().forEach(record -> {
+				record.setTaskTypeName(taskTypeMap.get(record.getTaskTypeId()));
+				record.setTaskTypeId(taskTypeMap.get(record.getTaskTypeId()));
+			});
+		}
+
+		return R.ok(page);
+	}
+
+	/**
+	 * 小程序查询当前人的任务记录(已弃用,改为调用getNewHistoryTaskList接口)
+	 *
+	 * @param page 分页参数
+	 * @param wmTask 条件
+	 * @return 任务分页列表
+	 */
+	@Deprecated
+	@GetMapping("/getHistoryTaskList1")
+	public R getHistoryTaskList1(Page page, WmTask wmTask) {
 		wmTask.setEnableFlag("0");
 		wmTask.setDelFlag("0");
 		UserDTO userDTO = new UserDTO();