From b62c0ac0e4fa36e233915256ac2f9e3875ff3144 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 28 Sep 2023 10:49:28 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 2 ++
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 10 ++++++++++
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 21 +++++++++++++++++++++
3 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
index 2704560..476d2c6 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
@@ -62,6 +62,16 @@
return ResultMessage.ok(professions);
}
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @RequestMapping(value = "unit", method = RequestMethod.GET)
+ public ResultMessage unit() {
+ List<ResponsibilityUnit> responsibilityUnits = allocationService.seleteUnit();
+ return ResultMessage.ok(responsibilityUnits);
+ }
+
/**
* ���������������
diff --git a/screen-api/src/main/java/com/moral/api/service/AllocationService.java b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
index c610ced..16f4f0f 100644
--- a/screen-api/src/main/java/com/moral/api/service/AllocationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
@@ -19,6 +19,8 @@
List<Map<String, Object>> sysDictData(String code);
+ List<ResponsibilityUnit> seleteUnit();
+
Integer insertAllocation(AllocationAddCond allocation);
void updateAll(AllocationUpdateCond allocationUpdateCond);
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index 3c0806f..b691536 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -104,6 +104,27 @@
return sysDictDataMapper.selectMaps(dataQueryWrapper);
}
+ /**
+ * ������������������
+ * @return
+ */
+ @Override
+ public List<ResponsibilityUnit> seleteUnit() {
+ QueryWrapper<ResponsibilityUnit> wrapper = new QueryWrapper<>();
+ wrapper.select("unit_name","unit_id");
+ wrapper.eq("is_del",Constants.NOT_DELETE);
+ wrapper.eq("state",0);
+ wrapper.eq("is_invalid",0);
+
+ //������������������
+ List<Integer> unitList = unitResult();
+ if (CollectionUtils.isNotEmpty(unitList)){
+ wrapper.in("unit_id",unitList);
+ }
+ List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper);
+ return responsibilityUnits;
+ }
+
/**
* ���������������
--
Gitblit v1.8.0