From dc0c8cf089d92c7bc6d43b20cacd889f157d6899 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 9 Aug 2023 16:04:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GroupManagementController.java | 14 ++++++++++++++ .../groupmanagement/dao/GroupManagementMapper.java | 2 ++ .../service/GroupManagementService.java | 4 ++++ .../service/impl/GroupManagementServiceImpl.java | 5 +++++ .../mybatis/mapper/GroupManagementMapper.xml | 11 +++++++++++ 5 files changed, 36 insertions(+) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java index 1b8574e1..329f4b12 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java @@ -194,4 +194,18 @@ public class GroupManagementController { return R.ok("设置失败"); } } + + + @PostMapping("/findAllGroupInfo") + @ApiOperation(value = "查询所有组织信息", httpMethod = "POST") + @SysLog(operation = "查询所有组织信息") + public R findAllGroupInfo() { + + try { + List groups = groupManagementService.findAllGroupInfo(); + return R.ok().put("groupInfo",groups); + } catch (Exception e) { + return R.error(); + } + } } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java index dce49143..6282ffd1 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java @@ -43,4 +43,6 @@ public interface GroupManagementMapper { int deleteGroup(@Param(value = "id") String id); int countEntIdNumByXfnsrsbh(@Param("xfnsrsbh") String xfnsrsbh); + + List findAllGroupInfo(); } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java index 03ccdd05..dfa473a2 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java @@ -54,4 +54,8 @@ public interface GroupManagementService { */ List queryByGroupIdList(List groupIdList); + /** + * 查询所有组织信息 + */ + List findAllGroupInfo(); } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java index 3253db74..1d67585c 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java @@ -206,6 +206,11 @@ public class GroupManagementServiceImpl implements GroupManagementService { return groupManagementMapper.queryByGroupIdList(groupIdList, OrderInfoEnum.ORDER_KPZZGL_CXLX_1.getKey()); } + @Override + public List findAllGroupInfo() { + return groupManagementMapper.findAllGroupInfo(); + } + /** * 构建组织树集合 diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml index e95e0529..8e845078 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml @@ -273,4 +273,15 @@ WHERE id = #{id} + + + From 12e08dd4de41f960e500c11c09271d70798982d2 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 9 Aug 2023 16:09:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/GroupManagementMapper.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml index 8e845078..59ed0e05 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml @@ -274,8 +274,14 @@ id = #{id} + + + + + - select group_id,group_name,xhf_nsrsbh from sys_group_management where data_source = '0' From bafebb880250002b52cde0d1ab97bc21b3f5828e Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Fri, 18 Aug 2023 17:03:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GroupManagementController.java | 2 +- .../dao/GroupManagementMapper.java | 3 ++- .../model/GroupManagementEntityVO.java | 19 +++++++++++++++++++ .../service/GroupManagementService.java | 7 ++----- .../impl/GroupManagementServiceImpl.java | 7 ++----- .../mybatis/mapper/GroupManagementMapper.xml | 2 +- 6 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupManagementEntityVO.java diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java index 329f4b12..fd8dddfd 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java @@ -202,7 +202,7 @@ public class GroupManagementController { public R findAllGroupInfo() { try { - List groups = groupManagementService.findAllGroupInfo(); + List groups = groupManagementService.findAllGroupInfo(); return R.ok().put("groupInfo",groups); } catch (Exception e) { return R.error(); diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java index 6282ffd1..99281445 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java @@ -1,6 +1,7 @@ package com.dxhy.order.baseservice.module.groupmanagement.dao; import com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntity; +import com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntityVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -44,5 +45,5 @@ public interface GroupManagementMapper { int countEntIdNumByXfnsrsbh(@Param("xfnsrsbh") String xfnsrsbh); - List findAllGroupInfo(); + List findAllGroupInfo(); } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupManagementEntityVO.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupManagementEntityVO.java new file mode 100644 index 00000000..4b877235 --- /dev/null +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupManagementEntityVO.java @@ -0,0 +1,19 @@ +package com.dxhy.order.baseservice.module.groupmanagement.model; + +import lombok.Data; + +@Data +public class GroupManagementEntityVO { + /** + * 组织id + */ + private String groupId; + /** + * 组织名称 + */ + private String groupName; + /** + * 销方纳税人识别号 + */ + private String xhfNsrsbh; +} diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java index dfa473a2..1dd7d636 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java @@ -1,9 +1,6 @@ package com.dxhy.order.baseservice.module.groupmanagement.service; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupDataStatusUpdate; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntity; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementQuery; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupTreeVO; +import com.dxhy.order.baseservice.module.groupmanagement.model.*; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -57,5 +54,5 @@ public interface GroupManagementService { /** * 查询所有组织信息 */ - List findAllGroupInfo(); + List findAllGroupInfo(); } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java index 1d67585c..280ff0a0 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java @@ -7,10 +7,7 @@ import cn.hutool.core.lang.tree.TreeNode; import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.json.JSONUtil; import com.dxhy.order.baseservice.module.groupmanagement.dao.GroupManagementMapper; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupDataStatusUpdate; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntity; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementQuery; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupTreeVO; +import com.dxhy.order.baseservice.module.groupmanagement.model.*; import com.dxhy.order.baseservice.module.groupmanagement.service.GroupManagementService; import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity; import com.dxhy.order.baseservice.module.thirdservice.user.model.TaxPlayerCodeDept; @@ -207,7 +204,7 @@ public class GroupManagementServiceImpl implements GroupManagementService { } @Override - public List findAllGroupInfo() { + public List findAllGroupInfo() { return groupManagementMapper.findAllGroupInfo(); } diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml index 59ed0e05..ed98190a 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml @@ -275,7 +275,7 @@ + type="com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntityVO">