[task-1766] 性能验证模块 开发 （二期） / 添加新的验证方法和新的配置detail表

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/entity/ExperimentalConfigDetailTbl.java

@@ -1,16 +1,18 @@
 package com.lc.ibps.components.pv.persistence.entity;
 
+import java.util.Date;
+
 import com.lc.ibps.base.framework.persistence.entity.AbstractPo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 性能验证配置详情 表对象
- * 
- *<pre> 
+ *
+ *<pre>
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-05-29 08:52:38
+ * 创建时间：2024-05-30 11:56:56
  *</pre>
  */
 @SuppressWarnings("serial")
@@ -33,7 +35,7 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	@ApiModelProperty(value = "是否基础")
 	protected String  isBasic; 		/*是否基础*/
 	@ApiModelProperty(value = "是否禁用")
-	protected String isDisabled; 		/*是否禁用*/
+	protected String  isDisabled; 		/*是否禁用*/
 	@ApiModelProperty(value = "是否公开")
 	protected String  isPublic; 		/*是否公开*/
 	@ApiModelProperty(value = "实验步骤")
@@ -54,8 +56,10 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	protected String  chartOption; 		/*图表配置*/
 	@ApiModelProperty(value = "适用范围")
 	protected String  scope; 		/*适用范围*/
+	@ApiModelProperty(value = "方法Key")
+	protected String  methodKey; 		/*方法Key*/
 
-	public void setId(String id) 
+	public void setId(String id)
 	{
 		this.id = id;
 	}
@@ -63,11 +67,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 主键
 	 * @return
 	 */
-	public String getId() 
+	public String getId()
 	{
 		return this.id;
 	}
-	public void setParentId(String parentId) 
+	public void setParentId(String parentId)
 	{
 		this.parentId = parentId;
 	}
@@ -75,11 +79,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 外键
 	 * @return
 	 */
-	public String getParentId() 
+	public String getParentId()
 	{
 		return this.parentId;
 	}
-	public void setTenantId(String tenantId) 
+	public void setTenantId(String tenantId)
 	{
 		this.tenantId = tenantId;
 	}
@@ -87,11 +91,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 租户ID
 	 * @return
 	 */
-	public String getTenantId() 
+	public String getTenantId()
 	{
 		return this.tenantId;
 	}
-	public void setIp(String ip) 
+	public void setIp(String ip)
 	{
 		this.ip = ip;
 	}
@@ -99,11 +103,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 IP地址
 	 * @return
 	 */
-	public String getIp() 
+	public String getIp()
 	{
 		return this.ip;
 	}
-	public void setMethodName(String methodName) 
+	public void setMethodName(String methodName)
 	{
 		this.methodName = methodName;
 	}
@@ -111,11 +115,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 方法名称
 	 * @return
 	 */
-	public String getMethodName() 
+	public String getMethodName()
 	{
 		return this.methodName;
 	}
-	public void setMethodType(String methodType) 
+	public void setMethodType(String methodType)
 	{
 		this.methodType = methodType;
 	}
@@ -123,11 +127,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 方法类型
 	 * @return
 	 */
-	public String getMethodType() 
+	public String getMethodType()
 	{
 		return this.methodType;
 	}
-	public void setSn(String sn) 
+	public void setSn(String sn)
 	{
 		this.sn = sn;
 	}
@@ -135,11 +139,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 排序
 	 * @return
 	 */
-	public String getSn() 
+	public String getSn()
 	{
 		return this.sn;
 	}
-	public void setIsBasic(String isBasic) 
+	public void setIsBasic(String isBasic)
 	{
 		this.isBasic = isBasic;
 	}
@@ -147,7 +151,7 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 是否基础
 	 * @return
 	 */
-	public String getIsBasic() 
+	public String getIsBasic()
 	{
 		return this.isBasic;
 	}
@@ -163,7 +167,7 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	{
 		return this.isDisabled;
 	}
-	public void setIsPublic(String isPublic) 
+	public void setIsPublic(String isPublic)
 	{
 		this.isPublic = isPublic;
 	}
@@ -171,11 +175,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 是否公开
 	 * @return
 	 */
-	public String getIsPublic() 
+	public String getIsPublic()
 	{
 		return this.isPublic;
 	}
-	public void setStep(String step) 
+	public void setStep(String step)
 	{
 		this.step = step;
 	}
