Merge branch 'master' of http://8.130.72.63:18081/single-window/yqyc-system

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

@@ -99,4 +99,9 @@ public class QySecondlineHzdTzAddParam {
     @ExcelProperty(index = 20,value = "单据状态")
     private String status;
 
+    @Schema(description = "核注单预录入编号")
+    @ColumnWidth(12)
+    @ExcelProperty(index = 18,value = "核注单预录入编号")
+    private String hzdrCode;
+
 }

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

@@ -50,6 +50,7 @@ import vip.xiaonuo.biz.modular.qysecondlinehzdtz.entity.QySecondlineHzdTz;
 import vip.xiaonuo.biz.modular.qysecondlinehzdtz.mapper.QySecondlineHzdTzMapper;
 import vip.xiaonuo.biz.modular.qysecondlinehzdtz.service.QySecondlineHzdTzService;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -114,8 +115,14 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         String hzdId = UUID.fastUUID().toString();
         baseInfo.setHzdId(hzdId);
         QySecondlineHzdTz qySecondlineHzdTz = BeanUtil.toBean(baseInfo, QySecondlineHzdTz.class);
-        this.saveRelation(hzdId,qySecondlineHzdTzBaseParam);
         //新增关联
+        this.saveRelation(hzdId,qySecondlineHzdTzBaseParam);
+        qySecondlineHzdTz.setSbsj(new Date());
+        //默认的申报类型
+        if(ObjectUtil.isEmpty(baseInfo.getSblx())){
+            //默认备案
+            qySecondlineHzdTz.setSblx("basq");
+        }
         this.save(qySecondlineHzdTz);
     }