From 5172db1a5ceda6bfbeaad6fef8f77b184cffa914 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 十二月 2024 15:59:22 +0800
Subject: [PATCH] 更新至(2e305f)
---
cnas-personnel/src/main/java/com/yuanchu/mom/controller/SuperVisePlanController.java | 1 +
cnas-personnel/src/main/java/com/yuanchu/mom/controller/PersonTrainingController.java | 2 ++
cnas-personnel/src/main/java/com/yuanchu/mom/excel/PersonTrainingDetailedUpload.java | 9 ++++++++-
cnas-personnel/src/main/java/com/yuanchu/mom/pojo/PersonTrainingDetailed.java | 8 ++++++++
cnas-personnel/src/main/java/com/yuanchu/mom/service/impl/PersonTrainingDetailedServiceImpl.java | 2 +-
cnas-process/src/main/java/com/yuanchu/mom/dto/ProcessMethodSearchNewDto.java | 6 ++++++
cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodSearchNewServiceImpl.java | 16 +++++++++++-----
cnas-personnel/src/main/resources/static/person-training-record.docx | 0
cnas-personnel/src/main/java/com/yuanchu/mom/dto/PersonTrainingRecordSubmitDto.java | 4 ++++
9 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/yuanchu/mom/controller/PersonTrainingController.java b/cnas-personnel/src/main/java/com/yuanchu/mom/controller/PersonTrainingController.java
index 095cc94..49bd248 100644
--- a/cnas-personnel/src/main/java/com/yuanchu/mom/controller/PersonTrainingController.java
+++ b/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();
}
diff --git a/cnas-personnel/src/main/java/com/yuanchu/mom/controller/SuperVisePlanController.java b/cnas-personnel/src/main/java/com/yuanchu/mom/controller/SuperVisePlanController.java
index 488a19e..ab9d545 100644
--- a/cnas-personnel/src/main/java/com/yuanchu/mom/controller/SuperVisePlanController.java
+++ b/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;
diff --git a/cnas-personnel/src/main/java/com/yuanchu/mom/dto/PersonTrainingRecordSubmitDto.java b/cnas-personnel/src/main/java/com/yuanchu/mom/dto/PersonTrainingRecordSubmitDto.java
index 307b34d..a5eb3b6 100644
--- a/cnas-personnel/src/main/java/com/yuanchu/mom/dto/PersonTrainingRecordSubmitDto.java
+++ b/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("璇炬椂")
diff --git a/cnas-personnel/src/main/java/com/yuanchu/mom/excel/PersonTrainingDetailedUpload.java b/cnas-personnel/src/main/java/com/yuanchu/mom/excel/PersonTrainingDetailedUpload.java
index 3afed10..29d80f9 100644
--- a/cnas-personnel/src/main/java/com/yuanchu/mom/excel/PersonTrainingDetailedUpload.java
+++ b/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;
diff --git a/cnas-personnel/src/main/java/com/yuanchu/mom/pojo/PersonTrainingDetailed.java b/cnas-personnel/src/main/java/com/yuanchu/mom/pojo/PersonTrainingDetailed.java
index 2f5b8b2..21f3eb8 100644
--- a/cnas-personnel/src/main/java/com/yuanchu/mom/pojo/PersonTrainingDetailed.java
+++ b/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;
}
diff --git a/cnas-personnel/src/main/java/com/yuanchu/mom/service/impl/PersonTrainingDetailedServiceImpl.java b/cnas-personnel/src/main/java/com/yuanchu/mom/service/impl/PersonTrainingDetailedServiceImpl.java
index 577aca6..e8dd092 100644
--- a/cnas-personnel/src/main/java/com/yuanchu/mom/service/impl/PersonTrainingDetailedServiceImpl.java
+++ b/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
diff --git a/cnas-personnel/src/main/resources/static/person-training-record.docx b/cnas-personnel/src/main/resources/static/person-training-record.docx
index 8ce7a06..a55cf04 100644
--- a/cnas-personnel/src/main/resources/static/person-training-record.docx
+++ b/cnas-personnel/src/main/resources/static/person-training-record.docx
Binary files differ
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/dto/ProcessMethodSearchNewDto.java b/cnas-process/src/main/java/com/yuanchu/mom/dto/ProcessMethodSearchNewDto.java
index 161d0c7..20d6421 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/dto/ProcessMethodSearchNewDto.java
+++ b/cnas-process/src/main/java/com/yuanchu/mom/dto/ProcessMethodSearchNewDto.java
@@ -26,6 +26,12 @@
@ApiModelProperty("鎵瑰噯浜篿d")
private Integer ratifyUserId;
+ @ApiModelProperty("缂栧埗浜烘棩鏈�")
+ private String writeDate;
+
+ @ApiModelProperty("鎵瑰噯浜烘棩鏈�")
+ private String ratifyDate;
+
@ExcelProperty(value = {"鏄惁鏈夋洿鏂版爣鍑�", "鏄惁鏈夋洿鏂版爣鍑�"}, index = 4)
@ApiModelProperty("鏄惁鏈夋洿鏂版爣鍑�")
private String isNewStandardString;
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodSearchNewServiceImpl.java b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodSearchNewServiceImpl.java
index 7c9ca22..2e691cd 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessMethodSearchNewServiceImpl.java
+++ b/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);
// 杩欓噷鏄痺rite 鍒拰fill 鎼為敊浜�
excelWriter.write(totalListList, writeSheet);
--
Gitblit v1.9.3