核注核放修改

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyrecordinfo/entity/BusinessIdGenerator.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.biz.modular.qyrecordinfo.entity;
 
+import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
 import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
 import com.baomidou.mybatisplus.extension.ddl.history.IDdlGenerator;
 import org.springframework.util.IdGenerator;
@@ -80,11 +81,17 @@ public class BusinessIdGenerator {
     }
 
     public static void main(String[] args) {
-        for (int i = 0; i < 10; i++) {
-            String code = generateBusinessId(i);
-            System.out.println("Generated Code: " + code);
+//        for (int i = 0; i < 10; i++) {
+//            String code = generateBusinessId(i);
+//            System.out.println("Generated Code: " + code);
+//        }
+        for (int i = 0; i < 100; i++) {
+            DefaultIdentifierGenerator defaultIdentifierGenerator = new DefaultIdentifierGenerator();
+            System.out.println(defaultIdentifierGenerator.nextId(null));
         }
-        System.out.println("UUID:"+generateNumBerUUID(18));
+
+        DefaultIdentifierGenerator defaultIdentifierGenerator = new DefaultIdentifierGenerator();
+        System.out.println(defaultIdentifierGenerator.nextId(null));
     }
 
     /**
@@ -93,16 +100,11 @@ public class BusinessIdGenerator {
      * @return
      */
     public static String generateNumBerUUID(int number) {
-        UUID uuid = UUID.randomUUID();
-        String uuidStr = uuid.toString().replace("_", "");
-        //只保留数字部分
-        StringBuilder sb = new StringBuilder();
-        for (char c : uuidStr.toCharArray()) {
-            if (Character.isDigit(c)) {
-                sb.append(c);
-            }
-        }
-        //截取指定位左右最终结果
-        return sb.toString().substring(0, number);
+
+        DefaultIdentifierGenerator defaultIdentifierGenerator = new DefaultIdentifierGenerator();
+        Long l = defaultIdentifierGenerator.nextId(null);
+        return String.valueOf(l);
     }
+
+
 }

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

@@ -25,6 +25,7 @@ import org.apache.http.auth.AUTH;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.biz.modular.qyrecordinfo.entity.BusinessIdGenerator;
 import vip.xiaonuo.biz.modular.qysecondlinehfd.param.*;
 import vip.xiaonuo.biz.modular.qysecondlinehfd.vo.QySecondlineHfdBgInfoVo;
@@ -44,6 +45,8 @@ import vip.xiaonuo.biz.modular.qysecondlinehfdlist.service.QySecondlineHfdListSe
 import vip.xiaonuo.biz.modular.qysecondlinehfdproduct.entity.QySecondlineHfdProduct;
 import vip.xiaonuo.biz.modular.qysecondlinehfdproduct.param.QySecondlineHfdProductAddParam;
 import vip.xiaonuo.biz.modular.qysecondlinehfdproduct.service.QySecondlineHfdProductService;
+import vip.xiaonuo.biz.modular.qysecondlinehzdlist.entity.QySecondlineHzdList;
+import vip.xiaonuo.biz.modular.qysecondlinehzdtz.param.QySecondlineHzdTzBaseParam;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
@@ -96,12 +99,15 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
         if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getStatus())) {
             queryWrapper.lambda().eq(QySecondlineHfd::getStatus, qySecondlineHfdPageParam.getStatus());
         }
+        if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getHfdrCode())) {
+            queryWrapper.lambda().eq(QySecondlineHfd::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(QySecondlineHfd::getId);
+            queryWrapper.lambda().orderByDesc(QySecondlineHfd::getId);
         }
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
@@ -122,6 +128,9 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
         deleteHfdRelation(hfdId);
         //关联相关信息
         saveHfdRelation(hfdId,qySecondlineHfdBaseParam);
+
+        //新增回执
+        this.saveHz(qySecondlineHfd.getId(),qySecondlineHfdBaseParam);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -198,7 +207,46 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
         this.save(qySecondlineHfd);
         //新增核放单关联信息
         this.saveHfdRelation(qySecondlineHfd.getId(),qySecondlineHfdBaseParam);
+        //新增回执
+        this.saveHz(qySecondlineHfd.getId(),qySecondlineHfdBaseParam);
+    }
+
+    private void saveHz(String hfdId,QySecondlineHfdBaseParam qySecondlineHfdBaseParam){
+        if(!qySecondlineHfdBaseParam.getBaseInfo().getStatus().equals("3")){
+            return;
+        }
+        Date date = new Date();
+        QySecondlineHfdList qySecondlineHfdListSq = new QySecondlineHfdList();
+        qySecondlineHfdListSq.setHfdId(hfdId);
+        qySecondlineHfdListSq.setCheckTime(date);
+        qySecondlineHfdListSq.setStatus("审核中");
+        qySecondlineHfdListSq.setResult("提交成功，待审核");
+
+        String applyTypeName = "备案";
+
+        if ("bgsq".equals(qySecondlineHfdBaseParam.getBaseInfo().getSblx())){
+            applyTypeName = "变更";
+        }
+        if ("zxsq".equals(qySecondlineHfdBaseParam.getBaseInfo().getSblx())){
+            applyTypeName = "注销";
+        }
+        qySecondlineHfdListSq.setApplyType(applyTypeName);
+        String nickname = StpLoginUserUtil.getLoginUser().getName();
+        qySecondlineHfdListSq.setApplicant(nickname);
+
+
+        QySecondlineHfdList qySecondlineHfdListSh= new QySecondlineHfdList();
+        qySecondlineHfdListSh.setHfdId(hfdId);
+        qySecondlineHfdListSh.setCheckTime(date);
+        qySecondlineHfdListSh.setStatus("审核通过");
+        qySecondlineHfdListSh.setApplyMan(nickname);
+        qySecondlineHfdListSh.setResult("提交成功，审核通过");
+        qySecondlineHfdListSh.setApplyType(applyTypeName);
+
+
 
+        qySecondlineHfdListService.save(qySecondlineHfdListSq);
+        qySecondlineHfdListService.save(qySecondlineHfdListSh);
     }
 
     /**

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdtz/entity/QySecondlineHzdTz.java

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

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

@@ -12,6 +12,7 @@
  */
 package vip.xiaonuo.biz.modular.qysecondlinehzdtz.param;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
