fix 订单列表

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeAddBo.java

@@ -95,4 +95,7 @@ public class UserSubscribeAddBo {
     /** 考培日期 */
     @ApiModelProperty("考培日期")
     private Long applySiteExamTrainTime;
+    /** 导入批次编号 */
+    @ApiModelProperty("导入批次编号")
+    private String importNo;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeEditBo.java

@@ -113,5 +113,7 @@ public class UserSubscribeEditBo {
     @ApiModelProperty("考培日期")
     private Long applySiteExamTrainTime;
 
-
+    /** 导入批次编号 */
+    @ApiModelProperty("导入批次编号")
+    private String importNo;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeQueryBo.java

@@ -116,4 +116,8 @@ public class UserSubscribeQueryBo extends BaseEntity {
 
 	@ApiModelProperty("考试地点")
 	private String applySiteAddress;
+
+	/** 导入批次编号 */
+	@ApiModelProperty("导入批次编号")
+	private String importNo;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserSubscribe.java

@@ -77,4 +77,6 @@ private static final long serialVersionUID=1L;
     private String applySiteEndTrainTime;
     /** 考培日期 */
     private Long applySiteExamTrainTime;
+    /** 导入批次编号 */
+    private String importNo;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.alisms.service.IAliSmsService;
 import com.zhongzheng.modules.exam.mapper.ExamApplyMapper;
 import com.zhongzheng.modules.exam.vo.ExamApplySiteTimeVo;
@@ -502,7 +503,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
-
+            String importNo = ServletUtils.getEncoded("IMPORT");
+            userSubscribeAddBo.setImportNo(importNo);
             userSubscribeAddBo.setCreateTime(DateUtils.getNowTime());
             userSubscribeAddBo.setUpdateTime(DateUtils.getNowTime());
             this.insertByAddBo(userSubscribeAddBo);
@@ -655,7 +657,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeAddBo.setApplySiteStartTrainTime(startTime);
                 userSubscribeAddBo.setApplySiteEndTrainTime(endTime);
             }
-
+            String importNo = ServletUtils.getEncoded("IMPORT");
+            userSubscribeAddBo.setImportNo(importNo);
             userSubscribeAddBo.setCreateTime(DateUtils.getNowTime());
             userSubscribeAddBo.setUpdateTime(DateUtils.getNowTime());
             this.insertByAddBo(userSubscribeAddBo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserSubscribeVo.java

@@ -184,6 +184,9 @@ public class UserSubscribeVo {
 	@Excel(name = "剩余前培次数")
 	@ApiModelProperty("剩余前培次数")
 	private Long beforeCount;
-
+	/** 导入批次编号 */
+	@Excel(name = "导入批次编号")
+	@ApiModelProperty("导入批次编号")
+	private String importNo;
 
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="beforeExpend" column="before_expend"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="importNo" column="import_no"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserSubscribeVo" id="UserSubscribeVo">
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="businessId" column="business_id"/>
         <result property="beforeCount" column="before_count"/>
         <result property="beforeName" column="before_name"/>
+        <result property="importNo" column="import_no"/>
     </resultMap>
 
     <select id="listSubscribe" parameterType="com.zhongzheng.modules.user.bo.UserSubscribeQueryBo" resultMap="UserSubscribeVo">