@@ -183,11 +187,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 实验步骤
 	 * @return
 	 */
-	public String getStep() 
+	public String getStep()
 	{
 		return this.step;
 	}
-	public void setCriterion(String criterion) 
+	public void setCriterion(String criterion)
 	{
 		this.criterion = criterion;
 	}
@@ -195,11 +199,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 判定标准
 	 * @return
 	 */
-	public String getCriterion() 
+	public String getCriterion()
 	{
 		return this.criterion;
 	}
-	public void setReferences(String references) 
+	public void setReferences(String references)
 	{
 		this.references = references;
 	}
@@ -207,11 +211,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 参考资料
 	 * @return
 	 */
-	public String getReferences() 
+	public String getReferences()
 	{
 		return this.references;
 	}
-	public void setParams(String params) 
+	public void setParams(String params)
 	{
 		this.params = params;
 	}
@@ -219,11 +223,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 实验参数
 	 * @return
 	 */
-	public String getParams() 
+	public String getParams()
 	{
 		return this.params;
 	}
-	public void setFormulas(String formulas) 
+	public void setFormulas(String formulas)
 	{
 		this.formulas = formulas;
 	}
@@ -231,11 +235,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 实验公式
 	 * @return
 	 */
-	public String getFormulas() 
+	public String getFormulas()
 	{
 		return this.formulas;
 	}
-	public void setTemplate(String template) 
+	public void setTemplate(String template)
 	{
 		this.template = template;
 	}
@@ -243,11 +247,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 结论模板
 	 * @return
 	 */
-	public String getTemplate() 
+	public String getTemplate()
 	{
 		return this.template;
 	}
-	public void setTemplateDesc(String templateDesc) 
+	public void setTemplateDesc(String templateDesc)
 	{
 		this.templateDesc = templateDesc;
 	}
@@ -255,11 +259,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 模板说明
 	 * @return
 	 */
-	public String getTemplateDesc() 
+	public String getTemplateDesc()
 	{
 		return this.templateDesc;
 	}
-	public void setChartOption(String chartOption) 
+	public void setChartOption(String chartOption)
 	{
 		this.chartOption = chartOption;
 	}
@@ -267,11 +271,11 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 图表配置
 	 * @return
 	 */
-	public String getChartOption() 
+	public String getChartOption()
 	{
 		return this.chartOption;
 	}
-	public void setScope(String scope) 
+	public void setScope(String scope)
 	{
 		this.scope = scope;
 	}
