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

.gitignore

@@ -14,6 +14,8 @@
 */target/
 */.classpath
 */*.iml
+order-management-consumer/src/main/resources/bootstrap.yaml
+order-management-consumer/src/main/resources/generator.properties
 
 ## 其他web 模式忽略文件
 order-management-consumer/src/main/resources/META-INF/

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java

@@ -194,4 +194,17 @@ public class GroupManagementController {
             return R.ok("设置失败");
         }
     }
+
+    @PostMapping("/findAllGroupInfo")
+    @ApiOperation(value = "查询所有组织信息", httpMethod = "POST")
+    @SysLog(operation = "查询所有组织信息")
+    public R findAllGroupInfo() {
+
+        try {
+            List<GroupManagementEntity> 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

@@ -43,4 +43,6 @@ public interface GroupManagementMapper {
     int deleteGroup(@Param(value = "id") String id);
 
     int countEntIdNumByXfnsrsbh(@Param("xfnsrsbh") String xfnsrsbh);
+
+    List<GroupManagementEntity> findAllGroupInfo();
 }

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java

@@ -54,4 +54,9 @@ public interface GroupManagementService {
      */
     List<GroupManagementEntity> queryByGroupIdList(List<String> groupIdList);
 
+    /**
+     * 查询所有组织信息
+     */
+    List<GroupManagementEntity> findAllGroupInfo();
+
 }

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java

@@ -207,6 +207,10 @@ public class GroupManagementServiceImpl implements GroupManagementService {
     }
 
 
+    @Override
+    public List<GroupManagementEntity> findAllGroupInfo() {
+        return groupManagementMapper.findAllGroupInfo();
+    }
     /**
      * 构建组织树集合
      */

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

@@ -273,4 +273,22 @@
         WHERE
             id = #{id}
     </delete>
+
+
+    <resultMap id="groupInfoResultMap"
+               type="com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntity">
+        <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>

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/emum/SdenergyTaxCodeMatchEnum.java

@@ -14,7 +14,7 @@ public enum SdenergyTaxCodeMatchEnum {
     WIFIBM_NAME("物料分类编码*", "wlflbm"),
     FIMC_NAME("物料名称*", "flmc"),
     SSFIBM_NAME("税收分类编码*", "ssflbm"),
-    SSFIMC_NAME("税收分类名称*", "ssflmc"),
+    SSFIMC_NAME("税收分类简称*", "ssflmc"),
     ;
 
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/entity/SdenergyTaxCodeMathchImport.java

@@ -0,0 +1,25 @@
+package com.dxhy.order.consumer.modules.taxcodematch.entity;
+
+import lombok.Data;
+
+@Data
+public class SdenergyTaxCodeMathchImport {
+
+
+    /**
+     * 物料分类编码
+     */
+    private String wlflbm;
+    /**
+     * 物料名称
+     */
+    private String flmc;
+    /**
+     * 税收分类编码
+     */
+    private String ssflbm;
+    /**
+     * 税收分类名称
+     */
+    private String ssflmc;
+}