fix

zhongzheng-admin-business/src/main/java/com/zhongzheng/controller/goods/BsUserGoodsCollectionController.java

@@ -5,6 +5,7 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 
@@ -108,4 +109,16 @@ public class BsUserGoodsCollectionController extends BaseController {
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
         return toAjax(iBsUserGoodsCollectionService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
+    /**
+     * 删除用户商品收藏
+     */
+    @ApiOperation("删除用户商品收藏")
+    @PreAuthorize("@ss.hasPermi('goods:collection:remove')")
+    @Log(title = "用户商品收藏" , businessType = BusinessType.DELETE)
+    @GetMapping("/test/{ids}")
+    public AjaxResult<Void> test(@PathVariable String ids) {
+        String decrypt = EncryptHandler.decrypt(ids);
+        System.out.println(decrypt);
+        return null;
+    }
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserSubscribeController.java

@@ -270,6 +270,7 @@ public class UserSubscribeController extends BaseController {
             export.setIdCard("44086921356895125365");
             export.setApplyName(bo.getApplyName());
             export.setApplySiteAddress(bo.getApplySiteAddress());
+            export.setStudentType("是");
             if (ObjectUtils.isNotNull(siteTime)){
                 List<ExamApplySiteTimeTwoAddBo> siteTimeTwoAddBos = JSONArray.parseArray(siteTime.getSiteTime(), ExamApplySiteTimeTwoAddBo.class);
                 if (CollectionUtils.isNotEmpty(siteTimeTwoAddBos)){
@@ -284,7 +285,6 @@ public class UserSubscribeController extends BaseController {
             export.setMajorName("土建质量员");
 //            export.setCode("SP6415428604");
 //            export.setGoodsName("一级建造师继续教育（必修课+机电工程）");
-
             List<UserSubscribeExport> list = new ArrayList<>();
             list.add(export);
             ExcelUtil<UserSubscribeExport> util = new ExcelUtil<UserSubscribeExport>(UserSubscribeExport.class);
@@ -301,7 +301,7 @@ public class UserSubscribeController extends BaseController {
             export.setApplySiteTime("9:00-12:00");
             export.setCode("SP6415428604");
             export.setGoodsName("一级建造师继续教育（必修课+机电工程）");
-
+            export.setStudentType("是");
             export.setApplySiteAddressTrain(bo.getApplySiteAddressTrain());
             if (ObjectUtils.isNotNull(siteTime)){
                 List<ExamApplySiteTimeTwoAddBo> siteTimeTwoAddBos = JSONArray.parseArray(siteTime.getSiteTime(), ExamApplySiteTimeTwoAddBo.class);

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

@@ -57,4 +57,6 @@ public class UserSubscribeExport {
 	@Excel(name = "失败原因")
 	private String cause;
 
+	@Excel(name = "是否补考学员(是/否)")
+	private String studentType;
 }

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

@@ -61,5 +61,6 @@ public class UserSubscribeTrainExport {
 
 	@Excel(name = "失败原因")
 	private String cause;
-
+	@Excel(name = "是否补考学员(是/否)")
+	private String studentType;
 }