试验评定添加评定状态,
This commit is contained in:
@@ -0,0 +1,20 @@
|
|||||||
|
package org.jeecg.modules.database.constant;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public enum ExperimentReviewStatusEnum {
|
||||||
|
|
||||||
|
INIT(1, "待评定"),
|
||||||
|
REVIEWING(2, "评定中"),
|
||||||
|
REVIEW_FINISHED(0, "评定完成"),
|
||||||
|
TEMP_SAVE(5, "暂存")
|
||||||
|
|
||||||
|
;
|
||||||
|
|
||||||
|
|
||||||
|
final int status;
|
||||||
|
final String description;
|
||||||
|
}
|
||||||
@@ -14,13 +14,18 @@ import org.jeecg.common.api.vo.Result;
|
|||||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||||
import org.jeecg.common.system.base.controller.JeecgController;
|
import org.jeecg.common.system.base.controller.JeecgController;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
|
import org.jeecg.common.system.util.JwtUtil;
|
||||||
|
import org.jeecg.modules.database.constant.ExperimentReviewStatusEnum;
|
||||||
import org.jeecg.modules.database.entity.ExperimentReview;
|
import org.jeecg.modules.database.entity.ExperimentReview;
|
||||||
import org.jeecg.modules.database.service.IExperimentReviewService;
|
import org.jeecg.modules.database.service.IExperimentReviewService;
|
||||||
|
import org.jeecg.modules.system.entity.SysUser;
|
||||||
|
import org.jeecg.modules.system.service.ISysUserService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 试验评定
|
* @Description: 试验评定
|
||||||
@@ -36,6 +41,9 @@ public class ExperimentReviewController extends JeecgController<ExperimentReview
|
|||||||
@Autowired
|
@Autowired
|
||||||
private IExperimentReviewService experimentReviewService;
|
private IExperimentReviewService experimentReviewService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ISysUserService userService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页列表查询
|
* 分页列表查询
|
||||||
*
|
*
|
||||||
@@ -68,14 +76,27 @@ public class ExperimentReviewController extends JeecgController<ExperimentReview
|
|||||||
@Operation(summary = "试验评定-添加")
|
@Operation(summary = "试验评定-添加")
|
||||||
@RequiresPermissions("database:experiment_review:add")
|
@RequiresPermissions("database:experiment_review:add")
|
||||||
@PostMapping(value = "/add")
|
@PostMapping(value = "/add")
|
||||||
public Result<String> add(@RequestBody ExperimentReview experimentReview) {
|
public Result<String> add(@RequestBody ExperimentReview experimentReview, HttpServletRequest request) {
|
||||||
|
String username = JwtUtil.getUserNameByToken(request);
|
||||||
|
SysUser userByName = userService.getUserByName(username);
|
||||||
|
|
||||||
|
experimentReview.setReviewStatus(ExperimentReviewStatusEnum.REVIEW_FINISHED.getStatus());
|
||||||
|
experimentReview.setUpdateTime( new Date());
|
||||||
|
experimentReview.setUpdateBy(userByName.getId());
|
||||||
experimentReviewService.save(experimentReview);
|
experimentReviewService.save(experimentReview);
|
||||||
return Result.OK("添加成功!");
|
return Result.OK("添加成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Operation(summary = "试验评定-暂存")
|
@Operation(summary = "试验评定-暂存")
|
||||||
@PostMapping(value = "/temporarySave")
|
@PostMapping(value = "/temporarySave")
|
||||||
public Result<String> temporarySave(@RequestBody ExperimentReview experimentReview) {
|
public Result<String> temporarySave(@RequestBody ExperimentReview experimentReview, HttpServletRequest request) {
|
||||||
|
String username = JwtUtil.getUserNameByToken(request);
|
||||||
|
SysUser userByName = userService.getUserByName(username);
|
||||||
|
|
||||||
|
experimentReview.setUpdateTime(new Date());
|
||||||
|
experimentReview.setCreateBy(userByName.getId());
|
||||||
|
experimentReview.setUpdateBy(userByName.getId());
|
||||||
|
experimentReview.setReviewStatus(ExperimentReviewStatusEnum.REVIEWING.getStatus());
|
||||||
experimentReviewService.saveOrUpdate(experimentReview);
|
experimentReviewService.saveOrUpdate(experimentReview);
|
||||||
return Result.OK("暂存成功!");
|
return Result.OK("暂存成功!");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -85,4 +85,11 @@ public class ExperimentReview implements Serializable {
|
|||||||
@Excel(name = "评审结果", width = 15)
|
@Excel(name = "评审结果", width = 15)
|
||||||
@Schema(description = "评审结果(合格/不合格)")
|
@Schema(description = "评审结果(合格/不合格)")
|
||||||
private String reviewResult;
|
private String reviewResult;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 评审状态
|
||||||
|
*/
|
||||||
|
@Excel(name = "评审状态", width = 15)
|
||||||
|
@Schema(description = "评审状态")
|
||||||
|
private int reviewStatus;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user