sfms3.0
/
sfms3.0
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改申请权限Bug

master_hella_20240701
刘忱 1 year ago
parent
faa1859b55
commit
646c98e6ab
3 changed files with 19 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      win-module-qms/win-module-qms-biz/src/main/java/com/win/module/qms/controller/inspectionJob/InspectionJobMainController.java
  2. 4
      win-module-qms/win-module-qms-biz/src/main/java/com/win/module/qms/controller/inspectionRecord/InspectionRecordMainController.java
  3. 20
      win-module-qms/win-module-qms-biz/src/main/java/com/win/module/qms/controller/inspectionRequest/InspectionRequestMainController.java

16
win-module-qms/win-module-qms-biz/src/main/java/com/win/module/qms/controller/inspectionJob/InspectionJobMainController.java
View File

@ -8,12 +8,10 @@ import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.eam.enums.DictTypeConstants;
import com.win.module.qms.controller.inspectionJob.vo.*;
import com.win.module.qms.controller.inspectionRequest.vo.InspectionRequestMainRespVO;
import com.win.module.qms.convert.inspectionJob.InspectionJobMainConvert;
import com.win.module.qms.dal.dataobject.inspectionJob.InspectionJobDetailDO;
import com.win.module.qms.dal.dataobject.inspectionJob.InspectionJobMainDO;
import com.win.module.qms.dal.dataobject.inspectionScheme.InspectionSchemeDO;
import com.win.module.qms.dal.mysql.inspectionScheme.InspectionSchemeMapper;
import com.win.module.qms.enums.job.JobStatusEnum;
import com.win.module.qms.service.inspectionJob.InspectionJobDetailService;
import com.win.module.qms.service.inspectionJob.InspectionJobMainService;
@ -58,7 +56,7 @@ public class InspectionJobMainController {
@GetMapping("/get")
@Operation(summary = "获得检验任务主")
@PreAuthorize("@ss.hasPermission('job:inspection-job-main:query')")
@PreAuthorize("@ss.hasPermission('qms:inspection-job-main:query')")
public CommonResult<InspectionJobMainRespVO> getInspectionJobMain(@RequestParam("id") Long id) {
InspectionJobMainDO inspectionJobMain = inspectionJobMainService.getInspectionJobMain(id);
return success(InspectionJobMainConvert.INSTANCE.convert(inspectionJobMain));
@ -91,7 +89,7 @@ public class InspectionJobMainController {
@GetMapping("/export-excel")
@Operation(summary = "导出检验任务 Excel")
@PreAuthorize("@ss.hasPermission('job:inspection-job-main:export')")
@PreAuthorize("@ss.hasPermission('qms:inspection-job-main:export')")
@OperateLog(type = EXPORT)
public void exportInspectionJobMainExcel(@Valid InspectionJobMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException {
List<InspectionJobMainDO> list = inspectionJobMainService.getInspectionJobMainList(exportReqVO);
@ -102,7 +100,7 @@ public class InspectionJobMainController {
@PostMapping("/export-excel-senior")
@Operation(summary = "导出检验任务主 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspection-job-main:export')")
@PreAuthorize("@ss.hasPermission('qms:inspection-job-main:export')")
@OperateLog(type = EXPORT)
public void exportInspectionJobMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<InspectionJobMainDO> list = inspectionJobMainService.getInspectJobMainSenior(conditions);
@ -135,7 +133,7 @@ public class InspectionJobMainController {
}
@Operation(summary = "承接任务")
@PreAuthorize("@ss.hasPermission('wms:inspection-job-main:accept')")
@PreAuthorize("@ss.hasPermission('qms:inspection-job-main:accept')")
@PutMapping(value = "/accept")
public CommonResult<Boolean> acceptInspectionJobMain(@RequestParam("id") Long id) {
int result = inspectionJobMainService.acceptInspectionJobMain(id);
@ -143,7 +141,7 @@ public class InspectionJobMainController {
}
@Operation(summary = "放弃任务")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:abandon')")
@PreAuthorize("@ss.hasPermission('qms:inspect-job-main:abandon')")
@PutMapping(value = "/abandon")
public CommonResult<Boolean> abandonInspectionJobMain(@RequestParam("id") Long id) {
int result = inspectionJobMainService.abandonInspectionJobMain(id);
@ -152,7 +150,7 @@ public class InspectionJobMainController {
@PutMapping(value = "/close")
@Operation(summary = "关闭任务")
@PreAuthorize("@ss.hasPermission('wms:inspection-job-main:close')")
@PreAuthorize("@ss.hasPermission('qms:inspection-job-main:close')")
public CommonResult<Boolean> closeInspectionJobMain(@RequestParam("id") Long id) {
int result = inspectionJobMainService.closeInspectionJobMain(id);
return success(result > 0);
@ -161,7 +159,7 @@ public class InspectionJobMainController {
@PutMapping("/execute")
@Operation(summary = "执行任务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspection-job-main:execute')")
@PreAuthorize("@ss.hasPermission('qms:inspection-job-main:execute')")
public CommonResult<String> executeInspectionJobMain(@Valid @RequestBody InspectionJobMainUpdateReqVO updateReqVO) {
String number = inspectionJobMainService.executeInspectionJobMain(updateReqVO);
return success(number);

4
win-module-qms/win-module-qms-biz/src/main/java/com/win/module/qms/controller/inspectionRecord/InspectionRecordMainController.java
View File

@ -36,7 +36,7 @@ public class InspectionRecordMainController {
@PutMapping("/update")
@Operation(summary = "更新检验记录")
@PreAuthorize("@ss.hasPermission('record:inspection-record-main:update')")
@PreAuthorize("@ss.hasPermission('qms:inspection-record-main:update')")
public CommonResult<Boolean> updateInspectionRecordMain(@Valid @RequestBody InspectionRecordMainUpdateReqVO updateReqVO) {
int result = inspectionRecordMainService.updateInspectionRecordMain(updateReqVO);
return success(result > 0);
@ -44,7 +44,7 @@ public class InspectionRecordMainController {
@PutMapping("/publish")
@Operation(summary = "发布")
@PreAuthorize("@ss.hasPermission('record:inspection-record-main:update')")
@PreAuthorize("@ss.hasPermission('qms:inspection-record-main:update')")
public CommonResult<Boolean> publishInspectionRecordMain(@RequestParam("id") Long id) {
int result = inspectionRecordMainService.publishInspectionRecordMain(id);
return success(result > 0);

20
win-module-qms/win-module-qms-biz/src/main/java/com/win/module/qms/controller/inspectionRequest/InspectionRequestMainController.java
View File

@ -48,14 +48,14 @@ public class InspectionRequestMainController {
@PostMapping("/create")
@Operation(summary = "创建检验申请")
@PreAuthorize("@ss.hasPermission('request:inspection-request-main:create')")
@PreAuthorize("@ss.hasPermission('qms:inspection-request-main:create')")
public CommonResult<Long> createInspectionRequestMain(@Valid @RequestBody InspectionRequestMainCreateReqVO createReqVO) {
return success(inspectionRequestMainService.createInspectionRequestMain(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新检验申请")
@PreAuthorize("@ss.hasPermission('request:inspection-request-main:update')")
@PreAuthorize("@ss.hasPermission('qms:inspection-request-main:update')")
public CommonResult<Boolean> updateInspectionRequestMain(@Valid @RequestBody InspectionRequestMainUpdateReqVO updateReqVO) {
int result = inspectionRequestMainService.updateInspectionRequestMain(updateReqVO);
return success(result > 0);
@ -64,7 +64,7 @@ public class InspectionRequestMainController {
@DeleteMapping("/delete")
@Operation(summary = "删除检验申请")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('request:inspection-request-main:delete')")
@PreAuthorize("@ss.hasPermission('qms:inspection-request-main:delete')")
public CommonResult<Boolean> deleteInspectionRequestMain(@RequestParam("id") Long id) {
int result = inspectionRequestMainService.deleteInspectionRequestMain(id);
return success(result > 0);
@ -107,7 +107,7 @@ public class InspectionRequestMainController {
@GetMapping("/export-excel")
@Operation(summary = "导出检验申请 Excel")
@PreAuthorize("@ss.hasPermission('request:inspection-request-main:export')")
@PreAuthorize("@ss.hasPermission('qms:inspection-request-main:export')")
@OperateLog(type = EXPORT)
public void exportInspectionRequestMainExcel(@Valid InspectionRequestMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException {
List<InspectionRequestMainDO> list = inspectionRequestMainService.getInspectionRequestMainList(exportReqVO);
@ -127,7 +127,7 @@ public class InspectionRequestMainController {
@PutMapping("/close")
@Operation(summary = "关闭检验申请主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspection-request-main:close')")
@PreAuthorize("@ss.hasPermission('qms:inspection-request-main:close')")
public CommonResult<Boolean> closeInspectionRequestMain(@RequestParam("id") Long id) {
Integer count = inspectionRequestMainService.closeInspectionRequestMain(id);
return success(count > 0);
@ -136,7 +136,7 @@ public class InspectionRequestMainController {
@PutMapping("/submit")
@Operation(summary = "提交检验申请主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspection-request-main:submit')")
@PreAuthorize("@ss.hasPermission('qms:inspection-request-main:submit')")
public CommonResult<Boolean> submitInspectionRequestMain(@RequestParam("id") Long id) {
Integer count = inspectionRequestMainService.submitInspectionRequestMain(id);
return success(count > 0);
@ -145,7 +145,7 @@ public class InspectionRequestMainController {
@PutMapping("/reAdd")
@Operation(summary = "重新添加检验申请主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspection-request-main:reAdd')")
@PreAuthorize("@ss.hasPermission('qms:inspection-request-main:reAdd')")
public CommonResult<Boolean> openInspectionRequestMain(@RequestParam("id") Long id) {
Integer count = inspectionRequestMainService.reAddInspectionRequestMain(id);
return success(count > 0);
@ -154,7 +154,7 @@ public class InspectionRequestMainController {
@PutMapping("/agree")
@Operation(summary = "审批通过检验申请主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspection-request-main:agree')")
@PreAuthorize("@ss.hasPermission('qms:inspection-request-main:agree')")
public CommonResult<Boolean> agreeInspeciontRequestMain(@RequestParam("id") Long id) {
Integer count = inspectionRequestMainService.agreeInspectionRequestMain(id);
return success(count > 0);
@ -163,7 +163,7 @@ public class InspectionRequestMainController {
@PutMapping("/handle")
@Operation(summary = "执行检验申请主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspection-request-main:handle')")
@PreAuthorize("@ss.hasPermission('qms:inspection-request-main:handle')")
public CommonResult<Boolean> handleInspectionRequestMain(@RequestParam("id") Long id) {
Integer count = inspectionRequestMainService.handleInspectionRequestMain(id);
return success(count > 0);
@ -172,7 +172,7 @@ public class InspectionRequestMainController {
@PutMapping("/refused")
@Operation(summary = "审批拒绝检验申请主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspection-request-main:abort')")
@PreAuthorize("@ss.hasPermission('qms:inspection-request-main:abort')")
public CommonResult<Boolean> refusedInspectionRequestMain(@RequestParam("id") Long id) {
Integer count = inspectionRequestMainService.refusedInspectionRequestMain(id);
return success(count > 0);

Write Preview
Loading…
Cancel
Save