From e3026dae68fc425df7ca46c1b416aae32e036098 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 25 三月 2025 23:50:05 +0800
Subject: [PATCH] 修改cnas部分导出
---
ruoyi-system/src/main/resources/mapper/system/InformationNotificationMapper.xml | 1
cnas-device/src/main/java/com/ruoyi/device/dto/DeviceExaminePlanDetailsDto.java | 7 +++
cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml | 3 +
cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceExaminePlanDetailsMapper.java | 3 +
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java | 3 +
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java | 5 +-
cnas-device/src/main/java/com/ruoyi/device/service/DeviceExaminePlanService.java | 3 +
cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml | 13 +++---
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java | 8 ++--
cnas-device/src/main/resources/static/word/device-calibration-plan.docx | 0
cnas-device/src/main/resources/static/word/use-record.docx | 0
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java | 3 +
cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml | 18 +++++++-
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/controller/InformationNotificationController.java | 5 +-
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceCalibrationPlanServiceImpl.java | 8 ++-
16 files changed, 56 insertions(+), 26 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java
index 6e76125..fa77f8f 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.device.dto.DeviceExaminePlanDetailsDto;
import com.ruoyi.device.dto.DeviceExaminePlanDto;
import com.ruoyi.device.dto.DeviceExamineRecordContrastDto;
import com.ruoyi.device.dto.DeviceExamineRecordDto;
@@ -133,7 +134,7 @@
*/
@ApiOperation(value = "璁惧鏍告煡璁″垝璇︽儏鍒楄〃")
@GetMapping("/pageDeviceExaminePlanDetail")
- public Result<IPage<DeviceExaminePlanDetails>> pageDeviceExaminePlanDetail(Page page, DeviceExaminePlanDetails deviceExaminePlanDetails) {
+ public Result<IPage<DeviceExaminePlanDetailsDto>> pageDeviceExaminePlanDetail(Page page, DeviceExaminePlanDetails deviceExaminePlanDetails) {
return Result.success(deviceExaminePlanService.pageDeviceExaminePlanDetail(page, deviceExaminePlanDetails));
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceExaminePlanDetailsDto.java b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceExaminePlanDetailsDto.java
index 4ab9e37..88d30a5 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceExaminePlanDetailsDto.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceExaminePlanDetailsDto.java
@@ -13,4 +13,11 @@
public class DeviceExaminePlanDetailsDto extends DeviceExaminePlanDetails {
@ApiModelProperty("搴忓彿")
private Integer index;
+
+ @ApiModelProperty("璁板綍鐘舵��, 0: 鏈紑濮�, 1:寰呮壒鍑�, 2:閫氳繃, 3:涓嶉�氳繃")
+ private Integer recordStatus;
+
+ @ApiModelProperty("瀵规瘮鐘舵��, 0: 鏈紑濮�, 1:寰呮壒鍑�, 2:閫氳繃, 3:涓嶉�氳繃")
+ private Integer recordContrastStatus;
+
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceExaminePlanDetailsMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceExaminePlanDetailsMapper.java
index b458685..228f0ad 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceExaminePlanDetailsMapper.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceExaminePlanDetailsMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.device.dto.DeviceExaminePlanDetailsDto;
import com.ruoyi.device.pojo.DeviceExaminePlanDetails;
import org.apache.ibatis.annotations.Param;
@@ -23,5 +24,5 @@
* @param ew
* @return
*/
- IPage<DeviceExaminePlanDetails> pageDeviceExaminePlanDetail(Page page, @Param("ew") QueryWrapper<DeviceExaminePlanDetails> ew);
+ IPage<DeviceExaminePlanDetailsDto> pageDeviceExaminePlanDetail(Page page, @Param("ew") QueryWrapper<DeviceExaminePlanDetails> ew);
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceExaminePlanService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceExaminePlanService.java
index c06f9de..c1653a6 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceExaminePlanService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceExaminePlanService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.device.dto.DeviceExaminePlanDetailsDto;
import com.ruoyi.device.dto.DeviceExaminePlanDto;
import com.ruoyi.device.pojo.DeviceExaminePlan;
import com.ruoyi.device.pojo.DeviceExaminePlanDetails;
@@ -62,7 +63,7 @@
* @param DeviceExaminePlanDetails
* @return
*/
- IPage<DeviceExaminePlanDetails> pageDeviceExaminePlanDetail(Page page, DeviceExaminePlanDetails DeviceExaminePlanDetails);
+ IPage<DeviceExaminePlanDetailsDto> pageDeviceExaminePlanDetail(Page page, DeviceExaminePlanDetails DeviceExaminePlanDetails);
/**
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceCalibrationPlanServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceCalibrationPlanServiceImpl.java
index 3e6e513..20eba63 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceCalibrationPlanServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceCalibrationPlanServiceImpl.java
@@ -262,15 +262,17 @@
deviceCalibrationPlanDto.setRatifyTimeStr(deviceCalibrationPlan.getRatifyTime() == null ? null : deviceCalibrationPlan.getRatifyTime().format(formatter));
// 鏌ヨ璁惧鏍″噯璁″垝璇︽儏
- List<DeviceCalibrationPlanDetail> deviceCalibrationPlanDetailList = deviceCalibrationPlanDetailMapper.selectList(Wrappers.<DeviceCalibrationPlanDetail>lambdaQuery().eq(DeviceCalibrationPlanDetail::getPlanId, deviceCalibrationPlanId));
+ List<DeviceCalibrationPlanDetail> deviceCalibrationPlanDetailList = deviceCalibrationPlanDetailMapper.selectList(Wrappers.<DeviceCalibrationPlanDetail>lambdaQuery()
+ .eq(DeviceCalibrationPlanDetail::getPlanId, deviceCalibrationPlanId)
+ .orderByAsc(DeviceCalibrationPlanDetail::getPlanDate));
// 璁剧疆搴忓彿 鍜� 鏃堕棿
ArrayList<DeviceCalibrationPlanDetailDto> deviceCalibrationPlanDetailDtoList = new ArrayList<>();
deviceCalibrationPlanDetailList.forEach(deviceCalibrationPlanDetail -> {
DeviceCalibrationPlanDetailDto deviceCalibrationPlanDetailDto = new DeviceCalibrationPlanDetailDto();
BeanUtils.copyProperties(deviceCalibrationPlanDetail, deviceCalibrationPlanDetailDto);
deviceCalibrationPlanDetailDto.setIndex(deviceCalibrationPlanDetailList.indexOf(deviceCalibrationPlanDetail) + 1);
- deviceCalibrationPlanDetailDto.setLastDateStr((deviceCalibrationPlanDetail.getLastDate().format(formatter)));
- deviceCalibrationPlanDetailDto.setPlanDateStr((deviceCalibrationPlanDetail.getPlanDate().format(formatter)));
+ deviceCalibrationPlanDetailDto.setLastDateStr(deviceCalibrationPlanDetail.getLastDate() == null ? null : deviceCalibrationPlanDetail.getLastDate().format(formatter));
+ deviceCalibrationPlanDetailDto.setPlanDateStr(deviceCalibrationPlanDetail.getPlanDate() == null ? null : deviceCalibrationPlanDetail.getPlanDate().format(formatter));
deviceCalibrationPlanDetailDtoList.add(deviceCalibrationPlanDetailDto);
});
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java
index b0d6ba6..db70678 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java
@@ -250,7 +250,7 @@
* @return
*/
@Override
- public IPage<DeviceExaminePlanDetails> pageDeviceExaminePlanDetail(Page page, DeviceExaminePlanDetails deviceExaminePlanDetails) {
+ public IPage<DeviceExaminePlanDetailsDto> pageDeviceExaminePlanDetail(Page page, DeviceExaminePlanDetails deviceExaminePlanDetails) {
if (deviceExaminePlanDetails.getPlanId() == null) {
return new Page();
}
@@ -268,7 +268,8 @@
DeviceExaminePlanDto deviceExaminePlanDto = baseMapper.selectExamineExaminePlanDto(deviceExaminePlanId);
// 鏌ヨ璁惧鏍告煡璁″垝璇︽儏
- List<DeviceExaminePlanDetails> deviceExaminePlanDetailsList = deviceExaminePlanDetailsMapper.selectList(Wrappers.<DeviceExaminePlanDetails>lambdaQuery().eq(DeviceExaminePlanDetails::getPlanId, deviceExaminePlanId));
+ List<DeviceExaminePlanDetails> deviceExaminePlanDetailsList = deviceExaminePlanDetailsMapper.selectList(Wrappers.<DeviceExaminePlanDetails>lambdaQuery().eq(DeviceExaminePlanDetails::getPlanId, deviceExaminePlanId)
+ .orderByAsc(DeviceExaminePlanDetails::getCheckTime));
// 璁剧疆搴忓彿
ArrayList<DeviceExaminePlanDetailsDto> deviceExaminePlanDetailsDtoList = new ArrayList<>();
deviceExaminePlanDetailsList.forEach(deviceExamineRecordContrastDetail -> {
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
index 349ce8a..b38cc3d 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
@@ -88,11 +88,12 @@
endTime = deviceRecord.getUseEndDate().format(formatter);
String[] startTimeSplit = startTime.split(" ");
String[] endTimeSplit = endTime.split(" ");
- startTime = startTimeSplit[1];
if (startTimeSplit[0].equals(endTimeSplit[0])) {
+ startTime = startTimeSplit[1];
endTime = endTimeSplit[1];
} else {
endTime = endTimeSplit[0] + '\n' + endTimeSplit[1];
+ startTime = startTimeSplit[0] + '\n' + startTimeSplit[1];
}
DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy.M.d");
operationDate = deviceRecord.getUseStartDate().format(formatter2);
diff --git a/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml b/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
index 36852a8..2de8c93 100644
--- a/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
@@ -4,10 +4,22 @@
<!--璁惧鏍告煡璁″垝璇︽儏鍒楄〃-->
- <select id="pageDeviceExaminePlanDetail" resultType="com.ruoyi.device.pojo.DeviceExaminePlanDetails">
+ <select id="pageDeviceExaminePlanDetail" resultType="com.ruoyi.device.dto.DeviceExaminePlanDetailsDto">
select * from (
- select *
- from device_examine_plan_details
+ select d.*,
+ CASE
+ WHEN dc.review_status = 0 THEN 3
+ WHEN dc.review_status = 1 THEN 2
+ WHEN dc.record_id IS NOT NULL THEN 1
+ ELSE 0 END record_status,
+ CASE
+ WHEN dd.review_status = 0 THEN 3
+ WHEN dd.review_status = 1 THEN 2
+ WHEN dd.record_contrast_id IS NOT NULL THEN 1
+ ELSE 0 END record_contrast_status
+ from device_examine_plan_details d
+ left join device_examine_record dc on d.plan_details_id = dc.plan_details_id
+ left join device_examine_record_contrast dd on dd.plan_details_id = dc.plan_details_id
order by check_time asc
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
diff --git a/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml b/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
index 1707e9d..8a5e3cf 100644
--- a/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
+++ b/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
@@ -44,7 +44,8 @@
and dr.device_id = #{deviceId}
</if>
<if test="exportDate != '' and exportDate != null">
- and DATE_FORMAT(dr.use_start_date, '%Y-%m') = #{exportDate};
+ and DATE_FORMAT(dr.use_start_date, '%Y-%m') = #{exportDate}
</if>
+ ORDER BY dr.use_start_date asc
</select>
</mapper>
diff --git a/cnas-device/src/main/resources/static/word/device-calibration-plan.docx b/cnas-device/src/main/resources/static/word/device-calibration-plan.docx
index 4f4e6ff..fc32f72 100644
--- a/cnas-device/src/main/resources/static/word/device-calibration-plan.docx
+++ b/cnas-device/src/main/resources/static/word/device-calibration-plan.docx
Binary files differ
diff --git a/cnas-device/src/main/resources/static/word/use-record.docx b/cnas-device/src/main/resources/static/word/use-record.docx
index 236e645..00632d7 100644
--- a/cnas-device/src/main/resources/static/word/use-record.docx
+++ b/cnas-device/src/main/resources/static/word/use-record.docx
Binary files differ
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java
index a066615..220493f 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java
@@ -58,13 +58,13 @@
}
@ApiOperation(value = "纭 浜哄憳鑳藉姏")
- @GetMapping("confirmPersonnelCapability")
- public Result<?> confirmPersonnelCapability(@RequestParam("id") Integer id) {
+ @PostMapping("confirmPersonnelCapability")
+ public Result<?> confirmPersonnelCapability(@RequestBody PersonPersonnelCapacity personPersonnelCapacity) {
Integer userId = SecurityUtils.getUserId().intValue();
personPersonnelCapacityService.update(Wrappers.<PersonPersonnelCapacity>lambdaUpdate()
- .eq(PersonPersonnelCapacity::getId, id)
+ .eq(PersonPersonnelCapacity::getId, personPersonnelCapacity.getId())
.set(PersonPersonnelCapacity::getConfirmOperatingPersonnelId, userId)
- .set(PersonPersonnelCapacity::getConfirmDate, LocalDateTime.now()));
+ .set(PersonPersonnelCapacity::getConfirmDate, personPersonnelCapacity.getConfirmDate()));
return Result.success();
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java
index 50acbc4..7c08bf7 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java
@@ -63,5 +63,5 @@
* @param trainingDate
* @return
*/
- List<TrainingRecordPersonDetailedDto> selectPersonDetailedDtosByTrainingDate(Integer userId, Integer year);
+ List<TrainingRecordPersonDetailedDto> selectPersonDetailedDtosByTrainingDate(@Param("userId") Integer userId, @Param("year") Integer year);
}
diff --git a/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml b/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
index 93360e5..395dfec 100644
--- a/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
+++ b/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
@@ -59,10 +59,9 @@
dl.name depart_lims_name,
cpbi.professional_title,
cpbi.official_academic_redentials,
- cpbi.unit_time,
cpbi.major1,
u.id user_id,
- DATE_FORMAT(cpbi.unit_time, '%Y-%m-%d') AS unitTimeSting
+ DATE_FORMAT(cpbi.group_time, '%Y-%m-%d') AS unitTimeSting
from user u
left join cnas_person_basic_info cpbi on cpbi.user_id = u.id
left join department_lims dl on dl.id = SUBSTRING_INDEX(SUBSTRING_INDEX(u.depart_lims_id, ',', -2), ',', 1)
@@ -83,7 +82,7 @@
and cptr.user_id = #{userId}
<where>
<if test="year!= null and year!= ''">
- and YEAR(cptd.training_date) = ${year}
+ and cptd.training_date like concat('%', #{year}, '%')}
</if>
</where>
</select>
@@ -99,7 +98,7 @@
and cptr.user_id = #{userId}
</if>
<if test="year!= null and year!= ''">
- and YEAR(cptd.training_date) = ${year}
+ and cptd.training_date like concat('%', #{year}, '%')
</if>
</where>
</select>
@@ -112,14 +111,16 @@
cptd.class_hour,
cptr.examination_results,
cptd.remarks,
- DATE_FORMAT(cptd.training_date, '%Y-%m-%d') AS trainingDateString
+ cptd.training_date AS trainingDateString
from cnas_person_training_record cptr
inner join cnas_person_training_detailed cptd on cptd.id = cptr.course_id
and cptr.user_id = #{userId}
<where>
<if test="year!= null and year!= ''">
- and YEAR(cptd.training_date) = ${year}
+ and cptd.training_date like concat('%', #{year}, '%')
</if>
</where>
+ order by STR_TO_DATE(CONCAT(cptd.training_date, '.01'), '%Y.%m.%d')
+
</select>
</mapper>
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InformationNotificationController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InformationNotificationController.java
index 63320de..342f860 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InformationNotificationController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InformationNotificationController.java
@@ -39,8 +39,9 @@
}
@ApiOperation(value = "娑堟伅閫氱煡-鐐瑰嚮璇︽儏瑙﹀彂淇敼鐘舵�佷负宸茶")
- @PostMapping("triggerModificationStatusToRead/{id}")
- public Result<?> triggerModificationStatusToRead(@PathVariable("id") Integer id) {
+ @PostMapping("triggerModificationStatusToRead")
+ public Result<?> triggerModificationStatusToRead(@RequestBody Map<String, Integer> params) {
+ Integer id = params.get("id");
informationNotificationService.triggerModificationStatusToRead(id);
return Result.success();
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/InformationNotificationMapper.xml b/ruoyi-system/src/main/resources/mapper/system/InformationNotificationMapper.xml
index 68a9b49..e20a753 100644
--- a/ruoyi-system/src/main/resources/mapper/system/InformationNotificationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/InformationNotificationMapper.xml
@@ -20,6 +20,7 @@
left join user u on i.sender_id = u.id
left join user u2 on u2.id = i.consignee_id
where i.consignee_id = #{userId}
+ and i.view_status = false
order by i.create_time desc
</select>
--
Gitblit v1.9.3