[政策、培训] 代码提交 培训修改没有保存及格线以及优秀线

dev-policydocument/src/main/java/com/tykj/dev/device/policydocument/controller/PolicyDocController.java

+package com.tykj.dev.device.policydocument.controller;
+
+import com.tykj.dev.config.swagger.AutoDocument;
+import com.tykj.dev.device.library.service.DeviceLibraryService;
+import com.tykj.dev.device.policydocument.entity.PolicyDocVo;
+import com.tykj.dev.device.policydocument.entity.PolicyDocument;
+import com.tykj.dev.device.policydocument.service.PolicyDocumentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName RepelQueryController.java
+ * @Description TODO
+ * @createTime 2021年01月10日 15:43:00
+ */
+@RestController
+@Api(tags = "政策文件、软件模块", description = "政策文件、软件模块 用type区分 1.政策 2.软件")
+@AutoDocument
+@RequestMapping("/policyDoc")
+public class PolicyDocController {
+
+    @Autowired
+    PolicyDocumentService policyDocumentService;
+
+
+    /**
+     * 添加政策文件
+     */
+    @ApiOperation(value = "添加政策文件")
+    @PostMapping("/save")
+    public ResponseEntity findOutsideTheProvince(@RequestBody PolicyDocument policyDocument) {
+        return ResponseEntity.ok(policyDocumentService.save(policyDocument));
+    }
+
+
+    /**
+     * 查询政策文件 -分页
+     */
+    @ApiOperation(value = "添加政策文件")
+    @PostMapping("/findAll/page")
+    public ResponseEntity findAllPage(@RequestBody PolicyDocVo policyDocument) {
+        return ResponseEntity.ok(policyDocumentService.findAllPage(policyDocument));
+    }
+
+
+
+
+}

dev-policydocument/src/main/java/com/tykj/dev/device/policydocument/dao/PolicyDocumentDao.java

+package com.tykj.dev.device.policydocument.dao;
+
+import com.tykj.dev.device.policydocument.entity.PolicyDocument;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface PolicyDocumentDao extends JpaRepository<PolicyDocument, Integer>, JpaSpecificationExecutor<PolicyDocument> {
+}

dev-policydocument/src/main/java/com/tykj/dev/device/policydocument/entity/PolicyDocVo.java

+package com.tykj.dev.device.policydocument.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tykj.dev.misc.base.CustomPage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName PolicyDocVo.java
+ * @Description TODO
+ * @createTime 2021年05月13日 15:48:00
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("政策文件查询vo")
+public class PolicyDocVo  extends CustomPage {
+    @ApiModelProperty(name = "开始清退的年份 默认各式 2020-01-01 00：00：00")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(name = "开始清退的年份 默认各式 2020-01-01 00：00：00")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime endTime;
+
+    private Integer type;
+}

dev-policydocument/src/main/java/com/tykj/dev/device/policydocument/entity/PolicyDocument.java

@@ -36,4 +36,9 @@ public class PolicyDocument extends BaseEntity {
 
     @Transient
     private List<FileRet> fileRetList;
+
+    /**
+     * 1 政策文件 2 软件
+     */
+    private Integer type;
 }

dev-policydocument/src/main/java/com/tykj/dev/device/policydocument/service/PolicyDocumentService.java

+package com.tykj.dev.device.policydocument.service;
+
+import com.tykj.dev.device.policydocument.entity.PolicyDocVo;
+import com.tykj.dev.device.policydocument.entity.PolicyDocument;
+import org.springframework.data.domain.Page;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName PolicyDocument.java
+ * @Description TODO
+ * @createTime 2021年05月13日 15:31:00
+ */
+public interface PolicyDocumentService {
+
+    PolicyDocument save(PolicyDocument policyDocument);
+
+    Page<PolicyDocument> findAllPage(PolicyDocVo policyDocVo);
+
+}

dev-policydocument/src/main/java/com/tykj/dev/device/policydocument/service/impl/PolicyDocumentServiceImpl.java

+package com.tykj.dev.device.policydocument.service.impl;
+
+import com.github.wenhao.jpa.PredicateBuilder;
+import com.github.wenhao.jpa.Specifications;
+import com.tykj.dev.device.file.service.FilesUtil;
+import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
+import com.tykj.dev.device.policydocument.dao.PolicyDocumentDao;
+import com.tykj.dev.device.policydocument.entity.PolicyDocVo;
+import com.tykj.dev.device.policydocument.entity.PolicyDocument;
+import com.tykj.dev.device.policydocument.service.PolicyDocumentService;
+import com.tykj.dev.device.user.subject.entity.Units;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.Transient;
+import java.lang.reflect.Field;
+import java.util.Date;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName PolicyDocument.java
+ * @Description TODO
+ * @createTime 2021年05月13日 15:31:00
+ */
+@Service
+public class PolicyDocumentServiceImpl implements PolicyDocumentService {
+
+    @Autowired
+    PolicyDocumentDao policyDocumentDao;
+
+    @Override
+    public PolicyDocument save(PolicyDocument policyDocument) {
+        policyDocument.setFileString(FilesUtil.stringFileToList(policyDocument.getFileRetList()));
+        return policyDocumentDao.save(policyDocument);
+    }
+
+    @Override
+    public Page<PolicyDocument> findAllPage(PolicyDocVo policyDocVo) {
+        return policyDocumentDao.findAll(getPredicateBuilder(policyDocVo),policyDocVo.getPageable()).map(
+                policyDocument -> {
+                    policyDocument.setFileRetList(FilesUtil.stringFileToList(policyDocument.getFileString()));
+                return policyDocument;
+                }
+        );
+    }
+
+    private Specification<PolicyDocument> getPredicateBuilder(PolicyDocVo policyDocVo) {
+        PredicateBuilder<PolicyDocument> predicateBuilder = Specifications.and();
+        if (policyDocVo != null) {
+            if (policyDocVo.getStartTime() != null) {
+                predicateBuilder.gt("createTime",policyDocVo.getStartTime());
+            }
+            if (policyDocVo.getEndTime()!=null){
+                predicateBuilder.lt("createTime",policyDocVo.getEndTime());
+            }
+            if (policyDocVo.getType()!=null){
+                predicateBuilder.eq("type",policyDocVo.getType());
+            }
+        }
+        return  predicateBuilder.build();
+    }
+}

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

