Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test

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<GroupManagementEntity> groups = groupManagementService.findAllGroupInfo();
+            List<GroupManagementEntityVO> groups = groupManagementService.findAllGroupInfo();
             return R.ok().put("groupInfo",groups);
         } catch (Exception e) {
             return R.error();

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<GroupManagementEntity> findAllGroupInfo();
+    List<GroupManagementEntityVO> findAllGroupInfo();
 }

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;
+}

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.*;
-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 org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
@@ -57,6 +54,6 @@ public interface GroupManagementService {
     /**
      * 查询所有组织信息
      */
-    List<GroupManagementEntity> findAllGroupInfo();
+    List<GroupManagementEntityVO> findAllGroupInfo();
 
 }

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.*;
-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.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<GroupManagementEntity> findAllGroupInfo() {
+    public List<GroupManagementEntityVO> findAllGroupInfo() {
         return groupManagementMapper.findAllGroupInfo();
     }
     /**

order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml

@@ -276,7 +276,7 @@
 
 
     <resultMap id="groupInfoResultMap"
-               type="com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntity">
+               type="com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntityVO">
         <result column="group_id" jdbcType="VARCHAR" property="groupId"/>
         <result column="group_name" jdbcType="VARCHAR" property="groupName"/>
         <result column="xhf_nsrsbh" jdbcType="VARCHAR" property="xhfNsrsbh"/>