From a4ad441dadc7813d1670fe92993d97ec186c80c2 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 26 Dec 2023 14:36:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E8=BF=87=E7=A8=8B=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80+=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3+=E6=8A=A5=E5=B7=A5sql=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/domain/quality/QcCheckTaskIncomeDTO.java  |  9 +++++++++
 .../controller/QcStaticTableController.java       | 15 ++++++++++-----
 .../impl/QcCheckTaskProduceServiceImpl.java       |  2 +-
 .../mapper/quality/QcCheckTaskIncomeMapper.xml    |  2 ++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java
index 8464cbcac..037a6dc69 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java
@@ -135,6 +135,15 @@ public class QcCheckTaskIncomeDTO extends BaseEntity {
 	private BigDecimal aNoOkquality;
 	private BigDecimal bNoOkquality;
 	private BigDecimal cNoOkquality;
+	private String orderType;
+
+	public String getOrderType() {
+		return orderType;
+	}
+
+	public void setOrderType(String orderType) {
+		this.orderType = orderType;
+	}
 
 	public BigDecimal getSampleQuality() {
 		return sampleQuality;
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java
index 1db2db044..473287128 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java
@@ -147,11 +147,16 @@ public class QcStaticTableController extends BaseController {
 					if(mdata.getcNoOkquality()==null){
 						mdata.setcNoOkquality(new BigDecimal("0"));
 					}
-					BigDecimal defectRate = (mdata.getaNoOkquality().add(mdata.getbNoOkquality()).multiply(new BigDecimal("0.65"))
-						.add(mdata.getcNoOkquality()).multiply(new BigDecimal(0.35)))
-						.divide(new BigDecimal(mdata.getSampleQuality()))
-						.setScale(2, BigDecimal.ROUND_HALF_UP);
-					datas.add(defectRate.doubleValue());
+					if(!"0.00".equals(mdata.getSampleQuality())){
+						BigDecimal defectRate = (mdata.getaNoOkquality().add(mdata.getbNoOkquality()).multiply(new BigDecimal("0.65"))
+								.add(mdata.getcNoOkquality()).multiply(new BigDecimal(0.35)))
+								.divide(new BigDecimal(mdata.getSampleQuality()))
+								.setScale(2, BigDecimal.ROUND_HALF_UP);
+						datas.add(defectRate.doubleValue());
+					}else{
+						datas.add(0.00);
+					}
+
 				}else{
 					datas.add(0.00);
 				}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java
index 32e76b3d7..1c4b04a04 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java
@@ -314,7 +314,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
             Date startTime = productTask.getCreateTime();
 
 			long mins = DateUtil.between(startTime, nowTime, DateUnit.MINUTE);
-			if(mins>=15){
+			if(mins>=60){
 				int m = insertQcCheckTaskProduce(productTask);
 				logger.info("++++++++++++过程检验巡检任务生成" + m + "++++++++++++++");
 			}
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
index 53b401f51..8d8416cc9 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
@@ -193,6 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="checkType != null">check_type,</if>
 			<if test="typeCode != null">type_code,</if>
 			<if test="sampleQuality != null">sample_quality,</if>
+			<if test="orderType != null">order_type,</if>
 		 </trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="recordId != null">#{recordId},</if>
@@ -227,6 +228,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="checkType != null">#{checkType},</if>
 			<if test="typeCode != null">#{typeCode},</if>
 			<if test="sampleQuality != null">#{sampleQuality},</if>
+			<if test="orderType != null">#{orderType},</if>
 		 </trim>
 	</insert>