From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/controller/GdImplementListController.java | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/controller/GdImplementListController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/controller/GdImplementListController.java
index e5f119c..86bf9ca 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/controller/GdImplementListController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/controller/GdImplementListController.java
@@ -16,38 +16,40 @@
*/
package org.sxkj.gd.implement.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.common.GenericConverter;
import org.sxkj.gd.common.IdParam;
import org.sxkj.gd.implement.dto.GdImplementListDTO;
import org.sxkj.gd.implement.entity.GdImplementListEntity;
-import org.sxkj.gd.implement.param.GdImplementListPageParam;
-import org.sxkj.gd.implement.vo.GdImplementListVO;
import org.sxkj.gd.implement.excel.GdImplementListExcel;
-import org.sxkj.gd.implement.wrapper.GdImplementListWrapper;
+import org.sxkj.gd.implement.param.GdImplementListPageParam;
+import org.sxkj.gd.implement.param.ThingListMaterialRelationParam;
import org.sxkj.gd.implement.service.IGdImplementListService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.tool.constant.BladeConstant;
+import org.sxkj.gd.implement.vo.GdImplementListVO;
+import org.sxkj.gd.implement.vo.GetThingListMaterialRelationVO;
+import org.sxkj.gd.implement.wrapper.GdImplementListWrapper;
import springfox.documentation.annotations.ApiIgnore;
-import java.util.Map;
-import java.util.List;
+
import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
/**
* 实施清单主表 控制器
@@ -92,17 +94,37 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "新增或修改", notes = "传入gdImplementList")
- public R submit(@Valid @RequestBody GdImplementListDTO gdImplementList) {
+ public R<Boolean> submit(@Valid @RequestBody GdImplementListDTO gdImplementList) {
return R.status(gdImplementListService.saveOrUpdate(GenericConverter.convert(gdImplementList, GdImplementListEntity.class)));
+ }
+
+ /**
+ * 查询实施清单-材料关联、流程关联
+ */
+ @GetMapping("/getThingListMaterialRelation")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "查询配置实施清单-材料关联、流程关联", notes = "传入gdImplementList")
+ public R<GetThingListMaterialRelationVO> getThingListMaterialRelation(IdParam idParam) {
+ return R.data(gdImplementListService.getThingListMaterialRelation(idParam));
+ }
+
+ /**
+ * 实施清单-材料关联、流程关联
+ */
+ @PostMapping("/thingListMaterialRelation")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "配置实施清单-材料关联、流程关联", notes = "传入gdImplementList")
+ public R<Boolean> thingListMaterialRelation(@Valid @RequestBody ThingListMaterialRelationParam param) {
+ return R.status(gdImplementListService.thingListMaterialRelation(param));
}
/**
* 实施清单主表 删除
*/
@PostMapping("/remove")
- @ApiOperationSupport(order = 4)
+ @ApiOperationSupport(order = 5)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ public R<Boolean> remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(gdImplementListService.deleteLogic(Func.toLongList(ids)));
}
--
Gitblit v1.9.3