From 2778c77cef66e5e6c19bc93e4c5db557591ea089 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 14 三月 2024 16:09:25 +0800
Subject: [PATCH] 业务管理：检验任务修改
---
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 23 +++++++++++++++++++++++
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 3 ++-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 7 ++++++-
3 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
index d14d1fd..0b15189 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
@@ -177,8 +177,9 @@
@ApiModelProperty(value = "妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)")
private Integer insState;
+ @JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "涓嬪彂鏃堕棿")
- private LocalDateTime sendTime;
+ private LocalDate sendTime;
@ApiModelProperty(value = "宸ュ巶")
private String factory;
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 df03b38..01011d2 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
@@ -11,6 +11,7 @@
import com.yuanchu.mom.pojo.InsOrderUser;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.utils.QueryWrappers;
+import com.yuanchu.mom.vo.InsOrderPlanVO;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -34,15 +35,18 @@
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrder insOrder) {
+ //鍒濆鍖杙age
Page<InsOrder> insOrderPage = new Page<>();
insOrderPage.setCurrent(page.getCurrent());
insOrderPage.setPages(page.getPages());
insOrderPage.setSize(page.getSize());
Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(InsOrder.class));
+ //鑾峰彇琛ㄥご
+ map.put("head", PrintChina.printChina(InsOrderPlanVO.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderPlanList");
Integer userId = map1.get("userId");
if (map1.get("look") == 1) insOrder.setCreateUser(userId);
+ //鏌ヨ
List<InsOrder> orderPage = insOrderMapper.selectList(QueryWrappers.queryWrappers(insOrder));
List<InsOrder> filterData = orderPage.stream().filter(order -> {
List<InsOrderUser> insOrderUsers = insOrderUserMapper.selectList(Wrappers.<InsOrderUser>lambdaQuery()
@@ -50,6 +54,7 @@
boolean isZero = insOrderUsers.stream().noneMatch(iou -> iou.getUserId().equals(userId));
return insOrderUsers.isEmpty() || !isZero;
}).collect(Collectors.toList());
+ insOrderPage.setRecords(filterData);
insOrderPage.setTotal(filterData.size());
map.put("body", insOrderPage);
return map;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
index e4d9342..11260ae 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.vo;
+import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import lombok.Data;
@@ -7,5 +8,27 @@
public class InsOrderPlanVO extends OrderBy {
+ private String id;
+
+ @ValueTableShow(value = 1,name = "濮旀墭缂栧彿")
+ private String entrustCode;
+
+ @ValueTableShow(value = 2,name = "鏍峰搧缂栧彿")
+ private String sampleCode;
+
+ @ValueTableShow(value = 3,name = "鏍峰搧鍚嶇О")
+ private String sample;
+
+ @ValueTableShow(value = 4,name = "绱ф�ョ▼搴�")
+ private String type;
+
+ @ValueTableShow(value = 5,name = "鐘舵��")
+ private String insState;
+
+ @ValueTableShow(value = 6,name = "绾﹀畾鏃堕棿")
+ private String appointed;
+
+ @ValueTableShow(value = 7,name = "涓嬪彂鏃堕棿")
+ private String sendTime;
}
--
Gitblit v1.9.3