From dd664cf0ffa2eeef35c3e6955297b7fa2c903cc3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 24 十二月 2024 17:03:21 +0800
Subject: [PATCH] 完成截止12.24测试出来的问题
---
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 30 ++++++++++----
cnas-resource-require/src/main/java/com/yuanchu/mom/excel/FeStandardSubstanceExcel.java | 10 +++--
cnas-resource-require/src/main/resources/static/internal-wastes.docx | 0
cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FeIllumination.java | 4 ++
cnas-personnel/src/main/java/com/yuanchu/mom/dto/TrainingRecordPersonDetailedDto.java | 4 ++
cnas-personnel/src/main/java/com/yuanchu/mom/pojo/PersonSupervisePlanDetails.java | 2 +
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 4 --
cnas-process/src/main/java/com/yuanchu/mom/dto/ProcessOrderDto.java | 8 ++++
cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FeIlluminationDto.java | 6 +++
cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FePowerStableDto.java | 6 +++
cnas-process/src/main/java/com/yuanchu/mom/pojo/ProcessOrder.java | 8 ----
cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeStandardSubstanceController.java | 7 +++
cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FePowerStable.java | 4 ++
13 files changed, 68 insertions(+), 25 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/yuanchu/mom/dto/TrainingRecordPersonDetailedDto.java b/cnas-personnel/src/main/java/com/yuanchu/mom/dto/TrainingRecordPersonDetailedDto.java
index fc2b403..efaccdf 100644
--- a/cnas-personnel/src/main/java/com/yuanchu/mom/dto/TrainingRecordPersonDetailedDto.java
+++ b/cnas-personnel/src/main/java/com/yuanchu/mom/dto/TrainingRecordPersonDetailedDto.java
@@ -1,7 +1,9 @@
package com.yuanchu.mom.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -12,6 +14,8 @@
private String trainingDateString;
@ApiModelProperty("鍩硅鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date trainingDate;
@ApiModelProperty("鍩硅鍐呭")
diff --git a/cnas-personnel/src/main/java/com/yuanchu/mom/pojo/PersonSupervisePlanDetails.java b/cnas-personnel/src/main/java/com/yuanchu/mom/pojo/PersonSupervisePlanDetails.java
index 6cac12a..b09c8f2 100644
--- a/cnas-personnel/src/main/java/com/yuanchu/mom/pojo/PersonSupervisePlanDetails.java
+++ b/cnas-personnel/src/main/java/com/yuanchu/mom/pojo/PersonSupervisePlanDetails.java
@@ -14,6 +14,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -37,6 +38,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty("鐩戠潱鏃ユ湡")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date superviseDate;
@ApiModelProperty("鐩戠潱鐩殑")
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/dto/ProcessOrderDto.java b/cnas-process/src/main/java/com/yuanchu/mom/dto/ProcessOrderDto.java
index 4dd64c7..8a1ce79 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/dto/ProcessOrderDto.java
+++ b/cnas-process/src/main/java/com/yuanchu/mom/dto/ProcessOrderDto.java
@@ -76,6 +76,14 @@
@ApiModelProperty("鎶ュ憡鍙戦�佹柟寮�")
private Integer send;
+ private String comprehensiveUserName;
+
+ private String comprehensiveUserUrl;
+
+ private String issueUserName;
+
+ private String issueUserUrl;
+
//鏍峰搧鍜屾楠岄」鐩俊鎭�
private List<SampleItemDto> sampleItems;
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/pojo/ProcessOrder.java b/cnas-process/src/main/java/com/yuanchu/mom/pojo/ProcessOrder.java
index 66e54d3..0652423 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/pojo/ProcessOrder.java
+++ b/cnas-process/src/main/java/com/yuanchu/mom/pojo/ProcessOrder.java
@@ -40,11 +40,7 @@
@ApiModelProperty("缁煎悎瀹ょ鍚嶄汉")
private Integer comprehensiveUser;
- @TableField(select = false,exist = false)
- private String comprehensiveUserName;
- @TableField(select = false,exist = false)
- private String comprehensiveUserUrl;
@ApiModelProperty("鎺ユ敹鏃ユ湡")
private LocalDate comprehensiveTime;
@@ -52,11 +48,7 @@
@ApiModelProperty("棰嗘牱鍛�")
private Integer issueUser;
- @TableField(select = false,exist = false)
- private String issueUserName;
- @TableField(select = false,exist = false)
- private String issueUserUrl;
@ApiModelProperty("棰嗘牱鏃ユ湡")
private LocalDate issueTime;
diff --git a/cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeStandardSubstanceController.java b/cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeStandardSubstanceController.java
index 8e114a6..719b792 100644
--- a/cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeStandardSubstanceController.java
+++ b/cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeStandardSubstanceController.java
@@ -77,6 +77,13 @@
HttpServletResponse response) throws Exception {
IPage<FeStandardSubstance> ipage = feStandardSubstanceService.page(new Page<>(1, -1), feStandardSubstance);
List<FeStandardSubstanceExcel> studentList = JSONObject.parseArray(JSON.toJSONString(ipage.getRecords()), FeStandardSubstanceExcel.class);
+ for (FeStandardSubstanceExcel record : studentList) {
+ if (record.getState()==1){
+ record.setStateName("鍊熺敤");
+ }else {
+ record.setStateName("褰掕繕");
+ }
+ }
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader("requestType", "excel");
response.setHeader("Access-Control-Expose-Headers", "requestType");
diff --git a/cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FeIlluminationDto.java b/cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FeIlluminationDto.java
index 0bc7f03..8e68de7 100644
--- a/cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FeIlluminationDto.java
+++ b/cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FeIlluminationDto.java
@@ -1,8 +1,10 @@
package com.yuanchu.mom.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.pojo.FeIllumination;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -21,8 +23,12 @@
private String managementNumber;
@ApiModelProperty("鏍″噯鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date calibrationDate;
@ApiModelProperty("涓嬫鏍″噯鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date nextCalibrationDate;
}
diff --git a/cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FePowerStableDto.java b/cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FePowerStableDto.java
index 648dcb8..5a88f89 100644
--- a/cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FePowerStableDto.java
+++ b/cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FePowerStableDto.java
@@ -1,8 +1,10 @@
package com.yuanchu.mom.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.pojo.FePowerStable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -22,8 +24,12 @@
private String managementNumber;
@ApiModelProperty("鏍″噯鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date calibrationDate;
@ApiModelProperty("涓嬫鏍″噯鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date nextCalibrationDate;
}
diff --git a/cnas-resource-require/src/main/java/com/yuanchu/mom/excel/FeStandardSubstanceExcel.java b/cnas-resource-require/src/main/java/com/yuanchu/mom/excel/FeStandardSubstanceExcel.java
index 686596c..23279bc 100644
--- a/cnas-resource-require/src/main/java/com/yuanchu/mom/excel/FeStandardSubstanceExcel.java
+++ b/cnas-resource-require/src/main/java/com/yuanchu/mom/excel/FeStandardSubstanceExcel.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.excel;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yuanchu.mom.pojo.FeStandardSubstance;
import lombok.Data;
@@ -41,15 +42,16 @@
@ExcelProperty("瀛樻斁浣嶇疆")
private String position;
- @ExcelProperty("鍊熻皟鐘舵��")
+ @ExcelIgnore
private Integer state;
+
+ @ExcelProperty("鍊熻皟鐘舵��")
+ private String stateName;
@ExcelProperty("澶囨敞")
private String remark;
- @ExcelProperty("鍒涘缓浜�")
- private String createUser;
-
@ExcelProperty("鍒涘缓鏃ユ湡")
private LocalDateTime createTime;
+
}
diff --git a/cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FeIllumination.java b/cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FeIllumination.java
index e735e25..cd61e50 100644
--- a/cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FeIllumination.java
+++ b/cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FeIllumination.java
@@ -9,10 +9,12 @@
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>
@@ -47,6 +49,8 @@
private Integer checkerId;
@ApiModelProperty("妫�娴嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date testDate;
@ApiModelProperty("鍒涘缓鏃堕棿")
diff --git a/cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FePowerStable.java b/cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FePowerStable.java
index f48a695..602bd03 100644
--- a/cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FePowerStable.java
+++ b/cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FePowerStable.java
@@ -9,10 +9,12 @@
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>
@@ -38,6 +40,8 @@
private String testLocation;
@ApiModelProperty("娴嬭瘯鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date testDate;
@ApiModelProperty("璁惧id")
diff --git a/cnas-resource-require/src/main/resources/static/internal-wastes.docx b/cnas-resource-require/src/main/resources/static/internal-wastes.docx
index b4bc955..94fb80c 100644
--- a/cnas-resource-require/src/main/resources/static/internal-wastes.docx
+++ b/cnas-resource-require/src/main/resources/static/internal-wastes.docx
Binary files differ
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index 46a9b91..616b615 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -981,10 +981,6 @@
@Override
public List<Map<String, Object>> treeDevice(String deviceName) {
List<Map<String, Object>> listMap = deviceMapper.treeDevice(deviceName);
- /* Map<String, List<Device>> listMap = devices.stream()
- .collect(Collectors.groupingBy(device ->
- device.getLargeCategory() != null ? device.getLargeCategory() : "鍏朵粬"
- ));*/
return listMap;
}
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index b9f80a9..1bb8478 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -127,23 +127,35 @@
<resultMap id="treeDeviceDto" type="map">
- <result property="largeCategory" column="large_category"/>
- <collection property="children" resultMap="DeviceDto" javaType="List"/>
+ <result property="label" column="laboratory_name"/>
+ <result property="value" column="value" />
+ <collection property="children" resultMap="storagePointMap" javaType="List"/>
</resultMap>
- <resultMap id="DeviceDto" type="map">
- <id property="id" column="id"/>
- <result property="deviceName" column="device_name"/>
+ <resultMap id="storagePointMap" type="map">
+ <result property="value" column="value"/>
+ <result property="label" column="storage_point"/>
+ <collection property="children" resultMap="deviceNameMap" javaType="List"/>
+ </resultMap>
+
+ <resultMap id="deviceNameMap" type="map">
+ <result property="value" column="id"/>
+ <result property="label" column="device_name"/>
</resultMap>
<select id="treeDevice" resultMap="treeDeviceDto">
- select id,
- case when large_category is null || large_category ='' then '鍏朵粬'
- else large_category end as large_category, device_name
- from device
+ select
+ d.id,
+ case when l.laboratory_name is null || l.laboratory_name ='' then '鍏朵粬' else l.laboratory_name end as laboratory_name,
+ case when d.large_category is null || d.large_category ='' then '鍏朵粬' else d.large_category end as storage_point,
+ d.device_name,
+ null as value
+ from device d
+ LEFT JOIN laboratory l ON l.id = d.subordinate_departments_id
<where>
<if test="deviceName!=null and deviceName!=''">
and device_name like concat('%',#{deviceName},'%')
</if>
</where>
+ order by l.laboratory_name desc, d.large_category desc
</select>
</mapper>
--
Gitblit v1.9.3