已选与退回权限修改

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

@@ -254,12 +254,7 @@ public class DwxxServiceImpl implements DwxxService {
             throw exception(ERROR, "不存在用户信息");
         }
         String areaLevel = loginUser.getInfo().get("areaLevel");
-        // 国家交易中心已选
         if ("0".equals(areaLevel) || ObjectUtil.isEmpty(areaLevel)) {
-            List<StoreRespVO> storeListForNation = getStoreListByNation(pageReqVO);
-            return storeListForNation;
-        }
-        if ("1".equals(areaLevel)) {
             String roleIds = loginUser.getInfo().get("roleIds");
             if (ObjectUtils.isEmpty(roleIds)) {
                 throw exception(ERROR, "当前用户不存在角色信息");
@@ -275,12 +270,16 @@ public class DwxxServiceImpl implements DwxxService {
                     }
                     List<StoreRespVO> storeListForBank = getStoreListByBank(pageReqVO, bankType);
                     return storeListForBank;
-                } else {// 省已选
-                    List<StoreRespVO> storeListForProvice = getStoreListByProvince(pageReqVO);
-                    return storeListForProvice;
+                } else {// 国家已选
+                    List<StoreRespVO> storeListForNation = getStoreListByNation(pageReqVO);
+                    return storeListForNation;
                 }
             }
         }
+        if ("1".equals(areaLevel)) {
+            List<StoreRespVO> storeListForProvice = getStoreListByProvince(pageReqVO);
+            return storeListForProvice;
+        }
         return null;
     }
 
@@ -386,10 +385,6 @@ public class DwxxServiceImpl implements DwxxService {
         String areaLevel = loginUser.getInfo().get("areaLevel");
         // 国家交易中心已选
         if ("0".equals(areaLevel) || ObjectUtil.isEmpty(areaLevel)) {
-            //信息存入新表
-            createCaAndKuAndDWForSheng(updateReqVO);
-        }
-        if ("1".equals(areaLevel)) {
             String roleIds = loginUser.getInfo().get("roleIds");
             if (ObjectUtils.isEmpty(roleIds)) {
                 throw exception(ERROR, "当前用户不存在角色信息");
@@ -422,22 +417,26 @@ public class DwxxServiceImpl implements DwxxService {
                     if (!ObjectUtils.isEmpty(bankDOS)) {
                         bankMapper.insertBatch(bankDOS);
                     }
-                } else {// 省已选
-                    List<ProvinceDO> provinceDOS = new ArrayList<>();
-                    for (Long caId : updateReqVO.getIds()) {
-                        ProvinceDO province = new ProvinceDO();
-                        province.setCaId(caId);
-                        province.setKqId(updateReqVO.getKqId());
-                        province.setId(YitIdHelper.nextId());
-                        province.setDeleted(false);
-                        provinceDOS.add(province);
-                    }
-                    if (!ObjectUtils.isEmpty(provinceDOS)) {
-                        provinceMapper.insertBatch(provinceDOS);
-                    }
+                } else {// 国家
+                    //信息存入新表
+                    createCaAndKuAndDWForSheng(updateReqVO);
                 }
             }
         }
+        if ("1".equals(areaLevel)) {
+            List<ProvinceDO> provinceDOS = new ArrayList<>();
+            for (Long caId : updateReqVO.getIds()) {
+                ProvinceDO province = new ProvinceDO();
+                province.setCaId(caId);
+                province.setKqId(updateReqVO.getKqId());
+                province.setId(YitIdHelper.nextId());
+                province.setDeleted(false);
+                provinceDOS.add(province);
+            }
+            if (!ObjectUtils.isEmpty(provinceDOS)) {
+                provinceMapper.insertBatch(provinceDOS);
+            }
+        }
     }
 
     @Override
