批量查询

src/main/java/com/aps/controller/common/ChromosomeDataController.java

@@ -229,45 +229,31 @@ public class ChromosomeDataController {
      * 支持在一个请求中查询多个实体
      * 示例:
      * POST /queryChromosome/report
-     * Body: {
-     *   "sceneId": "SCENE001",
-     *   "data": [
-     *     {
-     *       "type": "page",
-     *       "name": "订单列表",
-     *       "table": "order",
-     *       "data": { "pageIndex": 1, "pageSize": 10 }
-     *     },
-     *     {
-     *       "type": "list",
-     *       "name": "工序列表",
-     *       "table": "entry",
-     *       "data": { "conditions": [] }
-     *     },
-     *     {
-     *       "type": "get",
-     *       "name": "订单详情",
-     *       "table": "order",
-     *       "data": { "id": "123" }
+     * Body: [
+     *   {
+     *     "type": "page",
+     *     "name": "订单列表",
+     *     "table": "order",
+     *     "data": { 
+     *       "pageIndex": 1, 
+     *       "pageSize": 10,
+     *       "conditions": [
+     *         { "fieldName": "sceneId", "fieldValue": "SCENE001", "conditionalType": "EQUAL" }
+     *       ]
      *     }
-     *   ]
-     * }
+     *   }
+     * ]
      *
-     * @param params 请求参数
-     * @return 查询结果列表
+     * @param sqlOrders SqlOrder列表
+     * @return 查询结果Map
      */
     @PostMapping("/report")
     @Operation(summary = "批量查询接口", description = "支持在一个请求中查询多个实体，type支持 page/list/get")
-    public R<List<SqlOrderResult>> executeSqlOrderReport(
-            @Parameter(description = "请求参数", required = true)
-            @RequestBody Map<String, Object> params) {
+    public R<Map<String, Object>> executeSqlOrderReport(
+            @Parameter(description = "SqlOrder列表", required = true)
+            @RequestBody List<SqlOrder> sqlOrders) {
         
-        String sceneId = params.get("sceneId") != null ? params.get("sceneId").toString() : null;
-        @SuppressWarnings("unchecked")
-        List<SqlOrder> sqlOrders = objectMapper.convertValue(params.get("data"), 
-                new com.fasterxml.jackson.core.type.TypeReference<List<SqlOrder>>() {});
-        
-        List<SqlOrderResult> results = chromosomeDataService.executeSqlOrderReport(sqlOrders, sceneId);
+        Map<String, Object> results = chromosomeDataService.executeSqlOrderReport(sqlOrders);
         return ok(results);
     }
 
@@ -276,45 +262,31 @@ public class ChromosomeDataController {
      * 支持在一个请求中修改多个实体
      * 示例:
      * POST /queryChromosome/commit
-     * Body: {
-     *   "sceneId": "SCENE001",
-     *   "data": [
-     *     {
-     *       "type": "update",
-     *       "name": "更新订单",
-     *       "table": "order",
-     *       "data": { "id": 1, "name": "新订单名称" }
-     *     },
-     *     {
-     *       "type": "delete",
-     *       "name": "删除工序",
-     *       "table": "entry",
-     *       "data": { "id": 123 }
-     *     },
-     *     {
-     *       "type": "insert",
-     *       "name": "新增订单",
-     *       "table": "order",
-     *       "data": { "name": "新订单" }
+     * Body: [
+     *   {
+     *     "type": "update",
+     *     "name": "更新订单",
+     *     "table": "order",
+     *     "data": { 
+     *       "id": 1, 
+     *       "name": "新订单名称",
+     *       "conditions": [
+     *         { "fieldName": "sceneId", "fieldValue": "SCENE001", "conditionalType": "EQUAL" }
+     *       ]
      *     }
-     *   ]
-     * }
+     *   }
+     * ]
      *
-     * @param params 请求参数
-     * @return 执行结果列表
+     * @param sqlOrders SqlOrder列表
+     * @return 执行结果Map
      */
     @PostMapping("/commit")
     @Operation(summary = "批量修改接口", description = "支持在一个请求中修改多个实体，type支持 update/delete/insert")
-    public R<List<SqlOrderResult>> executeSqlOrderCommit(
-            @Parameter(description = "请求参数", required = true)
-            @RequestBody Map<String, Object> params) {
-        
-        String sceneId = params.get("sceneId") != null ? params.get("sceneId").toString() : null;
-        @SuppressWarnings("unchecked")
-        List<SqlOrder> sqlOrders = objectMapper.convertValue(params.get("data"), 
-                new com.fasterxml.jackson.core.type.TypeReference<List<SqlOrder>>() {});
+    public R<Map<String, Object>> executeSqlOrderCommit(
+            @Parameter(description = "SqlOrder列表", required = true)
+            @RequestBody List<SqlOrder> sqlOrders) {
         
-        List<SqlOrderResult> results = chromosomeDataService.executeSqlOrderCommit(sqlOrders, sceneId);
+        Map<String, Object> results = chromosomeDataService.executeSqlOrderCommit(sqlOrders);
         return ok(results);
     }
 }
\ No newline at end of file

src/main/java/com/aps/entity/Gantt/ProductGanttVO.java

@@ -50,12 +50,17 @@ public class ProductGanttVO {
     @Schema(description = "状态")
     private String status;
 
-    @Schema(description = "头ID")
+    @Schema(description = "工艺ID")
     private Integer headerId;
 
-    @Schema(description = "头名称")
+    @Schema(description = "工艺名称")
     private String headerName;
 
     @Schema(description = "任务列表")
     private List<TaskVO> list;
+
+    @Schema(description = "订单编号")
+    private String orderCode;
+
+
 }
\ No newline at end of file

src/main/java/com/aps/service/plan/PlanResultService.java

@@ -2009,7 +2009,7 @@ private  GlobalParam InitGlobalParam()
 //                            productGanttVO.setShopId(firstGene.getMachineId());
 //                            productGanttVO.setShopName(firstGene.getMachineId()+"号线");
                             productGanttVO.setStatus("已发布");
-                            
+                            productGanttVO.setOrderCode(firstGene.getOrderCode());
                             Entry entry = allOperations.stream()
                                     .filter(t -> t.getId() == firstGene.getOperationId()).findFirst().orElse(null);
                             if (entry != null) {