From 4c563cb7274be53e15f8ce5537ef6e57e15b6458 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 02 四月 2024 18:01:31 +0800
Subject: [PATCH] 检验报告
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 35 ++++++++
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsReportMapper.java | 7 +
inspect-server/src/main/resources/mapper/InsReportMapper.xml | 21 +++-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 25 ++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 65 +++++++++++----
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsReport.java | 17 ++++
inspect-server/pom.xml | 10 ++
inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java | 29 +++++++
inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java | 7 +
9 files changed, 191 insertions(+), 25 deletions(-)
diff --git a/inspect-server/pom.xml b/inspect-server/pom.xml
index 46bb1cf..ef062e2 100644
--- a/inspect-server/pom.xml
+++ b/inspect-server/pom.xml
@@ -22,6 +22,16 @@
<artifactId>framework</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>5.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.deepoove</groupId>
+ <artifactId>poi-tl</artifactId>
+ <version>1.12.2</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
new file mode 100644
index 0000000..718bf4a
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
@@ -0,0 +1,35 @@
+package com.yuanchu.mom.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.ReportPageDto;
+import com.yuanchu.mom.dto.SampleOrderDto;
+import com.yuanchu.mom.service.InsReportService;
+import com.yuanchu.mom.utils.JackSonUtil;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/insReport")
+@Api("妫�楠屾姤鍛�")
+public class InsReportController {
+
+ private InsReportService insReportService;
+
+ @ApiOperation(value = "鏌ヨ妫�楠屾姤鍛婃暟鎹�")
+ @PostMapping("/pageInsReport")
+ public Result pageInsReport(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ ReportPageDto reportPageDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ReportPageDto.class);
+ return Result.success(insReportService.pageInsReport(page, reportPageDto));
+ }
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java
new file mode 100644
index 0000000..b39829f
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java
@@ -0,0 +1,29 @@
+package com.yuanchu.mom.dto;
+
+import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
+import com.yuanchu.mom.pojo.InsReport;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+@Data
+public class ReportPageDto extends InsReport implements Serializable {
+
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "濮旀墭缂栧彿")
+ private String entrustCode;
+
+ @ValueTableShow(value = 3,name = "缂栧埗浜�")
+ private String updateUserName;
+
+ @ValueTableShow(value = 8,name = "鎵瑰噯浜�")
+ private String ratifyUser;
+
+ @ValueTableShow(value = 5,name = "瀹℃牳浜�")
+ private String examineUser;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsReportMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsReportMapper.java
index f5a93a3..657494d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsReportMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsReportMapper.java
@@ -1,5 +1,10 @@
package com.yuanchu.mom.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yuanchu.mom.dto.ReportPageDto;
+import com.yuanchu.mom.dto.SampleOrderDto;
+import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsReport;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -11,6 +16,8 @@
*/
public interface InsReportMapper extends BaseMapper<InsReport> {
+ IPage<ReportPageDto> pageInsReport(IPage<ReportPageDto> page, QueryWrapper<ReportPageDto> ew);
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsReport.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsReport.java
index 248dfae..78fe548 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsReport.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsReport.java
@@ -7,6 +7,8 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,12 +18,16 @@
*/
@TableName(value ="ins_report")
@Data
-public class InsReport implements Serializable {
+public class InsReport extends OrderBy implements Serializable {
/**
*
*/
@TableId(type = IdType.AUTO)
private Integer id;
+
+ @ValueTableShow(value = 1, name = "鎶ュ憡缂栧彿")
+ @ApiModelProperty("鎶ュ憡缂栧彿")
+ private String code;
/**
* 澶栭敭锛氭楠屽崟id
@@ -41,12 +47,20 @@
/**
* 1锛氭壒鍑� 0锛氭湭鎵瑰噯
*/
+ @ValueTableShow(value = 9, name = "鎵瑰噯鐘舵��")
private Integer isRatify;
+
+ @ValueTableShow(value = 10, name = "鎵瑰噯澶囨敞")
+ private String ratifyTell;
/**
* 1锛氬鏍� 0锛氭湭瀹℃牳
*/
+ @ValueTableShow(value = 6, name = "瀹℃牳鐘舵��")
private Integer isExamine;
+
+ @ValueTableShow(value = 7, name = "瀹℃牳澶囨敞")
+ private String examineTell;
/**
* 澶栭敭锛氱敤鎴穒d锛堟壒鍑嗕汉锛�
@@ -69,6 +83,7 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
+ @ValueTableShow(value = 4, name = "缂栧埗鏃堕棿")
@ApiModelProperty("淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
index ef82d2d..28b1ea8 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
@@ -1,7 +1,12 @@
package com.yuanchu.mom.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.InsOrderPlanDTO;
+import com.yuanchu.mom.dto.ReportPageDto;
import com.yuanchu.mom.pojo.InsReport;
import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
/**
* @author Administrator
@@ -10,4 +15,6 @@
*/
public interface InsReportService extends IService<InsReport> {
+ Map<String,Object> pageInsReport(Page page, ReportPageDto reportPageDto);
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 4c1ad61..4f74f80 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.deepoove.poi.XWPFTemplate;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
@@ -23,7 +24,10 @@
import com.yuanchu.mom.vo.InsOrderPlanVO;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -57,7 +61,7 @@
map.put("head", PrintChina.printChina(InsOrderPlanVO.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
Integer userId = map1.get("userId");
- if(ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())){
+ if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
insOrderPlanDTO.setUserId(userId.longValue());
}
IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
@@ -67,13 +71,13 @@
@Override
public boolean claimInsOrderPlan(InsOrderPlanDTO entity) {
- if(Objects.isNull(entity)){
+ if (Objects.isNull(entity)) {
return false;
}
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
Integer userId = map1.get("userId");
InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 1);
- return insSampleUserMapper.insert(insSampleUser)>0;
+ return insSampleUserMapper.insert(insSampleUser) > 0;
}
@Override
@@ -82,7 +86,7 @@
insOrder.setId(id);
insOrder.setInsState(1);
InsOrder order = insOrderMapper.selectById(id);
- if(BeanUtil.isEmpty(order.getInsTime())){
+ if (BeanUtil.isEmpty(order.getInsTime())) {
insOrder.setInsTime(LocalDateTime.now());
insOrderMapper.updateById(insOrder);
}
@@ -94,11 +98,15 @@
for (SampleProductDto samples : list) {
if (BeanUtil.isEmpty(samples.getInsProduct())) continue;
for (InsProduct product : samples.getInsProduct()) {
- if(set.add(product.getTemplateId())){
+ if (product.getTemplateId() == null) {
+ product.setTemplate(new ArrayList<>());
+ continue;
+ }
+ if (set.add(product.getTemplateId())) {
map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + "");
}
String thing = map2.get(product.getTemplateId());
- if (StrUtil.isNotEmpty(thing)){
+ if (StrUtil.isNotEmpty(thing)) {
JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
@@ -108,22 +116,22 @@
style.put("rowlen", config.get("rowlen"));
style.put("columnlen", config.get("columnlen"));
int r = -1;
- if (BeanUtil.isNotEmpty(cellData)){
+ if (BeanUtil.isNotEmpty(cellData)) {
for (JSONObject o : cellData) {
JSONObject v = JSON.parseObject(JSON.toJSONString(o.get("v")));
- if(BeanUtil.isNotEmpty(v.get("ps"))){
+ if (BeanUtil.isNotEmpty(v.get("ps"))) {
JSONObject ps = JSON.parseObject(JSON.toJSONString(v.get("ps")));
- if (ps.get("value").equals("妫�楠岄」") && v.get("v").equals(product.getInspectionItem())){
+ if (ps.get("value").equals("妫�楠岄」") && v.get("v").equals(product.getInspectionItem())) {
tableData.add(o);
- r = Integer.parseInt(o.get("r")+"");
+ r = Integer.parseInt(o.get("r") + "");
continue;
}
}
- if(tableData.size()>0){
- if(Integer.parseInt(o.get("r")+"") == r + 1 || Integer.parseInt(o.get("r")+"") == r){
- r = Integer.parseInt(o.get("r")+"");
+ if (tableData.size() > 0) {
+ if (Integer.parseInt(o.get("r") + "") == r + 1 || Integer.parseInt(o.get("r") + "") == r) {
+ r = Integer.parseInt(o.get("r") + "");
tableData.add(o);
- }else{
+ } else {
break;
}
}
@@ -148,17 +156,38 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
- Integer num = (type==1?5:4);
- return insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell));
+ Integer num = (type == 1 ? 5 : 4);
+ insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell).set(InsOrderState::getVerifyUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
+ List<InsOrderState> insOrderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery().eq(InsOrderState::getInsOrderId, orderId));
+ long count = insOrderStates.stream().filter(a -> a.getInsState() == 5).count();
+ if (count == insOrderStates.size()) {
+ XWPFTemplate template = XWPFTemplate.compile("template.docx").render(
+ new HashMap<String, Object>() {{
+ put("title", "Hi, poi-tl Word妯℃澘寮曟搸");
+ }});
+ try {
+ template.writeAndClose(new FileOutputStream("output.docx"));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId));
+ insSamples.forEach(a -> {
+ System.out.println(a);
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, a.getId()));
+ insProducts.forEach(System.out::println);
+ });
+ }
+ return 1;
}
@Override
public int submitPlan(Integer orderId, String laboratory) {
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
- List<Integer> ids = insSamples.stream().map(a-> a.getId()).collect(Collectors.toList());
+ List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).isNotNull(InsProduct::getInsResult));
- if(insProducts.size()==0){
+ if (insProducts.size() == 0) {
return 0;
}
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3));
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
index d114de5..67f7ef2 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
@@ -1,10 +1,21 @@
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.dto.InsOrderPlanDTO;
+import com.yuanchu.mom.dto.ReportPageDto;
+import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.pojo.InsReport;
import com.yuanchu.mom.service.InsReportService;
import com.yuanchu.mom.mapper.InsReportMapper;
+import com.yuanchu.mom.utils.QueryWrappers;
+import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
/**
* @author Administrator
@@ -12,9 +23,23 @@
* @createDate 2024-03-17 22:10:02
*/
@Service
+@AllArgsConstructor
public class InsReportServiceImpl extends ServiceImpl<InsReportMapper, InsReport>
implements InsReportService{
+ private GetLook getLook;
+
+ private InsReportMapper insReportMapper;
+
+ @Override
+ public Map<String, Object> pageInsReport(Page page, ReportPageDto reportPageDto) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(ReportPageDto.class));
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("pageInsReport");
+ if (map1.get("look") == 1) reportPageDto.setCreateUser(map1.get("userId"));
+ map.put("body", insReportMapper.pageInsReport(page, QueryWrappers.queryWrappers(reportPageDto)));
+ return map;
+ }
}
diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index 8bde742..a7b3143 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -19,10 +19,19 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <sql id="Base_Column_List">
- id,ins_order_id,url,
- url_s,is_ratify,is_examine,
- ratify_user_id,examine_user_id,create_user,
- update_user,create_time,update_time
- </sql>
+ <select id="pageInsReport" resultType="com.yuanchu.mom.dto.ReportPageDto">
+ select *
+ from (
+ select
+ ir.*,io.entrust_code,u.name update_user_name,u1.name ratify_user,u2.name examine_user
+ from ins_report ir
+ left join ins_order io on io.id = ir.ins_order_id
+ left join user u on u.id = ir.update_user
+ left join user u1 on u1.id = ir.ratify_user_id
+ left join user u2 on u2.id = ir.examine_user_id
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3