@@ -279,9 +283,21 @@ public class ExperimentalConfigDetailTbl extends AbstractPo<String>{
 	 * 返回 适用范围
 	 * @return
 	 */
-	public String getScope() 
+	public String getScope()
 	{
 		return this.scope;
 	}
-	
+	public void setMethodKey(String methodKey)
+	{
+		this.methodKey = methodKey;
+	}
+	/**
+	 * 返回 方法Key
+	 * @return
+	 */
+	public String getMethodKey()
+	{
+		return this.methodKey;
+	}
+
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/entity/ExperimentalTbl.java

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
  *<pre>
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-05-28 06:12:12
+ * 创建时间：2024-05-30 11:57:10
  *</pre>
  */
 @SuppressWarnings("serial")
@@ -78,6 +78,8 @@ public class ExperimentalTbl extends AbstractPo<String>{
 	protected String  fangFaKey; 		/*方法Key*/
 	@ApiModelProperty(value = "计算结果")
 	protected String  jiSuanJieGuo; 		/*计算结果*/
+	@ApiModelProperty(value = "方法ID")
+	protected String  fangFaId; 		/*方法ID*/
 
 	public void setId(String id)
 	{
@@ -439,5 +441,17 @@ public class ExperimentalTbl extends AbstractPo<String>{
 	{
 		return this.jiSuanJieGuo;
 	}
+	public void setFangFaId(String fangFaId)
+	{
+		this.fangFaId = fangFaId;
+	}
+	/**
+	 * 返回 方法ID
+	 * @return
+	 */
+	public String getFangFaId()
+	{
+		return this.fangFaId;
+	}
 
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/verification/model2/PVItemBuilder.java

@@ -92,21 +92,21 @@ public class PVItemBuilder {
 
     public PVModel buildPVModel(double[][] dataArrays) {
 //        PVModel pvModel;
-        if (config.getKey().equals("精密度验证")) {
+        if (config.getKey().equals("精密度:EP15精密度验证")) {
             pvModel = new PrecisionEP15(dataArrays, config);
-        } else if (config.getKey().equals("重复性验证")) {
+        } else if (config.getKey().equals("精密度:重复性验证")) {
             pvModel = new PrecisionRepeatability(dataArrays, config);
-        } else if (config.getKey().equals("使用定值参考物质验证")) {
+        } else if (config.getKey().equals("正确度:使用定值参考物质验证")) {
             pvModel = new TruenessRefernece(dataArrays, config);
-        } else if (config.getKey().equals("使用患者样品验证")) {
+        } else if (config.getKey().equals("正确度:使用患者样品验证")) {
             pvModel = new TruenessEP15Patient(dataArrays, config);
-        } else if (config.getKey().equals("CNAS-GL037偏倚评估")) {
+        } else if (config.getKey().equals("正确度:偏倚评估")) {
             pvModel = new TruenessBiasAssessment(dataArrays, config);
-        } else if (config.getKey().equals("408线性评价")) {
+        } else if (config.getKey().equals("线性区间:EP6线性评价")) {
             pvModel = new LinearRangeEP6A(dataArrays, config);
-        } else if (config.getKey().equals("平均斜率评价法")) {
+        } else if (config.getKey().equals("线性区间:平均斜率评价法")) {
             pvModel = new LinearRangeAverageSlope(dataArrays, config);
-        } else if (config.getKey().equals("线性稀释回收法")) {
+        } else if (config.getKey().equals("线性区间:线性稀释回收法")) {
             pvModel = new LinearRangeRecoveryMethod(dataArrays, config);
         } else {
             return null;

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/pv/persistence/mapping/Experimental.map.xml

@@ -37,17 +37,18 @@
 		<result property="zhiBiaoId" column="ZHI_BIAO_ID_" jdbcType="VARCHAR"/>
 		<result property="fangFaKey" column="FANG_FA_KEY_" jdbcType="VARCHAR"/>
 		<result property="jiSuanJieGuo" column="JI_SUAN_JIE_GUO_" jdbcType="BLOB"/>
+		<result property="fangFaId" column="FANG_FA_ID_" jdbcType="VARCHAR"/>
 	</resultMap>
 
 	<sql id="columns">
-		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,DI_DIAN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,KUAI_ZHAO_,SHI_YAN_XIANG_MU_,SHI_YAN_FANG_FA_,YANG_BEN_LEI_XING,SHI_YAN_YI_QI_,YI_QI_BIAN_HAO_,KAI_SHI_SHI_JIAN_,JIE_SHU_SHI_JIAN_,JIE_GUO_DAN_WEI_,BAO_LIU_XIAO_SHU_,BEI_ZHU_,FANG_AN_LEI_XING_,SHI_YAN_CAN_SHU_,SHI_YAN_SHU_JU_,SHEN_HE_REN_,BAO_GAO_SHI_JIAN_,FU_JIAN_,SHI_YAN_JIE_LUN_,XING_NENG_ZHI_BIA,ZHI_BIAO_ID_,FANG_FA_KEY_,JI_SUAN_JIE_GUO_
+		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,DI_DIAN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,KUAI_ZHAO_,SHI_YAN_XIANG_MU_,SHI_YAN_FANG_FA_,YANG_BEN_LEI_XING,SHI_YAN_YI_QI_,YI_QI_BIAN_HAO_,KAI_SHI_SHI_JIAN_,JIE_SHU_SHI_JIAN_,JIE_GUO_DAN_WEI_,BAO_LIU_XIAO_SHU_,BEI_ZHU_,FANG_AN_LEI_XING_,SHI_YAN_CAN_SHU_,SHI_YAN_SHU_JU_,SHEN_HE_REN_,BAO_GAO_SHI_JIAN_,FU_JIAN_,SHI_YAN_JIE_LUN_,XING_NENG_ZHI_BIA,ZHI_BIAO_ID_,FANG_FA_KEY_,JI_SUAN_JIE_GUO_,FANG_FA_ID_
 	</sql>
 
 	<insert id="create" parameterType="com.lc.ibps.components.pv.persistence.entity.ExperimentalPo">
 		INSERT INTO T_XNYZSYXX
 		(<include refid="columns"/>)
 		VALUES
-		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{shiYanXiangMu,jdbcType=VARCHAR}, #{shiYanFangFa,jdbcType=VARCHAR}, #{yangBenLeiXing,jdbcType=VARCHAR}, #{shiYanYiQi,jdbcType=VARCHAR}, #{yiQiBianHao,jdbcType=VARCHAR}, #{kaiShiShiJian,jdbcType=VARCHAR}, #{jieShuShiJian,jdbcType=VARCHAR}, #{jieGuoDanWei,jdbcType=VARCHAR}, #{baoLiuXiaoShu,jdbcType=VARCHAR}, #{beiZhu,jdbcType=VARCHAR}, #{fangAnLeiXing,jdbcType=VARCHAR}, #{shiYanCanShu,jdbcType=BLOB}, #{shiYanShuJu,jdbcType=BLOB}, #{shenHeRen,jdbcType=VARCHAR}, #{baoGaoShiJian,jdbcType=VARCHAR}, #{fuJian,jdbcType=VARCHAR}, #{shiYanJieLun,jdbcType=BLOB}, #{xingNengZhiBia,jdbcType=VARCHAR}, #{zhiBiaoId,jdbcType=VARCHAR}, #{fangFaKey,jdbcType=VARCHAR}, #{jiSuanJieGuo,jdbcType=BLOB})
+		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{shiYanXiangMu,jdbcType=VARCHAR}, #{shiYanFangFa,jdbcType=VARCHAR}, #{yangBenLeiXing,jdbcType=VARCHAR}, #{shiYanYiQi,jdbcType=VARCHAR}, #{yiQiBianHao,jdbcType=VARCHAR}, #{kaiShiShiJian,jdbcType=VARCHAR}, #{jieShuShiJian,jdbcType=VARCHAR}, #{jieGuoDanWei,jdbcType=VARCHAR}, #{baoLiuXiaoShu,jdbcType=VARCHAR}, #{beiZhu,jdbcType=VARCHAR}, #{fangAnLeiXing,jdbcType=VARCHAR}, #{shiYanCanShu,jdbcType=BLOB}, #{shiYanShuJu,jdbcType=BLOB}, #{shenHeRen,jdbcType=VARCHAR}, #{baoGaoShiJian,jdbcType=VARCHAR}, #{fuJian,jdbcType=VARCHAR}, #{shiYanJieLun,jdbcType=BLOB}, #{xingNengZhiBia,jdbcType=VARCHAR}, #{zhiBiaoId,jdbcType=VARCHAR}, #{fangFaKey,jdbcType=VARCHAR}, #{jiSuanJieGuo,jdbcType=BLOB}, #{fangFaId,jdbcType=VARCHAR})
 	</insert>
 
 	<select id="get" parameterType="java.lang.String" resultMap="ExperimentalPo">
@@ -121,7 +122,8 @@
 							  XING_NENG_ZHI_BIA=#{xingNengZhiBia,jdbcType=VARCHAR},
 							  ZHI_BIAO_ID_=#{zhiBiaoId,jdbcType=VARCHAR},
 							  FANG_FA_KEY_=#{fangFaKey,jdbcType=VARCHAR},
-							  JI_SUAN_JIE_GUO_=#{jiSuanJieGuo,jdbcType=BLOB}
+							  JI_SUAN_JIE_GUO_=#{jiSuanJieGuo,jdbcType=BLOB},
+							  FANG_FA_ID_=#{fangFaId,jdbcType=VARCHAR}
 		WHERE
 			ID_=#{id}
 	</update>

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/pv/persistence/mapping/ExperimentalConfigDetail.map.xml

@@ -26,26 +26,27 @@
 		<result property="templateDesc" column="TEMPLATE_DESC_" jdbcType="BLOB"/>
 		<result property="chartOption" column="CHART_OPTION_" jdbcType="BLOB"/>
 		<result property="scope" column="SCOPE_" jdbcType="VARCHAR"/>
+		<result property="methodKey" column="METHOD_KEY_" jdbcType="VARCHAR"/>
 	</resultMap>
-	
+
 	<sql id="columns">
-		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,METHOD_NAME_,METHOD_TYPE_,SN_,IS_BASIC,IS_DISABLED_,IS_PUBLIC_,STEP_,CRITERION_,REFERENCES_,PARAMS_,FORMULAS_,TEMPLATE_,TEMPLATE_DESC_,CHART_OPTION_,SCOPE_
+		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,METHOD_NAME_,METHOD_TYPE_,SN_,IS_BASIC,IS_DISABLED_,IS_PUBLIC_,STEP_,CRITERION_,REFERENCES_,PARAMS_,FORMULAS_,TEMPLATE_,TEMPLATE_DESC_,CHART_OPTION_,SCOPE_,METHOD_KEY_
 	</sql>
-	
+
 	<insert id="create" parameterType="com.lc.ibps.components.pv.persistence.entity.ExperimentalConfigDetailPo">
 		INSERT INTO T_XNYZPZXQ
 		(<include refid="columns"/>)
-		VALUES 
-		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{methodName,jdbcType=VARCHAR}, #{methodType,jdbcType=VARCHAR}, #{sn,jdbcType=VARCHAR}, #{isBasic,jdbcType=VARCHAR}, #{isDisabled,jdbcType=VARCHAR}, #{isPublic,jdbcType=VARCHAR}, #{step,jdbcType=BLOB}, #{criterion,jdbcType=BLOB}, #{references,jdbcType=BLOB}, #{params,jdbcType=BLOB}, #{formulas,jdbcType=BLOB}, #{template,jdbcType=BLOB}, #{templateDesc,jdbcType=BLOB}, #{chartOption,jdbcType=BLOB}, #{scope,jdbcType=VARCHAR})
+		VALUES
+		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{methodName,jdbcType=VARCHAR}, #{methodType,jdbcType=VARCHAR}, #{sn,jdbcType=VARCHAR}, #{isBasic,jdbcType=VARCHAR}, #{isDisabled,jdbcType=VARCHAR}, #{isPublic,jdbcType=VARCHAR}, #{step,jdbcType=BLOB}, #{criterion,jdbcType=BLOB}, #{references,jdbcType=BLOB}, #{params,jdbcType=BLOB}, #{formulas,jdbcType=BLOB}, #{template,jdbcType=BLOB}, #{templateDesc,jdbcType=BLOB}, #{chartOption,jdbcType=BLOB}, #{scope,jdbcType=VARCHAR}, #{methodKey,jdbcType=VARCHAR})
 	</insert>
-	
+
 	<select id="get" parameterType="java.lang.String" resultMap="ExperimentalConfigDetailPo">
-		SELECT <include refid="columns"/> FROM T_XNYZPZXQ 
-		WHERE 
+		SELECT <include refid="columns"/> FROM T_XNYZPZXQ
+		WHERE
 		ID_=#{id}
 	</select>
-	
-	
+
+
 	<sql id="querySql" >
 		SELECT <include refid="columns"/> FROM T_XNYZPZXQ
 		<where>
@@ -60,72 +61,73 @@
 			ORDER BY ID_ DESC
 		</if>
 	</sql>
-	
+
 	<select id="query" parameterType="java.util.Map" resultMap="ExperimentalConfigDetailPo">
 		<include refid="querySql"/>
 	</select>
-	
+
 	<select id="queryIds" parameterType="java.util.Map" resultMap="ExperimentalConfigDetailPo">
 		SELECT ID_ FROM (<include refid="querySql"/>) T
 	</select>
-	
+
 	<select id="findByIds" resultMap="ExperimentalConfigDetailPo">
 		SELECT <include refid="columns"/> FROM T_XNYZPZXQ
-			WHERE ID_ in 
-			<foreach item="id" index="index" collection="ids" open="(" separator="," close=")">  
-				#{id}  
-			</foreach>  		
-			ORDER BY ID_ DESC			
-	</select>	
-	
+		WHERE ID_ in
+		<foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+		ORDER BY ID_ DESC
+	</select>
+
 	<update id="update" parameterType="com.lc.ibps.components.pv.persistence.entity.ExperimentalConfigDetailPo">
 		UPDATE T_XNYZPZXQ SET
-		PARENT_ID_=#{parentId,jdbcType=VARCHAR},
-		TENANT_ID_=#{tenantId,jdbcType=VARCHAR},
-		IP_=#{ip,jdbcType=VARCHAR},
-		UPDATE_BY_=#{updateBy,jdbcType=VARCHAR},
-		UPDATE_TIME_=#{updateTime,jdbcType=TIMESTAMP},
-		METHOD_NAME_=#{methodName,jdbcType=VARCHAR},
-		METHOD_TYPE_=#{methodType,jdbcType=VARCHAR},
-		SN_=#{sn,jdbcType=VARCHAR},
-		IS_BASIC=#{isBasic,jdbcType=VARCHAR},
-		IS_DISABLED_=#{isDisabled,jdbcType=VARCHAR},
-		IS_PUBLIC_=#{isPublic,jdbcType=VARCHAR},
-		STEP_=#{step,jdbcType=BLOB},
-		CRITERION_=#{criterion,jdbcType=BLOB},
-		REFERENCES_=#{references,jdbcType=BLOB},
-		PARAMS_=#{params,jdbcType=BLOB},
-		FORMULAS_=#{formulas,jdbcType=BLOB},
-		TEMPLATE_=#{template,jdbcType=BLOB},
-		TEMPLATE_DESC_=#{templateDesc,jdbcType=BLOB},
-		CHART_OPTION_=#{chartOption,jdbcType=BLOB},
-		SCOPE_=#{scope,jdbcType=VARCHAR}
+							  PARENT_ID_=#{parentId,jdbcType=VARCHAR},
+							  TENANT_ID_=#{tenantId,jdbcType=VARCHAR},
+							  IP_=#{ip,jdbcType=VARCHAR},
+							  UPDATE_BY_=#{updateBy,jdbcType=VARCHAR},
+							  UPDATE_TIME_=#{updateTime,jdbcType=TIMESTAMP},
+							  METHOD_NAME_=#{methodName,jdbcType=VARCHAR},
+							  METHOD_TYPE_=#{methodType,jdbcType=VARCHAR},
+							  SN_=#{sn,jdbcType=VARCHAR},
+							  IS_BASIC=#{isBasic,jdbcType=VARCHAR},
+							  IS_DISABLED_=#{isDisabled,jdbcType=VARCHAR},
+							  IS_PUBLIC_=#{isPublic,jdbcType=VARCHAR},
+							  STEP_=#{step,jdbcType=BLOB},
+							  CRITERION_=#{criterion,jdbcType=BLOB},
+							  REFERENCES_=#{references,jdbcType=BLOB},
+							  PARAMS_=#{params,jdbcType=BLOB},
+							  FORMULAS_=#{formulas,jdbcType=BLOB},
+							  TEMPLATE_=#{template,jdbcType=BLOB},
+							  TEMPLATE_DESC_=#{templateDesc,jdbcType=BLOB},
+							  CHART_OPTION_=#{chartOption,jdbcType=BLOB},
+							  SCOPE_=#{scope,jdbcType=VARCHAR},
+							  METHOD_KEY_=#{methodKey,jdbcType=VARCHAR}
 		WHERE
-		ID_=#{id}
+			ID_=#{id}
 	</update>
-	
+
 	<delete id="remove" parameterType="java.lang.String">
-		DELETE FROM T_XNYZPZXQ 
+		DELETE FROM T_XNYZPZXQ
 		WHERE
-		ID_=#{id}
+			ID_=#{id}
 	</delete>
-	
+
 	<delete id="deleteByMainId">
-	    DELETE FROM T_XNYZPZXQ
-	    WHERE
-	    PARENT_ID_=#{mainId}
-	</delete>    
-	
+		DELETE FROM T_XNYZPZXQ
+		WHERE
+			PARENT_ID_=#{mainId}
+	</delete>
+
 	<select id="findByMainId" resultMap="ExperimentalConfigDetailPo">
-	    SELECT <include refid="columns"/>
-	    FROM T_XNYZPZXQ 
-	    WHERE PARENT_ID_=#{mainId}
+		SELECT <include refid="columns"/>
+		FROM T_XNYZPZXQ
+		WHERE PARENT_ID_=#{mainId}
 	</select>
-	
+
 	<select id="findIdsByMainId" parameterType="java.util.Map" resultMap="ExperimentalConfigDetailPo">
 		SELECT ID_ FROM T_XNYZPZXQ
-	    WHERE
-	    PARENT_ID_=#{mainId}
+		WHERE
+			PARENT_ID_=#{mainId}
 	</select>
-	
+
 </mapper>