From 015b4f31cebbecf6f6da760ed2f8af3da721e802 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 四月 2025 16:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/api/business/WorkorderController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 7813df5..a99183f 100644
--- a/server/src/main/java/com/doumee/api/business/WorkorderController.java
+++ b/server/src/main/java/com/doumee/api/business/WorkorderController.java
@@ -11,10 +11,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;
@@ -72,6 +71,16 @@
workorderService.updateById(workorder);
return ApiResponse.success(null);
}
+ @ApiOperation("宸ヤ綔鍙扮粺璁℃暟鎹�")
+ @PostMapping("/getIndexData")
+ public ApiResponse<WorkorderIndexNumVO> getIndexData(@RequestBody Workorder workorder) {
+ return ApiResponse.success( workorderService.getIndexData(workorder));
+ }
+ @ApiOperation("宸ヤ綔鍙扮粺璁℃姤琛ㄦ暟鎹�")
+ @PostMapping("/getWorkOrderData")
+ public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestBody OrderDataDTO workorder) {
+ return ApiResponse.success( workorderService.getWorkOrderData(workorder));
+ }
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@@ -110,7 +119,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);
}
}
@@ -160,6 +174,6 @@
@GetMapping("/{id}")
@RequiresPermissions("business:workorder:query")
public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(workorderService.getDetail(id));
+ return ApiResponse.success(workorderService.getDetail(id,null));
}
}
--
Gitblit v1.9.3