修改逻辑

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

@@ -103,7 +103,7 @@ public class DeliveryController {
         return success(true);
     }
 
-    @PutMapping("/revertCaxx")
+    @PostMapping("/revertCaxx")
     @Operation(summary = "仓房退回")
     @PreAuthorize("@ss.hasPermission('coding:delivery:query')")
     public CommonResult<Boolean> revertCaxx(@Valid @RequestBody CaxxUpdateReqVO updateReqVO) {
@@ -120,17 +120,16 @@ public class DeliveryController {
         }
         return success(true);
     }
-    @PutMapping("/revertKqxx")
+    @GetMapping("/revertKqxx")
     @Operation(summary = "库区退回")
     @PreAuthorize("@ss.hasPermission('coding:delivery:query')")
-    public CommonResult<Boolean> revertKqxx(@Valid @RequestBody CaxxUpdateReqVO updateReqVO) {
+    public CommonResult<Boolean> revertKqxx(@Valid @RequestParam("kqIds") List<Long> kqIds) {
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         log.info("loginUser: {}", loginUser);
         if (ObjectUtils.isNotEmpty(loginUser)) {
             String areaLevel = loginUser.getInfo().get("areaLevel");
             if (StringUtils.isNotBlank(areaLevel)) {
-                updateReqVO.setAreaLevel(areaLevel);
-                dwxxService.revertKqxx(updateReqVO);
+                dwxxService.revertKqxx(kqIds,areaLevel);
             } else { // admin 管理员
                 log.info("超级管理员无修改数据权限loginUser: {}", loginUser);
             }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/bank/BankMapper.java

@@ -41,7 +41,12 @@ public interface BankMapper extends BaseMapperX<BankDO> {
                         .in(!ObjectUtil.isEmpty(caIds),BankDO::getCaId, caIds)
         );
     }
-
+    default int deleteListByKqIds(List<Long> kqIds) {
+        return delete(
+                new LambdaUpdateWrapper<BankDO>()
+                        .in(!ObjectUtil.isEmpty(kqIds),BankDO::getKqId, kqIds)
+        );
+    }
 
     default void updateByKqId(BankDO bankDO, Long kqId){
         update(bankDO, new LambdaQueryWrapperX<BankDO>().eq(BankDO::getKqId,kqId));

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/cwxx/CwxxMapper.java

@@ -24,7 +24,7 @@ public interface CwxxMapper extends BaseMapperX<CwxxDO> {
                 .orderByDesc(CwxxDO::getId));
     }
 
-    default CwxxDO selectBYKqId(Long kqId){
+    default CwxxDO selectByKqId(Long kqId){
         return selectOne(CwxxDO::getKqid,kqId);
     }
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/province/ProvinceMapper.java

@@ -60,4 +60,11 @@ public interface ProvinceMapper extends BaseMapperX<ProvinceDO> {
         );
     }
     List<StoreRespVO> getStoreListForProvince(@Param("kqId") Long  kqId,@Param("type")Integer type);
+
+    default int deleteListByKqIds(List<Long> kqIds) {
+        return delete(
+                new LambdaUpdateWrapper<ProvinceDO>()
+                        .in(!ObjectUtil.isEmpty(kqIds),ProvinceDO::getKqId, kqIds)
+        );
+    }
 }

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

@@ -63,5 +63,5 @@ public interface DwxxService {
 
     void revertCaxx(CaxxUpdateReqVO updateReqVO);
 
-    void revertKqxx(CaxxUpdateReqVO updateReqVO);
+    void revertKqxx(List<Long> kqIds,String areaLevel);
 }

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

@@ -348,7 +348,7 @@ public class DwxxServiceImpl implements DwxxService {
             if (ObjectUtils.isEmpty(caxxDOS)){
                 dwxxMapper.deleteByDwId(updateReqVO.getDeptId());
                 kqxxMapper.deleteByKqId(updateReqVO.getKqId());
-                CwxxDO cwxxDO = cwxxMapper.selectBYKqId(updateReqVO.getKqId());
+                CwxxDO cwxxDO = cwxxMapper.selectByKqId(updateReqVO.getKqId());
                 if (!ObjectUtil.isEmpty(cwxxDO)){
                     Long cwxxDOId = cwxxDO.getId();
                     cwxxMapper.deleteById(cwxxDOId);
@@ -376,7 +376,7 @@ public class DwxxServiceImpl implements DwxxService {
                         dwxxMapper.deleteByDwId(updateReqVO.getDeptId());
                         kqxxMapper.deleteByKqId(updateReqVO.getKqId());
                         caxxMapper.deleteListByKqId(updateReqVO.getKqId());
-                        CwxxDO cwxxDO = cwxxMapper.selectBYKqId(updateReqVO.getKqId());
+                        CwxxDO cwxxDO = cwxxMapper.selectByKqId(updateReqVO.getKqId());
                         if (!ObjectUtil.isEmpty(cwxxDO)){
                             Long cwxxDOId = cwxxDO.getId();
                             cwxxMapper.deleteById(cwxxDOId);
@@ -389,17 +389,17 @@ public class DwxxServiceImpl implements DwxxService {
     }
 
     @Override
-    public void revertKqxx(CaxxUpdateReqVO updateReqVO) {
+    @Transactional
+    public void revertKqxx(List<Long> kqIds,String areaLevel) {
         Long loginUserId = SecurityFrameworkUtils.getLoginUser().getId();
         //获取当前用户角色
         List<UserRoleDO> userRoleList = userRoleMapper.selectListByUserId(loginUserId);
         if (ObjectUtils.isEmpty(userRoleList)) {
             throw exception(ERROR,"不存在角色信息");
         }
-        String areaLevel = updateReqVO.getAreaLevel();
         // 国家交易中心
         if ("0".equals(areaLevel)) {
-            caxxMapper.deleteByIds(updateReqVO.getIds());
+         /*   caxxMapper.deleteByIds(updateReqVO.getIds());
             List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(updateReqVO.getKqId());
             if (ObjectUtils.isEmpty(caxxDOS)){
                 dwxxMapper.deleteByDwId(updateReqVO.getDeptId());
@@ -410,17 +410,18 @@ public class DwxxServiceImpl implements DwxxService {
                     cwxxMapper.deleteById(cwxxDOId);
                     cwxxYearMapper.deleteListByCwxxId(cwxxDOId);
                 }
-            }
+            }*/
         }
         if ("1".equals(areaLevel)) {
             List<Long> roleIdList = userRoleList.stream().map(UserRoleDO::getRoleId).distinct().collect(Collectors.toList());
             if (roleIdList.contains(RoleIdEnum.BANK_ADMIN.getRoleId())) {
                 // 银行已选
-                bankMapper.deleteListByKqIdAndCaIds(updateReqVO.getKqId(), updateReqVO.getIds());
+                bankMapper.deleteListByKqIds(kqIds);
             }else{
                 // 省已选
-                provinceMapper.deleteListByKqIdAndCaIds(updateReqVO.getKqId(), updateReqVO.getIds());
-                KqxxDO kqxxDO = kqxxMapper.selectById(updateReqVO.getKqId());
+                provinceMapper.deleteListByKqIds(kqIds);
+/*
+                KqxxDO kqxxDO = kqxxMapper.selectById(kqId);
                 if (ObjectUtils.isEmpty(kqxxDO)){
                     throw exception(ERROR,"库区信息不存在");
                 }
@@ -432,17 +433,16 @@ public class DwxxServiceImpl implements DwxxService {
                         dwxxMapper.deleteByDwId(updateReqVO.getDeptId());
                         kqxxMapper.deleteByKqId(updateReqVO.getKqId());
                         caxxMapper.deleteListByKqId(updateReqVO.getKqId());
-                        CwxxDO cwxxDO = cwxxMapper.selectBYKqId(updateReqVO.getKqId());
+                        CwxxDO cwxxDO = cwxxMapper.selectByKqId(updateReqVO.getKqId());
                         if (!ObjectUtil.isEmpty(cwxxDO)){
                             Long cwxxDOId = cwxxDO.getId();
                             cwxxMapper.deleteById(cwxxDOId);
                             cwxxYearMapper.deleteListByCwxxId(cwxxDOId);
                         }
-                    }
+                    }*/
                 }
             }
         }
-    }
 
     @Transactional
     public void createCaAndKuAndDWForSheng(CaxxUpdateReqVO updateReqVO) {

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/task/TaskServiceImpl.java

@@ -250,7 +250,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     public TaskCwxxRespVO getCwxxByKqId(TaskPageReqVO reqVO) {
 
-        CwxxDO cwxxDO = cwxxMapper.selectBYKqId(reqVO.getKqId());
+        CwxxDO cwxxDO = cwxxMapper.selectByKqId(reqVO.getKqId());
 
         if(ObjectUtils.isEmpty(cwxxDO)){
             return null;