生产过程检验v4

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java

@@ -78,8 +78,8 @@ public class QcCheckTaskIncome extends BaseEntity {
 	private String checkManName;
 
 	/** 检验时间 */
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd")
+	@Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
 	private Date checkTime;
 
 	/** 检验结果Y合格 */

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java

@@ -78,8 +78,8 @@ public class QcCheckTaskProduce extends BaseEntity {
 	private String checkManName;
 
 	/** 检验时间 */
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd")
+	@Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
 	private Date checkTime;
 
 	/** 检验结果Y合格 */

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

@@ -100,7 +100,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
 
 		/**取检测项**/
 		QcCheckTypeProject qctp= new  QcCheckTypeProject();
-		qctp.setTypeId(qcCheckTaskProduce.getCheckType());//来料检验
+		qctp.setTypeId(qcCheckTaskProduce.getCheckType());//生产过程检验
 		qctp.setMaterialCode(qcCheckTaskProduce.getMaterialCode());//特性
 		/**qc_check_type_project**/
 		List<QcCheckTaskDetail> items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp);

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

@@ -111,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		left join qc_check_project qcp on qcp.id = qctp.project_id
 		where qctp.del_flag = '0' and qctp.status = '0'
              and qctp.material_code = #{materialCode}
+		     and qctp.type_id = #{typeId}
 		order by qctp.sort
 	</select>
 	<select id="getTPByTypeGroup" resultType="com.op.quality.domain.QcCheckTaskDetail">
@@ -131,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		left join qc_check_project qcp on qcp.id = qctp.project_id
 		where qctp.del_flag = '0' and qctp.status = '0'
 		  and qctp.group_id = #{groupId}
+		  and qctp.type_id = #{typeId}
 		order by qctp.sort
 	</select>
 
@@ -154,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="delFlag != null">del_flag,</if>
 			<if test="groupId != null">group_id,</if>
 			<if test="materialCode != null">material_code,</if>
-		    <if test="sampleNum != null">sample_num</if>
+		    <if test="sampleNum != null">sample_num,</if>
 			<if test="projectNo != null">project_no</if>
 		 </trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -175,6 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="delFlag != null">#{delFlag},</if>
 			<if test="groupId != null">#{groupId},</if>
 			<if test="materialCode != null">#{materialCode},</if>
+			<if test="sampleNum != null">#{sampleNum},</if>
 			<if test="projectNo != null">#{projectNo}</if>
 		 </trim>
 	</insert>
@@ -198,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="delFlag != null">del_flag = #{delFlag},</if>
 			<if test="groupId != null">group_id = #{groupId},</if>
 			<if test="materialCode != null">material_code = #{materialCode},</if>
-			<if test="sampleNum != null">sample_num = #{sampleNum}</if>
+			<if test="sampleNum != null">sample_num = #{sampleNum},</if>
 			<if test="projectNo != null">project_no = #{projectNo}</if>
 		</trim>
 		where id = #{id}