@@ -72,4 +73,10 @@ public class QySecondlineHzdTzPageParam {
     @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;
+
 }

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

@@ -26,12 +26,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.biz.modular.qyrecardbody.entity.QyRecardBody;
 import vip.xiaonuo.biz.modular.qyrecardbody.param.QyRecardBodyIdParam;
 import vip.xiaonuo.biz.modular.qyrecardbody.service.QyRecardBodyService;
 import vip.xiaonuo.biz.modular.qyrecordinfo.entity.BusinessIdGenerator;
 import vip.xiaonuo.biz.modular.qyrecordinfo.entity.QyRecordInfo;
 import vip.xiaonuo.biz.modular.qyrecordinfo.service.QyRecordInfoService;
+import vip.xiaonuo.biz.modular.qyrecordinfochecklist.entity.QyRecordInfoCheckList;
 import vip.xiaonuo.biz.modular.qyrecordproduct.entity.QyRecordProduct;
 import vip.xiaonuo.biz.modular.qyrecordproduct.service.QyRecordProductService;
 import vip.xiaonuo.biz.modular.qysecondlinehfdproduct.entity.QySecondlineHfdProduct;
@@ -105,13 +107,19 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getSblx())) {
             queryWrapper.lambda().eq(QySecondlineHzdTz::getSblx, qySecondlineHzdTzPageParam.getSblx());
         }
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getStartSbsj())) {
+            queryWrapper.lambda().ge(QySecondlineHzdTz::getSbsj, qySecondlineHzdTzPageParam.getStartSbsj());
+        }
+        if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getEndSbsj())) {
+            queryWrapper.lambda().le(QySecondlineHzdTz::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(QySecondlineHzdTz::getId);
+            queryWrapper.lambda().orderByDesc(QySecondlineHzdTz::getId);
         }
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
@@ -126,6 +134,8 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         QySecondlineHzdTz qySecondlineHzdTz = BeanUtil.toBean(baseInfo, QySecondlineHzdTz.class);
         //新增关联
         this.saveRelation(hzdId,qySecondlineHzdTzBaseParam);
+        //保存回执
+        this.saveHz(hzdId,qySecondlineHzdTzBaseParam);
         qySecondlineHzdTz.setSbsj(new Date());
         //默认的申报类型
         if(ObjectUtil.isEmpty(baseInfo.getSblx())){
@@ -142,6 +152,48 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         this.save(qySecondlineHzdTz);
     }
 
+    /**
+     * 插入回执
+     */
+    private void saveHz(String hzdId, QySecondlineHzdTzBaseParam qySecondlineHzdTzBaseParam){
+        if(!qySecondlineHzdTzBaseParam.getBaseInfo().getStatus().equals("3")){
+                return;
+        }
+        Date date = new Date();
+        QySecondlineHzdList qySecondlineHzdListSq = new QySecondlineHzdList();
+        qySecondlineHzdListSq.setHzdId(hzdId);
+        qySecondlineHzdListSq.setCheckTime(date);
+        qySecondlineHzdListSq.setStatus("审核中");
+        qySecondlineHzdListSq.setResult("提交成功，待审核");
+
+        String applyTypeName = "备案";
+
+        if ("bgsq".equals(qySecondlineHzdTzBaseParam.getBaseInfo().getSblx())){
+           applyTypeName = "变更";
+        }
+        if ("zxsq".equals(qySecondlineHzdTzBaseParam.getBaseInfo().getSblx())){
+            applyTypeName = "注销";
+        }
+        qySecondlineHzdListSq.setApplyType(applyTypeName);
+        String nickname = StpLoginUserUtil.getLoginUser().getName();
+        qySecondlineHzdListSq.setApplicant(nickname);
+
+
+        QySecondlineHzdList qySecondlineHzdListSh= new QySecondlineHzdList();
+        qySecondlineHzdListSh.setHzdId(hzdId);
+        qySecondlineHzdListSh.setCheckTime(date);
+        qySecondlineHzdListSh.setStatus("审核通过");
+        qySecondlineHzdListSh.setApplyMan(nickname);
+        qySecondlineHzdListSh.setResult("提交成功，审核通过");
+        qySecondlineHzdListSh.setApplyType(applyTypeName);
+
+
+
+        qySecondlineHzdListService.save(qySecondlineHzdListSq);
+        qySecondlineHzdListService.save(qySecondlineHzdListSh);
+    }
+
+
     private void saveRelation(String hzdId, QySecondlineHzdTzBaseParam qySecondlineHzdTzBaseParam) {
         //新增商品
         List<QySecondlineHzdProductAddParam> productList = qySecondlineHzdTzBaseParam.getProductList();
@@ -180,6 +232,8 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         this.deleteRelation(hzdId);
         //添加关联
         this.saveRelation(hzdId,qySecondlineHzdTzBaseParam);
+        //保存回执
+        this.saveHz(hzdId,qySecondlineHzdTzBaseParam);
     }
 
     private void deleteRelation(String hzdId) {