@@ -450,37 +449,6 @@ public class DwxxServiceImpl implements DwxxService {
         String areaLevel = loginUser.getInfo().get("areaLevel");
         // 国家交易中心
         if ("0".equals(areaLevel) || ObjectUtil.isEmpty(areaLevel)) {
-            //校验是否该仓房是否存在省已经选用或者银行已经选用
-            List<ProvinceDO> provinceDOS = provinceMapper.selectListBycaIds(updateReqVO.getIds());
-            if (!ObjectUtils.isEmpty(provinceDOS)) {
-                throw exception(ERROR, "存在仓房已经被省选用");
-            }
-            List<BankDO> bankDOS = bankMapper.selectListBycaIds(updateReqVO.getIds());
-            if (!ObjectUtils.isEmpty(bankDOS)) {
-                throw exception(ERROR, "存在仓房已经被银行选用");
-            }
-            List<UsersDO> usersDOS = usersMapper.selectListBycaIds(updateReqVO.getIds());
-            if (!ObjectUtils.isEmpty(usersDOS)) {
-                throw exception(ERROR, "存在仓房已经存粮人被选用");
-            }
-            caxxMapper.deleteByIds(updateReqVO.getIds());
-            List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(updateReqVO.getKqId());
-            if (ObjectUtils.isEmpty(caxxDOS)) {
-                kqxxMapper.deleteByKqId(updateReqVO.getKqId());
-                CwxxDO cwxxDO = cwxxMapper.selectByKqId(updateReqVO.getKqId());
-                if (!ObjectUtil.isEmpty(cwxxDO)) {
-                    Long cwxxDOId = cwxxDO.getId();
-                    cwxxMapper.deleteById(cwxxDOId);
-                    cwxxYearMapper.deleteListByCwxxId(cwxxDOId);
-                }
-                //校验是否存在使用该库区单位的其他库区,不存在其他库区则删除该单位信息
-                List<KqxxDO> kqxxDOS = kqxxMapper.selectListByDwId(updateReqVO.getDeptId());
-                if (ObjectUtils.isEmpty(kqxxDOS)) {
-                    dwxxMapper.deleteByDwId(updateReqVO.getDeptId());
-                }
-            }
-        }
-        if ("1".equals(areaLevel)) {
             //获取当前用户角色
             String roleIds = loginUser.getInfo().get("roleIds");
             if (ObjectUtils.isEmpty(roleIds)) {
@@ -502,45 +470,86 @@ public class DwxxServiceImpl implements DwxxService {
                     }
                     bankMapper.deleteListByKqIdAndCaIdsAndBank(updateReqVO.getKqId(), updateReqVO.getIds(), bankType);
                 } else {
-                    // 省已选,先校验是否存在银行已经选的
-                    List<BankDO> bankDOS = bankMapper.selectListBycaIds(updateReqVO.getIds());
-                    if (!ObjectUtils.isEmpty(bankDOS)) {
-                        throw exception(ERROR, "存在仓房已经被银行选用");
-                    }
-                    List<UsersDO> usersDOS = usersMapper.selectListBycaIds(updateReqVO.getIds());
-                    if (!ObjectUtils.isEmpty(usersDOS)) {
-                        throw exception(ERROR, "存在仓房已经存粮人被选用");
-                    }
-                    provinceMapper.deleteListByKqIdAndCaIds(updateReqVO.getKqId(), updateReqVO.getIds());
-                    KqxxDO kqxxDO = kqxxMapper.selectById(updateReqVO.getKqId());
-                    if (ObjectUtils.isEmpty(kqxxDO)) {
-                        throw exception(ERROR, "库区信息不存在");
-                    }
-                    Integer sjly = kqxxDO.getSjly();
-                    if (sjly != null && sjly == 0) {
-                        //新建的库区，如果省退回全部的仓房则删除库区的全部信息
-                        List<ProvinceDO> provinceDOS = provinceMapper.selectListByKqId(updateReqVO.getKqId());
-                        if (ObjectUtils.isEmpty(provinceDOS)) {
-                            kqxxMapper.deleteByKqId(updateReqVO.getKqId());
-                            caxxMapper.deleteListByKqId(updateReqVO.getKqId());
-                            CwxxDO cwxxDO = cwxxMapper.selectByKqId(updateReqVO.getKqId());
-                            if (!ObjectUtil.isEmpty(cwxxDO)) {
-                                Long cwxxDOId = cwxxDO.getId();
-                                cwxxMapper.deleteById(cwxxDOId);
-                                cwxxYearMapper.deleteListByCwxxId(cwxxDOId);
-                            }
-                            //校验是否存在使用该库区单位的其他库区,不存在其他库区则删除该单位信息
-                            List<KqxxDO> kqxxDOS = kqxxMapper.selectListByDwId(updateReqVO.getDeptId());
-                            if (ObjectUtils.isEmpty(kqxxDOS)) {
-                                dwxxMapper.deleteByDwId(updateReqVO.getDeptId());
-                            }
-                        }
-                    }
+                    revertCaxxByNation(updateReqVO);
+                }
+            }
+        }
+        if ("1".equals(areaLevel)) {
+            // 省已选,先校验是否存在银行已经选的
+            revertCaxxByProvince(updateReqVO);
+        }
+    }
+
+    @Transactional
+    public void revertCaxxByProvince(CaxxUpdateReqVO updateReqVO) {
+        List<BankDO> bankDOS = bankMapper.selectListBycaIds(updateReqVO.getIds());
+        if (!ObjectUtils.isEmpty(bankDOS)) {
+            throw exception(ERROR, "存在仓房已经被银行选用");
+        }
+        List<UsersDO> usersDOS = usersMapper.selectListBycaIds(updateReqVO.getIds());
+        if (!ObjectUtils.isEmpty(usersDOS)) {
+            throw exception(ERROR, "存在仓房已经存粮人被选用");
+        }
+        provinceMapper.deleteListByKqIdAndCaIds(updateReqVO.getKqId(), updateReqVO.getIds());
+        KqxxDO kqxxDO = kqxxMapper.selectById(updateReqVO.getKqId());
+        if (ObjectUtils.isEmpty(kqxxDO)) {
+            throw exception(ERROR, "库区信息不存在");
+        }
+        Integer sjly = kqxxDO.getSjly();
+        if (sjly != null && sjly == 0) {
+            //新建的库区，如果省退回全部的仓房则删除库区的全部信息
+            List<ProvinceDO> provinceDOS = provinceMapper.selectListByKqId(updateReqVO.getKqId());
+            if (ObjectUtils.isEmpty(provinceDOS)) {
+                kqxxMapper.deleteByKqId(updateReqVO.getKqId());
+                caxxMapper.deleteListByKqId(updateReqVO.getKqId());
+                CwxxDO cwxxDO = cwxxMapper.selectByKqId(updateReqVO.getKqId());
+                if (!ObjectUtil.isEmpty(cwxxDO)) {
+                    Long cwxxDOId = cwxxDO.getId();
+                    cwxxMapper.deleteById(cwxxDOId);
+                    cwxxYearMapper.deleteListByCwxxId(cwxxDOId);
+                }
+                //校验是否存在使用该库区单位的其他库区,不存在其他库区则删除该单位信息
+                List<KqxxDO> kqxxDOS = kqxxMapper.selectListByDwId(updateReqVO.getDeptId());
+                if (ObjectUtils.isEmpty(kqxxDOS)) {
+                    dwxxMapper.deleteByDwId(updateReqVO.getDeptId());
                 }
             }
         }
     }
 
