提交 2a5ac027 authored 作者: niguanghui's avatar niguanghui

--no commit message

上级 5b3bdf61
......@@ -71,7 +71,7 @@ public class ApplyController {
@PostMapping(value = WorksRequestPath.SAVE)
public CallBack<Boolean> save(@RequestBody SaveApplyForm saveApply) {
Apply apply = saveApply.getApply();
apply.setStatus(StatusEnum.STATUS_0.getCode());
apply.setStatus(StatusEnum.TOBEAUDITED.getCode());
apply.setApplyTime(new Date());
if (!service.insert(apply)) {
throw new BaseException("申请信息保存失败");
......@@ -114,7 +114,7 @@ public class ApplyController {
}
}
vo.setList(list);
if (apply.getStatus() == StatusEnum.STATUS_1.getCode() || apply.getStatus() == StatusEnum.STATUS_2.getCode()) {
if (apply.getStatus() == StatusEnum.AUDITPASS.getCode() || apply.getStatus() == StatusEnum.NOT_AUDITPASS.getCode()) {
Criteria es = examineService.createCriteria();
es.andEqualTo("applyId", oid);
Examine examine = examineService.selectOneByCriteria();
......@@ -159,11 +159,11 @@ public class ApplyController {
List<Apply> applyList = service.selectByCriteria();
Date date = new Date();
for (Apply apply : applyList) {
if (apply.getStatus() != StatusEnum.STATUS_0.getCode()) {
if (apply.getStatus() != StatusEnum.TOBEAUDITED.getCode()) {
throw new BaseException("请选择未审核数据");
}
}
if (form.getStatus() == StatusEnum.STATUS_2.getCode() && StringUtils.isBlank(form.getExamine().getOpinion())) {
if (form.getStatus() == StatusEnum.NOT_AUDITPASS.getCode() && StringUtils.isBlank(form.getExamine().getOpinion())) {
throw new BaseException("驳回需要填写审核意见");
}
// 数据保存
......
......@@ -68,11 +68,11 @@ public class ExamineController {
List<Apply> applyList = service.selectByCriteria();
Date date = new Date();
for (Apply apply : applyList) {
if (apply.getStatus() != StatusEnum.STATUS_0.getCode()) {
if (apply.getStatus() != StatusEnum.TOBEAUDITED.getCode()) {
throw new BaseException("请选择未审核数据");
}
}
if (form.getStatus() == StatusEnum.STATUS_2.getCode() && StringUtils.isBlank(form.getExamine().getOpinion())) {
if (form.getStatus() == StatusEnum.NOT_AUDITPASS.getCode() && StringUtils.isBlank(form.getExamine().getOpinion())) {
throw new BaseException("驳回需要填写审核意见");
}
// 数据保存
......
......@@ -48,7 +48,7 @@ public class ApplyServiceImpl extends BaseServiceImpl<Apply, Integer> implements
rs.andEqualTo("applyId", oid);
List<ApplyResource> list = resourceMapper.selectByCriteria();
vo.setList(list);
if (apply.getStatus() == StatusEnum.STATUS_1.getCode() || apply.getStatus() == StatusEnum.STATUS_2.getCode()) {
if (apply.getStatus() == StatusEnum.AUDITPASS.getCode() || apply.getStatus() == StatusEnum.NOT_AUDITPASS.getCode()) {
Criteria es = examineMapper.createCriteria();
es.andEqualTo("applyId", oid);
Examine examine = examineMapper.selectOneByCriteria();
......
#Properties
#Mon Feb 11 10:00:23 CST 2019
build.time=2019-02-11T10\:00\:23+0800
build.artifact=com.zrqx.statistics
#Tue Feb 12 10:07:05 CST 2019
build.time=2019-02-12T10\:07\:05+0800
build.artifact=com.zrqx.works
build.group=com.zrqx
build.name=com.zrqx.statistics
build.name=com.zrqx.works
build.version=1.0.0
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论