From a06309c39436991b9cb7aff40a77df224cab669f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 14 三月 2024 11:40:37 +0800
Subject: [PATCH] 业务管理：检验任务
---
framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java | 2
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 11 +++
framework/src/main/java/com/yuanchu/mom/common/PrintChina.java | 12 +--
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 9 +++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 57 +++++++++++++++++++
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 32 ++++++++++
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 13 ++++
7 files changed, 129 insertions(+), 7 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java b/framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java
index 6bf2458..05ae0a6 100644
--- a/framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java
+++ b/framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java
@@ -8,4 +8,6 @@
int value() default 1;
+ String name() default "";
+
}
diff --git a/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java b/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
index 0b84598..4cc2726 100644
--- a/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
+++ b/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
@@ -26,14 +26,12 @@
Map<String, String> soundVo = new HashMap<>();
boolean bool = field.isAnnotationPresent(ApiModelProperty.class);
boolean bool2 = field.isAnnotationPresent(ValueTableShow.class);
- if (bool) {
- int order;
- if (bool2){
- order = field.getAnnotation(ValueTableShow.class).value();
- }else{
- continue;
+ if (bool2) {
+ int order = field.getAnnotation(ValueTableShow.class).value();
+ String value = field.getAnnotation(ValueTableShow.class).name();
+ if (bool){
+ value = value.isEmpty() ? field.getAnnotation(ApiModelProperty.class).value() : value;
}
- String value = field.getAnnotation(ApiModelProperty.class).value();
soundVo.put("label", field.getName());
soundVo.put("value", value);
soundVo.put("order", order + "");
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
new file mode 100644
index 0000000..2a88607
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -0,0 +1,32 @@
+package com.yuanchu.mom.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.InsOrder;
+import com.yuanchu.mom.service.InsOrderPlanService;
+import com.yuanchu.mom.utils.JackSonUtil;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * 妫�楠屼换鍔�-鎺у埗灞�
+ */
+@RestController
+@RequestMapping("/insOrderPlan")
+@AllArgsConstructor
+public class InsOrderPlanController {
+
+ private InsOrderPlanService insOrderPlanService;
+
+ @ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
+ @PostMapping("/selectInsOrderPlanList")
+ public Result selectInsOrderPlanList(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ InsOrder enums = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrder.class);
+ return Result.success(insOrderPlanService.selectInsOrderPlanList(page, enums));
+ }
+
+}
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 2ec16fe..c336d0e 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
@@ -167,4 +167,13 @@
private Integer userId;
+ @ApiModelProperty(value = "妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)")
+ private Integer insState;
+
+ @ApiModelProperty(value = "妫�楠岀粨鏋�(0锛氫笉鍚堟牸 1锛氬悎鏍�)")
+ private Integer insResult;
+
+ @ApiModelProperty(value = "涓嬪彂鏃堕棿")
+ private LocalDateTime sendTime;
+
}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
new file mode 100644
index 0000000..478d4a3
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
@@ -0,0 +1,13 @@
+package com.yuanchu.mom.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.InsOrder;
+
+import java.util.Map;
+
+/**
+ * 妫�楠屼换鍔�-涓氬姟灞�
+ */
+public interface InsOrderPlanService {
+ Map<String,Object> selectInsOrderPlanList(Page page, InsOrder enums);
+}
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
new file mode 100644
index 0000000..df03b38
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -0,0 +1,57 @@
+package com.yuanchu.mom.service.impl;
+
+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.yuanchu.mom.common.GetLook;
+import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.mapper.InsOrderMapper;
+import com.yuanchu.mom.mapper.InsOrderUserMapper;
+import com.yuanchu.mom.pojo.InsOrder;
+import com.yuanchu.mom.pojo.InsOrderUser;
+import com.yuanchu.mom.service.InsOrderPlanService;
+import com.yuanchu.mom.utils.QueryWrappers;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
+ */
+@Service
+@AllArgsConstructor
+public class InsOrderPlanServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder> implements InsOrderPlanService {
+
+ private InsOrderMapper insOrderMapper;
+
+ private InsOrderUserMapper insOrderUserMapper;
+
+ private GetLook getLook;
+
+ @Override
+ public Map<String, Object> selectInsOrderPlanList(Page page, InsOrder insOrder) {
+ 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<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()
+ .eq(InsOrderUser::getInsOrderId, order.getId()));
+ boolean isZero = insOrderUsers.stream().noneMatch(iou -> iou.getUserId().equals(userId));
+ return insOrderUsers.isEmpty() || !isZero;
+ }).collect(Collectors.toList());
+ 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
new file mode 100644
index 0000000..e4d9342
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
@@ -0,0 +1,11 @@
+package com.yuanchu.mom.vo;
+
+import com.yuanchu.mom.common.OrderBy;
+import lombok.Data;
+
+@Data
+public class InsOrderPlanVO extends OrderBy {
+
+
+
+}
--
Gitblit v1.9.3