|
|
@@ -53,6 +53,8 @@ import com.qunzhixinxi.hnqz.admin.entity.XlsPackageInfo;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.XlsTask;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.dto.CommonEvidenceDTO;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.model.excel.CommonTaskExcelModel;
|
|
|
+import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
|
|
|
+import com.qunzhixinxi.hnqz.admin.enums.TaskStatusEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.mapper.WmTaskMapper;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.ReportExportService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
|
|
|
@@ -1150,6 +1152,34 @@ public class WmTaskController {
|
|
|
return wmTaskService.getWmTaskList(page, wmTask);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 根据积分包id查询任务
|
|
|
+ *
|
|
|
+ * @param page 分页参数
|
|
|
+ * @param packageId 积分包id
|
|
|
+ * @param taskStatus 任务审核状态
|
|
|
+ * @param realName 姓名
|
|
|
+ * @return 分页结果
|
|
|
+ */
|
|
|
+ @GetMapping("/list-score-package-task")
|
|
|
+ public R<?> listScorePackageTask(Page<WmTask> page, @RequestParam("packageId") String packageId,
|
|
|
+ TaskStatusEnum taskStatus, String realName) {
|
|
|
+ QueryWrapper<WmTask> queryWrapper = Wrappers.query();
|
|
|
+ if (StrUtil.isNotBlank(realName)) {
|
|
|
+ queryWrapper.like("u.realname", realName);
|
|
|
+ }
|
|
|
+ if (taskStatus != null) {
|
|
|
+ queryWrapper.eq("t.task_status", taskStatus.val());
|
|
|
+ }
|
|
|
+ queryWrapper.eq("t.score_package_id", packageId);
|
|
|
+ queryWrapper.eq("t.del_flag", DelEnum.NOT_DEL.val());
|
|
|
+ queryWrapper.eq("t.real_flag", "0");
|
|
|
+ queryWrapper.orderByDesc("t.lookinto_date");
|
|
|
+ IPage<WmTask> taskIPage = wmTaskMapper.listWmTaskByWrapper(new Page<>(page.getCurrent(), page.getSize()), queryWrapper);
|
|
|
+
|
|
|
+ return R.ok(taskIPage);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 任务审核
|
|
|
*
|
