From a2ce400cc0245707333ec187a860787afdca3dae Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期三, 09 八月 2023 09:24:09 +0800
Subject: [PATCH] 报告审核
---
inspection-server/src/main/resources/mapper/ReportMapper.xml | 52 +++++++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java | 4
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportAuditingService.java | 6
sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java | 6 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java | 4
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportAuditingVo.java | 6
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 20 +++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java | 18 ++--
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportAuditingServiceImpl.java | 37 +++++++++
/dev/null | 37 ---------
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java | 8 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java | 4
14 files changed, 144 insertions(+), 63 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
index dd191cd..5b01d22 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
import com.yuanchu.limslaboratory.service.RawMaterialService;
@@ -133,7 +134,6 @@
}
return Result.success(inspectionService.updateInspectsById(id));
}
-
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportCheckController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java
similarity index 77%
rename from inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportCheckController.java
rename to inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java
index 920a1a2..f8b6e42 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportCheckController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java
@@ -3,18 +3,18 @@
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.pojo.vo.ReportAuditingVo;
+import com.yuanchu.limslaboratory.service.ReportAuditingService;
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 javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
@@ -29,13 +29,13 @@
*/
@Api(tags = "妫�楠屾ā鍧�-->鎶ュ憡瀹℃牳")
@RestController
-@RequestMapping("/reportCheck")
-public class ReportCheckController {
+@RequestMapping("/reportAuditing")
+public class ReportAuditingController {
/**
* 鏈嶅姟瀵硅薄
*/
- @Autowired
- private ReportCheckService reportCheckService;
+ @Resource
+ private ReportAuditingService reportAuditingService;
@ApiOperation("鏌ヨ鎶ュ憡瀹℃牳鍐呭")
@ApiImplicitParams(value = {
@@ -44,9 +44,9 @@
@ApiImplicitParam(name = "status", value = "鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "name", value = "鎼滅储淇℃伅", dataTypeClass = String.class)
})
- @GetMapping("/selectAllReportCheck")
+ @GetMapping("/selectAllReportAuditing")
public Result selectAllReportCheck(Integer page, Integer pageSize, Integer status, String name) {
- IPage<ReportCheckVo> reportPage = reportCheckService.selectAllReportCheck(new Page<Object>(page, pageSize), status, name);
+ IPage<ReportAuditingVo> reportPage = reportAuditingService.selectAllReportAuditing(new Page<Object>(page, pageSize), status, name);
Map<String, Object> map = new HashMap<>();
map.put("total", reportPage.getTotal());
map.put("row", reportPage.getRecords());
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 50b9302..5a3ece9 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
@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
@@ -34,7 +35,7 @@
/**
* 鏈嶅姟瀵硅薄
*/
- @Autowired
+ @Resource
private ReportService reportService;
@ApiOperation("鏌ヨ妫�楠屾姤鍛�")
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
index 3f9d8d4..c5f3504 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java
@@ -4,7 +4,7 @@
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.ReportAuditingVo;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
/**
@@ -28,6 +28,6 @@
* 鏌ヨ鎶ュ憡瀹℃牳
* @return
*/
- IPage<ReportCheckVo> selectAllReportCheck(Page<Object> page, Integer status, String name);
+ IPage<ReportAuditingVo> selectAllReportAuditing(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
index d1ab3bb..0ecf6b6 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java
@@ -20,8 +20,8 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="InspectionReport瀵硅薄", description="")
-@TableName("inspection_report")
+@ApiModel(value="Report瀵硅薄", description="")
+@TableName("report")
public class Report implements Serializable {
private static final long serialVersionUID = 1L;
@@ -38,8 +38,8 @@
@ApiModelProperty(value = "瀹℃牳缁撹")
private String conclusion;
- @ApiModelProperty(value = "瀹℃牳浜篿d")
- private Integer userId;
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ private String approver;
@ApiModelProperty(value = "鍏宠仈 鐢宠琛╥d")
private Integer inspectionId;
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/ReportAuditingVo.java
similarity index 84%
rename from inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportCheckVo.java
rename to inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportAuditingVo.java
index 60bb95e..7e7ffd1 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportCheckVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportAuditingVo.java
@@ -11,7 +11,7 @@
* 鎶ュ憡瀹℃牳
*/
@Data
-public class ReportCheckVo {
+public class ReportAuditingVo {
@ApiModelProperty(value = "鏍峰搧缂栧彿")
@JsonSerialize
private String materialCode;
@@ -28,9 +28,9 @@
@JsonSerialize
private Integer approver;
@ApiModelProperty(value = "鎻愪氦鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date submitTime;
@ApiModelProperty(value = "瀹℃牳鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", 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
index 0bb084b..9c7849e 100644
--- 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
@@ -21,7 +21,7 @@
@ApiModelProperty(value = "瀹℃壒浜�")
@JsonSerialize
private Integer approver;
- @ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟瀹℃牳锛�2锛氬緟绛惧瓧锛�3锛氬凡瀹屾垚")
+ @ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟瀹℃牳锛�2锛氬凡瀹℃牳")
@JsonSerialize
private Integer status;
@ApiModelProperty(value = "妫�楠岀粨璁�")
@@ -29,5 +29,5 @@
private String conclusion;
@ApiModelProperty(value = "缂栧埗浜�")
@JsonSerialize
- private Integer userId;
+ private String name;
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportCheckService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportAuditingService.java
similarity index 66%
rename from inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportCheckService.java
rename to inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportAuditingService.java
index fb1af30..362ee97 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportCheckService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportAuditingService.java
@@ -4,7 +4,7 @@
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;
+import com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo;
/**
* <p>
@@ -14,12 +14,12 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-08-07
*/
-public interface ReportCheckService extends IService<Report> {
+public interface ReportAuditingService extends IService<Report> {
/**
* 椤圭洰瀹℃牳琛ㄦ煡璇�
* @return
*/
- IPage<ReportCheckVo> selectAllReportCheck(Page<Object> page, Integer status, String name);
+ IPage<ReportAuditingVo> selectAllReportAuditing(Page<Object> page, Integer status, String name);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
index 444d70c..03314be 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
@@ -13,6 +13,7 @@
import com.yuanchu.limslaboratory.pojo.vo.InspectDetailVo;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.*;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -58,6 +59,9 @@
@Resource
UserMapper userMapper;
+
+ @Resource
+ ReportMapper reportMapper;
/**
* 鏌ヨ妫�楠岀敵璇峰崟鍒楄〃
@@ -192,6 +196,22 @@
.build();
inspectionMapper.updateById(inspection);
//鐢熸垚鎶ュ憡鍗�
+ Report report = new Report();
+ //鐢熸垚鎶ュ憡鍗曞彿
+ String code = MyUtil.getTimeSixNumberCode("BG");
+ //鑾峰彇妫�楠岀粨璁�
+ String conclusion = "";
+ Inspection inspection1 = inspectionMapper.selectById(id);
+ if (inspection1.getInspectionStatus().equals(1)) {
+ conclusion = "鍚堟牸";
+ }else {
+ conclusion = "涓嶅悎鏍�";
+ }
+ report.setCode(code);
+ report.setStatus(0);
+ report.setConclusion(conclusion);
+ report.setInspectionId(id);
+ reportMapper.insert(report);
return true;
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportAuditingServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportAuditingServiceImpl.java
new file mode 100644
index 0000000..df8e8e4
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportAuditingServiceImpl.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.ReportAuditingVo;
+import com.yuanchu.limslaboratory.service.ReportAuditingService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+@Service
+public class ReportAuditingServiceImpl extends ServiceImpl<ReportMapper, Report> implements ReportAuditingService {
+
+ @Resource
+ private ReportMapper reportMapper;
+
+ /**
+ * 椤圭洰瀹℃牳琛ㄦ煡璇�
+ * @return
+ */
+ @Override
+ public IPage<ReportAuditingVo> selectAllReportAuditing(Page<Object> page, Integer status, String name) {
+ return reportMapper.selectAllReportAuditing(page, status, 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
deleted file mode 100644
index 4162cd6..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportCheckServiceImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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
index 2673b2c..702f2ae 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
@@ -10,6 +10,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+
/**
* <p>
* 鏈嶅姟瀹炵幇绫�
@@ -21,7 +23,7 @@
@Service
public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> implements ReportService {
- @Autowired
+ @Resource
private ReportMapper reportMapper;
/**
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
new file mode 100644
index 0000000..54d2f39
--- /dev/null
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yuanchu.limslaboratory.mapper.ReportMapper">
+
+ <!--鏌ヨ妫�楠屾姤鍛�-->
+ <select id="selectAllReport" resultType="com.yuanchu.limslaboratory.pojo.vo.ReportVo">select im.code materialCode,
+ r.code reportCode,
+ i.code inspectionCode,
+ r.approver approver,
+ r.status status,
+ r.conclusion conclusion,
+ u.name name
+ from report r
+ join inspection i on r.inspection_id = i.id
+ join user u on i.user_id = u.id
+ join inspection_material im on i.id = im.inspection_id
+ <where>
+ <if test="status != null">
+ and r.status = #{status}
+ </if>
+ <if test="name != null and name != ''">
+ and im.code like concat('%', #{name}, '%')
+ or i.code like concat('%', #{name}, '%')
+ or r.code like concat('%', #{name}, '%')
+ </if>
+ </where>
+ </select>
+
+ <!--鏌ヨ鎶ュ憡瀹℃牳-->
+ <select id="selectAllReportAuditing" resultType="com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo">
+ select im.code materialCode,
+ r.code reportCode,
+ im.name materialName,
+ r.status status,
+ r.approver approver,
+ DATE_FORMAT(r.`create_time`, '%Y-%m-%d') submitTime,
+ DATE_FORMAT(r.`check_time`, '%Y-%m-%d') checkTime
+ from report r
+ join inspection i on r.inspection_id = i.id
+ join inspection_material im on i.id = im.inspection_id
+ <where>
+ <if test="status != null">
+ and r.status = #{status}
+ </if>
+ <if test="name != null and name != ''">
+ and im.code like concat('%', #{name}, '%')
+ or i.code like concat('%', #{name}, '%')
+ or im.name like concat('%', #{name}, '%')
+ </if>
+ </where>
+ </select>
+</mapper>
diff --git a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
index 9d91f2b..183445b 100644
--- a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
+++ b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
@@ -1,4 +1,5 @@
package com.yuanchu.limslaboratory;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -11,6 +12,11 @@
System.out.println("newString === " + newString);
}
+ @Test
+ void TT() {
+ System.out.println(MyUtil.getTimeSixNumberCode("BG"));
+
+ }
}
--
Gitblit v1.9.3