From d4fd54448ff25bfecb1ea026fb2389a7e331a3fd Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 15:00:50 +0800
Subject: [PATCH] 查询不合格样品数据
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java | 38 +++++++
inspect-server/src/main/java/com/yuanchu/mom/service/InsUnPassService.java | 14 ++
inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java | 40 ++++++++
inspect-server/src/main/java/com/yuanchu/mom/dto/UnPassPageDto.java | 15 +++
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsUnPassMapper.java | 15 +++
system-run/src/main/java/com/yuanchu/mom/SystemRunApplication.java | 1
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java | 83 ++++++++++++++++
inspect-server/src/main/resources/mapper/InsUnPassMapper.xml | 33 ++++++
framework/src/main/java/com/yuanchu/mom/common/GetLook.java | 1
10 files changed, 240 insertions(+), 2 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/common/GetLook.java b/framework/src/main/java/com/yuanchu/mom/common/GetLook.java
index d7a263c..9920bd0 100644
--- a/framework/src/main/java/com/yuanchu/mom/common/GetLook.java
+++ b/framework/src/main/java/com/yuanchu/mom/common/GetLook.java
@@ -23,5 +23,4 @@
map.put("look", authMapper.countPower(id, method));
return map;
}
-
}
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
index ab508a7..6a40450 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
@@ -10,6 +10,7 @@
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -22,6 +23,7 @@
@RestController
@RequestMapping("/insReport")
+@AllArgsConstructor
@Api("妫�楠屾姤鍛�")
public class InsReportController {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java
new file mode 100644
index 0000000..e379da7
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java
@@ -0,0 +1,40 @@
+package com.yuanchu.mom.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.dto.UnPassPageDto;
+import com.yuanchu.mom.service.InsUnPassService;
+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 javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * @author 鏈变匠鍚�
+ * @date 2024/5/8 10:35
+ */
+@RestController
+@RequestMapping("/unPass")
+@Api("/涓嶅悎鏍肩鐞�")
+@AllArgsConstructor
+public class InsUnPassController {
+ @Resource
+ private InsUnPassService insUnPassService;
+
+ @ValueAuth
+ @ApiOperation(value = "鏌ヨ涓嶅悎鏍兼牱鍝佹暟鎹�")
+ @PostMapping("/pageInsUnPass")
+ public Result pageUnPass(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ UnPassPageDto unPassPageDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UnPassPageDto.class);
+ return Result.success(insUnPassService.pageInsUnPass(page, unPassPageDto));
+ }
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/UnPassPageDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/UnPassPageDto.java
new file mode 100644
index 0000000..d22aa34
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/UnPassPageDto.java
@@ -0,0 +1,15 @@
+package com.yuanchu.mom.dto;
+
+import com.yuanchu.mom.pojo.InsUnPass;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author 鏈变匠鍚�
+ * @date 2024/5/8 12:38
+ */
+@Data
+public class UnPassPageDto extends InsUnPass implements Serializable {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsUnPassMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsUnPassMapper.java
new file mode 100644
index 0000000..1f0990d
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsUnPassMapper.java
@@ -0,0 +1,15 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yuanchu.mom.dto.UnPassPageDto;
+import com.yuanchu.mom.pojo.InsUnPass;
+
+/**
+ * @author 鏈变匠鍚�
+ * @date 2024/5/8 13:05
+ */
+public interface InsUnPassMapper extends BaseMapper<InsUnPass> {
+ IPage<UnPassPageDto> pageInsUnPass(IPage<UnPassPageDto> page, QueryWrapper<UnPassPageDto> ew);
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java
new file mode 100644
index 0000000..c1fcdd0
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java
@@ -0,0 +1,83 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+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;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author 鏈变匠鍚�
+ * @date 2024/5/8 14:11
+ */
+@Data
+@TableName("ins_un_pass")
+public class InsUnPass extends OrderBy implements Serializable {
+ /**
+ * 涓嶅悎鏍糹d
+ */
+ @ApiModelProperty(value = "涓婚敭")
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 瑙勬牸鍨嬪彿
+ */
+ @ValueTableShow(value = 2, name = "瑙勬牸鍨嬪彿")
+ private String model;
+ /**
+ * 鏍峰搧鍚嶇О
+ */
+ @ValueTableShow(value = 3, name = "鏍峰搧鍚嶇О")
+ private String sample;
+ /**
+ * 妫�娴嬮」
+ */
+ @ValueTableShow(value = 4, name = "妫�娴嬮」")
+ private String inspectionItems;
+ /**
+ * 妫�娴嬪瓙椤�
+ */
+ @ValueTableShow(value = 5, name = "妫�娴嬪瓙椤�")
+ private String inspectionItemSubclass;
+ /**
+ * 妫�娴嬬粨鏋�
+ */
+ @ValueTableShow(value = 6, name = "妫�娴嬬粨鏋�")
+ private String lastValue;
+ /**
+ * 澶勭悊鎰忚
+ */
+ @ValueTableShow(value = 7, name = "澶勭悊鎰忚")
+ private String handleSuggestion;
+ /**
+ * 濮旀墭缂栧彿
+ */
+ @ValueTableShow(value = 8, name = "濮旀墭缂栧彿")
+ private String entrustCode;
+ /**
+ * 鐢ㄦ埛鍚�
+ */
+ @ValueTableShow(value = 9, name = "鐢ㄦ埛鍚�")
+ private String name;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsUnPassService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsUnPassService.java
new file mode 100644
index 0000000..fba17e5
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsUnPassService.java
@@ -0,0 +1,14 @@
+package com.yuanchu.mom.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.UnPassPageDto;
+
+import java.util.Map;
+
+/**
+ * @author 鏈变匠鍚�
+ * @date 2024/5/8 13:00
+ */
+public interface InsUnPassService {
+ Map<String, Object> pageInsUnPass(Page page, UnPassPageDto unPassPageDto);
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java
new file mode 100644
index 0000000..4350315
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java
@@ -0,0 +1,38 @@
+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.UnPassPageDto;
+import com.yuanchu.mom.mapper.InsUnPassMapper;
+import com.yuanchu.mom.pojo.InsUnPass;
+import com.yuanchu.mom.service.InsUnPassService;
+import com.yuanchu.mom.utils.QueryWrappers;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author 鏈变匠鍚�
+ * @date 2024/5/8 13:02
+ */
+@Service
+public class InsUnPassServiceImpl extends ServiceImpl<InsUnPassMapper, InsUnPass> implements InsUnPassService {
+ @Resource
+ private GetLook getLook;
+ @Resource
+ private InsUnPassMapper insUnPassMapper;
+ @Override
+ public Map<String, Object> pageInsUnPass(Page page, UnPassPageDto unPassPageDto) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(UnPassPageDto.class));
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("pageInsUnPass");
+ if (map1.get("look") == 1) unPassPageDto.setCreateUser(map1.get("userId"));
+ map.put("body", insUnPassMapper.pageInsUnPass(page, QueryWrappers.queryWrappers(unPassPageDto)));
+ return map;
+ }
+}
diff --git a/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml b/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml
new file mode 100644
index 0000000..79658de
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml
@@ -0,0 +1,33 @@
+<?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.mom.mapper.InsUnPassMapper">
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsUnPass">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="sample" column="sample" jdbcType="VARCHAR"/>
+ <result property="inspectionItems" column="inspection_items" jdbcType="VARCHAR"/>
+ <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
+ <result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
+ <result property="model" column="model" jdbcType="VARCHAR"/>
+ <result property="handleSuggestion" column="handle_suggestion" jdbcType="VARCHAR"/>
+ <result property="entrustCode" column="entrust_code" jdbcType="VARCHAR"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+ <select id="pageInsUnPass" resultType="com.yuanchu.mom.dto.UnPassPageDto">
+-- select *
+-- from (
+-- select
+-- iu.*,io.entrust_code,u.name write_user_name
+-- from ins_un_pass iu
+-- left join ins_order io on io.id = iu.ins_order_id
+-- left join user u on u.id = iu.create_user
+-- ) a
+ select *
+ from ins_un_pass iu
+ </select>
+</mapper>
diff --git a/system-run/src/main/java/com/yuanchu/mom/SystemRunApplication.java b/system-run/src/main/java/com/yuanchu/mom/SystemRunApplication.java
index 41f659a..af0a610 100644
--- a/system-run/src/main/java/com/yuanchu/mom/SystemRunApplication.java
+++ b/system-run/src/main/java/com/yuanchu/mom/SystemRunApplication.java
@@ -16,5 +16,4 @@
public static void main(String[] args) {
SpringApplication.run(SystemRunApplication.class, args);
}
-
}
--
Gitblit v1.9.3