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..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 @@ -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..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; @@ -43,4 +44,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/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 03ccdd05..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; @@ -54,4 +51,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..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; @@ -206,6 +203,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..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 @@ -273,4 +273,21 @@ WHERE id = #{id} + + + + + + + +