Skip to content

I
indicators
Commit a21f0bbc by 张祺
Options

修改填报任务相关模型和接口

parent de9b0f6c
Showing with 105 additions and 27 deletions
src/main/java/com/keymobile/indicators/api/hytobacco/DataEnterCtrl.java
......@@ -44,7 +44,7 @@ public class DataEnterCtrl {
@GetMapping("findToEdit")
public List<TaskIndValue> findToEdit(@RequestParam("taskId") String taskId) {
List<TaskIndValue> list = new ArrayList<>();
Task task = taskService.getById(taskId);
Task task = taskService.getById(taskId, true, false);
String userId = SystemUserUtil.getCurrentUserId();
String orgId = SystemUserUtil.getCurrentUserOrgId();
String orgName = SystemUserUtil.getCurrentUserOrgName();
......@@ -80,6 +80,10 @@ public class DataEnterCtrl {
List<TaskIndValue> list = new ArrayList<>();
List<TaskIndicator> taskIndicators = task.getIndicators();
for (TaskIndicator indicator : taskIndicators) {
if (StringUtils.isNotBlank(indicator.getIndFormula())) {
//需要通过计算才能取得值的数据项跳过
continue;
}
if (indicator.getIndSource() == Constants.INPUT_ONLINE) {
TaskIndValue value = new TaskIndValue();
value.setIndId(indicator.getIndId());
......@@ -109,7 +113,7 @@ public class DataEnterCtrl {
public Result saveData(@RequestBody List<TaskIndValue> values, @RequestParam("taskId") String taskId) {
Date now = new Date();
String userId = SystemUserUtil.getCurrentUserId();
Task task = taskService.getById(taskId);
Task task = taskService.getById(taskId, false, false);
for (TaskIndValue value : values) {
value.setId(IdWorker.getStrId());
value.setTaskId(taskId);
......@@ -144,7 +148,7 @@ public class DataEnterCtrl {
int lastRow = sheet.getLastRowNum();
String sameTermValutTime = null;
Task task = taskService.getById(taskId);
Task task = taskService.getById(taskId, true, false);
if (template.getNeedSameTerm() != null && template.getNeedSameTerm()) {
hasSameTerm = true;
sameTermValutTime = getSameTermValueTime(task.getValueTime());
......
src/main/java/com/keymobile/indicators/api/hytobacco/TaskCtrl.java
......@@ -27,22 +27,23 @@ public class TaskCtrl {
@ApiOperation("根据规则生成相关填报任务")
@GetMapping("generateTaskByRule")
public Result generateTaskByRule(@ApiParam("规则id") @RequestParam Integer ruleId) {
public Result generateTaskByRule(@ApiParam("规则id") @RequestParam("ruleId") Integer ruleId) {
Result result = null;
taskRuleService.getById(ruleId);
return result;
}
@ApiOperation("根据关键字、规则类型、用户获取相关的填报任务")
@PostMapping("findByPage")
public Page<Task> findByPage(@RequestBody QueryTaskParam param) {
param.setUserId(SystemUserUtil.getCurrentUserId());
return taskService.findTask(param);
}
@ApiOperation("根据id获取填报任务")
@GetMapping("getById")
public Task getById(@ApiParam(name = "任务id") @RequestParam String id) {
return taskService.getById(id);
return taskService.getById(id, true, true);
}
......@@ -73,4 +74,11 @@ public class TaskCtrl {
return taskService.findAuditRecordByTaskId(id);
}
@ApiOperation("任务总体分析")
@GetMapping("analysis")
public TaskAnalysisResult analysis() {
TaskAnalysisResult result = new TaskAnalysisResult();
return result;
}
}
src/main/java/com/keymobile/indicators/model/entity/dataenter/QueryTaskParam.java
......@@ -7,16 +7,18 @@ import lombok.Data;
@ApiModel("查询任务参数")
@Data
public class QueryTaskParam {
@ApiModelProperty(name = "规则类型：1 省级 2 市级 3 县级")
private Integer ruleType;
/**
* 查询类型：1 查找填报人任务 2 查找审核人任务 3 查找全部
*/
@ApiModelProperty(name = "查询类型：1 查找填报人任务 2 查找审核人任务 3 查找全部")
private int queryType = 1;
@ApiModelProperty(name = "所属用户id")
private String userId;
@ApiModelProperty(name = "搜索关键字（名字）")
private String keyword;
@ApiModelProperty(name = "填报时间")
......
src/main/java/com/keymobile/indicators/model/entity/dataenter/Task.java
package com.keymobile.indicators.model.entity.dataenter;
import com.keymobile.indicators.model.entity.BaseModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Id;
......@@ -19,6 +20,9 @@ public class Task extends BaseModel {
@Id
private String id;
@ApiModelProperty("任务描述")
private String description;
/**
* 父id
*/
......@@ -27,6 +31,7 @@ public class Task extends BaseModel {
/**
* 是否存在子任务
*/
@ApiModelProperty("是否存在子任务")
private Boolean hasChildren;
/**
......@@ -42,6 +47,7 @@ public class Task extends BaseModel {
/**
* 任务规则名称
*/
@ApiModelProperty("任务规则名称")
private String ruleName;
/**
......@@ -52,22 +58,24 @@ public class Task extends BaseModel {
/**
* 填报数据截止日期
*/
@ApiModelProperty("填报数据截止日期")
private Date endDate;
/**
* 审核数据截止日期
*/
@ApiModelProperty("审核数据截止日期")
private Date auditEndDate;
/**
* 审核数据截止日期
* 填报人员id，多个用,分割
*/
private Date summitEndDate;
private String enterUsers;
/**
* 上报人员id，多个用,分割
* 填报人员名称，多个用,分割
*/
private String enterUsers;
private String enterUserNames;
/**
* 审核人员id，多个用,分割
......@@ -75,6 +83,12 @@ public class Task extends BaseModel {
private String auditUsers;
/**
* 填报角色名称,多个用,分割
*/
@ApiModelProperty("填报对象，多个用,分割")
private String toRoleNames;
/**
* 是否需要分发人员自填
*/
private Boolean needSelfEnter;
......@@ -93,5 +107,13 @@ public class Task extends BaseModel {
* 任务关联的数据项信息
*/
@Transient
@ApiModelProperty("任务数据项列表")
private List<TaskIndicator> indicators;
/**
* 任务关联的指标信息
*/
@Transient
@ApiModelProperty("任务关联的指标列表")
private List<TaskRuleIndicator> ruleIndicators;
}
src/main/java/com/keymobile/indicators/model/entity/dataenter/TaskAnalysisResult.java 0 → 100644
package com.keymobile.indicators.model.entity.dataenter;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ApiModel("任务汇总分析")
@Data
public class TaskAnalysisResult {
@ApiModelProperty("总数")
private int totalCount;
@ApiModelProperty("待审核总数")
private int toAuditCount;
@ApiModelProperty("待填报总数")
private int toEditCount;
}
src/main/java/com/keymobile/indicators/model/entity/dataenter/TaskIndicator.java
......@@ -45,4 +45,9 @@ public class TaskIndicator extends BaseModel {
* 指标数量来源：1 Excel导入 2 手工录入
*/
private Integer indSource;
/**
* 数据项关联的公式
*/
private String indFormula;
}
src/main/java/com/keymobile/indicators/model/entity/dataenter/TaskRule.java
......@@ -79,6 +79,12 @@ public class TaskRule extends BaseModel {
*/
@ApiModelProperty("填报对象，多个用,分割")
private String toRoleIds;
/**
* 填报角色名称,多个用,分割
*/
@ApiModelProperty("填报对象，多个用,分割")
private String toRoleNames;
/**
* 上次触发时间
*/
......
src/main/java/com/keymobile/indicators/service/dataenter/TaskService.java
......@@ -32,9 +32,11 @@ public interface TaskService {
/**
* 根据id获取任务详细
* @param taskId
* @param needTaskInd
* @param needRuleInd
* @return
*/
Task getById(String taskId);
Task getById(String taskId, boolean needTaskInd, boolean needRuleInd);
/**
......
src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java
......@@ -2,10 +2,7 @@ package com.keymobile.indicators.service.dataenter.impl;
import com.keymobile.indicators.constant.Constants;
import com.keymobile.indicators.model.entity.dataenter.*;
import com.keymobile.indicators.model.mapper.indicators.TaskAuditRecordMapper;
import com.keymobile.indicators.model.mapper.indicators.TaskIndValueMapper;
import com.keymobile.indicators.model.mapper.indicators.TaskIndicatorMapper;
import com.keymobile.indicators.model.mapper.indicators.TaskMapper;
import com.keymobile.indicators.model.mapper.indicators.*;
import com.keymobile.indicators.service.dataenter.TaskService;
import com.keymobile.indicators.utils.IdWorker;
import org.apache.commons.collections.CollectionUtils;
......@@ -35,17 +32,14 @@ public class TaskServiceImpl implements TaskService {
@Autowired
private TaskAuditRecordMapper taskAuditRecordMapper;
@Autowired
private TaskRuleIndicatorMapper taskRuleIndicatorMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public Task createTask(Task task) {
taskMapper.insert(task);
List<TaskIndicator> indicators = task.getIndicators();
if (CollectionUtils.isNotEmpty(indicators)) {
for (TaskIndicator indicator : indicators) {
indicator.setState(Constants.DATA_STATE_A);
taskIndicatorMapper.insert(indicator);
}
}
saveTaskIndicators(task);
return task;
}
......@@ -54,9 +48,18 @@ public class TaskServiceImpl implements TaskService {
public void updateTask(Task task) {
taskIndicatorMapper.deleteByTaskId(task.getId());
taskMapper.updateByPrimaryKey(task);
saveTaskIndicators(task);
}
/**
* 保存任务关联的数据项
* @param task
*/
private void saveTaskIndicators(Task task) {
List<TaskIndicator> indicators = task.getIndicators();
if (CollectionUtils.isNotEmpty(indicators)) {
for (TaskIndicator indicator : indicators) {
indicator.setId(IdWorker.getStrId());
indicator.setState(Constants.DATA_STATE_A);
taskIndicatorMapper.insert(indicator);
}
......@@ -69,10 +72,16 @@ public class TaskServiceImpl implements TaskService {
}
@Override
public Task getById(String taskId) {
public Task getById(String taskId, boolean needTaskInd, boolean needRuleInd) {
Task task = taskMapper.selectByPrimaryKey(taskId);
List<TaskIndicator> indicators = taskIndicatorMapper.getByTaskId(taskId);
task.setIndicators(indicators);
if (needTaskInd) {
List<TaskIndicator> indicators = taskIndicatorMapper.getByTaskId(taskId);
task.setIndicators(indicators);
}
if (needRuleInd) {
List<TaskRuleIndicator> ruleIndicators = taskRuleIndicatorMapper.getByRuleId(task.getRuleId());
task.setRuleIndicators(ruleIndicators);
}
return task;
}
......@@ -126,7 +135,7 @@ public class TaskServiceImpl implements TaskService {
@Override
@Transactional(rollbackFor = Exception.class)
public void assignTask(TaskAssginParam param, String userId) {
Task parentTask = getById(param.getTaskId());
Task parentTask = getById(param.getTaskId(), true, false);
List<String> indIds = param.getIndIds();
List<String> objIds = param.getObjIds();
List<TaskIndicator> assignInds = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment