From 2cf827ada216097911ac25d555e8c841b765218b Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期四, 26 十月 2023 09:52:19 +0800
Subject: [PATCH] 20231026_qiuyh_磨具监测已完成、调整报表sql
---
hd/pipe/secure/src/main/resources/mapping/PipeReportMapper.xml | 27 +-
hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/entity/MoldQualityFileEntity.java | 28 +++
hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/mapper/MoldQualityFileMapper.java | 22 ++
hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/MoldQualityService.java | 46 +++++
hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/impl/MoldQualityServiceImpl.java | 104 +++++++++++++
hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/entity/MoldQualityEntity.java | 79 +++++++++
hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/mapper/MoldQualityMapper.java | 35 ++++
hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/controller/MoldQualityController.java | 86 ++++++++++
8 files changed, 414 insertions(+), 13 deletions(-)
diff --git a/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/controller/MoldQualityController.java b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/controller/MoldQualityController.java
new file mode 100644
index 0000000..aaa7602
--- /dev/null
+++ b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/controller/MoldQualityController.java
@@ -0,0 +1,86 @@
+package com.thhy.engineering.modules.biz.moldquality.controller;
+
+import com.thhy.engineering.modules.biz.moldquality.entity.MoldQualityEntity;
+import com.thhy.engineering.modules.biz.moldquality.service.MoldQualityService;
+import com.thhy.general.common.BasicResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @Author QiuYuHao
+ * @CreateDate 2023-10-25 14:57:04
+ * 模具质量检测控制层
+ */
+@RestController
+@RequestMapping(value = "moldQuality")
+public class MoldQualityController {
+
+ @Autowired
+ private MoldQualityService moldQualityService;
+
+ @PostMapping(value = "insert")
+ BasicResult insert(@RequestBody MoldQualityEntity moldQualityEntity){
+ return moldQualityService.insert(moldQualityEntity);
+ }
+
+ @GetMapping(value = "delete")
+ BasicResult delete(Integer id){
+ return moldQualityService.delete(id);
+ }
+
+ @PostMapping(value = "update")
+ BasicResult update(@RequestBody MoldQualityEntity moldQualityEntity){
+ return moldQualityService.update(moldQualityEntity);
+ }
+
+ /**
+ * 查询列表
+ * @param map
+ * @return
+ */
+ @PostMapping(value = "findAll")
+ BasicResult findAll(@RequestBody Map<String,Object> map){
+ return moldQualityService.findAll(map);
+ }
+
+ /**
+ * 根据id查询一条
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "findOneById")
+ BasicResult findOneById(Integer id){
+ return moldQualityService.findOneById(id);
+ }
+
+
+ /**
+ * 获取模具编号列表
+ * @return
+ */
+ @GetMapping(value = "getMoldNum")
+ BasicResult getMoldNum(String proId){
+ return moldQualityService.getMoldNum(proId);
+ }
+
+ /**
+ * 获取模具型号列表
+ * @return
+ */
+ @GetMapping(value = "getMoldCode")
+ BasicResult getMoldCode(String proId){
+ return moldQualityService.getMoldCode(proId);
+ }
+
+ /**
+ * 获取1条模具
+ * @return
+ */
+ @PostMapping(value = "getMoldByProIdAndModNumAndModCode")
+ BasicResult getMoldByProIdAndModNumAndModCode(@RequestBody Map<String,Object> map){
+ return moldQualityService.getMoldByProIdAndModNumAndModCode(map);
+ }
+
+}
diff --git a/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/entity/MoldQualityEntity.java b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/entity/MoldQualityEntity.java
new file mode 100644
index 0000000..4f4a722
--- /dev/null
+++ b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/entity/MoldQualityEntity.java
@@ -0,0 +1,79 @@
+package com.thhy.engineering.modules.biz.moldquality.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author QiuYuHao
+ * @CreateDate 2023-10-25 14:58:20
+ * 模具质量检测实体
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class MoldQualityEntity implements Serializable {
+
+ private Integer id;
+
+ /**
+ * 模具型号
+ */
+ private String mouldCode;
+
+ /**
+ * 模具编号
+ */
+ private String mouldNum;
+
+ /**
+ * 块号
+ */
+ private String blockNum;
+
+ /**
+ * 尺寸
+ */
+ private String size;
+
+ /**
+ * 转向
+ */
+ private String turn;
+
+ /**
+ * 注浆孔
+ */
+ private String groutingHole;
+
+ /**
+ * 检测内容
+ */
+ private String content;
+
+ /**
+ * 上传监测表
+ */
+ private List<MoldQualityFileEntity> moldQualityFileEntities;
+
+ /**
+ * 检查表日期
+ */
+ private Date checkDate;
+
+ /**
+ * 检测单位
+ */
+ private String checkUnit;
+ private Date createDate;
+ private String createUser;
+ private String companyId;
+ private String proId;
+ private String proName;
+}
diff --git a/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/entity/MoldQualityFileEntity.java b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/entity/MoldQualityFileEntity.java
new file mode 100644
index 0000000..bd81ff3
--- /dev/null
+++ b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/entity/MoldQualityFileEntity.java
@@ -0,0 +1,28 @@
+package com.thhy.engineering.modules.biz.moldquality.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author QiuYuHao
+ * @CreateDate 2023-10-26 8:53:53
+ * 模具质量检测文件表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class MoldQualityFileEntity implements Serializable {
+
+ private Integer id;
+ private Integer moldQualityId;
+ private String fileName;
+ private String fileUrl;
+ private Date createTime;
+
+}
diff --git a/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/mapper/MoldQualityFileMapper.java b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/mapper/MoldQualityFileMapper.java
new file mode 100644
index 0000000..1e0583e
--- /dev/null
+++ b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/mapper/MoldQualityFileMapper.java
@@ -0,0 +1,22 @@
+package com.thhy.engineering.modules.biz.moldquality.mapper;
+
+import com.thhy.engineering.modules.biz.moldquality.entity.MoldQualityFileEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.bouncycastle.voms.VOMSAttribute;
+
+import java.util.List;
+
+/**
+ * @Author QiuYuHao
+ * @CreateDate 2023-10-26 8:59:05
+ * 模具质量检测文件表mapper
+ */
+@Mapper
+public interface MoldQualityFileMapper {
+
+ void insertList(List<MoldQualityFileEntity> list);
+
+ void delete(Integer moldQualityId);
+
+ List<MoldQualityFileEntity> findFileList(Integer moldQualityId);
+}
diff --git a/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/mapper/MoldQualityMapper.java b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/mapper/MoldQualityMapper.java
new file mode 100644
index 0000000..008a546
--- /dev/null
+++ b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/mapper/MoldQualityMapper.java
@@ -0,0 +1,35 @@
+package com.thhy.engineering.modules.biz.moldquality.mapper;
+
+import com.thhy.engineering.modules.biz.moldquality.entity.MoldQualityEntity;
+import com.thhy.general.common.BasicResult;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author QiuYuHao
+ * @CreateDate 2023-10-25 15:03:34
+ * 模具质量检测mapper
+ */
+@Mapper
+public interface MoldQualityMapper {
+
+ void insert(MoldQualityEntity moldQualityEntity);
+ MoldQualityEntity findNewOne();
+
+ void delete(Integer id);
+
+ void update(MoldQualityEntity moldQualityEntity);
+
+ List<MoldQualityEntity> findAll(Map<String,Object> map);
+
+ MoldQualityEntity findOneById(Integer id);
+
+
+ List<Map> getMoldNum(String proId);
+
+ List<Map> getMoldCode(String proId);
+
+ Map getMoldByProIdAndModNumAndModCode(Map<String,Object> map);
+}
diff --git a/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/MoldQualityService.java b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/MoldQualityService.java
new file mode 100644
index 0000000..e602258
--- /dev/null
+++ b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/MoldQualityService.java
@@ -0,0 +1,46 @@
+package com.thhy.engineering.modules.biz.moldquality.service;
+
+import com.thhy.engineering.modules.biz.moldquality.entity.MoldQualityEntity;
+import com.thhy.general.common.BasicResult;
+
+import java.util.Map;
+
+/**
+ * @Author QiuYuHao
+ * @CreateDate 2023-10-25 15:06:07
+ * 模具检测逻辑层
+ */
+public interface MoldQualityService {
+
+
+ BasicResult insert(MoldQualityEntity moldQualityEntity);
+
+ BasicResult delete(Integer id);
+
+ BasicResult update(MoldQualityEntity moldQualityEntity);
+
+ BasicResult findAll(Map<String,Object> map);
+
+ BasicResult findOneById(Integer id);
+
+ /**
+ * 获取模具编号列表
+ * @return
+ */
+ BasicResult getMoldNum(String proId);
+
+
+ /**
+ * 获取模具型号列表
+ * @return
+ */
+ BasicResult getMoldCode(String proId);
+
+
+ /**
+ * 获取1条模具
+ * @return
+ */
+ BasicResult getMoldByProIdAndModNumAndModCode(Map<String,Object> map);
+
+}
diff --git a/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/impl/MoldQualityServiceImpl.java b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/impl/MoldQualityServiceImpl.java
new file mode 100644
index 0000000..9ddf2b5
--- /dev/null
+++ b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/impl/MoldQualityServiceImpl.java
@@ -0,0 +1,104 @@
+package com.thhy.engineering.modules.biz.moldquality.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.thhy.engineering.modules.biz.moldquality.entity.MoldQualityEntity;
+import com.thhy.engineering.modules.biz.moldquality.entity.MoldQualityFileEntity;
+import com.thhy.engineering.modules.biz.moldquality.mapper.MoldQualityFileMapper;
+import com.thhy.engineering.modules.biz.moldquality.mapper.MoldQualityMapper;
+import com.thhy.engineering.modules.biz.moldquality.service.MoldQualityService;
+import com.thhy.general.common.BasicResult;
+import com.thhy.general.config.SysUserInfo;
+import com.thhy.general.utils.UserInfoUtils;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author QiuYuHao
+ * @CreateDate 2023-10-25 15:06:40
+ * 磨具监测实现层
+ */
+
+@Service
+public class MoldQualityServiceImpl implements MoldQualityService {
+
+ @Autowired
+ private MoldQualityMapper mapper;
+
+ @Autowired
+ private MoldQualityFileMapper moldQualityFileMapper;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public BasicResult insert(MoldQualityEntity moldQualityEntity) {
+ SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
+ String companyId = sysUserInfo.getCompanyId();
+ moldQualityEntity.setCompanyId(companyId);
+ mapper.insert(moldQualityEntity);
+ MoldQualityEntity newOne = mapper.findNewOne();
+ moldQualityEntity.getMoldQualityFileEntities().forEach(modFile->{
+ modFile.setMoldQualityId(newOne.getId());
+ });
+ moldQualityFileMapper.insertList(moldQualityEntity.getMoldQualityFileEntities());
+ return BasicResult.success();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public BasicResult delete(Integer id) {
+ mapper.delete(id);
+ moldQualityFileMapper.delete(id);
+ return BasicResult.success();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public BasicResult update(MoldQualityEntity moldQualityEntity) {
+ mapper.update(moldQualityEntity);
+ moldQualityFileMapper.delete(moldQualityEntity.getId());
+ List<MoldQualityFileEntity> moldQualityFileEntities = moldQualityEntity.getMoldQualityFileEntities();
+ moldQualityFileEntities.forEach(moldFile->{
+ moldFile.setId(moldQualityEntity.getId());
+ });
+ moldQualityFileMapper.insertList(moldQualityFileEntities);
+ return BasicResult.success();
+ }
+
+ @Override
+ public BasicResult findAll(Map<String, Object> map) {
+ SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
+ String companyId = sysUserInfo.getCompanyId();
+ map.put("companyId",companyId);
+ PageHelper.startPage((int)map.get("pageNum"),(int)map.get("pageSize"));
+ List<MoldQualityEntity> all = mapper.findAll(map);
+ PageInfo<MoldQualityEntity> moldQualityEntities = new PageInfo<>(all);
+ return BasicResult.success(moldQualityEntities);
+ }
+
+ @Override
+ public BasicResult findOneById(Integer id) {
+ MoldQualityEntity oneById = mapper.findOneById(id);
+ oneById.setMoldQualityFileEntities(moldQualityFileMapper.findFileList(oneById.getId()));
+ return BasicResult.success(oneById);
+ }
+
+ @Override
+ public BasicResult getMoldNum(String proId) {
+ return BasicResult.success(mapper.getMoldNum(proId));
+ }
+
+ @Override
+ public BasicResult getMoldCode(String proId) {
+ return BasicResult.success(mapper.getMoldCode(proId));
+ }
+
+ @Override
+ public BasicResult getMoldByProIdAndModNumAndModCode(Map<String, Object> map) {
+ return BasicResult.success(mapper.getMoldByProIdAndModNumAndModCode(map));
+ }
+}
diff --git a/hd/pipe/secure/src/main/resources/mapping/PipeReportMapper.xml b/hd/pipe/secure/src/main/resources/mapping/PipeReportMapper.xml
index 3ab61e8..d74a177 100644
--- a/hd/pipe/secure/src/main/resources/mapping/PipeReportMapper.xml
+++ b/hd/pipe/secure/src/main/resources/mapping/PipeReportMapper.xml
@@ -13,13 +13,13 @@
IFNULL(e.shippingNum,0) shippingNum
FROM (
SELECT
- COUNT(a.pro_id) produceTotal,
- a.pro_id,
- b.pro_name
- FROM t_pipe_info a
- LEFT JOIN sys_project b on b.pro_id = a.pro_id
- WHERE b.company_id = #{companyId}
- GROUP BY a.pro_id
+ COUNT(b.pro_id) produceTotal,
+ b.pro_id,
+ b.pro_name
+ FROM sys_project b
+ LEFT JOIN t_pipe_info a on b.pro_id = a.pro_id
+ WHERE b.is_use =1 and b.company_id = #{companyId}
+ GROUP BY b.pro_id
) c
LEFT JOIN
(
@@ -57,13 +57,14 @@
IFNULL(f.moldedNum,0) moldedNum
FROM(
SELECT
- COUNT(a.pro_id) produceTotal,
- a.pro_id,
+ COUNT(b.pro_id) produceTotal,
+ b.pro_id,
b.pro_name
- FROM t_steel_produce a
- LEFT JOIN sys_project b on b.pro_id = a.pro_id
- WHERE a.is_use = 1 and b.company_id = #{companyId}
- GROUP BY a.pro_id
+ FROM sys_project b
+ LEFT JOIN t_pipe_info a on b.pro_id = a.pro_id
+ WHERE b.is_use =1 and b.company_id = #{companyId}
+ GROUP BY b.pro_id
+
) c
LEFT JOIN
(
--
Gitblit v1.9.3