修复入区核注，核放bug

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdrqtz/controller/QySecondlineHzdRqTzController.java

@@ -13,15 +13,19 @@
 package vip.xiaonuo.biz.modular.qysecondlinehzdrqtz.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.URLUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
+import vip.xiaonuo.biz.modular.dict.service.BizDictService;
 import vip.xiaonuo.biz.modular.qyrecardbody.entity.QyRecardBody;
 import vip.xiaonuo.biz.modular.qyrecardbody.param.QyRecardBodyIdParam;
 import vip.xiaonuo.biz.modular.qyrecordinfo.entity.QyRecordInfo;
@@ -34,6 +38,7 @@ import vip.xiaonuo.biz.modular.qysecondlinehzdrqproduct.entity.QySecondlineHzdRq
 import vip.xiaonuo.biz.modular.qysecondlinehzdrqqd.entity.QySecondlineHzdRqQd;
 import vip.xiaonuo.biz.modular.qysecondlinehzdrqtz.param.*;
 import vip.xiaonuo.biz.modular.qysecondlinehzdrqtz.vo.QySecondlineRqHzdDetailVo;
+import vip.xiaonuo.biz.modular.qysecondlinehzdtz.entity.QySecondlineHzdTz;
 import vip.xiaonuo.biz.modular.qysecondlinehzdtz.param.QySecondlineHzdTzIdParam;
 import vip.xiaonuo.biz.modular.qysecondlinehzdtz.vo.QySecondlineHzdDetailVo;
 import vip.xiaonuo.common.annotation.CommonLog;