+    @Transactional
+    public void revertCaxxByNation(CaxxUpdateReqVO updateReqVO) {
+        //校验是否该仓房是否存在省已经选用或者银行已经选用
+        List<ProvinceDO> provinceDOS = provinceMapper.selectListBycaIds(updateReqVO.getIds());
+        if (!ObjectUtils.isEmpty(provinceDOS)) {
+            throw exception(ERROR, "存在仓房已经被省选用");
+        }
+        List<BankDO> bankDOS = bankMapper.selectListBycaIds(updateReqVO.getIds());
+        if (!ObjectUtils.isEmpty(bankDOS)) {
+            throw exception(ERROR, "存在仓房已经被银行选用");
+        }
+        List<UsersDO> usersDOS = usersMapper.selectListBycaIds(updateReqVO.getIds());
+        if (!ObjectUtils.isEmpty(usersDOS)) {
+            throw exception(ERROR, "存在仓房已经存粮人被选用");
+        }
+        caxxMapper.deleteByIds(updateReqVO.getIds());
+        List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(updateReqVO.getKqId());
+        if (ObjectUtils.isEmpty(caxxDOS)) {
+            kqxxMapper.deleteByKqId(updateReqVO.getKqId());
+            CwxxDO cwxxDO = cwxxMapper.selectByKqId(updateReqVO.getKqId());
+            if (!ObjectUtil.isEmpty(cwxxDO)) {
+                Long cwxxDOId = cwxxDO.getId();
+                cwxxMapper.deleteById(cwxxDOId);
+                cwxxYearMapper.deleteListByCwxxId(cwxxDOId);
+            }
+            //校验是否存在使用该库区单位的其他库区,不存在其他库区则删除该单位信息
+            List<KqxxDO> kqxxDOS = kqxxMapper.selectListByDwId(updateReqVO.getDeptId());
+            if (ObjectUtils.isEmpty(kqxxDOS)) {
+                dwxxMapper.deleteByDwId(updateReqVO.getDeptId());
+            }
+        }
+    }
+
     @Override
     @Transactional
     public void revertKqxx(CaxxUpdateReqVO updateReqVO) {
@@ -555,43 +564,6 @@ public class DwxxServiceImpl implements DwxxService {
         String areaLevel = loginUser.getInfo().get("areaLevel");
         // 国家交易中心
         if ("0".equals(areaLevel) || ObjectUtil.isEmpty(areaLevel)) {
-            if (!ObjectUtil.isEmpty(kqIds)) {
-                for (Long kqId : kqIds) {
-                    KqxxDO kqxxDO = kqxxMapper.selectById(kqId);
-                    if (ObjectUtils.isEmpty(kqxxDO)) {
-                        throw exception(ERROR, "库区信息不存在");
-                    }
-                    //校验是否该库区是否存在省已经选用或者银行已经选用
-                    List<ProvinceDO> provinceDOS = provinceMapper.selectListByKqId(kqId);
-                    if (!ObjectUtils.isEmpty(provinceDOS)) {
-                        throw exception(ERROR, "存在库区已经被省选用,不允许删除!");
-                    }
-                    List<BankDO> bankDOS = bankMapper.selectListByKqId(kqId);
-                    if (!ObjectUtils.isEmpty(bankDOS)) {
-                        throw exception(ERROR, "存在库区已经被银行选用,不允许删除!");
-                    }
-                    List<UsersDO> usersDOS = usersMapper.selectListByKqId(kqId);
-                    if (!ObjectUtils.isEmpty(usersDOS)) {
-                        throw exception(ERROR, "存在仓房已经存粮人被选用");
-                    }
-                    Long dwId = kqxxDO.getDwid();
-                    caxxMapper.deleteListByKqId(kqId);
-                    kqxxMapper.deleteByKqId(kqId);
-                    CwxxDO cwxxDO = cwxxMapper.selectByKqId(kqId);
-                    if (!ObjectUtil.isEmpty(cwxxDO)) {
-                        Long cwxxDOId = cwxxDO.getId();
-                        cwxxMapper.deleteById(cwxxDOId);
-                        cwxxYearMapper.deleteListByCwxxId(cwxxDOId);
-                    }
-                    //校验是否存在使用该库区单位的其他库区,不存在其他库区则删除该单位信息
-                    List<KqxxDO> kqxxDOS = kqxxMapper.selectListByDwId(dwId);
-                    if (ObjectUtils.isEmpty(kqxxDOS)) {
-                        dwxxMapper.deleteByDwId(dwId);
-                    }
-                }
-            }
-        }
-        if ("1".equals(areaLevel)) {
             //获取当前用户角色
             String roleIds = loginUser.getInfo().get("roleIds");
             if (ObjectUtils.isEmpty(roleIds)) {
@@ -619,43 +591,51 @@ public class DwxxServiceImpl implements DwxxService {
                     }
                     bankMapper.deleteListByKqIdsAndBank(kqIds, bankType);
                 } else {
-                    // 省已选
-                    provinceMapper.deleteListByKqIds(kqIds);
-                    if (!ObjectUtil.isEmpty(kqIds)) {
-                        for (Long kqId : kqIds) {
-                            KqxxDO kqxxDO = kqxxMapper.selectById(kqId);
-                            if (ObjectUtils.isEmpty(kqxxDO)) {
-                                throw exception(ERROR, "库区信息不存在");
-                            }
-                            List<BankDO> bankDOS = bankMapper.selectListByKqId(kqId);
-                            if (!ObjectUtils.isEmpty(bankDOS)) {
-                                throw exception(ERROR, "存在库区已经被银行选用,不允许删除!");
-                            }
-                            List<UsersDO> usersDOS = usersMapper.selectListByKqId(kqId);
-                            if (!ObjectUtils.isEmpty(usersDOS)) {
-                                throw exception(ERROR, "存在仓房已经存粮人被选用");
-                            }
-                            Long dwId = kqxxDO.getDwid();
-                            Integer sjly = kqxxDO.getSjly();
-                            if (sjly != null && sjly == 0) {
-                                //新建的库区，如果省退回全部的仓房则删除库区的全部信息
-                                List<ProvinceDO> provinceDOS = provinceMapper.selectListByKqId(kqId);
-                                if (ObjectUtils.isEmpty(provinceDOS)) {
-                                    caxxMapper.deleteListByKqId(kqId);
-                                    kqxxMapper.deleteByKqId(kqId);
-                                    CwxxDO cwxxDO = cwxxMapper.selectByKqId(kqId);
-                                    if (!ObjectUtil.isEmpty(cwxxDO)) {
-                                        Long cwxxDOId = cwxxDO.getId();
-                                        cwxxMapper.deleteById(cwxxDOId);
-                                        cwxxYearMapper.deleteListByCwxxId(cwxxDOId);
-                                    }
-                                    //校验是否存在使用该库区单位的其他库区,不存在其他库区则删除该单位信息
-                                    List<KqxxDO> kqxxDOS = kqxxMapper.selectListByDwId(dwId);
-                                    if (ObjectUtils.isEmpty(kqxxDOS)) {
-                                        dwxxMapper.deleteByDwId(dwId);
-                                    }
-                                }
-                            }
+                    revertKqxxByNation(kqIds);
+                }
+            }
+        }
+        if ("1".equals(areaLevel)) {
+            revertKqxxByProvince(kqIds);
+        }
+    }
+
+    @Transactional
+    public void revertKqxxByProvince(List<Long> kqIds) {
+        // 省已选
+        provinceMapper.deleteListByKqIds(kqIds);
+        if (!ObjectUtil.isEmpty(kqIds)) {
+            for (Long kqId : kqIds) {
+                KqxxDO kqxxDO = kqxxMapper.selectById(kqId);
+                if (ObjectUtils.isEmpty(kqxxDO)) {
+                    throw exception(ERROR, "库区信息不存在");
+                }
+                List<BankDO> bankDOS = bankMapper.selectListByKqId(kqId);
+                if (!ObjectUtils.isEmpty(bankDOS)) {
+                    throw exception(ERROR, "存在库区已经被银行选用,不允许删除!");
+                }
+                List<UsersDO> usersDOS = usersMapper.selectListByKqId(kqId);
+                if (!ObjectUtils.isEmpty(usersDOS)) {
+                    throw exception(ERROR, "存在仓房已经存粮人被选用");
+                }
+                Long dwId = kqxxDO.getDwid();
+                Integer sjly = kqxxDO.getSjly();
+                if (sjly != null && sjly == 0) {
+                    //新建的库区，如果省退回全部的仓房则删除库区的全部信息
+                    List<ProvinceDO> provinceDOS = provinceMapper.selectListByKqId(kqId);
+                    if (ObjectUtils.isEmpty(provinceDOS)) {
+                        caxxMapper.deleteListByKqId(kqId);
+                        kqxxMapper.deleteByKqId(kqId);
+                        CwxxDO cwxxDO = cwxxMapper.selectByKqId(kqId);
+                        if (!ObjectUtil.isEmpty(cwxxDO)) {
+                            Long cwxxDOId = cwxxDO.getId();
+                            cwxxMapper.deleteById(cwxxDOId);
+                            cwxxYearMapper.deleteListByCwxxId(cwxxDOId);
+                        }
+                        //校验是否存在使用该库区单位的其他库区,不存在其他库区则删除该单位信息
+                        List<KqxxDO> kqxxDOS = kqxxMapper.selectListByDwId(dwId);
+                        if (ObjectUtils.isEmpty(kqxxDOS)) {
+                            dwxxMapper.deleteByDwId(dwId);
                         }
                     }
                 }
@@ -663,6 +643,45 @@ public class DwxxServiceImpl implements DwxxService {
         }
     }
 
+    @Transactional
+    public void revertKqxxByNation(List<Long> kqIds) {
+        if (!ObjectUtil.isEmpty(kqIds)) {
+            for (Long kqId : kqIds) {
+                KqxxDO kqxxDO = kqxxMapper.selectById(kqId);
+                if (ObjectUtils.isEmpty(kqxxDO)) {
+                    throw exception(ERROR, "库区信息不存在");
+                }
+                //校验是否该库区是否存在省已经选用或者银行已经选用
+                List<ProvinceDO> provinceDOS = provinceMapper.selectListByKqId(kqId);
+                if (!ObjectUtils.isEmpty(provinceDOS)) {
+                    throw exception(ERROR, "存在库区已经被省选用,不允许删除!");
+                }
+                List<BankDO> bankDOS = bankMapper.selectListByKqId(kqId);
+                if (!ObjectUtils.isEmpty(bankDOS)) {
+                    throw exception(ERROR, "存在库区已经被银行选用,不允许删除!");
+                }
+                List<UsersDO> usersDOS = usersMapper.selectListByKqId(kqId);
+                if (!ObjectUtils.isEmpty(usersDOS)) {
+                    throw exception(ERROR, "存在仓房已经存粮人被选用");
+                }
+                Long dwId = kqxxDO.getDwid();
+                caxxMapper.deleteListByKqId(kqId);
+                kqxxMapper.deleteByKqId(kqId);
+                CwxxDO cwxxDO = cwxxMapper.selectByKqId(kqId);
+                if (!ObjectUtil.isEmpty(cwxxDO)) {
+                    Long cwxxDOId = cwxxDO.getId();
+                    cwxxMapper.deleteById(cwxxDOId);
+                    cwxxYearMapper.deleteListByCwxxId(cwxxDOId);
+                }
+                //校验是否存在使用该库区单位的其他库区,不存在其他库区则删除该单位信息
+                List<KqxxDO> kqxxDOS = kqxxMapper.selectListByDwId(dwId);
+                if (ObjectUtils.isEmpty(kqxxDOS)) {
+                    dwxxMapper.deleteByDwId(dwId);
+                }
+            }
+        }
+    }
+
     @Override
     public PageResult<SpareRespVO> getProvinceSelectedPage(SparePageReqVO pageReqVO) {
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();