|
|
@@ -18,6 +18,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSubmissionPercentRule;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSubmissionRule;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeSubCategory;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
|
|
|
+import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmDaHospital;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageStatus;
|
|
|
@@ -30,7 +31,6 @@ import com.qunzhixinxi.hnqz.admin.enums.PackageTypeEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.mapper.WmDaHospitalMapper;
|
|
|
import com.qunzhixinxi.hnqz.admin.mapper.WmTaskContentMapper;
|
|
|
import com.qunzhixinxi.hnqz.admin.mapper.WmUserSignMapper;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.SysPublicParamService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.SysUserService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
|
|
|
@@ -52,7 +52,6 @@ import com.qunzhixinxi.hnqz.common.sequence.sequence.Sequence;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
-import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
@@ -92,17 +91,15 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
|
|
|
private final WmTaskTypeSubCategoryService taskTypeSubCategoryService;
|
|
|
private final WmTaskSubmissionRuleService taskSubmissionRuleService;
|
|
|
private final WmTaskSubmissionPercentRuleService wmTaskSubmissionPercentRuleService;
|
|
|
- private final SysDeptService deptService;
|
|
|
private final Sequence taskSequence;
|
|
|
+ private final UpmsConfig upmsConfig;
|
|
|
+ private final String active = "pre";
|
|
|
|
|
|
|
|
|
private static final DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
|
|
|
|
|
|
private static final String[] ingTypeIds = {"5", "6", "8", "9", "10", "11", "33"};
|
|
|
|
|
|
- @Value("${spring.profiles.active}")
|
|
|
- private String active;
|
|
|
-
|
|
|
/**
|
|
|
* 校验积分包
|
|
|
*
|
