yangdamao преди 9 месеца
родител
ревизия
e1386b3981

+ 12 - 0
zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserSubscribeController.java

@@ -77,4 +77,16 @@ public class UserSubscribeController extends BaseController {
     }
 
 
+    /**
+     * 新增用戶線下約考次數
+     */
+    @ApiOperation("新增用戶線下約考次數")
+    @GetMapping("/save/offline")
+    public AjaxResult<List<UserSubscribeVo>> saveSubscribeOffline(UserSubscribeQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        List<UserSubscribeVo> list = iUserSubscribeService.listSubscribe(bo);
+        return AjaxResult.success(list);
+    }
+
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysTenant.java

@@ -135,4 +135,6 @@ private static final long serialVersionUID=1L;
     private Integer detectLiveSign;
     /** 是否检测快进标识:1开启 0关闭*/
     private Integer fastForwardSign;
+    /** 培训学校名称*/
+    private String schoolName;
 }

+ 15 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SubscribeOfflineBo.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.user.bo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SubscribeOfflineBo implements Serializable {
+
+    private Long userId;
+
+    private Long appId;
+
+    private Long orderGoodsId;
+}

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

@@ -2836,6 +2836,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     public String subRecordUserExport(SubUserExportBo bo) {
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");
         SysTenant sysTenant = iSysTenantService.getById(Long.valueOf(tenantId));
+        String schoolName = ObjectUtils.isNotNull(sysTenant.getSchoolName()) ? sysTenant.getSchoolName() : "广东省祥粤建设职业培训学校";
         if (ObjectUtils.isNotNull(sysTenant.getExamRoom()) && sysTenant.getExamRoom() == 1) {
             //公用祥粤考场
             List<SysTenant> list = iSysTenantService
@@ -2866,7 +2867,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             if (!dirw.exists()) {
                 dirw.mkdirs();
             }
-            String photoPath = majorPath + "/" + "广东省祥粤建设职业培训学校";
+            String photoPath = majorPath + "/" + schoolName;
             File dirw2 = new File(photoPath);
             if (!dirw2.exists()) {
                 dirw2.mkdirs();
@@ -2932,7 +2933,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 examApplyExports.add(export);
             });
             //打包zip
-            String zipPath = majorPath + "/" + "广东省祥粤建设职业培训学校.zip";
+            String zipPath = majorPath + "/" + String.format("%s.zip",schoolName);
             FileUtils.toZip(zipPath, photoPath, true);
             //删除本地资源
             Path pathStr = Paths.get(photoPath);