From 33eb8605dc409dec28346f8b92bcb7046911d12c Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期四, 11 四月 2024 08:19:09 +0800
Subject: [PATCH] chenge plan
---
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/controller/EmInspectionPlanTaskController.java | 52 +++++++++++++++++++++++--
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/domain/EmInspectionPlanTask.java | 6 +++
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/vo/ProductSelectVO.java | 11 +++++
3 files changed, 64 insertions(+), 5 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/controller/EmInspectionPlanTaskController.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/controller/EmInspectionPlanTaskController.java
index 5169576..9b5b574 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/controller/EmInspectionPlanTaskController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/controller/EmInspectionPlanTaskController.java
@@ -1,10 +1,16 @@
package com.jcdm.main.em.inspectionPlanTask.controller;
+import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jcdm.common.core.domain.BaseEntity;
+import com.jcdm.main.em.inspectionPlanTask.vo.ProductSelectVO;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,13 +57,28 @@
@GetMapping("/getListLikeDevices")
public AjaxResult getListLikeDevices(EmInspectionPlanTask emInspectionPlanTask)
{
+ List<ProductSelectVO> result = new ArrayList<>();
List<EmInspectionPlanTask> list = emInspectionPlanTaskService.list(new LambdaQueryWrapper<EmInspectionPlanTask>()
- .select(EmInspectionPlanTask::getDevicesCode)
- .like(EmInspectionPlanTask::getDevicesCode,emInspectionPlanTask.getDevicesCode())
- .groupBy(EmInspectionPlanTask::getDevicesCode));
- List<String> collect = list.stream().map(EmInspectionPlanTask::getDevicesCode).collect(Collectors.toList());
+ .like(StrUtil.isNotBlank(emInspectionPlanTask.getDevicesCode()),EmInspectionPlanTask::getDevicesCode,emInspectionPlanTask.getDevicesCode())
+ );
+ if (CollUtil.isNotEmpty(list)){
+ ProductSelectVO all = new ProductSelectVO();
+ all.setLabel("鍏ㄩ儴");
+ all.setValue(null);
+ result.add(all);
+ for (EmInspectionPlanTask inspectionPlanTask : list) {
+ ProductSelectVO vo = new ProductSelectVO();
+ vo.setLabel(inspectionPlanTask.getDevicesName());
+ vo.setValue(inspectionPlanTask.getDevicesCode());
+ result.add(vo);
+ }
+ result = result.stream().distinct().collect(Collectors.toList());
- return AjaxResult.success(collect);
+
+ }
+
+
+ return AjaxResult.success(result);
}
/**
@@ -73,6 +94,27 @@
}
/**
+ * 鏌ヨ鐐规浠诲姟鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('em:inspectionPlanTask:list')")
+ @GetMapping("/list2")
+ public AjaxResult list2(EmInspectionPlanTask emInspectionPlanTask)
+ {
+ List<EmInspectionPlanTask> list = emInspectionPlanTaskService.selectEmInspectionPlanTaskList(emInspectionPlanTask);
+ if (StrUtil.isNotBlank(emInspectionPlanTask.getOrder())){
+ if ("1".equals(emInspectionPlanTask.getOrder())){
+ //椤哄簭
+ list = list.stream().sorted(Comparator.comparing(BaseEntity::getCreateTime)).collect(Collectors.toList());
+ } else if ("0".equals(emInspectionPlanTask.getOrder())) {
+ //閫嗗簭
+ list = list.stream().sorted(Comparator.comparing(BaseEntity::getCreateTime).reversed()).collect(Collectors.toList());
+ }
+ }
+
+ return AjaxResult.success(list);
+ }
+
+ /**
* 瀵煎嚭鐐规浠诲姟鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('em:inspectionPlanTask:export')")
diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/domain/EmInspectionPlanTask.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/domain/EmInspectionPlanTask.java
index 5a5f0db..915a881 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/domain/EmInspectionPlanTask.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/domain/EmInspectionPlanTask.java
@@ -1,5 +1,7 @@
package com.jcdm.main.em.inspectionPlanTask.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.jcdm.common.annotation.Excel;
@@ -11,6 +13,7 @@
* @author Yi
* @date 2024-03-23
*/
+@Data
public class EmInspectionPlanTask extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -66,6 +69,9 @@
@Excel(name = "淇敼浜�")
private String updateUser;
+ @TableField(exist = false)
+ private String order;
+
public void setId(Long id)
{
diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/vo/ProductSelectVO.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/vo/ProductSelectVO.java
new file mode 100644
index 0000000..ac98811
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/vo/ProductSelectVO.java
@@ -0,0 +1,11 @@
+package com.jcdm.main.em.inspectionPlanTask.vo;
+
+import lombok.Data;
+
+@Data
+public class ProductSelectVO {
+
+ private String label;
+ private String value;
+
+}
--
Gitblit v1.9.3