[用户模块 培训模块] 代码提交

dev-scrap/src/main/java/com/tykj/dev/device/scrap/subject/domin/Scrap.java

@@ -158,8 +158,4 @@ public class Scrap extends BaseEntity {
     private List<FileRet> outboundFiles ;
 
 
-    public Documents toDoc(){
-        return new Documents(num,"装备清退单据",receiveUnit,replayNumber,sendUnit,null,null,senderUserA,senderUserB,receiveUserA,receiveUserB,null);
-    }
-
 }

dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java

@@ -4,6 +4,7 @@ import com.tykj.dev.blockcha.subject.entity.BcHash;
 import com.tykj.dev.blockcha.subject.entity.BcText;
 import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import com.tykj.dev.config.swagger.AutoDocument;
+import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
@@ -98,8 +99,9 @@ public class TrainJobController {
     @ApiOperation(value = "1.培训业务新建接口", notes = "有两类人员，一必须培训的人员，这里状态为报名确认，只需要确认就ok，2。不是必须报名的人员 状态 待报名，需要让用户选择报名 或不报名")
     @PostMapping("/initiate")
     public ResponseEntity newTrain(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @RequestBody TrainThemeAddVo trainThemeAddVo) {
-        TrainTheme trainTheme = trainThemeService.save(trainThemeAddVo.toDo());
-//        List<User> userList = userService.findSubordinate(securityUser.getCurrentUserInfo().getUserId());
+        TrainTheme trainThemeNoDb= trainThemeAddVo.toDo();
+        trainThemeNoDb.setTrainDataFiles(FilesUtil.stringFileToList(trainThemeAddVo.getTrainDataFileList()));
+        TrainTheme trainTheme = trainThemeService.save(trainThemeNoDb);
         List<User> userList=userService.findUnitsIdInUsers(trainThemeAddVo.getUnitsIds());
 
         List<Integer> needTrain = new ArrayList<>();
@@ -211,6 +213,7 @@ public class TrainJobController {
 //            taskService.moveToEnd(taskBto);
 //            userLogService.save(new UserLog(securityUser.getCurrentUserInfo().getUserId(),new Date(),"不参加培训"));
 //        }
+        taskBto.setCreateUserId(securityUser.getCurrentUserInfo().getUserId());
         taskBto= taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1003, -1);
         List<Integer> userIds=userService.findAllByUnite(securityUser.getCurrentUserInfo().getUnitsId()).stream().map(User::getUserId).collect(Collectors.toList());
         userIds.addAll(userService.findAllByUnite(trainTheme.getUnitsId()).stream().map(User::getUserId).collect(Collectors.toList()));
@@ -275,7 +278,7 @@ public class TrainJobController {
     @PostMapping("/gradesGrade")
     public ResponseEntity cityAudit(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @RequestBody GradeEntryVo gradeEntryVo) {
         TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
-//        TaskEntity taskEntity= taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(),trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
+        trainTheme.setTrainPapersFiles(FilesUtil.stringFileToList(gradeEntryVo.getTrainPapersFileList()));
         TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
         //判断
         TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.TRAIN1008);
@@ -302,7 +305,6 @@ public class TrainJobController {
         return ResponseEntity.ok(trainThemeService.save(trainTheme));
     }
 
-
     //市培训申请发证审核  待确认
     @ApiOperation(value = "市培训申请发证状态 调用接口", notes = "下一步'市培训申请发证审核'")
     @PostMapping("/isApply")
@@ -339,11 +341,11 @@ public class TrainJobController {
         return ResponseEntity.ok(trainThemeService.save(trainTheme));
     }
 
-
     //省培训发证审核
     @PostMapping("/audit")
     public ResponseEntity audit(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @RequestBody GradeEntryVo gradeEntryVo) {
         TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
+        trainTheme.setTrainPapersFiles(FilesUtil.stringFileToList(gradeEntryVo.getTrainPapersFileList()));
         TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
 
         //判断
@@ -374,7 +376,6 @@ public class TrainJobController {
         return ResponseEntity.ok(trainThemeService.save(trainTheme));
     }
 
-
     @ApiOperation(value = "省培训发证审核以及市培训申请发证审核调用接口", notes = "同意培训完成")
     @PostMapping("/auditResult")
     public ResponseEntity gradeeEntry(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @RequestBody GradeEntryVo gradeEntryVo) {
@@ -398,10 +399,8 @@ public class TrainJobController {
         TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),statusEnums);
 
         taskService.moveToEnd(taskBto);
-//        TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
-//        //8 培训完成
-
-
+        //TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
+        //8 培训完成
         //9 成绩待确认
         /**
          * 15
@@ -432,9 +431,6 @@ public class TrainJobController {
         //修改业务都状态
     }
 
-
-
-
     //考情 1.正常参加 2.为参加 3.请假
     //分数
     //评价 1.优秀 2.良好 3.及格 4 不及格
@@ -443,8 +439,6 @@ public class TrainJobController {
 
     }
 
-
-
     /**
      * 成绩查看确认
      *

dev-train/src/main/java/com/tykj/dev/device/train/entity/TrainTheme.java

 package com.tykj.dev.device.train.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.train.entity.vo.*;
 import com.tykj.dev.misc.base.BeanHelper;
 import io.swagger.annotations.ApiModel;
@@ -11,7 +12,9 @@ import lombok.NoArgsConstructor;
 import org.modelmapper.ModelMapper;
 
 import javax.persistence.*;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author zjm
@@ -96,17 +99,13 @@ public class TrainTheme {
     @ApiModelProperty(value = "主讲人")
     private String speakerUserId;
 
-    /**
-     * 培训资料名称
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataName;
+    @Column(name = "train_data_files" ,columnDefinition = "TEXT")
+    @ApiModelProperty(value = "培训资料文件db", name = "trainDataFiles")
+    private String trainDataFiles;
 
-    /**
-     * 培训url
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataUrl;
+    @ApiModelProperty(value = "培训资料文件集合")
+    @Transient
+    private List<FileRet> trainDataFileList = new ArrayList<>();
 
 
     /**
@@ -115,23 +114,6 @@ public class TrainTheme {
     @ApiModelProperty(value = "trainSynopsis")
     private String trainSynopsis;
 
-//    /**
-//     * 参会人员（必须参会）
-//     */
-//    @ApiModelProperty(value = "参会人员id 多个使用人员id+x+id+x")
-//    private String joinUserId;
-//
-//    /**
-//     * 不必须参会人员
-//     */
-//    @ApiModelProperty(value = "参会人员id 多个使用人员id+x+id+x")
-//    private String noJoinUserId;
-//
-//    /**
-//     * 报名人员
-//     */
-//    @ApiModelProperty(value = "参会人员id 多个使用人员id+x+id+x")
-//    private String signUp;
 
     /**
      * 培训结果
@@ -162,17 +144,14 @@ public class TrainTheme {
     @ApiModelProperty(value = "优秀", name = "good")
     private Integer good;
 
-    /**
-     * 培训试卷url
-     */
-    @ApiModelProperty(value = "培训试卷url", name = "trainPapersUrl")
-    private String trainPapersUrl;
 
-    /**
-     * 培训试卷名称
-     */
-    @ApiModelProperty(value = "培训试卷名称", name = "trainPapersName")
-    private String trainPapersName;
+    @Column(name = "train_papers_files",columnDefinition = "TEXT")
+    @ApiModelProperty(value = "培训试卷文件db", name = "trainPapersFiles")
+    private String trainPapersFiles;
+
+    @ApiModelProperty(value = "培训试卷文件实体集合")
+    @Transient
+    private List<FileRet> trainPapersFileList = new ArrayList<>();
 
     @ApiModelProperty(value = "区块链RID",name = "recordId")
     private String recordId;

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/ByTrainingPeople.java

 package com.tykj.dev.device.train.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.train.entity.TrainUser;
 import com.tykj.dev.device.user.subject.entity.Mgrcert;
 import io.swagger.annotations.ApiModelProperty;
@@ -96,17 +97,10 @@ public class ByTrainingPeople {
     @ApiModelProperty(value = "主讲人")
     private String speakerUserId;
 
-    /**
-     * 培训资料名称
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataName;
 
-    /**
-     * 培训url
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataUrl;
+    @ApiModelProperty(value = "培训资料集合")
+    private List<FileRet> trainDataFileList;
+
     /**
      * 培训简介
      */

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/GradeEntryVo.java

 package com.tykj.dev.device.train.entity.vo;
 
+import com.tykj.dev.device.file.entity.FileRet;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 
+import javax.persistence.Transient;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -52,5 +56,7 @@ public class GradeEntryVo {
     @ApiModelProperty(value = "发证状态")
     private Integer good;
 
+    @ApiModelProperty(value = "培训试卷文件实体集合")
+    private List<FileRet> trainPapersFileList = new ArrayList<>();
 
 }

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/TrainAuditVo.java

 package com.tykj.dev.device.train.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.train.entity.TrainUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -97,17 +98,8 @@ public class TrainAuditVo {
     private String speakerUserId;
 
 
-    /**
-     * 培训资料名称
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataName;
-
-    /**
-     * 培训url
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataUrl;
+    @ApiModelProperty(value = "培训资料集合")
+    private List<FileRet> trainDataFileList;
 
     /**
      * 培训简介

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/TrainDetailsVo.java

 package com.tykj.dev.device.train.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.train.entity.TrainUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -103,17 +104,8 @@ public class TrainDetailsVo {
     @ApiModelProperty(value = "培训资料")
     private String trainDataName;
 
-    /**
-     * 培训url
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataUrl;
-
-    /**
-     * 培训简介
-     */
-    @ApiModelProperty(value = "trainSynopsis")
-    private String trainSynopsis;
+    @ApiModelProperty(value = "培训资料集合")
+    private List<FileRet> trainDataFileList;
 
     /**
      * 及格

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/TrainRegistrationVo.java

 package com.tykj.dev.device.train.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.train.entity.TrainUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -96,17 +97,8 @@ public class TrainRegistrationVo {
     private String speakerUserId;
 
 
-    /**
-     * 培训资料名称
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataName;
-
-    /**
-     * 培训url
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataUrl;
+    @ApiModelProperty(value = "培训资料集合")
+    private List<FileRet> trainDataFileList;
 
     /**
      * 培训简介

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/TrainThemeAddVo.java

 package com.tykj.dev.device.train.entity.vo;
 
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.train.entity.TrainTheme;
 import com.tykj.dev.misc.base.BeanHelper;
 import io.swagger.annotations.ApiModel;
@@ -84,17 +85,8 @@ public class TrainThemeAddVo {
     @ApiModelProperty(value = "主讲人")
     private String speakerUserId;
 
-    /**
-     * 培训资料名称
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataName;
-
-    /**
-     * 培训url
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataUrl;
+    @ApiModelProperty(value = "培训资料集合")
+    private List<FileRet> trainDataFileList;
 
     /**
      * 培训简介

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/TrainTrainingVo.java

 package com.tykj.dev.device.train.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.train.entity.TrainUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -97,17 +98,8 @@ public class TrainTrainingVo {
     private String speakerUserId;
 
 
-    /**
-     * 培训资料名称
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataName;
-
-    /**
-     * 培训url
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataUrl;
+    @ApiModelProperty(value = "培训资料集合")
+    private List<FileRet> trainDataFileList;
 
     /**
      * 培训简介

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/TrainUpdateVo.java

 package com.tykj.dev.device.train.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tykj.dev.device.file.entity.FileRet;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -8,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author zjm
@@ -51,18 +53,8 @@ public class TrainUpdateVo {
     @ApiModelProperty(value = "主讲人")
     private String speakerUserId;
 
-    /**
-     * 培训资料名称
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataName;
-
-    /**
-     * 培训url
-     */
-    @ApiModelProperty(value = "培训资料")
-    private String trainDataUrl;
-
+    @ApiModelProperty(value = "培训资料集合")
+    private List<FileRet> trainDataFileList;
 
     /**
      * 培训简介

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/TrainThemeServiceImpl.java

@@ -5,6 +5,7 @@ import com.github.wenhao.jpa.Specifications;
 import com.tykj.dev.blockcha.subject.entity.BcHash;
 import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import com.tykj.dev.config.TaskBeanConfig;
+import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.train.dao.TrainThemeDao;
 import com.tykj.dev.device.train.dao.TrainUserDao;
@@ -94,8 +95,16 @@ public class TrainThemeServiceImpl implements TrainThemeService {
 
     @Override
     public TrainTheme findById(Integer trainThemeId) {
+        Optional<TrainTheme> train = trainThemeDao.findById(trainThemeId);
+        if (train.isPresent()){
+            TrainTheme trainTheme=train.get();
+            trainTheme.setTrainDataFileList(FilesUtil.stringFileToList(trainTheme.getTrainDataFiles()));
+            trainTheme.setTrainPapersFileList(FilesUtil.stringFileToList(trainTheme.getTrainPapersFiles()));
+            return trainTheme;
+        }else {
+          throw new ApiException(ResponseEntity.status(500).body("[培训] 查询详情id："+trainThemeId+"没有找到"));
+        }
 
-        return trainThemeDao.findById(trainThemeId).get();
     }
 
     @Override
@@ -112,6 +121,7 @@ public class TrainThemeServiceImpl implements TrainThemeService {
         trainUsers.forEach(
                 trainUser1 -> trainUser1.setMgrcert(mgrcertService.findByUserId(trainUser1.getUserId()))
         );
+        byTrainingPeople.setTrainDataFileList(FilesUtil.stringFileToList(trainTheme.getTrainDataFiles()));
         byTrainingPeople.setTrainUserList(trainUsers);
         return byTrainingPeople;
     }
@@ -124,6 +134,7 @@ public class TrainThemeServiceImpl implements TrainThemeService {
         TrainRegistrationVo trainRegistrationVo = trainTheme.toTrainRegistrationVo();
         trainRegistrationVo.setSignUpUser(trainUserDao.findAllByIsSignUpAndTrainId(1,trainThemeId));
         trainRegistrationVo.setNoSignUpUser(trainUserDao.findAllByIsSignUpAndTrainId(2,trainThemeId));
+        trainRegistrationVo.setTrainDataFileList(FilesUtil.stringFileToList(trainTheme.getTrainDataFiles()));
         return trainRegistrationVo;
     }
 
@@ -138,6 +149,7 @@ public class TrainThemeServiceImpl implements TrainThemeService {
     @Override
     public TrainAuditVo findTrainAuditVo(Integer trainThemeId) {
         TrainTheme trainTheme = trainThemeDao.findById(trainThemeId).get();
+        trainTheme.setTrainDataFileList(FilesUtil.stringFileToList(trainTheme.getTrainDataFiles()));
         TrainAuditVo trainAuditVo = trainTheme.toTrainAuditVo();
         List<TrainUser> trainUsers= trainUserDao.findAllByIsSignUpAndTrainId(1,trainThemeId);
         trainUsers.forEach(trainUser -> {
@@ -159,11 +171,8 @@ public class TrainThemeServiceImpl implements TrainThemeService {
         if (trainUpdateVo.getStartTime() != null) {
             trainTheme.setStartTime(trainUpdateVo.getStartTime());
         }
-        if (trainUpdateVo.getTrainDataName() != null) {
-            trainTheme.setTrainDataName(trainUpdateVo.getTrainDataName());
-        }
-        if (trainUpdateVo.getTrainDataUrl() != null) {
-            trainTheme.setTrainDataUrl(trainUpdateVo.getTrainDataUrl());
+        if (trainUpdateVo.getTrainDataFileList()!=null&&trainUpdateVo.getTrainDataFileList().size()!=0){
+            trainTheme.setTrainDataFiles(FilesUtil.stringFileToList(trainUpdateVo.getTrainDataFileList()));
         }
         if (trainUpdateVo.getTrainLocation() != null) {
             trainTheme.setTrainLocation(trainUpdateVo.getTrainLocation());

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/WorkHandoverServiceImpl.java

@@ -116,16 +116,16 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
         //拿到工作交接人员对象组
         List<WorkHandoverUserVo> workHandoverUserVoList=JacksonUtil.readValue(workHandover.getWorkHandoverUsers(), new TypeReference<List<WorkHandoverUserVo>>() {});
         List<Integer> integerList=new ArrayList<>();
+        if (workHandoverUserVoList != null) {
             workHandoverUserVoList.forEach(
-                workHandoverUserVo -> {
-                   workHandoverUserVo.getHandoverUserIds().forEach(
+                    workHandoverUserVo -> workHandoverUserVo.getHandoverUserIds().forEach(
                             integerId ->{
                                 integerList.add(integerId);
                                 taskService.workHandover(integerId,workHandoverUserVo.getTurnOverUserIds());
                             }
+                    )
             );
         }
-        );
         //把交接人账号状态改为冻结
         List<User> users= userService.findAllUserIdInUser(integerList);
         users.forEach(

dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UnitsController.java

@@ -104,14 +104,12 @@ public class UnitsController {
         return ResponseEntity.ok(unitsService.findByUserIdUnitsTrainListVo(unitsId));
     }
 
-
     @GetMapping("/countries/units")
     @ApiOperation(value = "省入库发件单位下拉接口", notes = "省入库发件单位下拉接口")
     public ResponseEntity findSuperiorUnitsList(){
         return ResponseEntity.ok(unitsService.findSuperiorUnitsList());
     }
 
-
     @GetMapping("/countries/directlyUnder")
     @ApiOperation(value = "省直属单位接口", notes = "省直属单位接口")
     public ResponseEntity directlyUnder(){
@@ -119,5 +117,4 @@ public class UnitsController {
     }
 
 
-
 }

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UnitsServiceImpl.java

@@ -212,7 +212,9 @@ public class UnitsServiceImpl implements UnitsService {
         if (unitsOptional.isPresent()) {
             Units units=unitsOptional.get();
             List<Integer> areaIds = areaDao.findAllByFatherId(units.getAreaId()).stream().map(Area::getId).collect(Collectors.toList());
-            return unitsDao.findAllByAreaIdIn(areaIds);
+            List<Units> unitsList= unitsDao.findAllByAreaIdIn(areaIds);
+            unitsList.add(units);
+            return unitsList;
         }else {
             throw new ApiException(ResponseEntity.status(500).body("单位没有查到"));
         }