|
|
@@ -19,6 +19,7 @@ package com.qunzhixinxi.hnqz.admin.controller;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.ArrayUtil;
|
|
|
+import cn.hutool.core.util.NumberUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
@@ -50,6 +51,7 @@ import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageSettleNote;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmTask;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmTaskContent;
|
|
|
+import com.qunzhixinxi.hnqz.admin.entity.WmTaskContentConfig;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmTaskRule;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmTaskType;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmUserSign;
|
|
|
@@ -62,6 +64,7 @@ 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.EnableEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.enums.SettleStatusEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.enums.TaskStatusEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.enums.UserSignPurposeEnum;
|
|
|
@@ -77,6 +80,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmDaHospitalService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageSettleNoteService;
|
|
|
+import com.qunzhixinxi.hnqz.admin.service.WmTaskContentConfigService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmTaskContentService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmTaskRuleService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
|
|
|
@@ -196,6 +200,8 @@ public class WmTaskController {
|
|
|
|
|
|
private final WmUserSignDetailService wmUserSignDetailService;
|
|
|
|
|
|
+ private final WmTaskContentConfigService wmTaskContentConfigService;
|
|
|
+
|
|
|
private final SysDictItemService sysDictItemService;
|
|
|
|
|
|
private final SysFileService sysFileService;
|
|
|
@@ -1314,7 +1320,7 @@ public class WmTaskController {
|
|
|
|
|
|
// 医院拜访、商业公司拜访、药店拜访打卡记录
|
|
|
List<WmUserSign> wmUserSignList = new ArrayList<>();
|
|
|
- if (hasSignTask && null != wmTaskContent.getTemp3()) {
|
|
|
+ if (Arrays.asList("5", "6", "33").contains(wmTask.getTaskTypeId()) && NumberUtil.isNumber(wmTaskContent.getTemp3())) {
|
|
|
int userSignId = Integer.parseInt(wmTaskContent.getTemp3());
|
|
|
WmUserSign userSign = userSignMap.get(userSignId);
|
|
|
// 关联查询签到详情
|
