计算增加类型名称字段(2023.3.25)

main
“18231669351” 3 years ago
parent 7aea8f016d
commit 39dcc19104
  1. 9
      CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/task/TaskAuditController.java
  2. 3
      CarbonSysBE1/src/main/java/edu/ncst/carbon/model/task/TaskAudit.java
  3. 1
      CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ITaskAuditService.java
  4. 1
      CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java

@ -130,13 +130,4 @@ public class TaskAuditController {
return ResultUtils.success("ok", result); return ResultUtils.success("ok", result);
} }
@ApiOperation("用户确认审核任务")
@PostMapping("/confirm")
public ResultVO<TaskAudit> confirmAudit( @RequestParam Integer taskAuditId) {
TaskAudit result = taskAuditService.confirmAudit(taskAuditId);
return ResultUtils.success("ok", result);
}
} }

@ -53,5 +53,8 @@ public class TaskAudit implements Serializable {
@ApiModelProperty(value = "审批状态:待审核 1 审核通过 2 审核未通过 3 完成 0") @ApiModelProperty(value = "审批状态:待审核 1 审核通过 2 审核未通过 3 完成 0")
private String status; private String status;
@ApiModelProperty(value = "任务类型")
private String taskName;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }

@ -28,5 +28,4 @@ public interface ITaskAuditService extends IService<TaskAudit>{
TaskAudit audit(Integer taskAuditId, Boolean yesNo); 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.setText(text);
taskAudit.setStatus("1"); taskAudit.setStatus("1");
taskAudit.setIntegral(integral); taskAudit.setIntegral(integral);
taskAudit.setTaskName(task.getName());
CarFormula carFormula = carbonFormulaMapper.selectById(task.getCarbonFormulaId()); CarFormula carFormula = carbonFormulaMapper.selectById(task.getCarbonFormulaId());
taskAudit.setEmission(integral*carFormula.getEmission()); taskAudit.setEmission(integral*carFormula.getEmission());

Loading…
Cancel
Save