From a5789be508f38ec2c591b618cd15ee998f79a17c Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期三, 18 十月 2023 13:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/service/impl/PipeReportServiceImpl.java | 48 ++++++++++++++++
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/mapper/PipeReportMapper.java | 28 +++++++++
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/controller/PipeReportController.java | 31 ++++++++++
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/entity/PipeReportEntity.java | 51 +++++++++++++++++
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/service/PipeReportService.java | 17 +++++
5 files changed, 175 insertions(+), 0 deletions(-)
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/controller/PipeReportController.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/controller/PipeReportController.java
new file mode 100644
index 0000000..8c4c4af
--- /dev/null
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/controller/PipeReportController.java
@@ -0,0 +1,31 @@
+package com.thhy.secure.modules.biz.pipereport.controller;
+
+import com.thhy.general.common.BasicResult;
+import com.thhy.secure.modules.biz.pipereport.service.PipeReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @Author QiuYuHao
+ * @CreateDate 2023-10-17 17:13:01
+ * 管片报表控制层
+ */
+@RestController
+@RequestMapping(value = "szpipereport")
+public class PipeReportController {
+
+ @Autowired
+ private PipeReportService pipeReportService;
+
+ @PostMapping(value = "pipeReport")
+ public BasicResult pipeReport(@RequestBody Map<String,Object> map){
+ return pipeReportService.getPipeReportList(map);
+ }
+
+ @PostMapping(value = "steelReport")
+ public BasicResult steelReport(@RequestBody Map<String,Object> map){
+ return pipeReportService.getSteelReportList(map);
+ }
+}
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/entity/PipeReportEntity.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/entity/PipeReportEntity.java
new file mode 100644
index 0000000..e1e48e4
--- /dev/null
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/entity/PipeReportEntity.java
@@ -0,0 +1,51 @@
+package com.thhy.secure.modules.biz.pipereport.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author QiuYuHao
+ * @CreateDate 2023-10-17 17:19:23
+ * 管片报表实体
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class PipeReportEntity implements Serializable {
+ /**
+ * 项目名称
+ */
+ private String proName;
+ private String proId;
+
+ /**
+ * 生产总数
+ */
+ private Integer produceTotal;
+
+ /**
+ * 合格总数
+ */
+ private Integer qualifiedTotal;
+
+ /**
+ * 未入模数量
+ */
+ private Integer moldedNotNum;
+
+ /**
+ * 入模数量
+ */
+ private Integer moldedNum;
+
+ /**
+ * 发运数量
+ */
+ private Integer shippingNum;
+
+}
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/mapper/PipeReportMapper.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/mapper/PipeReportMapper.java
new file mode 100644
index 0000000..65e4a17
--- /dev/null
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/mapper/PipeReportMapper.java
@@ -0,0 +1,28 @@
+package com.thhy.secure.modules.biz.pipereport.mapper;
+
+import com.thhy.secure.modules.biz.pipereport.entity.PipeReportEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author QiuYuHao
+ * @CreateDate 2023-10-18 8:46:07
+ * 管片、钢筋笼报表mapper
+ */
+@Mapper
+public interface PipeReportMapper {
+
+ /**
+ * 管片生产报表
+ * @return
+ */
+ List<PipeReportEntity> getPipeReportList(Map<String,Object> map);
+
+ /**
+ * 钢筋笼生产报表
+ * @return
+ */
+ List<PipeReportEntity> getSteelReportList(Map<String,Object> map);
+}
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/service/PipeReportService.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/service/PipeReportService.java
new file mode 100644
index 0000000..ed1cad7
--- /dev/null
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/service/PipeReportService.java
@@ -0,0 +1,17 @@
+package com.thhy.secure.modules.biz.pipereport.service;
+
+import com.thhy.general.common.BasicResult;
+
+import java.util.Map;
+
+/**
+ * @Author QiuYuHao
+ * @CreateDate 2023-10-18 9:18:18
+ */
+public interface PipeReportService {
+
+ BasicResult getPipeReportList(Map<String,Object> map);
+
+ BasicResult getSteelReportList(Map<String,Object> map);
+
+}
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/service/impl/PipeReportServiceImpl.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/service/impl/PipeReportServiceImpl.java
new file mode 100644
index 0000000..f8fd726
--- /dev/null
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/pipereport/service/impl/PipeReportServiceImpl.java
@@ -0,0 +1,48 @@
+package com.thhy.secure.modules.biz.pipereport.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.thhy.general.common.BasicResult;
+import com.thhy.general.config.SysUserInfo;
+import com.thhy.general.utils.UserInfoUtils;
+import com.thhy.secure.modules.biz.pipereport.entity.PipeReportEntity;
+import com.thhy.secure.modules.biz.pipereport.mapper.PipeReportMapper;
+import com.thhy.secure.modules.biz.pipereport.service.PipeReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author QiuYuHao
+ * @CreateDate 2023-10-18 9:22:33
+ * 管片和钢筋笼报表实现
+ */
+@Service
+public class PipeReportServiceImpl implements PipeReportService
+{
+
+ @Autowired
+ private PipeReportMapper pipeReportMapper;
+
+ @Override
+ public BasicResult getPipeReportList(Map<String,Object> map) {
+ SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
+ String companyId = sysUserInfo.getCompanyId();
+ map.put("companyId",companyId);
+ PageHelper.startPage((Integer) map.get("pageNum"),(Integer)map.get("pageSize"));
+ List<PipeReportEntity> pipeReportList = pipeReportMapper.getPipeReportList(map);
+ return BasicResult.success(new PageInfo<PipeReportEntity>(pipeReportList));
+ }
+
+ @Override
+ public BasicResult getSteelReportList(Map<String, Object> map) {
+ SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
+ String companyId = sysUserInfo.getCompanyId();
+ map.put("companyId",companyId);
+ PageHelper.startPage((Integer) map.get("pageNum"),(Integer)map.get("pageSize"));
+ List<PipeReportEntity> steelReportList = pipeReportMapper.getSteelReportList(map);
+ return BasicResult.success(new PageInfo<PipeReportEntity>(steelReportList));
+ }
+}
--
Gitblit v1.9.3