From a0ae7e07b835a8f247988fce8103acccac2af8e3 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Thu, 7 Aug 2025 15:42:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nu/modules/common/NuCommonApi.java | 5 ++ .../controller/CanAddDirectiveController.java | 58 ++++++++++--------- .../jeecg/common/system/api/ISysBaseAPI.java | 2 + .../system/service/impl/SysBaseApiImpl.java | 14 +++++ 4 files changed, 52 insertions(+), 27 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java b/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java index eccdbe2..2748c4f 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java @@ -32,6 +32,11 @@ public class NuCommonApi { return Result.ok(sysBaseAPI.getOrgInfo(orgCode)); } + //获取标准指令库信息 + @GetMapping("/getDMOrgInfo") + public Result getDMOrgInfo(){ + return Result.ok(sysBaseAPI.getDMOrgInfo()); + } /** * 根据父id查询对应省、市、区/县 列表 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/controller/CanAddDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/controller/CanAddDirectiveController.java index cb7a07f..c4bde2f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/controller/CanAddDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/controller/CanAddDirectiveController.java @@ -10,6 +10,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; @@ -39,45 +41,47 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; - /** +/** * @Description: 可新增指令 * @Author: jeecg-boot - * @Date: 2025-08-01 + * @Date: 2025-08-01 * @Version: V1.0 */ -@Api(tags="可新增指令") +@Api(tags = "可新增指令") @RestController @RequestMapping("/canadddirective/canAddDirective") @Slf4j public class CanAddDirectiveController extends JeecgController { - @Autowired - private ICanAddDirectiveService canAddDirectiveService; + @Autowired + private ICanAddDirectiveService canAddDirectiveService; - /** - * 分页列表查询 - * - * @param canAddDirective - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "可新增指令-分页列表查询") - @ApiOperation(value="可新增指令-分页列表查询", notes="可新增指令-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(CanAddDirective canAddDirective, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + /** + * 分页列表查询 + * + * @param canAddDirective + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "可新增指令-分页列表查询") + @ApiOperation(value = "可新增指令-分页列表查询", notes = "可新增指令-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CanAddDirective canAddDirective, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { // 自定义查询规则 Map customeRuleMap = new HashMap<>(); // 自定义多选的查询规则为：LIKE_WITH_OR customeRuleMap.put("orgCode", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(canAddDirective, req.getParameterMap(),customeRuleMap); - queryWrapper.notIn("directive_id",canAddDirective.getExistDirectiveIds().split(",")); - Page page = new Page(pageNo, pageSize); - IPage pageList = canAddDirectiveService.page(page, queryWrapper); - return Result.OK(pageList); - } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(canAddDirective, req.getParameterMap(), customeRuleMap); + if (StringUtils.isNotBlank(canAddDirective.getExistDirectiveIds())) { + queryWrapper.notIn("directive_id", canAddDirective.getExistDirectiveIds().split(",")); + } + Page page = new Page(pageNo, pageSize); + IPage pageList = canAddDirectiveService.page(page, queryWrapper); + return Result.OK(pageList); + } } diff --git a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java index 751a2e6..e43ecf9 100644 --- a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java +++ b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java @@ -627,6 +627,8 @@ public interface ISysBaseAPI extends CommonAPI { JSONObject getOrgInfo(String orgCode); + JSONObject getDMOrgInfo(); + JSONObject getDeptInfo(); String addOrg(SysDepartEntity sysDepart); diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index 9aebd5d..a47f2a3 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -1904,6 +1904,20 @@ public class SysBaseApiImpl implements ISysBaseAPI { return queryOrgInfo(orgCode); } + @Override + public JSONObject getDMOrgInfo() { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("iz_directive_main", "0");//标准指令库 + qw.eq("org_category", "1");//机构类型 + qw.eq("del_flag", "0");//未删除数据 + SysDepart sysDepart = sysDepartService.getOne(qw); + if (sysDepart != null) { + return (JSONObject) JSONObject.toJSON(sysDepart); + } else { + return null; + } + } + @Override public JSONObject getDeptInfo() { Map map = Maps.newHashMap();