删除字段，退回兼容省新建库区

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

@@ -2,6 +2,7 @@ package com.unis.module.coding.controller.admin.delivery.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/codingcaxx/CodingCaxxDO.java

@@ -107,14 +107,4 @@ public class CodingCaxxDO {
      */
     private String cfcxt;
 
-    /**
-     * 交收库备选状态(0:备选,1:被认定,2:被选定)
-     */
-    private Integer bxzt;
-
-    /**
-     * 数据来源
-     */
-    private Integer sjly;
-
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/codingdwxx/CodingDwxxDO.java

@@ -130,10 +130,6 @@ public class CodingDwxxDO extends BaseDO {
      */
     private Integer sbid;
     /**
-     * 数据来源
-     */
-    private Integer sjly;
-    /**
      * 行政区划代码
      */
     private String xzqhdm;
@@ -154,55 +150,4 @@ public class CodingDwxxDO extends BaseDO {
     // 已选仓房
     @TableField(exist = false)
     private Integer yxcfnum;
-
-    /**
-     * 库区数量
-     */
-//    private Integer kqnum;
-
-    /**
-     * 注册资本
-     */
-//    private String zczb;
-    /**
-     * 资产总额
-     */
-//    private BigDecimal zcze;
-
-    /**
-     * 企业联系人
-     */
-//    private String qylxr;
-    /**
-     * 办公电话
-     */
-//    private String bgdh;
-    /**
-     * 企业邮箱
-     */
-//    private String qyemail;
-    /**
-     * 企业网站地址
-     */
-//    private String qywzdz;
-    /**
-     * 传真号码
-     */
-//    private String czhm;
-    /**
-     * 上级单位名称
-     */
-//    private String sjdwmc;
-    /**
-     * 上级单位统一编码
-     */
-//    private String sjdwtybm;
-    /**
-     * 油罐数量
-     */
-//    private Integer ygnum;
-    /**
-     * 单位状态
-     */
-//    private Integer dwzt;
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/codingkqxx/CodingKqxxDO.java

@@ -81,16 +81,6 @@ public class CodingKqxxDO extends BaseDO {
      */
     private String resid;
 
-
-    /**
-     * 租仓参考价(元)
-     */
-    private Integer zcckj;
-
-    /**
-     * 委托保管参考价(元/吨)
-     */
-    private Integer wtbgckj;
     /**
      * 上报状态 0、未上报   1、已上报
      */
@@ -139,30 +129,5 @@ public class CodingKqxxDO extends BaseDO {
      * 行政区划代码
      */
     private String xzqhdm;
-    /**
-     * 库区产权
-     */
-    private String kqcq;
-    /**
-     * 有效仓容
-     */
-    private BigDecimal yxcr;
-    /**
-     * 有效罐容
-     */
-    private BigDecimal yxgr;
-    /**
-     * 仓廒数量
-     */
-    private Integer canum;
-    /**
-     * 油罐数量
-     */
-    private Integer ygnum;
-
-    /**
-     * 数据来源
-     */
-    private Integer sjly;
 
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/dwxx/DwxxDO.java

@@ -96,14 +96,6 @@ public class DwxxDO extends BaseDO {
      */
     private String resid;
     /**
-     * 上报状态	0、未上报   1、已上报
-     */
-    private Integer sbzt;
-    /**
-     * 是否注销：0未注销、1已注销
-     */
-    private String sfzx;
-    /**
      * 审核状态 0、未审核  1、已审核
      */
     private Integer shzt;
@@ -125,10 +117,6 @@ public class DwxxDO extends BaseDO {
      */
     private String dwDeptId;
     /**
-     * 变更状态 0未变更，1已变更未保存,2变更并保存流程数据;3发起流程
-     */
-    private Integer bgzt;
-    /**
      * 上报id
      */
     private Integer sbid;
@@ -157,55 +145,4 @@ public class DwxxDO extends BaseDO {
     // 已选仓房
     @TableField(exist = false)
     private Integer yxcfnum;
-
-    /**
-     * 库区数量
-     */
-//    private Integer kqnum;
-
-    /**
-     * 注册资本
-     */
-//    private String zczb;
-    /**
-     * 资产总额
-     */
-//    private BigDecimal zcze;
-
-    /**
-     * 企业联系人
-     */
-//    private String qylxr;
-    /**
-     * 办公电话
-     */
-//    private String bgdh;
-    /**
-     * 企业邮箱
-     */
-//    private String qyemail;
-    /**
-     * 企业网站地址
-     */
-//    private String qywzdz;
-    /**
-     * 传真号码
-     */
-//    private String czhm;
-    /**
-     * 上级单位名称
-     */
-//    private String sjdwmc;
-    /**
-     * 上级单位统一编码
-     */
-//    private String sjdwtybm;
-    /**
-     * 油罐数量
-     */
-//    private Integer ygnum;
-    /**
-     * 单位状态
-     */
-//    private Integer dwzt;
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/kqxx/KqxxDO.java

@@ -73,10 +73,6 @@ public class KqxxDO extends BaseDO {
      */
     private BigDecimal zdmj;
     /**
-     * 库区状态  1、正常  2、退出储备粮承储
-     */
-    private String kqzt;
-    /**
      * 上传库区图id
      */
     private String resid;
@@ -92,26 +88,6 @@ public class KqxxDO extends BaseDO {
      */
     private Integer wtbgckj;
     /**
-     * 上报状态 0、未上报   1、已上报
-     */
-    private Integer sbzt;
-    /**
-     * 变更状态 0未变更，1已变更未保存,2变更并保存流程数据;3发起流程
-     */
-    private Integer bgzt;
-    /**
-     * 变更审核状态，0未审核，1已审核
-     */
-    private Integer bgshzt;
-    /**
-     * 审核状态 0、未审核  1、已审核
-     */
-    private Integer shzt;
-    /**
-     * 是否注销
-     */
-    private String sfzx;
-    /**
      * 标识  区分省级库区还是中储粮
      */
     private String bs;
@@ -136,31 +112,10 @@ public class KqxxDO extends BaseDO {
      */
     private String shxydm;
     /**
-     * 行政区划代码
-     */
-    private String xzqhdm;
-    /**
      * 库区产权
      */
     private String kqcq;
     /**
-     * 有效仓容
-     */
-    private BigDecimal yxcr;
-    /**
-     * 有效罐容
-     */
-    private BigDecimal yxgr;
-    /**
-     * 仓廒数量
-     */
-    private Integer canum;
-    /**
-     * 油罐数量
-     */
-    private Integer ygnum;
-
-    /**
      * 数据来源
      */
     private Integer sjly;

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

@@ -1,5 +1,6 @@
 package com.unis.module.coding.dal.mysql.bank;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.unis.framework.common.pojo.PageResult;
 import com.unis.framework.mybatis.core.mapper.BaseMapperX;
@@ -36,8 +37,8 @@ public interface BankMapper extends BaseMapperX<BankDO> {
     default int deleteListByKqIdAndCaIds(Long  kqId, List<Long> caIds) {
         return delete(
                 new LambdaUpdateWrapper<BankDO>()
-                        .eq(BankDO::getKqId, kqId)
-                        .in(BankDO::getCaId, caIds)
+                        .eq(kqId!=null,BankDO::getKqId, kqId)
+                        .in(!ObjectUtil.isEmpty(caIds),BankDO::getCaId, caIds)
         );
     }
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/caxx/CaxxMapper.java

@@ -3,6 +3,8 @@ package com.unis.module.coding.dal.mysql.caxx;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.unis.framework.common.pojo.PageResult;
 import com.unis.framework.common.util.object.ObjectUtils;
@@ -10,6 +12,7 @@ import com.unis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.unis.framework.mybatis.core.mapper.BaseMapperX;
 import com.unis.module.coding.controller.admin.delivery.vo.SparePageReqVO;
 import com.unis.module.coding.controller.admin.delivery.vo.SpareRespVO;
+import com.unis.module.coding.dal.dataobject.bank.BankDO;
 import com.unis.module.coding.dal.dataobject.caxx.CaxxDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.unis.module.coding.controller.admin.caxx.vo.*;
@@ -60,5 +63,10 @@ public interface CaxxMapper extends BaseMapperX<CaxxDO> {
         );
         return caxxList;
     }
-
+    default int deleteListByKqId(Long  kqId) {
+        return delete(
+                new LambdaUpdateWrapper<CaxxDO>()
+                        .eq(kqId!=null,CaxxDO::getKqid, kqId)
+        );
+    }
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/cwxxyear/CwxxYearMapper.java

@@ -1,9 +1,12 @@
 package com.unis.module.coding.dal.mysql.cwxxyear;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.unis.framework.common.pojo.PageResult;
 import com.unis.framework.mybatis.core.mapper.BaseMapperX;
 import com.unis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.unis.module.coding.controller.admin.cwxxyear.vo.CwxxYearPageReqVO;
+import com.unis.module.coding.dal.dataobject.bank.BankDO;
 import com.unis.module.coding.dal.dataobject.cwxxyear.CwxxYearDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -32,4 +35,10 @@ public interface CwxxYearMapper extends BaseMapperX<CwxxYearDO> {
                 .eq(CwxxYearDO::getCwxxId, cwxxId)
                 .orderByDesc(CwxxYearDO::getCn));
     }
+    default int deleteListByCwxxId(Long  cwxxId) {
+        return delete(
+                new LambdaUpdateWrapper<CwxxYearDO>()
+                        .eq(cwxxId!=null,CwxxYearDO::getCwxxId, cwxxId)
+        );
+    }
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/kqxx/KqxxMapper.java

@@ -31,13 +31,7 @@ public interface KqxxMapper extends BaseMapperX<KqxxDO> {
                 .eqIfPresent(KqxxDO::getKqfzr, reqVO.getKqfzr())
                 .eqIfPresent(KqxxDO::getLxdh, reqVO.getLxdh())
                 .eqIfPresent(KqxxDO::getZdmj, reqVO.getZdmj())
-                .eqIfPresent(KqxxDO::getKqzt, reqVO.getKqzt())
                 .eqIfPresent(KqxxDO::getResid, reqVO.getResid())
-                .eqIfPresent(KqxxDO::getSbzt, reqVO.getSbzt())
-                .eqIfPresent(KqxxDO::getBgzt, reqVO.getBgzt())
-                .eqIfPresent(KqxxDO::getBgshzt, reqVO.getBgshzt())
-                .eqIfPresent(KqxxDO::getShzt, reqVO.getShzt())
-                .eqIfPresent(KqxxDO::getSfzx, reqVO.getSfzx())
                 .eqIfPresent(KqxxDO::getBs, reqVO.getBs())
                 .betweenIfPresent(KqxxDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(KqxxDO::getShi, reqVO.getShi())

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

@@ -2,8 +2,10 @@ package com.unis.module.coding.dal.mysql.province;
 
 import java.util.*;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.unis.framework.common.pojo.PageResult;
+import com.unis.framework.common.util.object.ObjectUtils;
 import com.unis.framework.mybatis.core.mapper.BaseMapperX;
 import com.unis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.unis.module.coding.controller.admin.delivery.vo.StoreRespVO;
@@ -52,8 +54,8 @@ public interface ProvinceMapper extends BaseMapperX<ProvinceDO> {
     default int deleteListByKqIdAndCaIds(Long  kqId, List<Long> caIds) {
         return delete(
                 new LambdaUpdateWrapper<ProvinceDO>()
-                        .eq(ProvinceDO::getKqId, kqId)
-                        .in(ProvinceDO::getCaId, caIds)
+                        .eq(kqId!=null,ProvinceDO::getKqId, kqId)
+                        .in(!ObjectUtil.isEmpty(caIds),ProvinceDO::getCaId, caIds)
 
         );
     }

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

@@ -1,5 +1,6 @@
 package com.unis.module.coding.service.dwxx;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,6 +15,7 @@ import com.unis.module.coding.dal.dataobject.caxx.CaxxDO;
 import com.unis.module.coding.dal.dataobject.codingcaxx.CodingCaxxDO;
 import com.unis.module.coding.dal.dataobject.codingdwxx.CodingDwxxDO;
 import com.unis.module.coding.dal.dataobject.codingkqxx.CodingKqxxDO;
+import com.unis.module.coding.dal.dataobject.cwxx.CwxxDO;
 import com.unis.module.coding.dal.dataobject.kqxx.KqxxDO;
 import com.unis.module.coding.dal.dataobject.province.ProvinceDO;
 import com.unis.module.coding.dal.mysql.bank.BankMapper;
@@ -21,6 +23,8 @@ import com.unis.module.coding.dal.mysql.caxx.CaxxMapper;
 import com.unis.module.coding.dal.mysql.codingcaxx.CodingCaxxMapper;
 import com.unis.module.coding.dal.mysql.codingdwxx.CodingDwxxMapper;
 import com.unis.module.coding.dal.mysql.codingkqxx.CodingKqxxMapper;
+import com.unis.module.coding.dal.mysql.cwxx.CwxxMapper;
+import com.unis.module.coding.dal.mysql.cwxxyear.CwxxYearMapper;
 import com.unis.module.coding.dal.mysql.kqxx.KqxxMapper;
 import com.unis.module.coding.dal.mysql.province.ProvinceMapper;
 import com.unis.module.core.enums.XZQHLEVEL;
@@ -90,7 +94,10 @@ public class DwxxServiceImpl implements DwxxService {
     private ProvinceMapper provinceMapper;
     @Resource
     private BankMapper bankMapper;
-
+    @Resource
+    private CwxxMapper  cwxxMapper;
+    @Resource
+    private CwxxYearMapper cwxxYearMapper;
     @Override
     public Long createDwxx(DwxxSaveReqVO createReqVO) {
         // 插入
@@ -344,6 +351,25 @@ public class DwxxServiceImpl implements DwxxService {
             }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.deleteById(updateReqVO.getDeptId());
+                        kqxxMapper.deleteById(updateReqVO.getKqId());
+                        caxxMapper.deleteListByKqId(updateReqVO.getKqId());
+                        CwxxDO cwxxDO = cwxxMapper.selectBYKqId(updateReqVO.getKqId());
+                        if (!ObjectUtil.isEmpty(cwxxDO)){
+                            Long cwxxDOId = cwxxDO.getId();
+                            cwxxYearMapper.deleteListByCwxxId(cwxxDOId);
+                        }
+                    }
+                }
             }
         }
 

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/dal/mysql/arealevel/AreaLevelMapper.java

@@ -43,6 +43,6 @@ public interface AreaLevelMapper extends BaseMapperX<AreaLevelDO> {
     }
     default List<AreaLevelDO> selectListByName(List<String> names) {
         return selectList(new LambdaQueryWrapperX<AreaLevelDO>()
-                .eqIfPresent(AreaLevelDO::getAreaName,names));
+                .inIfPresent(AreaLevelDO::getAreaName,names));
     }
 }