|
@@ -103,6 +103,28 @@ public class WmTaskSubmissionRuleController {
|
|
|
return R.ok(taskTypeList);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 获取企业的任务类型id
|
|
|
+ *
|
|
|
+ * @param deptId 企业id
|
|
|
+ * @return 任务类型列表
|
|
|
+ */
|
|
|
+ @GetMapping("/list-task-type-ids")
|
|
|
+ public R<?> listTaskTypeIds(@RequestParam(value = "deptId") Integer deptId) {
|
|
|
+ // 查询任务类型启用状态
|
|
|
+ List<WmTaskSubmissionPercentRule> rules = taskSubmissionPercentRuleService.list(Wrappers.<WmTaskSubmissionPercentRule>lambdaQuery()
|
|
|
+ .eq(WmTaskSubmissionPercentRule::getDeptId, deptId)
|
|
|
+ .eq(WmTaskSubmissionPercentRule::getSubCategory, UpmsType.TaskSubCategory2.TASK_TYPE_CONFIG));
|
|
|
+ String[] taskTypeIds;
|
|
|
+ if (CollUtil.isNotEmpty(rules)) {
|
|
|
+ taskTypeIds = rules.get(0).getRule().getTaskTypeIds();
|
|
|
+ } else {
|
|
|
+ taskTypeIds = new String[0];
|
|
|
+ }
|
|
|
+
|
|
|
+ return R.ok(taskTypeIds);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 更新启用的任务类型
|
|
|
*
|
|
@@ -121,12 +143,12 @@ public class WmTaskSubmissionRuleController {
|
|
|
rule.setLimitPercent("");
|
|
|
rule.setStartScore(0);
|
|
|
rule.setTaskTypeIds(taskTypeIds.toArray(new String[0]));
|
|
|
- Integer currentDeptId = SecurityUtils.getUser().getDeptId();
|
|
|
|
|
|
- List<WmTaskSubmissionPercentRule> rules = taskSubmissionPercentRuleService.list(Wrappers.<WmTaskSubmissionPercentRule>lambdaQuery()
|
|
|
- .eq(WmTaskSubmissionPercentRule::getDeptId, currentDeptId)
|
|
|
+ // 查询待修改企业的规则
|
|
|
+ List<WmTaskSubmissionPercentRule> queryRules = taskSubmissionPercentRuleService.list(Wrappers.<WmTaskSubmissionPercentRule>lambdaQuery()
|
|
|
+ .eq(WmTaskSubmissionPercentRule::getDeptId, deptId)
|
|
|
.eq(WmTaskSubmissionPercentRule::getSubCategory, UpmsType.TaskSubCategory2.TASK_TYPE_CONFIG));
|
|
|
- if (CollUtil.isEmpty(rules)) {
|
|
|
+ if (CollUtil.isEmpty(queryRules)) {
|
|
|
WmTaskSubmissionPercentRule percentRule = new WmTaskSubmissionPercentRule();
|
|
|
percentRule.setDeptId(deptId);
|
|
|
percentRule.setRule(rule);
|