cnas-personnel/src/main/java/com/yuanchu/mom/controller/PersonTrainingController.java
@@ -40,6 +40,7 @@ @Api(tags = "人员 - 培训计划") @RestController @RequestMapping("/personTraining") //@CustomClazzName(name = "资源要求", index = 8) public class PersonTrainingController { @Autowired @@ -164,6 +165,7 @@ .set(PersonTrainingDetailed::getAssessmentMethod, personTrainingRecordSubmitDto.getAssessmentMethod()) .set(PersonTrainingDetailed::getComprehensiveAssessment, personTrainingRecordSubmitDto.getComprehensiveAssessment()) .set(PersonTrainingDetailed::getAssessmentUserId, personTrainingRecordSubmitDto.getAssessmentUserId()) .set(PersonTrainingDetailed::getAssessmentDate, personTrainingRecordSubmitDto.getAssessmentDate()) .set(PersonTrainingDetailed::getState, personTrainingRecordSubmitDto.getState())); return Result.success(); } cnas-personnel/src/main/java/com/yuanchu/mom/controller/SuperVisePlanController.java
@@ -34,6 +34,7 @@ @AllArgsConstructor @RestController @RequestMapping("/superVisePlan") //@CustomClazzName(name = "资源要求", index = 8) public class SuperVisePlanController { private PersonSupervisePlanDetailsService personSupervisePlanDetailsService; cnas-personnel/src/main/java/com/yuanchu/mom/dto/PersonTrainingRecordSubmitDto.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDate; import java.util.List; @Data @@ -21,6 +22,9 @@ @ApiModelProperty("评价人") private Integer assessmentUserId; @ApiModelProperty("评价时间") private LocalDate assessmentDate; private String state; @ApiModelProperty("课时") cnas-personnel/src/main/java/com/yuanchu/mom/excel/PersonTrainingDetailedUpload.java
@@ -1,9 +1,13 @@ package com.yuanchu.mom.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; import java.util.Date; @Data public class PersonTrainingDetailedUpload { @@ -27,7 +31,10 @@ private String trainingLecturerName; @ExcelProperty("培训时间") private LocalDateTime trainingDate; @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @NotNull private Date trainingDate; @ExcelProperty("课时") private Integer classHour; cnas-personnel/src/main/java/com/yuanchu/mom/pojo/PersonTrainingDetailed.java
@@ -7,13 +7,16 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; import org.springframework.format.annotation.DateTimeFormat; /** * <p> @@ -64,6 +67,8 @@ private Integer trainingLecturerId; @ApiModelProperty("培训日期") @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date trainingDate; @ApiModelProperty("开始时间") @@ -108,4 +113,7 @@ @ApiModelProperty("评价人") private Integer assessmentUserId; @ApiModelProperty("评价时间") private LocalDate assessmentDate; } cnas-personnel/src/main/java/com/yuanchu/mom/service/impl/PersonTrainingDetailedServiceImpl.java
@@ -49,7 +49,7 @@ @Autowired private GetLook getLook; @Autowired private NumberGenerator<PersonTrainingDetailed> numberGenerator; @Override cnas-personnel/src/main/resources/static/person-training-record.docxBinary files differ
cnas-process/src/main/java/com/yuanchu/mom/dto/ProcessMethodSearchNewDto.java
@@ -26,6 +26,12 @@ @ApiModelProperty("批准人id") private Integer ratifyUserId; @ApiModelProperty("编制人日期") private String writeDate; @ApiModelProperty("批准人日期") private String ratifyDate; @ExcelProperty(value = {"是否有更新标准", "是否有更新标准"}, index = 4) @ApiModelProperty("是否有更新标准") private String isNewStandardString; cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodSearchNewServiceImpl.java
@@ -30,6 +30,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URLEncoder; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -99,10 +100,14 @@ String endDate = processMethodSearchNew.getEndDate(); String writeUserId = processMethodSearchNew.getWriteUserId().toString(); String ratifyUserId = processMethodSearchNew.getRatifyUserId().toString(); String writeDate = processMethodSearchNew.getWriteDate(); String ratifyDate = processMethodSearchNew.getRatifyDate(); processMethodSearchNew.setBeginDate(null); processMethodSearchNew.setEndDate(null); processMethodSearchNew.setWriteUserId(null); processMethodSearchNew.setRatifyUserId(null); processMethodSearchNew.setWriteDate(null); processMethodSearchNew.setRatifyDate(null); List<ProcessMethodSearchNewDto> methodSearchNews = baseMapper.selectMethodSearchNew(QueryWrappers.queryWrappers(processMethodSearchNew), beginDate, endDate); int index = 1; @@ -118,9 +123,9 @@ // 备注 if (methodSearchNew.getRemark() != null) { if (methodSearchNew.getRemark().equals(1)) { methodSearchNew.setIsNewStandardString("替换"); methodSearchNew.setRemarkString("替换"); } else { methodSearchNew.setIsNewStandardString("作废"); methodSearchNew.setRemarkString("作废"); } } @@ -182,14 +187,15 @@ List<List<Object>> totalListList = ListUtils.newArrayList(); List<Object> totalList = ListUtils.newArrayList(); totalListList.add(totalList); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 第一列 totalList.add("查新人："); totalList.add("编制人："); // 第二列 设置签名 totalList.add(FileUtils.readFileToByteArray(new File(writeUserUrl))); // 第三列 totalList.add("日期："); // 第五列 totalList.add("2024-12-23"); // 日期写死 totalList.add(writeDate); // 第六列 totalList.add("审核："); // 第七列 @@ -197,7 +203,7 @@ // 第八列 totalList.add("日期："); // 第九列 totalList.add("2024-12-23"); // 日期写死 totalList.add(ratifyDate); // 这里是write 别和fill 搞错了 excelWriter.write(totalListList, writeSheet);