@@ -64,7 +69,8 @@ public class QySecondlineHzdRqTzController {
 
     @Resource
     private QySecondlineHzdRqTzService qySecondlineHzdRqTzService;
-
+    @Autowired
+    BizDictService bizDictService;
     /**
      * 获取二线入区核注单台账信息分页
      *
@@ -119,9 +125,41 @@ public class QySecondlineHzdRqTzController {
     //@SaCheckPermission("/biz/qysecondlinehzdrqtz/export")
     @PostMapping("/biz/qysecondlinehzdrqtz/export")
     public void export(@RequestBody @Valid QySecondlineHzdRqTzPageParam qySecondlineHzdRqTzPageParam, HttpServletResponse response) {
+        qySecondlineHzdRqTzPageParam.setSize(Integer.MAX_VALUE);
         Page<QySecondlineHzdRqTz> page =  qySecondlineHzdRqTzService.page(qySecondlineHzdRqTzPageParam);
         List<QySecondlineHzdRqTz> records = page.getRecords();
-        exportExcel(response,QySecondlineHzdRqTz.class,records,"二线入区核注单台账信息");
+
+        if(CollectionUtil.isNotEmpty(records)){
+            records.parallelStream().forEach(r->{
+                //申报类型
+                if(ObjectUtil.isNotEmpty(r.getSblx())){
+                    String sblx = bizDictService.getNameByType("qybalx", r.getSblx());
+                    r.setSblx(sblx);
+                }
+                //单据状态
+                if(ObjectUtil.isNotEmpty(r.getStatus())){
+                    String status = bizDictService.getNameByType("djzt", r.getStatus());
+                    r.setStatus(status);
+                }
+                //台账性质
+                if(ObjectUtil.isNotEmpty(r.getTzNature())){
+                    String tzNature = bizDictService.getNameByType("tzlx", r.getStatus());
+                    r.setTzNature(tzNature);
+                }
+                //监管方式
+                if(ObjectUtil.isNotEmpty(r.getRegulaMethod())){
+                    String jgfx = bizDictService.getNameByType("jgfs", r.getStatus());
+                    r.setRegulaMethod(jgfx);
+                }
+                //运输方式
+                if(ObjectUtil.isNotEmpty(r.getYsfs())){
+                    String ysfs = bizDictService.getNameByType("trans_type", r.getStatus());
+                    r.setRegulaMethod(ysfs);
+                }
+
+            });
+        }
+        exportExcel(response,QySecondlineHzdRqTz.class,records,"二线核注单台账信息");
     }
 
 

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdrqtz/param/QySecondlineHzdRqTzPageParam.java

@@ -17,6 +17,7 @@ import lombok.Getter;
 import lombok.Setter;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 二线入区核注单台账信息查询参数
@@ -48,4 +49,39 @@ public class QySecondlineHzdRqTzPageParam {
     @Schema(description = "关键词")
     private String searchKey;
 
+    /** 台账编号 */
+    @Schema(description = "台账编号")
+    private String tzCode;
+
+    /** 台账类型 */
+    @Schema(description = "台账类型")
+    private String tzType;
+
+    /** 台账类型 */
+    @Schema(description = "台账类型")
+    private String tzNature;
+
+    /** 海关核注单编号 */
+    @Schema(description = "海关核注单编号")
+    private String hgHzdCode;
+
+    /** 核注单预录入号 */
+    @Schema(description = "核注单预录入号")
+    private String hzdrCode;
+
+    /** 申报类型 */
+    @Schema(description = "申报类型")
+    private String sblx;
+
+    /** 单据状态 */
+    @Schema(description = "单据状态")
+    private String status;
+
+    //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private String startSbsj;
+
+    //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private String endSbsj;
+
+    private List<String> ids;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdrqtz/service/impl/QySecondlineHzdRqTzServiceImpl.java

@@ -87,16 +87,52 @@ public class QySecondlineHzdRqTzServiceImpl extends ServiceImpl<QySecondlineHzdR
     private QySecondlineHzdRqQdService qySecondlineHzdRqQdService;
 
     @Override
-    public Page<QySecondlineHzdRqTz> page(QySecondlineHzdRqTzPageParam qySecondlineHzdRqTzPageParam) {
+    public Page<QySecondlineHzdRqTz> page(QySecondlineHzdRqTzPageParam qySecondlineHzdTzPageParam) {
         QueryWrapper<QySecondlineHzdRqTz> queryWrapper = new QueryWrapper<QySecondlineHzdRqTz>().checkSqlInjection();
-        if(ObjectUtil.isAllNotEmpty(qySecondlineHzdRqTzPageParam.getSortField(), qySecondlineHzdRqTzPageParam.getSortOrder())) {
-            CommonSortOrderEnum.validate(qySecondlineHzdRqTzPageParam.getSortOrder());
-            queryWrapper.orderBy(true, qySecondlineHzdRqTzPageParam.getSortOrder().equalsIgnoreCase(CommonSortOrderEnum.ASC.getValue()),
-                    StrUtil.toUnderlineCase(qySecondlineHzdRqTzPageParam.getSortField()));
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getIds())) {
+            queryWrapper.lambda().in(QySecondlineHzdRqTz::getId,qySecondlineHzdTzPageParam.getIds());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getTzCode())) {
+            queryWrapper.lambda().like(QySecondlineHzdRqTz::getTzCode, qySecondlineHzdTzPageParam.getTzCode());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getTzType())) {
+            queryWrapper.lambda().like(QySecondlineHzdRqTz::getTzType, qySecondlineHzdTzPageParam.getTzType());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getHgHzdCode())) {
+            queryWrapper.lambda().like(QySecondlineHzdRqTz::getHgHzdCode, qySecondlineHzdTzPageParam.getHgHzdCode());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getHzdrCode())) {
+            queryWrapper.lambda().like(QySecondlineHzdRqTz::getHzdrCode, qySecondlineHzdTzPageParam.getHzdrCode());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getSblx())) {
+            queryWrapper.lambda().eq(QySecondlineHzdRqTz::getSblx, qySecondlineHzdTzPageParam.getSblx());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getTzNature())) {
+            queryWrapper.lambda().eq(QySecondlineHzdRqTz::getTzNature, qySecondlineHzdTzPageParam.getTzNature());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getStatus())) {
+            queryWrapper.lambda().eq(QySecondlineHzdRqTz::getStatus, qySecondlineHzdTzPageParam.getStatus());
+        }
+
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getSblx())) {
+            queryWrapper.lambda().eq(QySecondlineHzdRqTz::getSblx, qySecondlineHzdTzPageParam.getSblx());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getStartSbsj())) {
+            queryWrapper.lambda().ge(QySecondlineHzdRqTz::getSbsj, qySecondlineHzdTzPageParam.getStartSbsj());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getEndSbsj())) {
+            queryWrapper.lambda().le(QySecondlineHzdRqTz::getSbsj, qySecondlineHzdTzPageParam.getEndSbsj());
+        }
+
+        if(ObjectUtil.isAllNotEmpty(qySecondlineHzdTzPageParam.getSortField(), qySecondlineHzdTzPageParam.getSortOrder())) {
+            CommonSortOrderEnum.validate(qySecondlineHzdTzPageParam.getSortOrder());
+            queryWrapper.orderBy(true, qySecondlineHzdTzPageParam.getSortOrder().equalsIgnoreCase(CommonSortOrderEnum.ASC.getValue()),
+                    StrUtil.toUnderlineCase(qySecondlineHzdTzPageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByAsc(QySecondlineHzdRqTz::getId);
+            queryWrapper.lambda().orderByDesc(QySecondlineHzdRqTz::getSbsj);
         }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        Page<QySecondlineHzdRqTz> objectPage = CommonPageRequest.defaultPage();
+        return this.page(objectPage, queryWrapper);
     }
 
     @Transactional(rollbackFor = Exception.class)

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdtz/param/QySecondlineHzdTzPageParam.java

@@ -58,6 +58,10 @@ public class QySecondlineHzdTzPageParam {
     @Schema(description = "台账类型")
     private String tzType;
 
+    /** 台账类型 */
+    @Schema(description = "台账性质")
+    private String tzNature;
+
     /** 海关核注单编号 */
     @Schema(description = "海关核注单编号")
     private String hgHzdCode;

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdtz/service/impl/QySecondlineHzdTzServiceImpl.java

@@ -94,6 +94,9 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getTzType())) {
             queryWrapper.lambda().like(QySecondlineHzdTz::getTzType, qySecondlineHzdTzPageParam.getTzType());
         }
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getTzNature())) {
+            queryWrapper.lambda().like(QySecondlineHzdTz::getTzNature, qySecondlineHzdTzPageParam.getTzNature());
+        }
         if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getHgHzdCode())) {
             queryWrapper.lambda().like(QySecondlineHzdTz::getHgHzdCode, qySecondlineHzdTzPageParam.getHgHzdCode());
         }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinerqhfd/controller/QySecondlineRqHfdController.java

