Commit 336dbf0e authored by wangxl's avatar wangxl

1

parent 08555645
...@@ -24,41 +24,4 @@ public class ComEvaluationController extends BaseController<ComEvaluationService ...@@ -24,41 +24,4 @@ public class ComEvaluationController extends BaseController<ComEvaluationService
@Autowired @Autowired
private ComEvaluationService comEvaluationService; private ComEvaluationService comEvaluationService;
@ApiOperation(value = "分页查询", httpMethod = "GET", notes = "根据参数获取列表")
@GetMapping
@RequestMapping("/getListByPage")
public ResponseDataModel<Pagination<ComEvaluationDTO>> getListByPage(@Validated ComEvaluationQueryVO vo, BindingResult bindingResult) {
Pagination<ComEvaluationDTO> page = comEvaluationService.getListByPage(vo);
return ResponseDataModel.ok(page);
}
@ApiOperation(value = "获取评审表信息", httpMethod = "GET", notes = "获取评审表信息")
@GetMapping
@RequestMapping("/getEvaluationById")
public ResponseDataModel<ComEvaluationDTO> getEvaluationById(String id) {
return ResponseDataModel.ok(comEvaluationService.getEvaluationById(id));
}
@ApiOperation(value = "评审表添加", httpMethod = "POST", notes = "评审表添加")
@RequestMapping("/insertEvaluation")
@PostMapping
//@Logs(value = CommonEnum.LogType.BatchAdd)
public ResponseDataModel<String> insertEvaluation(@Validated @RequestBody ComEvaluationDTO dto) {
return ResponseDataModel.ok(comEvaluationService.insertEvaluation(dto));
}
@ApiOperation(value = "评审表修改", httpMethod = "POST", notes = "评审表修改")
@RequestMapping("/updateEvaluation")
@PostMapping
//@Logs(value = CommonEnum.LogType.BatchUpdate)
public ResponseDataModel<String> updateEvaluation(@Validated @RequestBody ComEvaluationDTO dto) {
return ResponseDataModel.ok(comEvaluationService.updateEvaluation(dto));
}
@ApiOperation(value = "删除评审表", httpMethod = "DELETE", notes = "删除评审表")
@DeleteMapping(value = "deleteEvaluation/{id}")
//@Logs(value = CommonEnum.LogType.BatchDelete)
public ResponseDataModel<String> deleteEvaluation(@PathVariable String id) {
return ResponseDataModel.ok(comEvaluationService.deleteEvaluation(id));
}
} }
...@@ -126,7 +126,6 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer ...@@ -126,7 +126,6 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
@PreAuthorize("hasAnyRole('UNIT','GOV')") @PreAuthorize("hasAnyRole('UNIT','GOV')")
public ResponseDataModel<Pagination<ComProjectAuditDTO>> getAuditListByPage(@Validated ComProjectAuditQueryVO vo, BindingResult bindingResult) { public ResponseDataModel<Pagination<ComProjectAuditDTO>> getAuditListByPage(@Validated ComProjectAuditQueryVO vo, BindingResult bindingResult) {
vo.setAuditUnitId(SecurityUserHolder.getUnitId()); vo.setAuditUnitId(SecurityUserHolder.getUnitId());
vo.setAuditMethod(CommonEnum.auditMethod.audit.getCode());
return getPaginationResponseDataModel(vo); return getPaginationResponseDataModel(vo);
} }
...@@ -169,7 +168,6 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer ...@@ -169,7 +168,6 @@ public class ComProjectAuditController extends BaseController<ComProjectAuditSer
@PreAuthorize("hasAnyRole('UNIT','GOV')") @PreAuthorize("hasAnyRole('UNIT','GOV')")
public ResponseDataModel<DataStatisticsDTO> getCount(ComProjectAuditQueryVO vo) { public ResponseDataModel<DataStatisticsDTO> getCount(ComProjectAuditQueryVO vo) {
vo.setAuditUnitId(SecurityUserHolder.getUnitId()); vo.setAuditUnitId(SecurityUserHolder.getUnitId());
vo.setAuditMethod(CommonEnum.auditMethod.audit.getCode());
return ResponseDataModel.ok(comProjectAuditService.getCount(vo)); return ResponseDataModel.ok(comProjectAuditService.getCount(vo));
} }
......
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