From 8bb407e6af7af441783dba54ce5db8eaf23956c3 Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期二, 08 八月 2023 09:25:26 +0800
Subject: [PATCH] 提交代码
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java | 57 ++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportCheckService.java | 25 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java | 33 ++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java | 57 ++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java | 37 +++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportCheckController.java | 57 ++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportCheckServiceImpl.java | 37 +++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java | 33 ++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java | 27 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportCheckVo.java | 36 +++++
10 files changed, 399 insertions(+), 0 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportCheckController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportCheckController.java
new file mode 100644
index 0000000..920a1a2
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportCheckController.java
@@ -0,0 +1,57 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.pojo.vo.ReportCheckVo;
+import com.yuanchu.limslaboratory.service.ReportCheckService;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.Api;
+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.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+@Api(tags = "妫�楠屾ā鍧�-->鎶ュ憡瀹℃牳")
+@RestController
+@RequestMapping("/reportCheck")
+public class ReportCheckController {
+ /**
+ * 鏈嶅姟瀵硅薄
+ */
+ @Autowired
+ private ReportCheckService reportCheckService;
+
+ @ApiOperation("鏌ヨ鎶ュ憡瀹℃牳鍐呭")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "page", value = "鍒濆椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "status", value = "鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "name", value = "鎼滅储淇℃伅", dataTypeClass = String.class)
+ })
+ @GetMapping("/selectAllReportCheck")
+ public Result selectAllReportCheck(Integer page, Integer pageSize, Integer status, String name) {
+ IPage<ReportCheckVo> reportPage = reportCheckService.selectAllReportCheck(new Page<Object>(page, pageSize), status, name);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", reportPage.getTotal());
+ map.put("row", reportPage.getRecords());
+ return Result.success(map);
+ }
+
+}
+
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
new file mode 100644
index 0000000..50b9302
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
@@ -0,0 +1,57 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
+import com.yuanchu.limslaboratory.service.ReportService;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.Api;
+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.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠屾姤鍛�")
+@RestController
+@RequestMapping("/report")
+public class ReportController {
+ /**
+ * 鏈嶅姟瀵硅薄
+ */
+ @Autowired
+ private ReportService reportService;
+
+ @ApiOperation("鏌ヨ妫�楠屾姤鍛�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "page", value = "鍒濆椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "status", value = "鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "name", value = "鎼滅储淇℃伅", dataTypeClass = String.class)
+ })
+ @GetMapping("/selectAllReport")
+ public Result selectAllReport(Integer page, Integer pageSize, Integer status, String name) {
+ IPage<ReportVo> reportPage = reportService.selectAllReport(new Page<Object>(page, pageSize), status, name);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", reportPage.getTotal());
+ map.put("row", reportPage.getRecords());
+ return Result.success(map);
+ }
+
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java
new file mode 100644
index 0000000..3f9d8d4
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java
@@ -0,0 +1,33 @@
+package com.yuanchu.limslaboratory.mapper;
+
+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.limslaboratory.pojo.Report;
+import com.yuanchu.limslaboratory.pojo.vo.ReportCheckVo;
+import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+public interface ReportMapper extends BaseMapper<Report> {
+
+
+ /**
+ * 鏌ヨ妫�楠屾姤鍛�
+ * @return
+ */
+ IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name);
+
+ /**
+ * 鏌ヨ鎶ュ憡瀹℃牳
+ * @return
+ */
+ IPage<ReportCheckVo> selectAllReportCheck(Page<Object> page, Integer status, String name);
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java
new file mode 100644
index 0000000..d1ab3bb
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java
@@ -0,0 +1,57 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="InspectionReport瀵硅薄", description="")
+@TableName("inspection_report")
+public class Report implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鎶ュ憡琛╥d", hidden = true)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "鎶ュ憡鍗曞彿")
+ private String code;
+
+ @ApiModelProperty(value = "瀹℃壒鐘舵��")
+ private Integer status;
+
+ @ApiModelProperty(value = "瀹℃牳缁撹")
+ private String conclusion;
+
+ @ApiModelProperty(value = "瀹℃牳浜篿d")
+ private Integer userId;
+
+ @ApiModelProperty(value = "鍏宠仈 鐢宠琛╥d")
+ private Integer inspectionId;
+
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportCheckVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportCheckVo.java
new file mode 100644
index 0000000..60bb95e
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportCheckVo.java
@@ -0,0 +1,36 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鎶ュ憡瀹℃牳
+ */
+@Data
+public class ReportCheckVo {
+ @ApiModelProperty(value = "鏍峰搧缂栧彿")
+ @JsonSerialize
+ private String materialCode;
+ @ApiModelProperty(value = "鎶ュ憡鍗曞彿")
+ @JsonSerialize
+ private String reportCode;
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О")
+ @JsonSerialize
+ private String materialName;
+ @ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟閫氳繃")
+ @JsonSerialize
+ private Integer status;
+ @ApiModelProperty(value = "瀹℃壒浜�")
+ @JsonSerialize
+ private Integer approver;
+ @ApiModelProperty(value = "鎻愪氦鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitTime;
+ @ApiModelProperty(value = "瀹℃牳鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date checkTime;
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
new file mode 100644
index 0000000..0bb084b
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
@@ -0,0 +1,33 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 妫�楠屾姤鍛�
+ */
+@Data
+public class ReportVo {
+ @ApiModelProperty(value = "鏍峰搧缂栧彿")
+ @JsonSerialize
+ private String materialCode;
+ @ApiModelProperty(value = "鎶ュ憡鍗曞彿")
+ @JsonSerialize
+ private String reportCode;
+ @ApiModelProperty(value = "鐢宠鍗曞彿")
+ @JsonSerialize
+ private String inspectionCode;
+ @ApiModelProperty(value = "瀹℃壒浜�")
+ @JsonSerialize
+ private Integer approver;
+ @ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟瀹℃牳锛�2锛氬緟绛惧瓧锛�3锛氬凡瀹屾垚")
+ @JsonSerialize
+ private Integer status;
+ @ApiModelProperty(value = "妫�楠岀粨璁�")
+ @JsonSerialize
+ private String conclusion;
+ @ApiModelProperty(value = "缂栧埗浜�")
+ @JsonSerialize
+ private Integer userId;
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportCheckService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportCheckService.java
new file mode 100644
index 0000000..fb1af30
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportCheckService.java
@@ -0,0 +1,25 @@
+package com.yuanchu.limslaboratory.service;
+
+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.Report;
+import com.yuanchu.limslaboratory.pojo.vo.ReportCheckVo;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+public interface ReportCheckService extends IService<Report> {
+
+ /**
+ * 椤圭洰瀹℃牳琛ㄦ煡璇�
+ * @return
+ */
+ IPage<ReportCheckVo> selectAllReportCheck(Page<Object> page, Integer status, String name);
+}
+
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
new file mode 100644
index 0000000..f8a1f21
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java
@@ -0,0 +1,27 @@
+package com.yuanchu.limslaboratory.service;
+
+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.Report;
+import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+public interface ReportService extends IService<Report> {
+
+
+ /**
+ * 鏌ヨ妫�楠屾姤鍛�
+ *
+ * @return
+ */
+ IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name);
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportCheckServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportCheckServiceImpl.java
new file mode 100644
index 0000000..4162cd6
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportCheckServiceImpl.java
@@ -0,0 +1,37 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+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.ReportMapper;
+import com.yuanchu.limslaboratory.pojo.Report;
+import com.yuanchu.limslaboratory.pojo.vo.ReportCheckVo;
+import com.yuanchu.limslaboratory.service.ReportCheckService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+@Service
+public class ReportCheckServiceImpl extends ServiceImpl<ReportMapper, Report> implements ReportCheckService {
+
+ @Autowired
+ private ReportMapper inspectionReportMapper;
+
+
+ /**
+ * 椤圭洰瀹℃牳琛ㄦ煡璇�
+ * @return
+ */
+ @Override
+ public IPage<ReportCheckVo> selectAllReportCheck(Page<Object> page, Integer status, String name) {
+ return inspectionReportMapper.selectAllReportCheck(page, status, name);
+ }
+}
+
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
new file mode 100644
index 0000000..2673b2c
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
@@ -0,0 +1,37 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+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.ReportMapper;
+import com.yuanchu.limslaboratory.pojo.Report;
+import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
+import com.yuanchu.limslaboratory.service.ReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+@Service
+public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> implements ReportService {
+
+ @Autowired
+ private ReportMapper reportMapper;
+
+ /**
+ * 鏌ヨ妫�楠屾姤鍛�
+ * @return
+ */
+ @Override
+ public IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name) {
+ return reportMapper.selectAllReport(page, status, name);
+ }
+
+}
+
--
Gitblit v1.9.3