From e44da3a342bad6552b6a6998b9ead44c540c2e47 Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期五, 26 四月 2024 09:14:10 +0800
Subject: [PATCH] 2024-04-25 资质凭证bug和印章管理将实验室id改为实验室名称
---
cnas-server/src/main/resources/mapper/SealMapper.xml | 6 +
cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java | 3
cnas-server/src/main/resources/mapper/CertificationMapper.xml | 29 +++------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 1
cnas-server/src/main/java/com/yuanchu/mom/mapper/CertificationMapper.java | 3
cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java | 4 -
cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java | 1
cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java | 15 ++--
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 31 ++++++----
cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 2
cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java | 2
cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java | 24 +++----
13 files changed, 58 insertions(+), 65 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
index 5f27c94..fa775fe 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
@@ -29,6 +29,7 @@
@ApiOperation(value = "鏌ヨ璧勮川鏄庣粏鍒楄〃")
@PostMapping("/getCertificationDetail")
public Result getCertificationDetail(@RequestBody Map<String, Object> data) throws Exception {
+ System.out.println(data);
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
Certification certification = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Certification.class);
return Result.success(certificationService.getCertificationDetail(page, certification));
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
index 3fccae6..8ac9dfd 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
@@ -7,7 +7,6 @@
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -52,8 +51,10 @@
@ApiOperation(value="鏌ヨ鍗扮珷鍒楄〃")
@PostMapping("/selectSeal")
public Result selectSeal(@RequestBody Map<String, Object> data) throws Exception {
+ System.out.println(data);
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
Seal seal = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Seal.class);
return Result.success(sealService.selectSeal(page,seal));
+
}
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/CertificationMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/CertificationMapper.java
index f874481..476e07b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/CertificationMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/CertificationMapper.java
@@ -5,9 +5,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.Certification;
+import org.apache.ibatis.annotations.Param;
public interface CertificationMapper extends BaseMapper<Certification> {
//鏌ヨ璧勮川鏄庣粏鍒楄〃
- IPage<Certification> getCertificationDetail(Page page, QueryWrapper<Certification> ew);
+ IPage<Certification> getCertificationDetail(Page page, @Param("ew") QueryWrapper<Certification> ew);
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java
index 7577a20..0a71b03 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java
@@ -4,13 +4,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.pojo.Certification;
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.pojo.Seal;
import java.util.List;
-import java.util.Map;
public interface SealMapper extends BaseMapper<Seal> {
IPage<Seal>selectSeal(Page page, QueryWrapper<Seal> ew);
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java
index a7074ae..91a0ddf 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java
@@ -37,22 +37,29 @@
@ValueTableShow(6)
@ApiModelProperty(value = "棣栨棰佸彂鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime firstTime;
-
+ private LocalDateTime firstIssuanceDate;
+ @ValueTableShow(7)
@ApiModelProperty(value = "鏈�杩戦鍙戞椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime recentlyTime;
+ private LocalDateTime latestIssuanceDate;
+
+
@ValueTableShow(8)
@ApiModelProperty(value = "鍒版湡棰佸彂鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime expireTime;
+
+ @ApiModelProperty(value = "棰佸竷鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime dateOfIssuance;
+
@ApiModelProperty(value = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ValueTableShow(9)
+
@ApiModelProperty(value = "鏇存柊浜�")
private String createUserName;
@@ -60,19 +67,10 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ValueTableShow(7)
- @ApiModelProperty(value = "鏈�杩戦鍙戞椂闂�")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
-
- @ValueTableShow(11)
- @ApiModelProperty(value = "鐘舵��")
- private Integer state;
@ApiModelProperty(value = "璧勮川鍥剧墖鍦板潃")
private String imageUrl;
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
index 07e7d1a..d9eef20 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
@@ -20,26 +20,27 @@
@ApiModelProperty(value = "涓婚敭")
@TableId(type = IdType.AUTO)
private Integer id;
- @ValueTableShow(1)
+
+
@ApiModelProperty(value = "瀹為獙瀹d")
private Integer labId;
+
+ @TableField(exist=false)
@ValueTableShow(2)
+ @ApiModelProperty(value = "瀹為獙瀹ゅ悕绉�")
+ private String laboratoryName;
+ @ValueTableShow(3)
@ApiModelProperty(value = "鍗扮珷鍥剧墖")
private String address;
- @ValueTableShow(3)
+ @ValueTableShow(4)
@ApiModelProperty(value = "鍗扮珷绫诲瀷")
private String type;
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ValueTableShow(5)
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
-
-
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index 5769b30..a5a5816 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -31,6 +31,4 @@
List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass);
Device selectDeviceByCode(String code);
-
}
-
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
index 390fbf7..01791b1 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
@@ -1,11 +1,8 @@
package com.yuanchu.mom.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.mapper.LaboratoryMapper;
import com.yuanchu.mom.mapper.SealMapper;
-import com.yuanchu.mom.pojo.Certification;
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.pojo.Seal;
import com.yuanchu.mom.service.SealService;
@@ -43,6 +40,7 @@
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(Seal.class));
map.put("body", sealMapper.selectSeal(page, QueryWrappers.queryWrappers(seal)));
+
return map;
}
@Override
diff --git a/cnas-server/src/main/resources/mapper/CertificationMapper.xml b/cnas-server/src/main/resources/mapper/CertificationMapper.xml
index 825ac46..a532113 100644
--- a/cnas-server/src/main/resources/mapper/CertificationMapper.xml
+++ b/cnas-server/src/main/resources/mapper/CertificationMapper.xml
@@ -2,27 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.mom.mapper.CertificationMapper">
<select id="getCertificationDetail" resultType="com.yuanchu.mom.pojo.Certification">
- select * from
- (select c.id,
- c.name,
- c.code,
- organization,
- explanation,
- first_time,
- recently_time,
- expire_time,
- u1.name create_user_name,
- c.create_time,
- case when now() > expire_time then 0
- else 1 end as state,
- image_url,
- file_url
- from certification c
- left join user u1 on c.create_user = u1.id
- order by c.id desc) a
+ select b.*
+ from ( select a.`name`, a.`code`,a.organization,a.explanation,a.first_issuance_date,a.latest_issuance_date,c.expire_time 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
+ GROUP BY
+ name) a left join certification c on a.id=c.id
+ ) b
</select>
</mapper>
\ No newline at end of file
diff --git a/cnas-server/src/main/resources/mapper/SealMapper.xml b/cnas-server/src/main/resources/mapper/SealMapper.xml
index c1e4380..37965da 100644
--- a/cnas-server/src/main/resources/mapper/SealMapper.xml
+++ b/cnas-server/src/main/resources/mapper/SealMapper.xml
@@ -4,14 +4,16 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.SealMapper">
<select id="selectSeal" resultType="com.yuanchu.mom.pojo.Seal">
- select * from seal
+ select l.id,s.lab_id,l.laboratory_name ,s.address, s.type as type,s.create_time
+ from seal s LEFT JOIN laboratory l on s.lab_id=l.id
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
+
</select>
<select id="selectLaboratory" resultType="com.yuanchu.mom.pojo.Laboratory">
SELECT *
from laboratory
- WHERE id =#{labId}
+ WHERE id = #{labId}
</select>
</mapper>
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index d2bda67..9a4a237 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -136,7 +136,5 @@
@PostMapping("/selectSampleDefects")
public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));
-
}
-
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 52d0804..55256da 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -172,7 +172,6 @@
Long aLong = insOrderMapper.getCount(inspectionItems, orderNumber);
map.put("total", aLong);
return map;
-
}
}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 5c209b2..eaf47c5 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -57,10 +57,10 @@
</resultMap>
<resultMap id="SampleDefectsChildrenMap" type="com.yuanchu.mom.vo.SampleDefectsChildrenVo">
- <result column="entrust_code" property="entrust_code" />
- <result column="inspection_item" property="inspection_item" />
+ <result column="entrust_code" property="entrust_code"/>
+ <result column="inspection_item" property="inspection_item"/>
<result column="name" property="name"/>
- <result column="create_time" property="create_time" />
+ <result column="create_time" property="create_time"/>
</resultMap>
<select id="selectInsOrderParameter" resultType="com.yuanchu.mom.pojo.InsOrder">
select *
@@ -116,6 +116,8 @@
<select id="selectSampleAndProductByOrderId" resultType="com.yuanchu.mom.dto.SampleProductDto2">
select *
from (
+ select
+ i.id,isa.sample_code,isa.sample,isa.model,ip.state,ip.unit,ip.inspection_item,ip.inspection_item_subclass,
select i.id,isa.sample_code,isa.sample,isa.model,isa.ins_state,ip.state,ip.unit,ip.inspection_item,ip.inspection_item_subclass,
ip.son_laboratory,ip.inspection_item_type,ip.inspection_value_type,ip.ask,ip.`last_value`,ip.ins_result,ipr.equip_value
from ins_sample isa
@@ -147,7 +149,8 @@
ins_order i
LEFT JOIN ins_sample isa ON isa.ins_order_id = i.id
LEFT JOIN `user` u ON u.id = i.user_id
- LEFT JOIN (select SUM(b.price) price, sum(b.man_hour) cost,b.ins_sample_id,GROUP_CONCAT(b.inspection_item SEPARATOR ',')
+ LEFT JOIN (select SUM(b.price) price, sum(b.man_hour) cost,b.ins_sample_id,GROUP_CONCAT(b.inspection_item
+ SEPARATOR ',')
inspection_item from (select * from ins_product where state = 1 GROUP BY ins_sample_id,man_hour_group) b GROUP
BY b.ins_sample_id) c ON c.ins_sample_id = isa.id
) a
@@ -156,7 +159,8 @@
</if>
</select>
<select id="selectDeviceList" resultType="java.util.Map">
- select device_name,specification_model,factory_no,date_format(latest_traceability, '%Y-%m-%d') latest_traceability from device
+ select device_name,specification_model,factory_no,date_format(latest_traceability, '%Y-%m-%d')
+ latest_traceability from device
where device_name in
<foreach collection="names" index="index" open="(" separator="," close=")" item="val">
#{val}
@@ -192,9 +196,11 @@
left JOIN ins_sample sam on io.id=sam.ins_order_id
LEFT JOIN ins_product ip on ip.ins_sample_id=sam.id
LEFT JOIN
- (SELECT create_time,create_user,ins_product_id FROM (select * FROM ins_product_user ORDER BY ins_product_user.create_time DESC) a GROUP BY a.ins_product_id) b
+ (SELECT create_time,create_user,ins_product_id FROM
+ (select * FROM ins_product_user ORDER BY ins_product_user.create_time DESC) a
+ GROUP BY a.ins_product_id) b
on b.ins_product_id=ip.id
- left JOIN `user` u on u.id=b.create_user
+ left JOIN `user` u on u.id=b.create_user
WHERE (ip.ins_result=0 OR ip.state=0)
<if test="inspectionItems != null and inspectionItems != ''">
and inspection_item like concat('%', #{inspectionItems}, '%')
@@ -212,16 +218,17 @@
left JOIN ins_sample sam on io.id=sam.ins_order_id
LEFT JOIN ins_product ip on ip.ins_sample_id=sam.id
LEFT JOIN
- (SELECT create_time,create_user,ins_product_id FROM (select * FROM ins_product_user ORDER BY ins_product_user.create_time DESC) a GROUP BY a.ins_product_id) b
+ (SELECT create_time,create_user,ins_product_id FROM (select * FROM ins_product_user ORDER BY
+ ins_product_user.create_time DESC) a GROUP BY a.ins_product_id) b
on b.ins_product_id=ip.id
- left JOIN `user` u on u.id=b.create_user
- where (ip.ins_result=0 OR ip.state=0)
+ left JOIN `user` u on u.id=b.create_user
+ where (ip.ins_result=0 OR ip.state=0)
<if test="inspectionItems != null and inspectionItems != ''">
- and inspection_item like concat('%', #{inspectionItems}, '%')
+ and inspection_item like concat('%', #{inspectionItems}, '%')
</if>
<if test="orderNumber != null and orderNumber != ''">
and io.entrust_code like concat('%', #{orderNumber}, '%')
</if>
- ) temp
+ ) temp
</select>
</mapper>
--
Gitblit v1.9.3