Merge remote-tracking branch 'origin/0809-findGroup' into release

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<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;
@@ -43,4 +44,6 @@ public interface GroupManagementMapper {
     int deleteGroup(@Param(value = "id") String id);
 
     int countEntIdNumByXfnsrsbh(@Param("xfnsrsbh") String xfnsrsbh);
+
+    List<GroupManagementEntityVO> findAllGroupInfo();
 }

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

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;
@@ -54,4 +51,8 @@ public interface GroupManagementService {
      */
     List<GroupManagementEntity> queryByGroupIdList(List<String> groupIdList);
 
+    /**
+     * 查询所有组织信息
+     */
+    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;
@@ -206,6 +203,11 @@ public class GroupManagementServiceImpl implements GroupManagementService {
         return groupManagementMapper.queryByGroupIdList(groupIdList, OrderInfoEnum.ORDER_KPZZGL_CXLX_1.getKey());
     }
 
+    @Override
+    public List<GroupManagementEntityVO> findAllGroupInfo() {
+        return groupManagementMapper.findAllGroupInfo();
+    }
+
 
     /**
      * 构建组织树集合

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

@@ -273,4 +273,21 @@
         WHERE
             id = #{id}
     </delete>
+
+    <resultMap id="groupInfoResultMap"
+               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"/>
+    </resultMap>
+
+    <select id="findAllGroupInfo" resultMap="groupInfoResultMap">
+        select group_id,group_name,xhf_nsrsbh
+        from sys_group_management
+        where data_source = '0'
+        and is_default = '0'
+        and data_status = '0'
+        and del_flag='0'
+        group by group_id
+    </select>
 </mapper>