Skip to content

D
device-back
提交 319e872e authored 作者: 133's avatar 133
浏览文件
操作

1

上级 7650b9c6
显示空白字符变更
内嵌 并排
正在显示 包含 109 行增加 和 61 行删除
dev-config/src/main/java/com/tykj/dev/config/MyWebMvcConfig.java 0 → 100644
浏览文件 @ 319e872e
package com.tykj.dev.config;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
* @author zjm
* @version 1.0.0
* @ClassName MyWebMvcConfig.java
* @Description TODO
* @createTime 2020年08月09日 17:28:00
*/
@Configuration
public class MyWebMvcConfig implements WebMvcConfigurer {
@Value("${file.path}")
private String path;
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
// 将/static/**访问映射到classpath:/mystatic/
registry.addResourceHandler("/file/**").addResourceLocations("file:"+path);
}
}
dev-device/device-file/src/main/java/com/tykj/dev/device/file/Controller/FileController.java
浏览文件 @ 319e872e
......@@ -154,12 +154,13 @@ public class FileController {
List<MultipartFile> multipartFiles = ((MultipartHttpServletRequest)request).getFiles("file");
System.out.println("数据条数"+multipartFiles.size());
File file1 = new File(url+"print/");
if (!file1.exists()){
file1.mkdirs();
}
String fileName = UUID.randomUUID().toString()+".pdf";
File file = new File(url+"print/"+fileName);
if (file.exists()){
file.mkdirs();
}
// 第一步：创建一个document对象。
Document document = new Document();
document.setMargins(0, 0, 0, 0);
......
dev-device/device-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java
浏览文件 @ 319e872e
......@@ -5,6 +5,7 @@ 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;
import com.tykj.dev.device.task.subject.bto.TaskLogBto;
import com.tykj.dev.device.task.subject.common.BusinessEnum;
import com.tykj.dev.device.task.subject.common.StatusEnum;
import com.tykj.dev.device.task.subject.domin.Task;
import com.tykj.dev.device.train.entity.TrainTheme;
......@@ -91,7 +92,7 @@ public class TrainJobController {
List<Integer> integers=new ArrayList<>();
integers.add(securityUser.getCurrentUserInfo().getUserId());
Task task= taskService.start(new TaskBto(StatusEnum.TRAIN1000.id,trainTheme.getName(),null,null,null,trainTheme.getTrainId(),13,0,null,integers));
Task task= taskService.start(new TaskBto(StatusEnum.TRAIN1000.id,trainTheme.getName(),null,null,trainTheme.getTrainId(),BusinessEnum.TRAIN.id,securityUser.getCurrentUserInfo().getUnitsId(),0,null,integers));
//1 新建培训
// jobService.addEntity(new JobEntity(taskEntity.getId(),1,39,0,"x"+securityUser.getCurrentUserInfo().getUserId()+"x",0));
......@@ -102,26 +103,26 @@ public class TrainJobController {
needTrain.forEach(
id->{
//4 报名确认
// TaskSaveVo taskSaveVo1=new TaskSaveVo(trainTheme.getName(),trainTheme.getTrainId(),36,taskEntity.getId(),"."+taskEntity.getId()+".",13,null,id,"x","x");
// TaskSaveVo taskSaveVo1=new TaskSaveVo(trainTheme.getName(),trainTheme.getTrainId(),36,taskEntity.getId(),"."+taskEntity.getId()+".",BusinessEnum.TRAIN.id,null,id,"x","x");
// TaskEntity taskEntity1 = taskService.addEntity(taskSaveVo1.toDo());
// JobEntity jobEntity1=new JobEntity(taskEntity1.getId(),0,36,id,"x"+id+"x",0);
// jobService.addEntity(jobEntity1);
List<Integer> list=new ArrayList<>();
list.add(id);
taskService.start(new TaskBto(StatusEnum.TRAIN1001.id,trainTheme.getName(),task.getId(),task.getId().toString(),trainTheme.getTrainId(),13,securityUser.getCurrentUserInfo().getUnitsId(),0,null,list));
taskService.start(new TaskBto(StatusEnum.TRAIN1001.id,trainTheme.getName(),task.getId(),task.getId().toString(),trainTheme.getTrainId(),BusinessEnum.TRAIN.id,securityUser.getCurrentUserInfo().getUnitsId(),0,null,list));
}
);
normal.forEach(
id->{
//3 待报名
// TaskSaveVo taskSaveVo1=new TaskSaveVo(trainTheme.getName(),trainTheme.getTrainId(),37,taskEntity.getId(),"."+taskEntity.getId()+".",13,null,id,"x","x");
// TaskSaveVo taskSaveVo1=new TaskSaveVo(trainTheme.getName(),trainTheme.getTrainId(),37,taskEntity.getId(),"."+taskEntity.getId()+".",BusinessEnum.TRAIN.id,null,id,"x","x");
// TaskEntity taskEntity1 = taskService.addEntity(taskSaveVo1.toDo());
// JobEntity jobEntity1=new JobEntity(taskEntity1.getId(),0,37,id,"x"+id+"x",0);
// jobService.addEntity(jobEntity1);
List<Integer> list=new ArrayList<>();
list.add(id);
taskService.start(new TaskBto(StatusEnum.TRAIN1002.id,trainTheme.getName(),task.getId(),task.getId().toString(),trainTheme.getTrainId(),13,securityUser.getCurrentUserInfo().getUnitsId(),0,null,list));
taskService.start(new TaskBto(StatusEnum.TRAIN1002.id,trainTheme.getName(),task.getId(),task.getId().toString(),trainTheme.getTrainId(),BusinessEnum.TRAIN.id,securityUser.getCurrentUserInfo().getUnitsId(),0,null,list));
}
);
TaskLogBto taskLogBto = new TaskLogBto(task.getId(),"发起培训",null);
......@@ -144,7 +145,7 @@ public class TrainJobController {
TrainTheme trainTheme = trainThemeService.findById(signUpReturn.getTrainThemeId());
TaskBto taskBto= taskService.get(signUpReturn.getTaskId());
if (signUpReturn.getReturns()==0) {
taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1003,-1);
taskBto=taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1003,-1);
// JobEntity jobEntity = jobService.getOne(signUpReturn.getJobId());
// jobEntity.setIsDone(1);
// //4 等待培训
......@@ -168,8 +169,9 @@ public class TrainJobController {
// jobService.update(jobEntity);
TaskLogBto taskLogBto = new TaskLogBto(taskBto.getId(),"不报名",null);
taskLogService.addLog(taskLogBto);
taskService.moveToEnd(taskBto);
taskBto=taskService.moveToEnd(taskBto);
}
taskService.update(taskBto);
myWebSocket.sendMessage1();
return ResponseEntity.ok(trainThemeService.save(trainTheme));
}
......@@ -183,25 +185,25 @@ public class TrainJobController {
public ResponseEntity<TrainTheme> signUpEnd(@PathVariable Integer trainId){
TrainTheme trainTheme = trainThemeService.findById(trainId);
//查询所有必须报名而没有报名的task 状态直接转为待培训
trainTaskService.selectBillidAndBillType(trainId,13,StatusEnum.TRAIN1001.id).forEach(
taskBto -> taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1003,-1)
trainTaskService.selectBillidAndBillType(trainId,BusinessEnum.TRAIN.id,StatusEnum.TRAIN1001.id).forEach(
taskBto -> taskService.update(taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1003,-1))
);
trainTaskService.selectBillidAndBillType(trainId,13,StatusEnum.TRAIN1002.id).forEach(
taskBto -> taskService.moveToEnd(taskBto)
trainTaskService.selectBillidAndBillType(trainId,BusinessEnum.TRAIN.id,StatusEnum.TRAIN1002.id).forEach(
taskBto -> taskService.update(taskService.moveToEnd(taskBto))
);
//未报名统一处理为为报名
// taskService.findBybullIdAndBussType(3,13).forEach(
// taskService.findBybullIdAndBussType(3,BusinessEnum.TRAIN.id).forEach(
// taskEntity -> {
//// JobEntity jobEntity= taskUtils.getCurrentJob(taskEntity.getId());
//// jobEntity.setIsDone(1);
//// jobService.update(jobEntity);
// }
// );
trainTaskService.selectBillidAndBillType(trainId,13,StatusEnum.TRAIN1000.id).forEach(
taskBto -> taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1010)
trainTaskService.selectBillidAndBillType(trainId,BusinessEnum.TRAIN.id,StatusEnum.TRAIN1000.id).forEach(
taskBto ->taskService.update( taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1010))
);
// TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),13);
// TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
// taskEntity.setBillStatus(7);
// taskService.update(taskEntity);
// JobEntity jobEntity= taskUtils.getCurrentJob(taskEntity.getId());
......@@ -224,10 +226,10 @@ public class TrainJobController {
@GetMapping("/inTraining/{trainId}")
public ResponseEntity<TrainTheme> inTraining(@PathVariable Integer trainId){
TrainTheme trainTheme = trainThemeService.findById(trainId);
trainTaskService.selectBillidAndBillType(trainId,13,StatusEnum.TRAIN1010.id).forEach(
taskBto -> taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1004, taskBto.getInvolveUserIdList().get(0))
trainTaskService.selectBillidAndBillType(trainId,BusinessEnum.TRAIN.id,StatusEnum.TRAIN1010.id).forEach(
taskBto -> taskService.update(taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1004, taskBto.getInvolveUserIdList().get(0)))
);
// TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),13);
// TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
// taskEntity.setBillStatus(8);
// taskService.update(taskEntity);
// JobEntity jobEntity= taskUtils.getCurrentJob(taskEntity.getId());
......@@ -253,7 +255,7 @@ public class TrainJobController {
// public ResponseEntity<TrainTheme> resultsEntry(@PathVariable Integer trainId){
// TrainTheme trainTheme = trainThemeService.findById(trainId);
//
// TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),13);
// TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
// JobEntity jobEntity= taskUtils.getCurrentJob(taskEntity.getId());
// jobEntity.setIsDone(1);
// JobEntity jobEntity1=new JobEntity();
......@@ -273,10 +275,10 @@ public class TrainJobController {
@PostMapping("/gradesGrade")
public ResponseEntity<TrainTheme> cityAudit(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser,@RequestBody GradeEntryVo gradeEntryVo){
TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
// TaskEntity taskEntity= taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(),trainTheme.getTrainId(),13);
TaskBto taskBto=trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(),13);
// TaskEntity taskEntity= taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(),trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
TaskBto taskBto=trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
taskBto.setOwnUnit(1);
taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1005);
taskService.update(taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1005));
// taskEntity.setBillStatus(32);
// taskEntity.setOwnUnit(1);
// taskService.update(taskEntity);
......@@ -311,7 +313,7 @@ public class TrainJobController {
// if (gradeEntryVo.getThrough()==0) {
// //申请发证
// TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
// TaskEntity taskEntity = taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(), trainTheme.getTrainId(), 13);
// TaskEntity taskEntity = taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(), trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
// taskEntity.setBillStatus(32);
// //省
// taskEntity.setOwnUnit(1);
......@@ -331,7 +333,7 @@ public class TrainJobController {
// return ResponseEntity.ok(trainThemeService.save(trainTheme));
// }else {
// TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
// TaskEntity taskEntity = taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(), trainTheme.getTrainId(), 13);
// TaskEntity taskEntity = taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(), trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
// taskEntity.setBillStatus(31);
// //省
// taskEntity.setOwnUnit(1);
......@@ -359,7 +361,7 @@ public class TrainJobController {
// @GetMapping("/gradesGrade")
// public ResponseEntity<TrainTheme> cityAudit(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser,@RequestBody GradeEntryVo gradeEntryVo){
// TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
// TaskEntity taskEntity= taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(),trainTheme.getTrainId(),13);
// TaskEntity taskEntity= taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(),trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
//
// taskEntity.setBillStatus(31);
// taskService.update(taskEntity);
......@@ -390,7 +392,7 @@ public class TrainJobController {
// if (gradeEntryVo.getThrough()==0) {
// //申请发证
// TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
// TaskEntity taskEntity = taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(), trainTheme.getTrainId(), 13);
// TaskEntity taskEntity = taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(), trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
// taskEntity.setBillStatus(32);
// //省
// taskEntity.setOwnUnit(1);
......@@ -410,7 +412,7 @@ public class TrainJobController {
// return ResponseEntity.ok(trainThemeService.save(trainTheme));
// }else {
// TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
// TaskEntity taskEntity = taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(), trainTheme.getTrainId(), 13);
// TaskEntity taskEntity = taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(), trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
// taskEntity.setBillStatus(31);
// //省
// taskEntity.setOwnUnit(1);
......@@ -439,12 +441,13 @@ public class TrainJobController {
@PostMapping("/isApply")
public ResponseEntity<TrainTheme> provinceAudit(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser,@RequestBody GradeEntryVo gradeEntryVo){
TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
TaskBto taskBto=trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(),13);
taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1006,gradeEntryVo.getAuditId());
TaskBto taskBto=trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
taskBto=taskService.addInvolveUser(taskBto,securityUser.getCurrentUserInfo().getUserId());
taskService.update(taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1006,gradeEntryVo.getAuditId()));
// TaskEntity taskEntity= taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),13);
// TaskEntity taskEntity= taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
// taskEntity.setBillStatus(33);
// taskService.update(taskEntity);
//
......@@ -480,11 +483,11 @@ public class TrainJobController {
@PostMapping("/audit")
public ResponseEntity<TrainTheme> audit(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser,@RequestBody GradeEntryVo gradeEntryVo){
TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
TaskBto taskBto=trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(),13);
taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1007,gradeEntryVo.getAuditId());
TaskBto taskBto=trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
taskService.update(taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1007,gradeEntryVo.getAuditId()));
//
// TaskEntity taskEntity= taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),13);
// TaskEntity taskEntity= taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
// taskEntity.setBillStatus(34);
// taskService.update(taskEntity);
// JobEntity jobEntity= taskUtils.getCurrentJob(taskEntity.getId());
......@@ -527,9 +530,9 @@ public class TrainJobController {
);
TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
//给培训报名的人员都发起一个通知，查看自己都证书
TaskBto taskBto=trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(),13);
taskService.moveToEnd(taskBto);
// TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),13);
TaskBto taskBto=trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
taskService.update(taskService.moveToEnd(taskBto));
// TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
// //8 培训完成
// taskEntity.setBillStatus(15);
// taskService.update(taskEntity);
......@@ -546,14 +549,14 @@ public class TrainJobController {
// jobEntity1.setInvoleUserId("x"+taskEntity.getStartUserId()+"x");
// jobService.addEntity(jobEntity1);
trainTaskService.selectBillidAndBillType(gradeEntryVo.getTrainThemeId(),13,StatusEnum.TRAIN1003.id).forEach(
trainTaskService.selectBillidAndBillType(gradeEntryVo.getTrainThemeId(),BusinessEnum.TRAIN.id,StatusEnum.TRAIN1003.id).forEach(
taskBto1 -> {
// taskBto1.setCurrentPoint(0);
taskService.moveToSpecial(taskBto1, StatusEnum.TRAIN1009,taskBto1.getInvolveUserIdList().get(0));
taskService.update(taskService.moveToSpecial(taskBto1, StatusEnum.TRAIN1009,taskBto1.getInvolveUserIdList().get(0)));
}
);
//9 成绩待确认
// TaskEntity taskEntity1=taskService.findByStartUserIdAndBillIdAndBussType(id,trainTheme.getTrainId(),13);
// TaskEntity taskEntity1=taskService.findByStartUserIdAndBillIdAndBussType(id,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
// taskEntity1.setBillStatus(38);
// taskService.update(taskEntity1);
// JobEntity jobEntity2 = taskUtils.getCurrentJob(taskEntity1.getId());
......@@ -600,9 +603,9 @@ public class TrainJobController {
// TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
// //给培训报名的人员都发起一个通知，查看自己都证书
// List<Integer> ids= StringSplitUtil.userIdSplit(trainTheme.getSignUp());
// TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),13);
// TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
// //8 待确认
// taskEntity.setBillStatus(13);
// taskEntity.setBillStatus(BusinessEnum.TRAIN.id);
// taskService.update(taskEntity);
// JobEntity jobEntity= jobService.findTaskIdAndinvoleUserIdLike(taskEntity.getId(),securityUser.getCurrentUserInfo().getUserId());
// jobEntity.setIsDone(1);
......@@ -614,7 +617,7 @@ public class TrainJobController {
// JobEntity jobEntity1=new JobEntity();
// BeanUtils.copyProperties(jobEntity,jobEntity1);
// jobEntity1.setId(null);
// jobEntity1.setBillStatus(13);
// jobEntity1.setBillStatus(BusinessEnum.TRAIN.id);
// jobEntity1.setIsDone(0);
// jobEntity1.setBelongUserId(taskEntity.getStartUserId());
// jobEntity1.setInvoleUserId("x"+taskEntity.getStartUserId()+"x");
......@@ -623,8 +626,8 @@ public class TrainJobController {
// ids.forEach(
// id->{
// //9 培训结果
// TaskEntity taskEntity1=taskService.findByStartUserIdAndBillIdAndBussType(id,trainTheme.getTrainId(),13);
// taskEntity1.setBillStatus(13);
// TaskEntity taskEntity1=taskService.findByStartUserIdAndBillIdAndBussType(id,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
// taskEntity1.setBillStatus(BusinessEnum.TRAIN.id);
// taskService.update(taskEntity1);
// JobEntity jobEntity2 = taskUtils.getCurrentJob(taskEntity1.getId());
// jobEntity2.setIsDone(1);
......@@ -632,7 +635,7 @@ public class TrainJobController {
// JobEntity jobEntity3=new JobEntity();
// BeanUtils.copyProperties(jobEntity2,jobEntity3);
// jobEntity3.setId(null);
// jobEntity3.setBillStatus(13);
// jobEntity3.setBillStatus(BusinessEnum.TRAIN.id);
// jobEntity3.setIsDone(0);
// jobService.addEntity(jobEntity3);
//
......@@ -669,9 +672,9 @@ public class TrainJobController {
// @PostMapping("/completionConfirmed")
// public ResponseEntity<Boolean> completionConfirmed(@RequestBody signUpReturn signUpReturn){
// TrainTheme trainTheme = trainThemeService.findById(signUpReturn.getTrainThemeId());
// TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),13);
// //13
// taskEntity.setBillStatus(13);
// TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
// //BusinessEnum.TRAIN.id
// taskEntity.setBillStatus(BusinessEnum.TRAIN.id);
// taskService.update(taskEntity);
// JobEntity jobEntity= taskUtils.getCurrentJob(taskEntity.getId());
// jobEntity.setIsDone(1);
......@@ -690,10 +693,10 @@ public class TrainJobController {
public ResponseEntity<Boolean> resultsConfirm(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser,@RequestBody signUpReturn signUpReturn){
TrainTheme trainTheme = trainThemeService.findById(signUpReturn.getTrainThemeId());
//给培训报名的人员都发起一个通知，查看自己都证书
// TaskEntity taskEntity=taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(),trainTheme.getTrainId(),13);
// TaskEntity taskEntity=taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(),trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
TaskBto taskBto = taskService.get(signUpReturn.getTaskId());
taskService.moveToEnd(taskBto);
// taskEntity.setBillStatus(13);
taskService.update(taskService.moveToEnd(taskBto));
// taskEntity.setBillStatus(BusinessEnum.TRAIN.id);
// taskService.update(taskEntity);
// JobEntity jobEntity= taskUtils.getCurrentJob(taskEntity.getId());
// jobEntity.setIsDone(1);
......
dev-device/device-train/src/main/java/com/tykj/dev/device/train/entity/vo/signUpReturn.java
浏览文件 @ 319e872e
......@@ -23,7 +23,7 @@ public class signUpReturn {
@ApiModelProperty(value = "是否报名 0 报名 1否" ,name ="returns" )
private Integer returns;
@ApiModelProperty(value = "job——id" ,name ="jobId" )
@ApiModelProperty(value = "job——id" ,name ="taskId" )
private Integer taskId;
@ApiModelProperty(value = "培训id" ,name ="trainThemeId" )
......
dev-device/device-user/src/main/java/com/tykj/dev/device/user/base/ret/UserTrainVo.java
浏览文件 @ 319e872e
......@@ -62,14 +62,21 @@ public class UserTrainVo {
/**
* 用户单位
*/
@ApiModelProperty(value = "用户单位", name = "unitsId", example = "12321L")
@ApiModelProperty(value = "用户单位", name = "unitsName", example = "12321L")
private String unitsName;
/**
* 用户单位id
*/
@ApiModelProperty(value = "用户单位id", name = "unitsId", example = "12321L")
private Integer unitsId;
/**
* 培训状态 0.已培训 1.已过期 2.未培训 3.快过期
*/
private Integer trainStatus;
/**
* 0 是 1 否
*/
......
dev-device/device-user/src/main/java/com/tykj/dev/device/user/subject/entity/User.java
浏览文件 @ 319e872e
......@@ -86,7 +86,7 @@ public class User {
private String fax;
/**
* 状态 默认0，1表示删除
* 状态 默认0、1表示冻结
*/
@ApiModelProperty(value = "状态", name = "isDel", example = "12321L")
private Integer isDel=0;
......
dev-device/device-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java
浏览文件 @ 319e872e
......@@ -226,7 +226,7 @@ public class UserServiceImpl implements UserService {
}else {
userTrainVo.setIsMustJoin(1);
}
userTrainVo.setUnitsName(units.getName());
userTrainVo.setUnitsName(unitsService.findById(user.getUnitsId()).getName());
list.add(userTrainVo);
}
);
......
dev-rfid/src/main/java/com/tykj/dev/rfid/timeTask/InventoryScheduled.java
浏览文件 @ 319e872e
......@@ -31,7 +31,8 @@ import java.util.List;
@Component
public class InventoryScheduled {
private String cron = "0 0/1 * * * ? ";
// private String cron = "0 0/1 * * * ? ";
private String cron = "0 0 1 * * ?";
private ThreadPoolTaskScheduler threadPoolTaskScheduler;
......
dev-union/pom.xml
浏览文件 @ 319e872e
......@@ -62,6 +62,18 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-usereport</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-apply</artifactId>
......
dev-union/src/main/resources/application.properties
浏览文件 @ 319e872e
......@@ -16,6 +16,6 @@ server.servlet.session.timeout=PT1H
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
file.path=/Users/zjm/code/
preview.path=192.168.0.10:8087/file/
preview.path=192.168.102.26:8087/file/
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论