修改财务信息连表

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

@@ -120,6 +120,23 @@ public class DeliveryController {
         }
         return success(true);
     }
+    @PutMapping("/revertKqxx")
+    @Operation(summary = "库区退回")
+    @PreAuthorize("@ss.hasPermission('coding:delivery:query')")
+    public CommonResult<Boolean> revertKqxx(@Valid @RequestBody CaxxUpdateReqVO updateReqVO) {
+        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);
+            } else { // admin 管理员
+                log.info("超级管理员无修改数据权限loginUser: {}", loginUser);
+            }
+        }
+        return success(true);
+    }
     @PostMapping("/createByAll")
     @Operation(summary = "创建单位/库区/仓房/财务/交通运输")
     @PreAuthorize("@ss.hasPermission('coding:delivery:createByAll')")

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

@@ -63,4 +63,5 @@ public interface DwxxService {
 
     void revertCaxx(CaxxUpdateReqVO updateReqVO);
 
+    void revertKqxx(CaxxUpdateReqVO updateReqVO);
 }

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

@@ -386,8 +386,64 @@ public class DwxxServiceImpl implements DwxxService {
                 }
             }
         }
+    }
 
+    @Override
+    public void revertKqxx(CaxxUpdateReqVO updateReqVO) {
+        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());
+            List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(updateReqVO.getKqId());
+            if (ObjectUtils.isEmpty(caxxDOS)){
+                dwxxMapper.deleteByDwId(updateReqVO.getDeptId());
+                kqxxMapper.deleteByKqId(updateReqVO.getKqId());
+                CwxxDO cwxxDO = cwxxMapper.selectBYKqId(updateReqVO.getKqId());
+                if (!ObjectUtil.isEmpty(cwxxDO)){
+                    Long cwxxDOId = cwxxDO.getId();
+                    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());
+            }else{
+                // 省已选
+                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)){
+                        dwxxMapper.deleteByDwId(updateReqVO.getDeptId());
+                        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);
+                        }
+                    }
+                }
+            }
+        }
     }
+
     @Transactional
     public void createCaAndKuAndDWForSheng(CaxxUpdateReqVO updateReqVO) {
         if (updateReqVO.getKqId() != null) {

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/caxx/CaxxMapper.xml

@@ -32,7 +32,7 @@
         left join
         (
                 select
-                        cx.DEPT_ID,
+                        cx.KQID,
                         cy.JLR
                 from   DELIVERY_CWXX  cx
                 JOIN
@@ -45,7 +45,7 @@
                    GROUP BY  CWXX_ID) m
                    ON d.CWXX_ID = m.CWXX_ID AND d.CN = m.maxCN
                    )  cy  on cx.id=cy.CWXX_ID
-        ) t2 on t2.DEPT_ID=cd.id
+        ) t2 on t2.KQID=ck.id
         <where>
             cd.qyxz!='10'
             and cd.DELETED=0
@@ -104,7 +104,7 @@
         left join
         (
                 select
-                        cx.DEPT_ID,
+                        cx.KQID,
                         cy.JLR
                 from   DELIVERY_CWXX  cx
                 JOIN
@@ -117,7 +117,7 @@
                    GROUP BY  CWXX_ID) m
                    ON d.CWXX_ID = m.CWXX_ID AND d.CN = m.maxCN
                    )  cy  on cx.id=cy.CWXX_ID
-        ) t2 on t2.DEPT_ID=cd.id
+        ) t2 on t2.KQID=ck.id
         <where>
             cd.qyxz!='10'
             and cd.DELETED=0   and pe.DELETED=0

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dwxx/DwxxMapper.xml

@@ -187,7 +187,7 @@
         from  DELIVERY_DWXX cd
         join DELIVERY_KQXX ck on ck.DWID=cd.id
         join DELIVERY_PROVINCE  pe  on ck.id=pe.KQ_ID
-        left join DELIVERY_CWXX  cx  on  cx.DEPT_ID=cd.id
+        left join DELIVERY_CWXX  cx  on  cx.KQID=ck.id
         join
         (
                 select