From a0849402cbf35d956eea058ba648922e4258a631 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 01 九月 2023 08:22:27 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java | 9 ++++
inspection-server/src/main/resources/mapper/ReportMapper.xml | 3 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java | 13 ++++++
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java | 23 +++++++++--
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java | 3 +
sys/src/main/resources/application-dev.yml | 14 +++---
6 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
index 603864b..df826f3 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
+import com.yuanchu.limslaboratory.enums.InterfaceType;
+import com.yuanchu.limslaboratory.enums.MenuEnums;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import com.yuanchu.limslaboratory.service.ReportService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
@@ -14,7 +16,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -99,5 +100,11 @@
return Result.success(reportService.getReportContext(code));
}
+ @GetMapping("/getEnterprise")
+ @ApiOperation("鑾峰彇浼佷笟淇℃伅")
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.checkTheReport,isAdd = true)
+ public Result getEnterprise() {
+ return Result.success(reportService.getEnterprise());
+ }
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java
index a134f11..72f3bc7 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.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.yuanchu.limslaboratory.pojo.Enterprise;
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
@@ -49,5 +50,7 @@
String delreport(Integer id);
Map<String, Object> getReportContext(String code);
+
+ Enterprise getEnterprise();
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
index c5ce8ed..f65dcc2 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
@@ -1,13 +1,17 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.mapper.EnterpriseMapper;
import com.yuanchu.limslaboratory.mapper.ReportMapper;
+import com.yuanchu.limslaboratory.pojo.Enterprise;
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import com.yuanchu.limslaboratory.service.ReportService;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.Date;
import java.util.Map;
@@ -25,6 +29,9 @@
@Resource
private ReportMapper reportMapper;
+
+ @Resource
+ private EnterpriseMapper enterpriseMapper;
/**
* 鏌ヨ妫�楠屾姤鍛�
@@ -75,5 +82,11 @@
return reportMapper.getReportContext(code);
}
+ @Override
+ public Enterprise getEnterprise() {
+ return enterpriseMapper.selectOne(new QueryWrapper<Enterprise>());
+ }
+
+
}
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index 25a09a3..096359e 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -36,6 +36,7 @@
<resultMap id="report" type="map">
<id property="rcode" column="rcode"/>
<result property="name" column="name"/>
+ <result property="num" column="num"/>
<result property="specifications" column="specifications"/>
<result property="supplier" column="supplier"/>
<result property="insCode" column="ins_code"/>
@@ -57,7 +58,7 @@
</resultMap>
<select id="getReportContext" resultMap="report">
- SELECT r.`code` rcode,date_format(r.create_time, '%Y-%m-%d') create_time,date_format(r.check_time, '%Y-%m-%d') check_time,i.inspection_status,im.`name`,im.specifications,im.supplier,im.`code` im_code,i.`code` ins_code,i.type,ip.id,ip.`name` ip_name,ip.unit,ip.required,ip.test_value,ip.test_state
+ SELECT r.`code` rcode,date_format(r.create_time, '%Y-%m-%d') create_time,date_format(r.check_time, '%Y-%m-%d') check_time,i.inspection_status,im.`name`,im.num,im.specifications,im.supplier,im.`code` im_code,i.`code` ins_code,i.type,ip.id,ip.`name` ip_name,ip.unit,ip.required,ip.test_value,ip.test_state
FROM report r
LEFT JOIN inspection i
ON r.inspection_id = i.id
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index c1b729a..c1b0e0b 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -40,12 +40,12 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
- username: user
- password: 123456
-# url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
-# username: root
+# url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+# username: user
# password: 123456
+ url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ username: root
+ password: 123456
druid:
# Druid鏁版嵁婧愰厤缃�
initialSize: 5 # 鍒濆杩炴帴鏁�
@@ -68,8 +68,8 @@
# redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
database: 0
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
- host: 192.168.110.209
-# host: localhost
+# host: 192.168.110.209
+ host: localhost
# redis绔彛锛堥粯璁や负6379锛�
port: 6380
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java
index 3248894..ae0753d 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java
@@ -1,17 +1,15 @@
package com.yuanchu.limslaboratory.pojo;
import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -36,6 +34,9 @@
@ApiModelProperty(value = "浼佷笟鍚嶅瓧")
private String name;
+ @ApiModelProperty(value = "浼佷笟鑻辨枃鍚嶅瓧")
+ private String nameEn;
+
@ApiModelProperty(value = "浼佷笟绠�绉�")
private String byname;
@@ -45,6 +46,18 @@
@ApiModelProperty(value = "鑱旂郴浜虹數璇�")
private String linkPhone;
+ @ApiModelProperty(value = "浼佷笟鍦板潃")
+ private String address;
+
+ @ApiModelProperty(value = "鑻辨枃浼佷笟鍦板潃")
+ private String addressEn;
+
+ @ApiModelProperty(value = "閭斂缂栫爜")
+ private String code;
+
+ @ApiModelProperty(value = "閭")
+ private String email;
+
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
private Date createTime;
--
Gitblit v1.9.3