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 27649c89..9c701913 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 @@ -201,7 +201,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..57a706ca --- /dev/null +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupManagementEntityVO.java @@ -0,0 +1,20 @@ +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 0be6dce0..844cfaac 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,6 +54,6 @@ 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 9bfdd8ea..e1220c05 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; @@ -208,7 +205,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 bb53bd11..6ff37b18 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 @@ -276,7 +276,7 @@ + type="com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntityVO">