工时改小时

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcSampleRuleMapper.java

@@ -2,6 +2,7 @@ package com.op.quality.mapper;
 
 import java.util.List;
 
+import com.op.quality.domain.QcCheckTaskIncome;
 import com.op.quality.domain.QcSampleRule;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -60,4 +61,6 @@ public interface QcSampleRuleMapper {
 	 * @return 结果
 	 */
 	public int deleteQcSampleRuleByIds(String[] ids);
+
+	String getSampNum(QcCheckTaskIncome qcCheckTaskIncome);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -77,6 +77,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 	@Autowired
 	private IQcCheckTaskDefectService qcCheckTaskDefectService;
 
+	@Autowired
+	private QcSampleRuleMapper qcSampleRuleMapper;
+
 	/**
 	 * 查询来料检验
 	 *
@@ -230,7 +233,12 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			}
 		}
 		qcCheckTaskIncome.setNoOkQuality(noOkQuality);
-
+		/**qc_sample_rule**/
+        String sampNum = qcSampleRuleMapper.getSampNum(qcCheckTaskIncome);
+        if(StringUtils.isNotBlank(sampNum)){
+			qcCheckTaskIncome.setSampleQuality(new BigDecimal(sampNum));
+		}
+		/**qc_check_task**/
 		qcCheckTaskIncomeMapper.insertQcCheckTaskIncome(qcCheckTaskIncome);
 
 		/**qc_check_task_detail**/

op-modules/op-quality/src/main/resources/mapper/quality/QcSampleRuleMapper.xml

@@ -41,8 +41,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectQcSampleRuleVo"/>
 		where id = #{id}
 	</select>
+    <select id="getSampNum" resultType="java.lang.String">
+		select sample_quality
+        from qc_sample_rule
+    	where end_value>= #{quality} and #{quality}>=start_value and del_flag = '0'
+		and check_type = #{checkType}
+	</select>
 
-	<insert id="insertQcSampleRule" parameterType="QcSampleRule">
+    <insert id="insertQcSampleRule" parameterType="QcSampleRule">
 		insert into qc_sample_rule
 		<trim prefix="(" suffix=")" suffixOverrides=",">
 			<if test="id != null">id,</if>