diff --git a/.gitignore b/.gitignore index 5d18031c..84ed3d17 100644 --- a/.gitignore +++ b/.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/ 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..27649c89 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,17 @@ 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..6282ffd1 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 @@ -43,4 +43,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/service/GroupManagementService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java index 03ccdd05..0be6dce0 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 @@ -54,4 +54,9 @@ 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..9bfdd8ea 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 @@ -207,6 +207,10 @@ public class GroupManagementServiceImpl implements GroupManagementService { } + @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..bb53bd11 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,22 @@ WHERE id = #{id} + + + + + + + + + diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/emum/SdenergyTaxCodeMatchEnum.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/emum/SdenergyTaxCodeMatchEnum.java index 800381fb..a2f66617 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/emum/SdenergyTaxCodeMatchEnum.java +++ b/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"), ; diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/entity/SdenergyTaxCodeMathchImport.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/entity/SdenergyTaxCodeMathchImport.java new file mode 100644 index 00000000..6725462c --- /dev/null +++ b/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; +}