submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderListVo.java

@@ -173,6 +173,9 @@ public class OrderListVo {
     @ApiModelProperty("手机号码")
     private String telphone;
 
+    @ApiModelProperty("公司名称")
+    private String companyName;
+
     @Excel(name = "商品订单状态")
     @ApiModelProperty("商品订单状态 -1关闭 0待支付 1已支付 2已退款")
     private Integer orderGoodsStatus;

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

@@ -2152,6 +2152,18 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                         item.setSex("女");
                     }
                 }
+                if (ObjectUtils.isNotNull(vo.getApplySiteExamTime())){
+                    String format = String.format("%s %s-%s", DateUtils.timestampToDateFormat(vo.getApplySiteExamTime()), "yyyy-MM-dd", vo.getApplySiteStartTime(), vo.getApplySiteEndTime());
+                    item.setApplyTime(format);
+                }
+                if (ObjectUtils.isNotNull(vo.getSubscribeId())){
+                    UserSubscribe subscribe = getById(vo.getSubscribeId());
+                    Goods goods = iGoodsService.getById(subscribe.getGoodsId());
+                    if (ObjectUtils.isNotNull(goods.getMajorId())){
+                        Major major = iMajorService.getById(goods.getMajorId());
+                        item.setMajorName(major.getCategoryName());
+                    }
+                }
                 list1.add(item);
 
                 if(Validator.isNotEmpty(vo.getIdCardImg1())){

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

@@ -43,6 +43,13 @@ public class UserSubscribeStudentExportVo {
 	@ApiModelProperty("工作单位")
 	private String companyName;
 
+	@Excel(name = "约考时间")
+	@ApiModelProperty("约考时间")
+	private String applyTime;
+
+	@Excel(name = "所报专业")
+	@ApiModelProperty("所报专业")
+	private String majorName;
 
 	@Excel(name = "岗位")
 	@ApiModelProperty("岗位")

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

@@ -307,6 +307,14 @@ public class UserVo {
 	private String school;
 	@ApiModelProperty("毕业时间")
 	private String graduationTime;
+	@ApiModelProperty("考试时间")
+	private Long applySiteExamTime;
+	@ApiModelProperty("考试时间")
+	private String applySiteStartTime;
+	@ApiModelProperty("考试时间")
+	private String applySiteEndTime;
+	@ApiModelProperty("预约ID")
+	private Long subscribeId;
 
 	public void setNull(){
 		this.setOpenId(null);

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="idCard" column="id_card" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
         <result property="telphone" column="telphone" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
         <result property="realname" column="realname"/>
+        <result property="companyName" column="company_name"/>
 
         <result property="goodsReceived" column="goods_received"/>
         <result property="refundStatus" column="refund_status"/>
@@ -105,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             u.telphone,
             u.realname,
             u.id_card,
+            u.company_name,
             cet.education_name,
             cpt.project_name,
             cb.business_name,

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

@@ -122,6 +122,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="idCardImg1" column="id_card_img1"/>
         <result property="idCardImg2" column="id_card_img2"/>
         <result property="keyValue" column="key_value"/>
+        <result property="applySiteExamTime" column="apply_site_exam_time"/>
+        <result property="applySiteStartTime" column="apply_site_start_time"/>
+        <result property="applySiteEndTime" column="apply_site_end_time"/>
+        <result property="subscribeId" column="subscribe_id"/>
     </resultMap>
 
     <select id="listSubscribe" parameterType="com.zhongzheng.modules.user.bo.UserSubscribeQueryBo" resultMap="UserSubscribeVo">