From 30e858fa504b268b9b436afca0a1259cf6e8c488 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 19 八月 2025 11:01:40 +0800 Subject: [PATCH] 优化 --- server/src/main/java/com/doumee/api/business/WorkorderController.java | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-) diff --git a/server/src/main/java/com/doumee/api/business/WorkorderController.java b/server/src/main/java/com/doumee/api/business/WorkorderController.java index bd3dd0d..f8aaa44 100644 --- a/server/src/main/java/com/doumee/api/business/WorkorderController.java +++ b/server/src/main/java/com/doumee/api/business/WorkorderController.java @@ -1,6 +1,8 @@ package com.doumee.api.business; import com.doumee.api.BaseController; +import com.doumee.config.annotation.EncryptionReq; +import com.doumee.config.annotation.EncryptionResp; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.constants.Constants; @@ -11,10 +13,9 @@ import com.doumee.core.model.PageData; import com.doumee.core.utils.DateUtil; import com.doumee.dao.business.model.Workorder; -import com.doumee.dao.business.vo.WorkorderDbhDto; -import com.doumee.dao.business.vo.WorkorderDcaChildDto; -import com.doumee.dao.business.vo.WorkorderDcaDto; -import com.doumee.dao.business.vo.WorkorderSheDto; +import com.doumee.dao.business.vo.*; +import com.doumee.dao.web.dto.OrderDataDTO; +import com.doumee.dao.web.vo.WorkOrderDataVO; import com.doumee.service.business.WorkorderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -43,6 +44,8 @@ @PreventRepeat @ApiOperation("鏂板缓") + @EncryptionReq + @EncryptionResp @PostMapping("/create") @RequiresPermissions("business:workorder:create") public ApiResponse create(@RequestBody Workorder workorder) { @@ -72,9 +75,25 @@ workorderService.updateById(workorder); return ApiResponse.success(null); } + @ApiOperation("宸ヤ綔鍙扮粺璁℃暟鎹�") + @PostMapping("/getIndexData") + @EncryptionReq + @EncryptionResp + public ApiResponse<WorkorderIndexNumVO> getIndexData(@RequestBody Workorder workorder) { + return ApiResponse.success( workorderService.getIndexData(workorder)); + } + @ApiOperation("宸ヤ綔鍙扮粺璁℃姤琛ㄦ暟鎹�") + @PostMapping("/getWorkOrderData") + @EncryptionReq + @EncryptionResp + public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestBody OrderDataDTO workorder) { + return ApiResponse.success( workorderService.getWorkOrderData(workorder)); + } @ApiOperation("鍒嗛〉鏌ヨ") @PostMapping("/page") + @EncryptionReq + @EncryptionResp @RequiresPermissions("business:workorder:query") public ApiResponse<PageData<Workorder>> findPage (@RequestBody PageWrap<Workorder> pageWrap) { return ApiResponse.success(workorderService.findPage(pageWrap)); @@ -82,6 +101,7 @@ @ApiOperation("瀵煎嚭Excel") @PostMapping("/exportExcel") + @EncryptionReq @RequiresPermissions("business:workorder:exportExcel") public void exportExcel (@RequestBody PageWrap<Workorder> pageWrap, HttpServletResponse response) { //0SHE浜嬩欢 1DCA浜嬩欢鎻愪氦璁板綍 2DCA宸ュ崟 3璺岀粖婊戜簨浠� @@ -110,7 +130,12 @@ } } t.setMemberNames("鏈汉"); - t.setMemberNames(t.getMemberNames()+"-"+StringUtils.defaultString(model.getMemberNames(),"")); + if(Constants.equalsInteger(model.getMemberType(),Constants.ONE)){ + t.setMemberNames( "鍚屼簨-"+StringUtils.defaultString(model.getMemberNames(),"")); + }else if(Constants.equalsInteger(model.getMemberType(),Constants.TWO)){ + t.setMemberNames("渚涘簲鍟�"); + t.setMemberNames( "渚涘簲鍟�-"+StringUtils.defaultString(model.getMemberNames(),"")); + } list.add(t); } } @@ -159,6 +184,8 @@ @ApiOperation("鏍规嵁ID鏌ヨ") @GetMapping("/{id}") @RequiresPermissions("business:workorder:query") + @EncryptionResp + @EncryptionReq public ApiResponse findById(@PathVariable Integer id) { return ApiResponse.success(workorderService.getDetail(id,null)); } -- Gitblit v1.9.3