修复入区核注，核放bug

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

@@ -143,18 +143,18 @@ public class QySecondlineHzdRqTzController {
                 }
                 //台账性质
                 if(ObjectUtil.isNotEmpty(r.getTzNature())){
-                    String tzNature = bizDictService.getNameByType("tzlx", r.getStatus());
+                    String tzNature = bizDictService.getNameByType("tzlx", r.getTzNature());
                     r.setTzNature(tzNature);
                 }
                 //监管方式
                 if(ObjectUtil.isNotEmpty(r.getRegulaMethod())){
-                    String jgfx = bizDictService.getNameByType("jgfs", r.getStatus());
+                    String jgfx = bizDictService.getNameByType("jgfs", r.getRegulaMethod());
                     r.setRegulaMethod(jgfx);
                 }
                 //运输方式
                 if(ObjectUtil.isNotEmpty(r.getYsfs())){
-                    String ysfs = bizDictService.getNameByType("trans_type", r.getStatus());
-                    r.setRegulaMethod(ysfs);
+                    String ysfs = bizDictService.getNameByType("trans_type", r.getYsfs());
+                    r.setYsfs(ysfs);
                 }
 
             });

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdrqtz/entity/QySecondlineHzdRqTz.java

@@ -11,6 +11,7 @@
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
 package vip.xiaonuo.biz.modular.qysecondlinehzdrqtz.entity;
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.*;
@@ -53,124 +54,125 @@ public class QySecondlineHzdRqTz {
     /** 台账类型 */
     @Schema(description = "台账类型")
     @ColumnWidth(12)
-    @ExcelProperty(index = 3,value = "台账类型")
+//    @ExcelProperty(index = 3,value = "台账类型")
+    @ExcelIgnore
     private String tzType;
 
     /** 台账性质 */
     @Schema(description = "台账性质")
     @ColumnWidth(12)
-    @ExcelProperty(index = 4,value = "台账性质")
+    @ExcelProperty(index =3,value = "台账性质")
     private String tzNature;
 
     /** 使用单位 */
     @Schema(description = "使用单位")
     @ColumnWidth(12)
-    @ExcelProperty(index = 5,value = "使用单位")
+    @ExcelProperty(index =4,value = "使用单位")
     private String useDept;
 
     /** 海关备案编号 */
     @Schema(description = "海关备案编号")
     @ColumnWidth(12)
-    @ExcelProperty(index = 6,value = "海关备案编号")
+    @ExcelProperty(index = 5,value = "海关备案编号")
     private String companyMainHgCode;
 
     /** 统一社会信用代码 */
     @Schema(description = "统一社会信用代码")
     @ColumnWidth(12)
-    @ExcelProperty(index = 7,value = "统一社会信用代码")
+    @ExcelProperty(index = 6,value = "统一社会信用代码")
     private String companyCode;
 
     /** 监管方式 */
     @Schema(description = "监管方式")
     @ColumnWidth(12)
-    @ExcelProperty(index = 8,value = "监管方式")
+    @ExcelProperty(index = 7,value = "监管方式")
     private String regulaMethod;
 
     /** 运输方式 */
     @Schema(description = "运输方式")
     @ColumnWidth(12)
-    @ExcelProperty(index = 9,value = "运输方式")
+    @ExcelProperty(index = 8,value = "运输方式")
     private String ysfs;
 
     /** 关联清单编号 */
     @Schema(description = "关联清单编号")
     @ColumnWidth(12)
-    @ExcelProperty(index = 10,value = "关联清单编号")
+    @ExcelProperty(index = 9,value = "关联清单编号")
     private String glqdCode;
 
     /** 对应报关申报编号 */
     @Schema(description = "对应报关申报编号")
     @ColumnWidth(12)
-    @ExcelProperty(index = 11,value = "对应报关申报编号")
+    @ExcelProperty(index = 10,value = "对应报关申报编号")
     private String dybgCode;
 
     /** 对应报关单申报单位名称 */
     @Schema(description = "对应报关单申报单位名称")
     @ColumnWidth(12)
-    @ExcelProperty(index = 12,value = "对应报关单申报单位名称")
+    @ExcelProperty(index = 11,value = "对应报关单申报单位名称")
     private String dybgDept;
 
     /** 备注 */
     @Schema(description = "备注")
     @ColumnWidth(12)
-    @ExcelProperty(index = 13,value = "备注")
+    @ExcelProperty(index = 12,value = "备注")
     private String remark;
 
     /** 创建人 */
     @Schema(description = "创建人")
     @ColumnWidth(12)
-    @ExcelProperty(index = 14,value = "创建人")
+    @ExcelProperty(index = 13,value = "创建人")
     @TableField(fill = FieldFill.INSERT)
     private String createUser;
 
     /** 创建时间 */
     @Schema(description = "创建时间")
     @ColumnWidth(12)
-    @ExcelProperty(index = 15,value = "创建时间")
+    @ExcelProperty(index = 14,value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /** 更新人 */
     @Schema(description = "更新人")
     @ColumnWidth(12)
-    @ExcelProperty(index = 16,value = "更新人")
+    @ExcelProperty(index = 15,value = "更新人")
     @TableField(fill = FieldFill.UPDATE)
     private String updateUser;
 
     /** 更新时间 */
     @Schema(description = "更新时间")
     @ColumnWidth(12)
-    @ExcelProperty(index = 17,value = "更新时间")
+    @ExcelProperty(index = 16,value = "更新时间")
     @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
     /** 海关核注单编号 */
     @Schema(description = "海关核注单编号")
     @ColumnWidth(12)
-    @ExcelProperty(index = 18,value = "海关核注单编号")
+    @ExcelProperty(index = 17,value = "海关核注单编号")
     private String hgHzdCode;
 
     /** 核注单预录入号 */
     @Schema(description = "核注单预录入号")
     @ColumnWidth(12)
-    @ExcelProperty(index = 19,value = "核注单预录入号")
+    @ExcelProperty(index = 18,value = "核注单预录入号")
     private String hzdrCode;
 
     /** 申报类型 */
     @Schema(description = "申报类型")
     @ColumnWidth(12)
-    @ExcelProperty(index = 20,value = "申报类型")
+    @ExcelProperty(index = 19,value = "申报类型")
     private String sblx;
 
     /** 单据状态 */
     @Schema(description = "单据状态")
     @ColumnWidth(12)
-    @ExcelProperty(index = 21,value = "单据状态")
+    @ExcelProperty(index = 20,value = "单据状态")
     private String status;
 
     /** 申报时间 */
     @Schema(description = "申报时间")
     @ColumnWidth(12)
-    @ExcelProperty(index = 22,value = "申报时间")
+    @ExcelProperty(index = 21,value = "申报时间")
     private Date sbsj;
 }

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

@@ -162,7 +162,7 @@ public class QySecondlineRqHfdController {
                 //绑定类型
                 if(ObjectUtil.isNotEmpty(r.getBdlx())){
                     String bdlx = bizDictService.getNameByType("bdlx", r.getBdlx());
-                    r.setJcbz(bdlx);
+                    r.setBdlx(bdlx);
                 }
             });
         }