renqianlong 1 year ago
parent
commit
b2d0d7e5c1

+ 53 - 4
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -2015,13 +2015,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     }
 
     @Override
-    public void userDataDownload(UserDownloadBo bo) {
+    public String userDataDownload(UserDownloadBo bo) {
         if (CollectionUtils.isEmpty(bo.getUserIds())){
-            return;
+            return null;
         }
         //创建学员资料下载
         SysTask task = new SysTask();
-        task.setTaskName(String.format("学员资料下载:操作人ID(%s),时间:%s",bo.getCreateSysUserId(),DateUtils.getTime()));
+        task.setTaskName(String.format("<%s>下载:操作人ID(%s),时间:%s",getTaskName(bo.getTypes().get(0)),bo.getCreateSysUserId(),DateUtils.getTime()));
         String code = ServletUtils.getEncoded("DA");
         bo.setTaskCode(code);
         task.setTaskCode(code);
@@ -2039,7 +2039,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");
         HashMap<String, String> map = new HashMap<>();
         map.put("TenantId", tenantId);
-       HttpUtils.sendPostJsonHeader(RECORD_DOWNLOAD, JSONObject.toJSONString(bo), map);
+        return HttpUtils.sendPostJsonHeader(RECORD_DOWNLOAD, JSONObject.toJSONString(bo), map);
     }
 
     @Override
@@ -2055,6 +2055,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         List<UserDownloadVo> collect = list.stream().map(item -> {
             UserDownloadVo vo = new UserDownloadVo();
             vo.setId(item.getId());
+            if (item.getTaskName().startsWith("<")){
+                int start = item.getTaskName().indexOf("<");
+                int end = item.getTaskName().indexOf(">");
+                vo.setFileName(item.getTaskName().substring(start+1,end));
+            }else {
+                vo.setFileName(item.getTaskName().substring(0,4));
+            }
             vo.setTaskCode(item.getTaskCode());
             vo.setTaskStatus(item.getTaskStatus());
             vo.setCreateSysUserId(item.getSysUserId());
@@ -2065,6 +2072,48 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return collect;
     }
 
+    public String getTaskName(Integer Type){
+        if (Type==1){
+            return "学员信息";
+        }
+        if (Type==2){
+            return "个人资料";
+        }
+        if (Type==3){
+            return "订单记录";
+        }
+        if (Type==4){
+            return "报名记录";
+        }
+        if (Type==5){
+            return "学员信息";
+        }
+        if (Type==6){
+            return "网课记录";
+        }
+        if (Type==7){
+            return "题库记录";
+        }
+        if (Type==8){
+            return "直播记录";
+        }
+        if (Type==9){
+            return "资料记录";
+        }
+        if (Type==10){
+            return "约考记录";
+        }
+        if (Type==11){
+            return "考试记录";
+        }
+        if (Type==12){
+            return "证书/证明";
+        }
+        if (Type==13){
+            return "承诺书";
+        }
+        return null;
+    }
     @Override
     public void userDataDownloadUp(UserDataDownloadUpBo bo) {
         SysTask task = iSysTaskService.getOne(new LambdaQueryWrapper<SysTask>()

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysTask.java

@@ -30,7 +30,7 @@ public class SysTask implements Serializable {
     private Integer taskType;
     /** 关联账号ID */
     private Long sysUserId;
-    /** 任务名称 */
+    /** 文件名称 */
     private String taskName;
     /** 任务名称 */
     private String taskCode;

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserDownloadVo.java

@@ -28,5 +28,6 @@ public class UserDownloadVo implements Serializable {
     private Long taskTime;
 
     private Long createSysUserId;
+    private String fileName;
 
 }