Merge remote-tracking branch 'origin/master'

# Conflicts:
#	snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyrecord/controller/QyRecordController.java
#	snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyrecord/entity/QyRecord.java

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyrecord/controller/QyRecordController.java

@@ -38,6 +38,8 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
+
+import java.text.SimpleDateFormat;
 import java.util.List;
 import java.io.IOException;
 import com.alibaba.excel.EasyExcel;
@@ -122,6 +124,7 @@ public class QyRecordController {
         Page<QyRecord> page =  qyRecordService.page(qyRecordPageParam);
         List<QyRecord> records = page.getRecords();
         if (CollectionUtil.isNotEmpty(records)){
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
             records.stream().forEach(item ->{
                 DevDict devDict;
                 String parentId;

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyrecord/entity/QyRecord.java

@@ -11,10 +11,11 @@
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
 package vip.xiaonuo.biz.modular.qyrecord.entity;
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
@@ -103,7 +104,7 @@ public class QyRecord {
     @Schema(description = "成立日期")
     @ColumnWidth(12)
     @ExcelProperty(index = 11,value = "成立日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat("yyyy-MM-dd")
     private Date companyRegisterDate;
 
     /** 企业地址 */
@@ -226,9 +227,9 @@ public class QyRecord {
 
     /** 删除状态 */
     @Schema(description = "删除状态")
-//    @ColumnWidth(12)
-//    @ExcelProperty(index = 31,value = "删除状态")
+    @ColumnWidth(12)
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
+    @ExcelIgnore
     private String deleteFlag;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehfd/service/impl/QySecondlineHfdServiceImpl.java

@@ -139,6 +139,7 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
         //生成核注单号(审核通过时)
         if(ObjectUtil.isNotEmpty(baseInfo.getStatus()) && "3".equals(baseInfo.getStatus())){
             qySecondlineHfd.setHfdCode(BusinessIdGenerator.generateNumBerUUID(18));
+            qySecondlineHfd.setSbsj(new Date());
         }
         this.updateById(qySecondlineHfd);
         //删除相关信息
@@ -213,7 +214,7 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
     public void add(QySecondlineHfdBaseParam qySecondlineHfdBaseParam){
         QySecondlineHfdAddParam baseInfo = qySecondlineHfdBaseParam.getBaseInfo();
         QySecondlineHfd qySecondlineHfd = BeanUtil.toBean(baseInfo, QySecondlineHfd.class);
-        qySecondlineHfd.setSbsj(new Date());
+
         //生成预录入单号
         StringBuilder stringBuilder = new StringBuilder(BusinessIdGenerator.generateNumBerUUID(18));
         stringBuilder.setCharAt(13,'e');
@@ -223,6 +224,7 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
         //生成核放单号(审核通过时)
         if(ObjectUtil.isNotEmpty(baseInfo.getStatus()) && "3".equals(baseInfo.getStatus())){
             qySecondlineHfd.setHfdCode(BusinessIdGenerator.generateNumBerUUID(18));
+            qySecondlineHfd.setSbsj(new Date());
         }
         this.save(qySecondlineHfd);
         //新增核放单关联信息

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehfdproduct/param/QySecondlineHfdProductAddParam.java

@@ -34,7 +34,7 @@ public class QySecondlineHfdProductAddParam {
 
     /** 关联商品序号 */
     @Schema(description = "关联商品序号")
-    private String productId;
+    private String productOrderCode;
 
     /** 商品编号 */
     @Schema(description = "商品编号")
@@ -50,7 +50,7 @@ public class QySecondlineHfdProductAddParam {
 
     /** 申报数量 */
     @Schema(description = "申报数量")
-    private String recordQuantity;
+    private String sbNum;
 
     /** 毛重 */
     @Schema(description = "毛重")

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

@@ -140,7 +140,7 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         this.saveRelation(hzdId,qySecondlineHzdTzBaseParam);
         //保存回执
         this.saveHz(hzdId,qySecondlineHzdTzBaseParam);
-        qySecondlineHzdTz.setSbsj(new Date());
+
         //默认的申报类型
         if(ObjectUtil.isEmpty(baseInfo.getSblx())){
             //默认备案
@@ -153,6 +153,7 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         //生成核注单号(审核通过时)
         if(ObjectUtil.isNotEmpty(baseInfo.getStatus()) && "3".equals(baseInfo.getStatus())){
             qySecondlineHzdTz.setHgHzdCode(this.baseMapper.createNo("QD"));
+            qySecondlineHzdTz.setSbsj(new Date());
         }
         this.save(qySecondlineHzdTz);
     }
@@ -234,6 +235,7 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         //生成核注单号(审核通过时)
         if(ObjectUtil.isNotEmpty(qySecondlineHzdTzBaseParam.getBaseInfo().getStatus()) && "3".equals(qySecondlineHzdTzBaseParam.getBaseInfo().getStatus())){
             qySecondlineHzdTz.setHgHzdCode(this.baseMapper.createNo("QD"));
+            qySecondlineHzdTz.setSbsj(new Date());
         }
         this.updateById(qySecondlineHzdTz);