@@ -13,15 +13,20 @@
 package vip.xiaonuo.biz.modular.qysecondlinerqhfd.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.URLUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
+import vip.xiaonuo.biz.modular.dict.service.BizDictService;
+import vip.xiaonuo.biz.modular.qysecondlinehfd.entity.QySecondlineHfd;
 import vip.xiaonuo.biz.modular.qysecondlinehfd.param.QySecondlineHfdBaseParam;
 import vip.xiaonuo.biz.modular.qysecondlinehfd.param.QySecondlineHfdIdParam;
 import vip.xiaonuo.biz.modular.qysecondlinehfd.vo.QySecondlineHfdBgInfoVo;
@@ -59,7 +64,8 @@ public class QySecondlineRqHfdController {
 
     @Resource
     private QySecondlineRqHfdService qySecondlineRqHfdService;
-
+    @Autowired
+    BizDictService bizDictService;
     /**
      * 获取二线入区核放单管理分页
      *
@@ -114,8 +120,52 @@ public class QySecondlineRqHfdController {
     //@SaCheckPermission("/biz/qysecondlinerqhfd/export")
     @PostMapping("/biz/qysecondlinerqhfd/export")
     public void export(@RequestBody @Valid QySecondlineRqHfdPageParam qySecondlineRqHfdPageParam, HttpServletResponse response) {
+        qySecondlineRqHfdPageParam.setSize( Integer.MAX_VALUE);
         Page<QySecondlineRqHfd> page =  qySecondlineRqHfdService.page(qySecondlineRqHfdPageParam);
         List<QySecondlineRqHfd> records = page.getRecords();
+
+        if(CollectionUtil.isNotEmpty(records)){
+            records.parallelStream().forEach(r->{
+                //翻译字典
+                //1.核放单类型
+                if(ObjectUtil.isNotEmpty(r.getHfdLx())){
+                    String hfdlx = bizDictService.getNameByType("hfdlx", r.getHfdLx());
+                    r.setHfdLx(hfdlx);
+                }
+                //申报类型
+                if(ObjectUtil.isNotEmpty(r.getSblx())){
+                    String sblx = bizDictService.getNameByType("qybalx", r.getSblx());
+                    if(ObjectUtil.isEmpty(sblx)){
+                        if ("1".equals(r.getSblx())){
+                            r.setSblx("备案");
+                        }
+
+                        if ("2".equals(r.getSblx())){
+                            r.setSblx("变更");
+                        }
+
+                        if ("3".equals(r.getSblx())){
+                            r.setSblx("注销");
+                        }
+                    }
+                }
+                //单据状态
+                if(ObjectUtil.isNotEmpty(r.getStatus())){
+                    String status = bizDictService.getNameByType("djzt", r.getStatus());
+                    r.setStatus(status);
+                }
+                //进出标志
+                if(ObjectUtil.isNotEmpty(r.getJcbz())){
+                    String jcbz = bizDictService.getNameByType("jcbz", r.getJcbz());
+                    r.setJcbz(jcbz);
+                }
+                //绑定类型
+                if(ObjectUtil.isNotEmpty(r.getBdlx())){
+                    String bdlx = bizDictService.getNameByType("bdlx", r.getBdlx());
+                    r.setJcbz(bdlx);
+                }
+            });
+        }
         exportExcel(response,QySecondlineRqHfd.class,records,"二线入区核放单管理");
     }
 

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinerqhfd/param/QySecondlineRqHfdPageParam.java

@@ -17,6 +17,7 @@ import lombok.Getter;
 import lombok.Setter;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 二线入区核放单管理查询参数
@@ -48,4 +49,32 @@ public class QySecondlineRqHfdPageParam {
     @Schema(description = "关键词")
     private String searchKey;
 
+    /** 核放单预录入号 */
+    @Schema(description = "核放单预录入号")
+    private String hfdrCode;
+
+    /** 核放单号 */
+    @Schema(description = "核放单号")
+    private String hfdCode;
+
+    /** 台账编号 */
+    @Schema(description = "台账编号")
+    private String ledgerCode;
+
+    /** 进出标志 */
+    @Schema(description = "进出标志")
+    private String jcbz;
+
+    /** 关联核注清单编号 */
+    @Schema(description = "关联核注清单编号")
+    private String glhzqdbh;
+
+    /** 单据状态 */
+    @Schema(description = "单据状态")
+    private String status;
+
+    @Schema(description = "申报类型")
+    private String sblx;
+
+    private List<String> ids;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinerqhfd/service/impl/QySecondlineRqHfdServiceImpl.java

@@ -102,16 +102,43 @@ public class QySecondlineRqHfdServiceImpl extends ServiceImpl<QySecondlineRqHfdM
     private QySecondlineHzdRqTzService qySecondlineHzdRqTzService;
 
     @Override
-    public Page<QySecondlineRqHfd> page(QySecondlineRqHfdPageParam qySecondlineRqHfdPageParam) {
+    public Page<QySecondlineRqHfd> page(QySecondlineRqHfdPageParam qySecondlineHfdPageParam) {
         QueryWrapper<QySecondlineRqHfd> queryWrapper = new QueryWrapper<QySecondlineRqHfd>().checkSqlInjection();
-        if(ObjectUtil.isAllNotEmpty(qySecondlineRqHfdPageParam.getSortField(), qySecondlineRqHfdPageParam.getSortOrder())) {
-            CommonSortOrderEnum.validate(qySecondlineRqHfdPageParam.getSortOrder());
-            queryWrapper.orderBy(true, qySecondlineRqHfdPageParam.getSortOrder().equalsIgnoreCase(CommonSortOrderEnum.ASC.getValue()),
-                    StrUtil.toUnderlineCase(qySecondlineRqHfdPageParam.getSortField()));
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getIds())) {
+            queryWrapper.lambda().in(QySecondlineRqHfd::getId, qySecondlineHfdPageParam.getIds());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getSblx())) {
+            queryWrapper.lambda().eq(QySecondlineRqHfd::getSblx, qySecondlineHfdPageParam.getSblx());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getHfdCode())) {
+            queryWrapper.lambda().like(QySecondlineRqHfd::getHfdCode, qySecondlineHfdPageParam.getHfdCode());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getLedgerCode())) {
+            queryWrapper.lambda().like(QySecondlineRqHfd::getLedgerCode, qySecondlineHfdPageParam.getLedgerCode());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getJcbz())) {
+            queryWrapper.lambda().eq(QySecondlineRqHfd::getJcbz, qySecondlineHfdPageParam.getJcbz());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getGlhzqdbh())) {
+            queryWrapper.lambda().like(QySecondlineRqHfd::getGlhzqdbh, qySecondlineHfdPageParam.getGlhzqdbh());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getStatus())) {
+            queryWrapper.lambda().eq(QySecondlineRqHfd::getStatus, qySecondlineHfdPageParam.getStatus());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getHfdrCode())) {
+            queryWrapper.lambda().like(QySecondlineRqHfd::getHfdrCode, qySecondlineHfdPageParam.getHfdrCode());
+        }
+        if(ObjectUtil.isAllNotEmpty(qySecondlineHfdPageParam.getSortField(), qySecondlineHfdPageParam.getSortOrder())) {
+            CommonSortOrderEnum.validate(qySecondlineHfdPageParam.getSortOrder());
+            queryWrapper.orderBy(true, qySecondlineHfdPageParam.getSortOrder().equalsIgnoreCase(CommonSortOrderEnum.ASC.getValue()),
+                    StrUtil.toUnderlineCase(qySecondlineHfdPageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByAsc(QySecondlineRqHfd::getId);
+            queryWrapper.lambda().orderByDesc(QySecondlineRqHfd::getSbsj);
         }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        Page<QySecondlineRqHfd> defaultPage = CommonPageRequest.defaultPage();
+
+        Page<QySecondlineRqHfd> page = this.page(defaultPage, queryWrapper);
+        return page;
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -152,10 +179,10 @@ public class QySecondlineRqHfdServiceImpl extends ServiceImpl<QySecondlineRqHfdM
 
         String applyTypeName = "备案";
 
-        if ("bgsq".equals(qySecondlineHfdBaseParam.getBaseInfo().getSblx())){
+        if ("bgsq".equals(qySecondlineHfdBaseParam.getBaseInfo().getSblx()) || "2".equals(qySecondlineHfdBaseParam.getBaseInfo().getSblx()) ){
             applyTypeName = "变更";
         }
-        if ("zxsq".equals(qySecondlineHfdBaseParam.getBaseInfo().getSblx())){
+        if ("zxsq".equals(qySecondlineHfdBaseParam.getBaseInfo().getSblx()) || "3".equals(qySecondlineHfdBaseParam.getBaseInfo().getSblx())){
             applyTypeName = "注销";
         }
         qySecondlineHfdListSq.setApplyType(applyTypeName);