From a90d4c73e67b27338e941f88673fd17fe8b2b5ff Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期二, 30 四月 2024 14:51:43 +0800 Subject: [PATCH] 前后端文件名统一调整 --- ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java | 90 ++++++++++++++++++++++++++------------------- 1 files changed, 52 insertions(+), 38 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java index aac85ac..de16ea7 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java @@ -2,6 +2,8 @@ import annotation.Log; import com.ycl.platform.domain.entity.ContractResult; +import com.ycl.platform.domain.entity.ContractResultRecord; +import com.ycl.platform.domain.vo.ContractResultVO; import com.ycl.platform.service.IContractResultService; import com.ycl.system.AjaxResult; import com.ycl.system.controller.BaseController; @@ -16,83 +18,95 @@ import java.util.List; /** - * 鍚堝悓鑰冩牳缁撴灉Controller + * 鑰冩牳缁撴灉Controller * * @author ruoyi * @date 2024-04-01 */ @RestController @RequestMapping("/contract/result") -public class ContractResultController extends BaseController -{ +public class ContractResultController extends BaseController { @Autowired - private IContractResultService defaultResultService; + private IContractResultService checkResultService; /** - * 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃 + * 鏌ヨ鑰冩牳缁撴灉鍒楄〃 */ @PreAuthorize("@ss.hasPermi('system:result:list')") - @GetMapping("/list") - public TableDataInfo list(ContractResult contractResult) - { + @PostMapping("/list") + public TableDataInfo list(@RequestBody ContractResultVO contractResult) { startPage(); - List<ContractResult> list = defaultResultService.selectDefaultResultList(contractResult); + List<ContractResultVO> list = checkResultService.selectCheckResultList(contractResult); return getDataTable(list); } /** - * 瀵煎嚭鍚堝悓鑰冩牳缁撴灉鍒楄〃 + * 鏌ヨ鑰冩牳缁撴灉鍒楄〃 */ - @PreAuthorize("@ss.hasPermi('system:result:export')") - @Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, ContractResult contractResult) - { - List<ContractResult> list = defaultResultService.selectDefaultResultList(contractResult); - ExcelUtil<ContractResult> util = new ExcelUtil<ContractResult>(ContractResult.class); - util.exportExcel(response, list, "鍚堝悓鑰冩牳缁撴灉鏁版嵁"); + @PreAuthorize("@ss.hasPermi('system:result:query')") + @GetMapping("/record/list") + public TableDataInfo recordList(Long resultId) { + List<ContractResultRecord> list = checkResultService.selectCheckResultRecordList(resultId); + return getDataTable(list); } /** - * 鑾峰彇鍚堝悓鑰冩牳缁撴灉璇︾粏淇℃伅 + * 瀵煎嚭鑰冩牳缁撴灉鍒楄〃 + */ + @PreAuthorize("@ss.hasPermi('system:result:export')") + @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ContractResultVO contractResult) { + List<ContractResultVO> list = checkResultService.selectCheckResultList(contractResult); + ExcelUtil<ContractResultVO> util = new ExcelUtil<>(ContractResultVO.class); + util.exportExcel(response, list, "鑰冩牳缁撴灉鏁版嵁"); + } + + /** + * 鑾峰彇鑰冩牳缁撴灉璇︾粏淇℃伅 */ @PreAuthorize("@ss.hasPermi('system:result:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(defaultResultService.selectDefaultResultById(id)); + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(checkResultService.selectCheckResultById(id)); } /** - * 鏂板鍚堝悓鑰冩牳缁撴灉 + * 鏂板鑰冩牳缁撴灉 */ @PreAuthorize("@ss.hasPermi('system:result:add')") - @Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.INSERT) + @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody ContractResult contractResult) - { - return toAjax(defaultResultService.insertDefaultResult(contractResult)); + public AjaxResult add(@RequestBody ContractResult contractResult) { + return toAjax(checkResultService.insertCheckResult(contractResult)); } /** - * 淇敼鍚堝悓鑰冩牳缁撴灉 + * 淇敼鑰冩牳缁撴灉 */ @PreAuthorize("@ss.hasPermi('system:result:edit')") - @Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.UPDATE) + @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody ContractResult contractResult) - { - return toAjax(defaultResultService.updateDefaultResult(contractResult)); + public AjaxResult edit(@RequestBody ContractResult contractResult) { + return toAjax(checkResultService.updateCheckResult(contractResult)); } /** - * 鍒犻櫎鍚堝悓鑰冩牳缁撴灉 + * 鍙戝竷鑰冩牳缁撴灉 + */ + @PreAuthorize("@ss.hasPermi('system:result:publish')") + @PutMapping("/publish/{id}") + public AjaxResult publish(@PathVariable("id") Long id) { + return toAjax(checkResultService.publish(id)); + } + + /** + * 鍒犻櫎鑰冩牳缁撴灉 */ @PreAuthorize("@ss.hasPermi('system:result:remove')") - @Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(defaultResultService.deleteDefaultResultByIds(ids)); + @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(checkResultService.deleteCheckResultByIds(ids)); } } -- Gitblit v1.8.0