Explorar el Código

国家查看省已选信息

lfy hace 3 semanas
padre
commit
deda8e6338

+ 7 - 0
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/delivery/DeliveryController.java

@@ -72,6 +72,13 @@ public class DeliveryController {
72 72
     public CommonResult<PageResult<DeliveryRespVO>> getDeliveryPage(@Valid DeliveryPageReqVO pageReqVO) {
73 73
         return success(dwxxService.getDeliveryPage(pageReqVO));
74 74
     }
75
+    @GetMapping("/province-selected/page")
76
+    @Operation(summary = "国家查看省已选交收仓选择分页")
77
+    @PreAuthorize("@ss.hasPermission('coding:delivery:query')")
78
+    public CommonResult<PageResult<SpareRespVO>> getProvinceSelectedPage(@Valid SparePageReqVO pageReqVO) {
79
+        return success(dwxxService.getProvinceSelectedPage(pageReqVO));
80
+    }
81
+
75 82
     @GetMapping("/storePage")
76 83
     @Operation(summary = "获得仓房列表分页")
77 84
     @PreAuthorize("@ss.hasPermission('coding:cfxx:query')")

+ 2 - 0
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxService.java

@@ -64,4 +64,6 @@ public interface DwxxService {
64 64
     void revertCaxx(CaxxUpdateReqVO updateReqVO);
65 65
 
66 66
     void revertKqxx(List<Long> kqIds,String areaLevel);
67
+
68
+    PageResult<SpareRespVO> getProvinceSelectedPage(SparePageReqVO pageReqVO);
67 69
 }

+ 20 - 0
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxServiceImpl.java

@@ -518,6 +518,26 @@ public class DwxxServiceImpl implements DwxxService {
518 518
             }
519 519
         }
520 520
     }
521
+
522
+    @Override
523
+    public PageResult<SpareRespVO> getProvinceSelectedPage(SparePageReqVO pageReqVO) {
524
+        if (StringUtils.isNotBlank(pageReqVO.getDwmc())) {
525
+            pageReqVO.setDwmc(String.format("%s%s%s", "%", pageReqVO.getDwmc(), "%"));
526
+        }
527
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
528
+        AdminUserDO adminUserDO = adminUserMapper.selectById(loginUserId);
529
+        if (ObjectUtils.isEmpty(adminUserDO)) {
530
+            throw exception(ERROR, "不存在用户信心信息");
531
+        }
532
+        Integer areaLevel = adminUserDO.getAreaLevel();
533
+        Page<SpareRespVO> page = new Page<SpareRespVO>();
534
+        // 国家交易中心已选
535
+        if (0 == areaLevel || ObjectUtil.isEmpty(areaLevel)) {
536
+            page = caxxMapper.selectWrapperPageForSheng(new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO);
537
+        }
538
+        return new PageResult<SpareRespVO>(page.getRecords(), page.getTotal());
539
+    }
540
+
521 541
     @Transactional
522 542
     public void createCaAndKuAndDWForSheng(CaxxUpdateReqVO updateReqVO) {
523 543
         if (updateReqVO.getKqId() != null) {