@ -130,13 +130,4 @@ public class TaskAuditController {
return ResultUtils.success("ok", result);
}
@ApiOperation("用户确认审核任务")
@PostMapping("/confirm")
public ResultVO<TaskAudit> confirmAudit( @RequestParam Integer taskAuditId) {
TaskAudit result = taskAuditService.confirmAudit(taskAuditId);
@ -53,5 +53,8 @@ public class TaskAudit implements Serializable {
@ApiModelProperty(value = "审批状态:待审核 1 审核通过 2 审核未通过 3 完成 0")
private String status;
@ApiModelProperty(value = "任务类型")
private String taskName;
private static final long serialVersionUID = 1L;
@ -28,5 +28,4 @@ public interface ITaskAuditService extends IService<TaskAudit>{
TaskAudit audit(Integer taskAuditId, Boolean yesNo);
TaskAudit confirmAudit(Integer taskAuditId);
@ -193,6 +193,7 @@ public class TaskAuditServiceImpl extends ServiceImpl<TaskAuditMapper, TaskAudit
taskAudit.setText(text);
taskAudit.setStatus("1");
taskAudit.setIntegral(integral);
taskAudit.setTaskName(task.getName());
CarFormula carFormula = carbonFormulaMapper.selectById(task.getCarbonFormulaId());
taskAudit.setEmission(integral*carFormula.getEmission());