From 5f0a78bbe998a2af411fd1cd6317cc4c4758df31 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Tue, 26 Dec 2023 17:49:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E5=90=88=E6=A0=BC=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QcProCheckController.java | 44 ++++++++++ .../com/op/quality/domain/QcProCheck.java | 84 +++++++++++++++---- .../op/quality/mapper/QcProCheckMapper.java | 2 + .../op/quality/service/QcProCheckService.java | 2 + .../service/impl/QcProCheckServiceImpl.java | 31 ++++--- .../mapper/quality/QcProCheckMapper.xml | 22 +++++ 6 files changed, 156 insertions(+), 29 deletions(-) create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/controller/QcProCheckController.java diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcProCheckController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcProCheckController.java new file mode 100644 index 00000000..ad10e2bd --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcProCheckController.java @@ -0,0 +1,44 @@ +package com.op.quality.controller; + + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.page.TableDataInfo; +import com.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.quality.domain.QcProCheck; +import com.op.quality.service.QcProCheckService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@RestController +@RequestMapping("/qcProCheck") +public class QcProCheckController extends BaseController { + @Autowired + private QcProCheckService qcProCheckService; + + @GetMapping("/list") + public List list(QcProCheck qcProCheck) { + List qcProChecks = qcProCheckService.selectQcCheckList(qcProCheck); + return qcProCheckService.selectQcCheckList(qcProCheck); + } + + @Log(title = "白坯合格统计", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QcProCheck qcProCheck) { + List list = qcProCheckService.selectQcCheckList(qcProCheck); + ExcelUtil util = new ExcelUtil(QcProCheck.class); + util.exportExcel(response, list, "白坯合格统计数据"); + } + +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProCheck.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProCheck.java index ad40abe3..9458ce00 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProCheck.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProCheck.java @@ -16,59 +16,43 @@ import java.util.List; public class QcProCheck extends BaseEntity { private static final long serialVersionUID = 1L; - @Excel(name = "id") private String id; - @Excel(name = "rfid") private String rfid; - @Excel(name = "工厂id") private String factoryId; - @Excel(name = "工厂编码") private String factoryCode; - @Excel(name = "工单id") private String workorderId; - @Excel(name = "工单编码") private String workorderCode; private String workorderName; - @Excel(name = "订单id") private String orderId; - @Excel(name = "订单编码") private String orderCode; private String workBatchCode; - @Excel(name = "机台id") private String machineId; - @Excel(name = "机台编码") + @Excel(name = "烘房编码") private String machineCode; + @Excel(name = "烘房名称") private String machineName; - @Excel(name = "不良描述") private String badMeg; - @Excel(name = "产品id") private String productId; private String productCode; private String productName; private String productSpc; - @Excel(name = "是否合格") private String isqua; - @Excel(name = "附件") private List fileList; private String fileId; - @Excel(name = "创建者") private String createBy; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; - @Excel(name = "更新者") private String updateBy; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; private String attr1; @@ -82,6 +66,70 @@ public class QcProCheck extends BaseEntity { private String itemCode; private String itemName; + // 创建日期范围list + private List createTimeArray; + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + + @Excel(name = "合格数") + private String acceptanceNumber; + + @Excel(name = "不合格数") + private String unqualifiedNumber; + + @Excel(name = "合格率") + private String passRate; + + public String getAcceptanceNumber() { + return acceptanceNumber; + } + + public void setAcceptanceNumber(String acceptanceNumber) { + this.acceptanceNumber = acceptanceNumber; + } + + public String getUnqualifiedNumber() { + return unqualifiedNumber; + } + + public void setUnqualifiedNumber(String unqualifiedNumber) { + this.unqualifiedNumber = unqualifiedNumber; + } + + public String getPassRate() { + return passRate; + } + + public void setPassRate(String passRate) { + this.passRate = passRate; + } + + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + public String getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(String createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public String getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(String createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } public String getItemCode() { return itemCode; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProCheckMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProCheckMapper.java index f68842a6..f3963e23 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProCheckMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProCheckMapper.java @@ -37,4 +37,6 @@ public interface QcProCheckMapper { List getDictList(QcProCheck qcProCheck); List getCheckTaskList(QcCheckTaskIncome qcCheckTaskIncome); + + List getQcProCheckList(QcProCheck qcProCheck); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java index 785a37c3..ca35706f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java @@ -37,4 +37,6 @@ public interface QcProCheckService { List getCheckTaskDetailList(QcCheckTaskDetail qcCheckTaskDetail); List getQcUnitList(SysDictData sysDictData); + + List selectQcCheckList(QcProCheck qcProCheck); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java index b3ce675d..562c9d23 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java @@ -19,10 +19,8 @@ import com.op.system.api.domain.SysDictData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; +import java.text.SimpleDateFormat; +import java.util.*; /** * @ClassName : quaServiceImpl @@ -40,7 +38,7 @@ public class QcProCheckServiceImpl implements QcProCheckService { @Override public R saveQcProCheck(QcProCheck qcProCheck) { - DynamicDataSourceContextHolder.push("ds_"+qcProCheck.getFactoryCode()); + DynamicDataSourceContextHolder.push("ds_" + qcProCheck.getFactoryCode()); qcProCheck.setId(UUID.randomUUID().toString().replace("-", "")); //上传附件 @@ -84,19 +82,19 @@ public class QcProCheckServiceImpl implements QcProCheckService { @Override public List selectQcProCheckList(QcProCheck qcProCheck) { - DynamicDataSourceContextHolder.push("ds_"+qcProCheck.getFactoryCode()); + DynamicDataSourceContextHolder.push("ds_" + qcProCheck.getFactoryCode()); return qcProCheckMapper.selectQcProCheckList(qcProCheck); } @Override public QcProCheck getInfoByRfid(QcProCheck qcProCheck) { - DynamicDataSourceContextHolder.push("ds_"+qcProCheck.getFactoryCode()); + DynamicDataSourceContextHolder.push("ds_" + qcProCheck.getFactoryCode()); QcProCheck dto = qcProCheckMapper.getInfoByRfid(qcProCheck); - if(dto==null || StringUtils.isEmpty(dto.getProductCode())){ + if (dto == null || StringUtils.isEmpty(dto.getProductCode())) { dto = new QcProCheck(); dto.setProductCode("EmptyPallet"); - }else{ - if(StringUtils.isNotEmpty(dto.getProductName())){ + } else { + if (StringUtils.isNotEmpty(dto.getProductName())) { dto.setProductSpc(dto.getProductName().split("mm")[0] + "mm"); } @@ -106,7 +104,7 @@ public class QcProCheckServiceImpl implements QcProCheckService { @Override public List getEquipmentList(QcProCheck qcProCheck) { - DynamicDataSourceContextHolder.push("ds_"+qcProCheck.getFactoryCode()); + DynamicDataSourceContextHolder.push("ds_" + qcProCheck.getFactoryCode()); return qcProCheckMapper.getEquipmentList(qcProCheck); } @@ -136,4 +134,15 @@ public class QcProCheckServiceImpl implements QcProCheckService { return qcCheckTaskIncomeMapper.getQcUnitList(sysDictData); } + @DS("#header.poolName") + @Override + public List selectQcCheckList(QcProCheck qcProCheck) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + if (qcProCheck.getCreateTimeArray() != null) { + qcProCheck.setCreateTimeStart(formatter.format(qcProCheck.getCreateTimeArray().get(0))); + qcProCheck.setCreateTimeEnd(formatter.format(qcProCheck.getCreateTimeArray().get(1))); + } + return qcProCheckMapper.getQcProCheckList(qcProCheck); + } + } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml index 6eaf1b82..6aadc642 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml @@ -265,4 +265,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by qct.create_time desc + +