From 703d72927c617ffd5098c72cf6a465d180c5939f Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 13 三月 2025 17:40:25 +0800
Subject: [PATCH] Merge branch 'dev' into dev_dz
---
cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java | 2 +-
basic-server/src/main/java/com/ruoyi/basic/pojo/Certification.java | 4 ++++
performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java | 2 +-
basic-server/src/main/resources/mapper/CertificationMapper.xml | 22 ++++++++--------------
basic-server/src/main/java/com/ruoyi/basic/mapper/CertificationMapper.java | 2 +-
basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java | 8 ++------
6 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/CertificationMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/CertificationMapper.java
index 2d50f3d..460068b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/CertificationMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/CertificationMapper.java
@@ -10,5 +10,5 @@
public interface CertificationMapper extends BaseMapper<Certification> {
//鏌ヨ璧勮川鏄庣粏鍒楄〃
- IPage<Certification> getCertificationDetail(Page page, @Param("ew") QueryWrapper<Certification> ew);
+ IPage<Certification> getCertificationDetail(Page page, @Param("param") Certification certification);
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/Certification.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/Certification.java
index 7eb1649..b3f9545 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/Certification.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/Certification.java
@@ -69,4 +69,8 @@
@ApiModelProperty(value = "璧勮川闄勪欢鍦板潃")
private String fileUrl;
+
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java
index 15b0e68..43eb9d2 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java
@@ -28,17 +28,13 @@
//鏌ヨ璧勮川鏄庣粏鍒楄〃
@Override
public IPage<Certification> getCertificationDetail(Page page, Certification certification) {
- return certificationMapper.getCertificationDetail(page, QueryWrappers.queryWrappers(certification));
+ return certificationMapper.getCertificationDetail(page, certification);
}
//娣诲姞璧勮川鏄庣粏鍒楄〃
@Override
public int addCertificationDetail(Certification certification) {
- if(null != certification.getId()){
- return certificationMapper.updateById(certification);
- }else {
- return certificationMapper.insert(certification);
- }
+ return certificationMapper.insert(certification);
}
//鍒犻櫎璧勮川鏄庣粏鍒楄〃
diff --git a/basic-server/src/main/resources/mapper/CertificationMapper.xml b/basic-server/src/main/resources/mapper/CertificationMapper.xml
index bec4d63..35154d0 100644
--- a/basic-server/src/main/resources/mapper/CertificationMapper.xml
+++ b/basic-server/src/main/resources/mapper/CertificationMapper.xml
@@ -2,19 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruoyi.basic.mapper.CertificationMapper">
<select id="getCertificationDetail" resultType="com.ruoyi.basic.pojo.Certification">
- select b.*
- from ( select c.id,a.`name`, a.`code`,a.organization,a.explanation,a.first_issuance_date,a.latest_issuance_date,c.expire_time , c.image_url,
- c.file_url FROM
- (SELECT id,name,MIN(date_of_issuance) AS first_issuance_date,
- MAX(date_of_issuance) AS latest_issuance_date,
- c.`code`,c.organization,c.explanation
- FROM
- certification c
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- GROUP BY
- name) a left join certification c on a.id=c.id
- ) b
+ SELECT * FROM certification
+ <where>
+ create_time IN (
+ SELECT MAX( create_time ) FROM certification WHERE create_time IS NOT NULL GROUP BY NAME )
+ <if test="param.name != null and param.name != ''">
+ AND name like concat('%',#{param.name},'%')
+ </if>
+ </where>
</select>
</mapper>
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java
index 48c0369..1d39939 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java
@@ -40,7 +40,7 @@
public Result<?> addLightningProtectionDetection(FeLightningProtection feLightningProtection,
@RequestPart(value = "file", required = false) MultipartFile file) {
if (ObjectUtils.isNotEmpty(file)) {
- String s = FileSaveUtil.StoreFile(file);
+ String s = FileSaveUtil.uploadWordFile(file);
feLightningProtection.setSystemFileName(s);
feLightningProtection.setFileName(file.getOriginalFilename());
}
diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
index b9f48d0..1880de8 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
@@ -104,7 +104,7 @@
} else {
IPage<AuxiliaryWorkingHoursDayDto> auxiliaryWorkingHoursDayDtoIPage = auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page, QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto), ids);
for (AuxiliaryWorkingHoursDayDto record : auxiliaryWorkingHoursDayDtoIPage.getRecords()) {
- record.setDateTime(record.getDateTime().substring(0, 10));
+ record.setDateTime(ObjectUtils.isEmpty(record.getDateTime())? null : record.getDateTime().substring(0, 10));
}
return auxiliaryWorkingHoursDayDtoIPage;
}
--
Gitblit v1.9.3