@@ -159,7 +159,11 @@ public class TrainJobController {
                 unitId->{
                     List<Integer> list = new ArrayList<>();
                     list.add(0);
-                    taskService.start(new TaskBto(StatusEnum.TRAIN1002.id, trainTheme.getName(), task.getId(), task.getId().toString(), trainTheme.getTrainId(), BusinessEnum.TRAIN.id, unitId, 0, null, list));
+                    TaskBto taskBto= new TaskBto(StatusEnum.TRAIN1002.id, trainTheme.getName(), task.getId(), task.getId().toString(), trainTheme.getTrainId(), BusinessEnum.TRAIN.id, unitId, 0, null, list);
+                    taskBto=taskService.start(taskBto);
+                    taskBto.setCreateUserId(null);
+                    taskService.update(taskBto);
+
                 }
         );
         if (securityUser.getCurrentUserInfo().getUnits().getLevel()==1){
@@ -365,6 +369,8 @@ public class TrainJobController {
                     saveTrainUser(trainUser);
                 }
         );
+        trainTheme.setPass(gradeEntryVo.getPass());
+        trainTheme.setGood(gradeEntryVo.getGood());
         trainTheme.setIsCertificate(gradeEntryVo.getIsCertificate());
         trainTaskService.selectBillidAndBillType(gradeEntryVo.getTrainThemeId(), BusinessEnum.TRAIN.id, StatusEnum.TRAIN1003.id).forEach(
                 taskBto1 -> {

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

 package com.tykj.dev.device.train.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.tykj.dev.device.train.entity.vo.TrainDetailsVo;
 import com.tykj.dev.device.train.entity.vo.TrainUserExcelVo;
 import com.tykj.dev.device.user.subject.entity.Mgrcert;
@@ -13,6 +14,9 @@ import lombok.NoArgsConstructor;
 import org.modelmapper.ModelMapper;
 
 import javax.persistence.*;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
 
 /**
@@ -130,11 +134,13 @@ public class TrainUser {
     private Integer certificate;
 
 
-    @ApiModelProperty(value = "到达时间", name = "arriveTime")
+    @ApiModelProperty(value = "到达日期", name = "arriveTime")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date arriveTime;
 
 
-    @ApiModelProperty(value = "离开时间", name = "leaveTime")
+    @ApiModelProperty(value = "离开日期", name = "leaveTime")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date leaveTime;
 
 
@@ -190,6 +196,20 @@ public class TrainUser {
                 trainUserExcelVo.setLeaveMealString("晚饭");
                 break;
         }
+        Instant instant = this.getLeaveTime().toInstant();
+        ZoneId zoneId = ZoneId.systemDefault();
+        LocalDateTime LeaveTime=instant.atZone(zoneId).toLocalDateTime();
+
+        Instant instant1 = this.getArriveTime().toInstant();
+        LocalDateTime ArriveTime=instant1.atZone(zoneId).toLocalDateTime();
+
+        int daysNum=(int)(LeaveTime.toLocalDate().toEpochDay() - ArriveTime.toLocalDate().toEpochDay());
+        if (daysNum>1){
+            trainUserExcelVo.setDayNum(daysNum);
+        }else {
+            trainUserExcelVo.setDayNum(0);
+        }
+
         return trainUserExcelVo;
     }
 

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

@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**

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

 package com.tykj.dev.device.train.entity.vo;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -69,12 +71,14 @@ public class TrainUserExcelVo {
 
     @ApiModelProperty(value = "到达时间", name = "arriveTime")
     @Excel(name = "到达时间", orderNum = "1", width = 30, needMerge = true)
-    private Date arriveTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDateTime arriveTime;
 
 
     @ApiModelProperty(value = "离开时间", name = "leaveTime")
     @Excel(name = "离开时间", orderNum = "1", width = 30, needMerge = true)
-    private Date leaveTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDateTime leaveTime;
 
 
     @ApiModelProperty(value = "到达就餐 0.无 1.午饭 2.晚饭", name = "arriveMeal")
@@ -86,5 +90,9 @@ public class TrainUserExcelVo {
     @Excel(name = "离开就餐", orderNum = "1", width = 30, needMerge = true)
     private String leaveMealString;
 
+    @ApiModelProperty(value = "住宿天数", name = "leaveMeal")
+    @Excel(name = "住宿天数", orderNum = "1", width = 30, needMerge = true)
+    private int dayNum;
+
 
 }