Merge remote-tracking branch 'origin/master'

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

@@ -7,7 +7,7 @@ import com.op.common.core.web.domain.BaseEntity;
 
 /**
  * 检验项目维护对象 qc_check_project
- * 
+ *
  * @author Open Platform
  * @date 2023-10-13
  */
@@ -53,11 +53,31 @@ public class QcCheckProject extends BaseEntity {
 	@Excel(name = "工厂编码")
 	private String factoryCode;
 
+	private String samplePlan;
+
+	private String judge;
+
+	public String getJudge() {
+		return judge;
+	}
+
+	public void setJudge(String judge) {
+		this.judge = judge;
+	}
+
 	/** 删除标识1删除0正常 */
 	private String delFlag;
 
 	private Long serialNumber;
 
+	public String getSamplePlan() {
+		return samplePlan;
+	}
+
+	public void setSamplePlan(String samplePlan) {
+		this.samplePlan = samplePlan;
+	}
+
 	public void setId(String id) {
 		this.id = id;
 	}

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.op.quality.mapper.QcCheckProjectMapper">
-	
+
 	<resultMap type="QcCheckProject" id="QcCheckProjectResult">
 		<result property="id"	column="id"	/>
 		<result property="orderNum"	column="order_num"	/>
@@ -20,15 +20,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateTime"	column="update_time"	/>
 		<result property="factoryCode"	column="factory_code"	/>
 		<result property="delFlag"	column="del_flag"	/>
+		<result property="samplePlan"	column="sample_plan"	/>
+		<result property="judge"	column="judge"	/>
+
 	</resultMap>
 
 	<sql id="selectQcCheckProjectVo">
-		select id, order_num, rule_name, property_code, check_mode, check_tool, unit_code, check_standard, attr1, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_check_project
+		select id, order_num, rule_name, property_code, check_mode, check_tool, unit_code, check_standard,
+		       attr1, create_by, create_time, update_by, update_time, factory_code, del_flag,sample_plan,
+			   judge
+		from qc_check_project
 	</sql>
 
 	<select id="selectQcCheckProjectList" parameterType="QcCheckProject" resultMap="QcCheckProjectResult">
 		<include refid="selectQcCheckProjectVo"/>
-		<where>  
+		<where>
 			<if test="orderNum != null  and orderNum != ''"> and order_num = #{orderNum}</if>
 			<if test="ruleName != null  and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
 			<if test="propertyCode != null  and propertyCode != ''"> and property_code = #{propertyCode}</if>
@@ -38,15 +44,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="checkStandard != null  and checkStandard != ''"> and check_standard = #{checkStandard}</if>
 			<if test="attr1 != null  and attr1 != ''"> and attr1 = #{attr1}</if>
 			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
+			<if test="judge != null  and judge != ''"> and judge = #{judge}</if>
 		</where>
 		order by create_time
 	</select>
-	
+
 	<select id="selectQcCheckProjectById" parameterType="String" resultMap="QcCheckProjectResult">
 		<include refid="selectQcCheckProjectVo"/>
 		where id = #{id}
 	</select>
-		
+
 	<insert id="insertQcCheckProject" parameterType="QcCheckProject">
 		insert into qc_check_project
 		<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -65,6 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateTime != null">update_time,</if>
 			<if test="factoryCode != null and factoryCode != ''">factory_code,</if>
 			<if test="delFlag != null">del_flag,</if>
+			<if test="samplePlan != null">sample_plan,</if>
+			<if test="judge != null">judge,</if>
 		 </trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="id != null">#{id},</if>
@@ -82,6 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateTime != null">#{updateTime},</if>
 			<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
 			<if test="delFlag != null">#{delFlag},</if>
+			<if test="samplePlan != null">#{samplePlan},</if>
+			<if test="judge != null">#{judge},</if>
 		 </trim>
 	</insert>
 
@@ -102,6 +113,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateTime != null">update_time = #{updateTime},</if>
 			<if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
 			<if test="delFlag != null">del_flag = #{delFlag},</if>
+			<if test="samplePlan != null">sample_plan = #{samplePlan},</if>
+			<if test="judge != null">judge = #{judge},</if>
 		</trim>
 		where id = #{id}
 	</update>
@@ -111,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</delete>
 
 	<delete id="deleteQcCheckProjectByIds" parameterType="String">
-		delete from qc_check_project where id in 
+		delete from qc_check_project where id in
 		<foreach item="id" collection="array" open="(" separator="," close=")">
 			#{id}
 		</foreach>
@@ -122,4 +135,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		FROM qc_check_project
 		WHERE CONVERT(varchar(10),create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
 	</select>
-</mapper>
+</mapper>