设备档案卡设备校准接口更新

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

@@ -20,82 +20,62 @@ import io.swagger.annotations.ApiModelProperty;
 public class CalibrationCheckRecordTbl extends AbstractPo<String>{
 	@ApiModelProperty(value = "主键")
 	protected String  id; 		/*主键*/
-	@ApiModelProperty(value = "外键")
-	protected String  parentId; 		/*外键*/
 	@ApiModelProperty(value = "租户ID")
 	protected String  tenantId; 		/*租户ID*/
 	@ApiModelProperty(value = "IP地址")
 	protected String  ip; 		/*IP地址*/
 	@ApiModelProperty(value = "是否过审")
 	protected String  shiFouGuoShen; 		/*是否过审*/
+	@ApiModelProperty(value = "地点")
+	protected String  diDian; 		/*地点*/
 	@ApiModelProperty(value = "编制人")
 	protected String  bianZhiRen; 		/*编制人*/
 	@ApiModelProperty(value = "编制部门")
 	protected String  bianZhiBuMen; 		/*编制部门*/
 	@ApiModelProperty(value = "编制时间")
 	protected String  bianZhiShiJian; 		/*编制时间*/
+	@ApiModelProperty(value = "快照")
+	protected String  kuaiZhao; 		/*快照*/
+	@ApiModelProperty(value = "设备id")
+	protected String  sheBeiId; 		/*设备id*/
+	@ApiModelProperty(value = "设备编号")
+	protected String  sheBeiBianHao; 		/*设备编号*/
 	@ApiModelProperty(value = "设备名称")
 	protected String  sheBeiMingChen; 		/*设备名称*/
-	@ApiModelProperty(value = "设备卡ID")
-	protected String  sheBeiId; 		/*设备卡ID*/
-	@ApiModelProperty(value = "型号/规格")
-	protected String  xingHaoGuiGe; 		/*型号/规格*/
-	@ApiModelProperty(value = "出厂编号")
-	protected String  chuChangBianHa; 		/*出厂编号*/
-	@ApiModelProperty(value = "证书编号")
-	protected String  zhunQueDu; 		/*证书编号*/
-	@ApiModelProperty(value = "范围")
-	protected String  liangCheng; 		/*范围*/
-	@ApiModelProperty(value = "检定单位")
-	protected String  jianDingDanWei; 		/*检定单位*/
-	@ApiModelProperty(value = "检定周期")
-	protected String  jianDingZhouQi; 		/*检定周期*/
-	@ApiModelProperty(value = "已检/校日期")
-	protected String  yiJianXiaoRiQ; 		/*已检/校日期*/
-	@ApiModelProperty(value = "计划日期")
-	protected String  jiHuaRiQi; 		/*计划日期*/
-	@ApiModelProperty(value = "附件上传")
-	protected String  beiZhu; 		/*附件上传*/
-	@ApiModelProperty(value = "设备名称")
-	protected String  sheBeiMingChe; 		/*设备名称*/
-	@ApiModelProperty(value = "送检单位")
-	protected String  songJianDanWei; 		/*送检单位*/
-	@ApiModelProperty(value = "检定/校准项目")
-	protected String  jianDingXiangM; 		/*检定/校准项目*/
-	@ApiModelProperty(value = "最大允差/准确度/U")
-	protected String  zuiDaYunCha; 		/*最大允差/准确度/U*/
+	@ApiModelProperty(value = "检定/校准参数")
+	protected String  jianDingXiaoZh; 		/*检定/校准参数*/
+	@ApiModelProperty(value = "预期使用范围")
+	protected String  yuQiShiYongFa; 		/*预期使用范围*/
+	@ApiModelProperty(value = "附件")
+	protected String  fuJian; 		/*附件*/
+	@ApiModelProperty(value = "校准点/标准值等")
+	protected String  xiaoZhunDianBi; 		/*校准点/标准值等*/
+	@ApiModelProperty(value = "准确度/测量不确定度")
+	protected String  zhunQueDuCeLi; 		/*准确度/测量不确定度*/
+	@ApiModelProperty(value = "检定/校准单位")
+	protected String  xiaoZhunDanWei; 		/*检定/校准单位*/
+	@ApiModelProperty(value = "检定/校准单位ID")
+	protected String  danWeiId; 		/*检定/校准单位ID*/
+	@ApiModelProperty(value = "周期")
+	protected String  zhouQi; 		/*周期*/
+	@ApiModelProperty(value = "上次检定/校准日期")
+	protected String  shangCiJianDin; 		/*上次检定/校准日期*/
 	@ApiModelProperty(value = "负责人")
 	protected String  fuZeRen; 		/*负责人*/
-	@ApiModelProperty(value = "设备编号中文")
-	protected String  bianHaoZhongWe; 		/*设备编号中文*/
-	@ApiModelProperty(value = "地点")
-	protected String  diDian; 		/*地点*/
-	@ApiModelProperty(value = "设备类型")
-	protected String  sheBeiLeiXing; 		/*设备类型*/
-	@ApiModelProperty(value = "厂家/品牌")
-	protected String  changJiaPinPai; 		/*厂家/品牌*/
+	@ApiModelProperty(value = "计划日期")
+	protected String  jiHuaRiQi; 		/*计划日期*/
+	@ApiModelProperty(value = "计划子表id")
+	protected String  jiHuaZiBiaoId; 		/*计划子表id*/
+	@ApiModelProperty(value = "计划主表id")
+	protected String  jiHuaZhuBiaoI; 		/*计划主表id*/
 	@ApiModelProperty(value = "实施日期")
 	protected String  shiShiRiQi; 		/*实施日期*/
-	@ApiModelProperty(value = "修正因子")
-	protected String  xiuZhengYinZi; 		/*修正因子*/
-	@ApiModelProperty(value = "经办人")
-	protected String  jingBanRen; 		/*经办人*/
-	@ApiModelProperty(value = "检定/校准单位ID")
-	protected String  danWeiId; 		/*检定/校准单位ID*/
-	@ApiModelProperty(value = "校验项目ID")
-	protected String  xiangMuId; 		/*校验项目ID*/
-	@ApiModelProperty(value = "参数")
-	protected String  canShu; 		/*参数*/
-	@ApiModelProperty(value = "原设备编号")
-	protected String  yuanSheBeiBian; 		/*原设备编号*/
-	@ApiModelProperty(value = "marks")
-	protected String  marks; 		/*marks*/
-	@ApiModelProperty(value = "有效期至")
-	protected String  youXiaoQiZhi; 		/*有效期至*/
-	@ApiModelProperty(value = "recordParentId")
-	protected String  recordParentid; 		/*recordParentId*/
+	@ApiModelProperty(value = "校准有效期至")
+	protected String  xiaoZhunYouXia; 		/*校准有效期至*/
+	@ApiModelProperty(value = "证书编号")
+	protected String zhengShuBianHao;
 
-	public void setId(String id) 
+	public void setId(String id)
 	{
 		this.id = id;
 	}
@@ -103,23 +83,11 @@ public class CalibrationCheckRecordTbl extends AbstractPo<String>{
 	 * 返回 主键
 	 * @return
 	 */
-	public String getId() 
+	public String getId()
 	{
 		return this.id;
 	}
-	public void setParentId(String parentId) 
-	{
-		this.parentId = parentId;
-	}
-	/**
-	 * 返回 外键
-	 * @return
-	 */
-	public String getParentId() 
-	{
-		return this.parentId;
-	}
-	public void setTenantId(String tenantId) 
+	public void setTenantId(String tenantId)
 	{
 		this.tenantId = tenantId;
 	}
@@ -127,11 +95,11 @@ public class CalibrationCheckRecordTbl 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;
 	}
@@ -139,11 +107,11 @@ public class CalibrationCheckRecordTbl extends AbstractPo<String>{
 	 * 返回 IP地址
 	 * @return
 	 */
-	public String getIp() 
+	public String getIp()
 	{
 		return this.ip;
 	}
-	public void setShiFouGuoShen(String shiFouGuoShen) 
+	public void setShiFouGuoShen(String shiFouGuoShen)
 	{
 		this.shiFouGuoShen = shiFouGuoShen;
 	}
@@ -151,11 +119,23 @@ public class CalibrationCheckRecordTbl extends AbstractPo<String>{
 	 * 返回 是否过审
 	 * @return
 	 */
-	public String getShiFouGuoShen() 
+	public String getShiFouGuoShen()
 	{
 		return this.shiFouGuoShen;
 	}
-	public void setBianZhiRen(String bianZhiRen) 
+	public void setDiDian(String diDian)
+	{
+		this.diDian = diDian;
+	}
+	/**
+	 * 返回 地点
+	 * @return
+	 */
+	public String getDiDian()
+	{
+		return this.diDian;
+	}
+	public void setBianZhiRen(String bianZhiRen)
 	{
 		this.bianZhiRen = bianZhiRen;
 	}
@@ -163,11 +143,11 @@ public class CalibrationCheckRecordTbl extends AbstractPo<String>{
 	 * 返回 编制人
 	 * @return
 	 */
-	public String getBianZhiRen() 
+	public String getBianZhiRen()
 	{
 		return this.bianZhiRen;
 	}
-	public void setBianZhiBuMen(String bianZhiBuMen) 
+	public void setBianZhiBuMen(String bianZhiBuMen)
 	{
 		this.bianZhiBuMen = bianZhiBuMen;
 	}
@@ -175,11 +155,11 @@ public class CalibrationCheckRecordTbl extends AbstractPo<String>{
 	 * 返回 编制部门
 	 * @return
 	 */
-	public String getBianZhiBuMen() 
+	public String getBianZhiBuMen()
 	{
 		return this.bianZhiBuMen;
 	}
-	public void setBianZhiShiJian(String bianZhiShiJian) 
+	public void setBianZhiShiJian(String bianZhiShiJian)
 	{
 		this.bianZhiShiJian = bianZhiShiJian;
 	}
@@ -187,191 +167,167 @@ public class CalibrationCheckRecordTbl extends AbstractPo<String>{
 	 * 返回 编制时间
 	 * @return
 	 */
-	public String getBianZhiShiJian() 
+	public String getBianZhiShiJian()
 	{
 		return this.bianZhiShiJian;
 	}
-	public void setSheBeiMingChen(String sheBeiMingChen) 
+	public void setKuaiZhao(String kuaiZhao)
 	{
-		this.sheBeiMingChen = sheBeiMingChen;
+		this.kuaiZhao = kuaiZhao;
 	}
 	/**
-	 * 返回 设备名称
+	 * 返回 快照
 	 * @return
 	 */
-	public String getSheBeiMingChen() 
+	public String getKuaiZhao()
 	{
-		return this.sheBeiMingChen;
+		return this.kuaiZhao;
 	}
-	public void setSheBeiId(String sheBeiId) 
+	public void setSheBeiId(String sheBeiId)
 	{
 		this.sheBeiId = sheBeiId;
 	}
 	/**
-	 * 返回 设备卡ID
+	 * 返回 设备id
 	 * @return
 	 */
-	public String getSheBeiId() 
+	public String getSheBeiId()
 	{
 		return this.sheBeiId;
 	}
-	public void setXingHaoGuiGe(String xingHaoGuiGe) 
-	{
-		this.xingHaoGuiGe = xingHaoGuiGe;
-	}
-	/**
-	 * 返回 型号/规格
-	 * @return
-	 */
-	public String getXingHaoGuiGe() 
-	{
-		return this.xingHaoGuiGe;
-	}
-	public void setChuChangBianHa(String chuChangBianHa) 
+	public void setSheBeiBianHao(String sheBeiBianHao)
 	{
-		this.chuChangBianHa = chuChangBianHa;
+		this.sheBeiBianHao = sheBeiBianHao;
 	}
 	/**
-	 * 返回 出厂编号
+	 * 返回 设备编号
 	 * @return
 	 */
-	public String getChuChangBianHa() 
+	public String getSheBeiBianHao()
 	{
-		return this.chuChangBianHa;
+		return this.sheBeiBianHao;
 	}
-	public void setZhunQueDu(String zhunQueDu) 
+	public void setSheBeiMingChen(String sheBeiMingChen)
 	{
-		this.zhunQueDu = zhunQueDu;
-	}
-	/**
-	 * 返回 证书编号
-	 * @return
-	 */
-	public String getZhunQueDu() 
-	{
-		return this.zhunQueDu;
-	}
-	public void setLiangCheng(String liangCheng) 
-	{
-		this.liangCheng = liangCheng;
+		this.sheBeiMingChen = sheBeiMingChen;
 	}
 	/**
-	 * 返回 范围
+	 * 返回 设备名称
 	 * @return
 	 */
-	public String getLiangCheng() 
+	public String getSheBeiMingChen()
 	{
-		return this.liangCheng;
+		return this.sheBeiMingChen;
 	}
-	public void setJianDingDanWei(String jianDingDanWei) 
+	public void setJianDingXiaoZh(String jianDingXiaoZh)
 	{
-		this.jianDingDanWei = jianDingDanWei;
+		this.jianDingXiaoZh = jianDingXiaoZh;
 	}
 	/**
-	 * 返回 检定单位
+	 * 返回 检定/校准参数
 	 * @return
 	 */
-	public String getJianDingDanWei() 
+	public String getJianDingXiaoZh()
 	{
-		return this.jianDingDanWei;
+		return this.jianDingXiaoZh;
 	}
-	public void setJianDingZhouQi(String jianDingZhouQi) 
+	public void setYuQiShiYongFa(String yuQiShiYongFa)
 	{
-		this.jianDingZhouQi = jianDingZhouQi;
+		this.yuQiShiYongFa = yuQiShiYongFa;
 	}
 	/**
-	 * 返回 检定周期
+	 * 返回 预期使用范围
 	 * @return
 	 */
-	public String getJianDingZhouQi() 
+	public String getYuQiShiYongFa()
 	{
-		return this.jianDingZhouQi;
+		return this.yuQiShiYongFa;
 	}
-	public void setYiJianXiaoRiQ(String yiJianXiaoRiQ) 
+	public void setFuJian(String fuJian)
 	{
-		this.yiJianXiaoRiQ = yiJianXiaoRiQ;
+		this.fuJian = fuJian;
 	}
 	/**
-	 * 返回 已检/校日期
+	 * 返回 附件
 	 * @return
 	 */
-	public String getYiJianXiaoRiQ() 
+	public String getFuJian()
 	{
-		return this.yiJianXiaoRiQ;
+		return this.fuJian;
 	}
-	public void setJiHuaRiQi(String jiHuaRiQi) 
+	public void setXiaoZhunDianBi(String xiaoZhunDianBi)
 	{
-		this.jiHuaRiQi = jiHuaRiQi;
+		this.xiaoZhunDianBi = xiaoZhunDianBi;
 	}
 	/**
-	 * 返回 计划日期
+	 * 返回 校准点/标准值等
 	 * @return
 	 */
-	public String getJiHuaRiQi() 
+	public String getXiaoZhunDianBi()
 	{
-		return this.jiHuaRiQi;
+		return this.xiaoZhunDianBi;
 	}
-	public void setBeiZhu(String beiZhu) 
+	public void setZhunQueDuCeLi(String zhunQueDuCeLi)
 	{
-		this.beiZhu = beiZhu;
+		this.zhunQueDuCeLi = zhunQueDuCeLi;
 	}
 	/**
-	 * 返回 附件上传
+	 * 返回 准确度/测量不确定度
 	 * @return
 	 */
-	public String getBeiZhu() 
+	public String getZhunQueDuCeLi()
 	{
-		return this.beiZhu;
+		return this.zhunQueDuCeLi;
 	}
-	public void setSheBeiMingChe(String sheBeiMingChe) 
+	public void setXiaoZhunDanWei(String xiaoZhunDanWei)
 	{
-		this.sheBeiMingChe = sheBeiMingChe;
+		this.xiaoZhunDanWei = xiaoZhunDanWei;
 	}
 	/**
-	 * 返回 设备名称
+	 * 返回 检定/校准单位
 	 * @return
 	 */
-	public String getSheBeiMingChe() 
+	public String getXiaoZhunDanWei()
 	{
-		return this.sheBeiMingChe;
+		return this.xiaoZhunDanWei;
 	}
-	public void setSongJianDanWei(String songJianDanWei) 
+	public void setDanWeiId(String danWeiId)
 	{
-		this.songJianDanWei = songJianDanWei;
+		this.danWeiId = danWeiId;
 	}
 	/**
-	 * 返回 送检单位
+	 * 返回 检定/校准单位ID
 	 * @return
 	 */
-	public String getSongJianDanWei() 
+	public String getDanWeiId()
 	{
-		return this.songJianDanWei;
+		return this.danWeiId;
 	}
-	public void setJianDingXiangM(String jianDingXiangM) 
+	public void setZhouQi(String zhouQi)
 	{
-		this.jianDingXiangM = jianDingXiangM;
+		this.zhouQi = zhouQi;
 	}
 	/**
-	 * 返回 检定/校准项目
+	 * 返回 周期
 	 * @return
 	 */
-	public String getJianDingXiangM() 
+	public String getZhouQi()
 	{
-		return this.jianDingXiangM;
+		return this.zhouQi;
 	}
-	public void setZuiDaYunCha(String zuiDaYunCha) 
+	public void setShangCiJianDin(String shangCiJianDin)
 	{
-		this.zuiDaYunCha = zuiDaYunCha;
+		this.shangCiJianDin = shangCiJianDin;
 	}
 	/**
-	 * 返回 最大允差/准确度/U
+	 * 返回 上次检定/校准日期
 	 * @return
 	 */
-	public String getZuiDaYunCha() 
+	public String getShangCiJianDin()
 	{
-		return this.zuiDaYunCha;
+		return this.shangCiJianDin;
 	}
-	public void setFuZeRen(String fuZeRen) 
+	public void setFuZeRen(String fuZeRen)
 	{
 		this.fuZeRen = fuZeRen;
 	}
@@ -379,59 +335,47 @@ public class CalibrationCheckRecordTbl extends AbstractPo<String>{
 	 * 返回 负责人
 	 * @return
 	 */
-	public String getFuZeRen() 
+	public String getFuZeRen()
 	{
 		return this.fuZeRen;
 	}
-	public void setBianHaoZhongWe(String bianHaoZhongWe) 
-	{
-		this.bianHaoZhongWe = bianHaoZhongWe;
-	}
-	/**
-	 * 返回 设备编号中文
-	 * @return
-	 */
-	public String getBianHaoZhongWe() 
-	{
-		return this.bianHaoZhongWe;
-	}
-	public void setDiDian(String diDian) 
+	public void setJiHuaRiQi(String jiHuaRiQi)
 	{
-		this.diDian = diDian;
+		this.jiHuaRiQi = jiHuaRiQi;
 	}
 	/**
-	 * 返回 地点
+	 * 返回 计划日期
 	 * @return
 	 */
-	public String getDiDian() 
+	public String getJiHuaRiQi()
 	{
-		return this.diDian;
+		return this.jiHuaRiQi;
 	}
-	public void setSheBeiLeiXing(String sheBeiLeiXing) 
+	public void setJiHuaZiBiaoId(String jiHuaZiBiaoId)
 	{
-		this.sheBeiLeiXing = sheBeiLeiXing;
+		this.jiHuaZiBiaoId = jiHuaZiBiaoId;
 	}
 	/**
-	 * 返回 设备类型
+	 * 返回 计划子表id
 	 * @return
 	 */
-	public String getSheBeiLeiXing() 
+	public String getJiHuaZiBiaoId()
 	{
-		return this.sheBeiLeiXing;
+		return this.jiHuaZiBiaoId;
 	}
-	public void setChangJiaPinPai(String changJiaPinPai) 
+	public void setJiHuaZhuBiaoI(String jiHuaZhuBiaoI)
 	{
-		this.changJiaPinPai = changJiaPinPai;
+		this.jiHuaZhuBiaoI = jiHuaZhuBiaoI;
 	}
 	/**
-	 * 返回 厂家/品牌
+	 * 返回 计划主表id
 	 * @return
 	 */
-	public String getChangJiaPinPai() 
+	public String getJiHuaZhuBiaoI()
 	{
-		return this.changJiaPinPai;
+		return this.jiHuaZhuBiaoI;
 	}
-	public void setShiShiRiQi(String shiShiRiQi) 
+	public void setShiShiRiQi(String shiShiRiQi)
 	{
 		this.shiShiRiQi = shiShiRiQi;
 	}
@@ -439,117 +383,28 @@ public class CalibrationCheckRecordTbl extends AbstractPo<String>{
 	 * 返回 实施日期
 	 * @return
 	 */
-	public String getShiShiRiQi() 
+	public String getShiShiRiQi()
 	{
 		return this.shiShiRiQi;
 	}
-	public void setXiuZhengYinZi(String xiuZhengYinZi) 
+	public void setXiaoZhunYouXia(String xiaoZhunYouXia)
 	{
-		this.xiuZhengYinZi = xiuZhengYinZi;
+		this.xiaoZhunYouXia = xiaoZhunYouXia;
 	}
 	/**
-	 * 返回 修正因子
+	 * 返回 校准有效期至
 	 * @return
 	 */
-	public String getXiuZhengYinZi() 
-	{
-		return this.xiuZhengYinZi;
-	}
-	public void setJingBanRen(String jingBanRen) 
+	public String getXiaoZhunYouXia()
 	{
-		this.jingBanRen = jingBanRen;
+		return this.xiaoZhunYouXia;
 	}
-	/**
-	 * 返回 经办人
-	 * @return
-	 */
-	public String getJingBanRen() 
-	{
-		return this.jingBanRen;
-	}
-	public void setDanWeiId(String danWeiId) 
-	{
-		this.danWeiId = danWeiId;
-	}
-	/**
-	 * 返回 检定/校准单位ID
-	 * @return
-	 */
-	public String getDanWeiId() 
-	{
-		return this.danWeiId;
-	}
-	public void setXiangMuId(String xiangMuId) 
-	{
-		this.xiangMuId = xiangMuId;
-	}
-	/**
-	 * 返回 校验项目ID
-	 * @return
-	 */
-	public String getXiangMuId() 
-	{
-		return this.xiangMuId;
-	}
-	public void setCanShu(String canShu) 
-	{
-		this.canShu = canShu;
-	}
-	/**
-	 * 返回 参数
-	 * @return
-	 */
-	public String getCanShu() 
-	{
-		return this.canShu;
-	}
-	public void setYuanSheBeiBian(String yuanSheBeiBian) 
-	{
-		this.yuanSheBeiBian = yuanSheBeiBian;
-	}
-	/**
-	 * 返回 原设备编号
-	 * @return
-	 */
-	public String getYuanSheBeiBian() 
-	{
-		return this.yuanSheBeiBian;
-	}
-	public void setMarks(String marks) 
-	{
-		this.marks = marks;
-	}
-	/**
-	 * 返回 marks
-	 * @return
-	 */
-	public String getMarks() 
-	{
-		return this.marks;
-	}
-	public void setYouXiaoQiZhi(String youXiaoQiZhi) 
-	{
-		this.youXiaoQiZhi = youXiaoQiZhi;
-	}
-	/**
-	 * 返回 有效期至
-	 * @return
-	 */
-	public String getYouXiaoQiZhi() 
-	{
-		return this.youXiaoQiZhi;
-	}
-	public void setRecordParentid(String recordParentid) 
-	{
-		this.recordParentid = recordParentid;
+
+	public String getZhengShuBianHao() {
+		return zhengShuBianHao;
 	}
-	/**
-	 * 返回 recordParentId
-	 * @return
-	 */
-	public String getRecordParentid() 
-	{
-		return this.recordParentid;
+
+	public void setZhengShuBianHao(String zhengShuBianHao) {
+		this.zhengShuBianHao = zhengShuBianHao;
 	}
-	
 }

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

@@ -4,7 +4,6 @@
 	<!--<cache type="net.oschina.j2cache.mybatis.J2CacheAdapter"/>-->
 	<resultMap id="CalibrationCheckRecordPo" type="com.lc.ibps.components.equipment.persistence.entity.CalibrationCheckRecordPo">
 		<id property="id" column="ID_" jdbcType="VARCHAR"/>
-		<result property="parentId" column="PARENT_ID_" jdbcType="VARCHAR"/>
 		<result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR"/>
 		<result property="ip" column="IP_" jdbcType="VARCHAR"/>
 		<result property="createBy" column="CREATE_BY_" jdbcType="VARCHAR"/>
@@ -12,61 +11,52 @@
 		<result property="updateBy" column="UPDATE_BY_" jdbcType="VARCHAR"/>
 		<result property="updateTime" column="UPDATE_TIME_" jdbcType="TIMESTAMP"/>
 		<result property="shiFouGuoShen" column="SHI_FOU_GUO_SHEN_" jdbcType="VARCHAR"/>
+		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
 		<result property="bianZhiRen" column="BIAN_ZHI_REN_" jdbcType="VARCHAR"/>
 		<result property="bianZhiBuMen" column="BIAN_ZHI_BU_MEN_" jdbcType="VARCHAR"/>
 		<result property="bianZhiShiJian" column="BIAN_ZHI_SHI_JIAN" jdbcType="VARCHAR"/>
+		<result property="kuaiZhao" column="KUAI_ZHAO_" jdbcType="VARCHAR"/>
+		<result property="sheBeiId" column="SHE_BEI_ID_" jdbcType="VARCHAR"/>
+		<result property="sheBeiBianHao" column="SHE_BEI_BIAN_HAO_" jdbcType="VARCHAR"/>
 		<result property="sheBeiMingChen" column="SHE_BEI_MING_CHEN" jdbcType="VARCHAR"/>
-		<result property="sheBeiId" column="SHE_BEI_BIAN_HAO_" jdbcType="VARCHAR"/>
-		<result property="xingHaoGuiGe" column="XING_HAO_GUI_GE_" jdbcType="VARCHAR"/>
-		<result property="chuChangBianHa" column="CHU_CHANG_BIAN_HA" jdbcType="VARCHAR"/>
-		<result property="zhunQueDu" column="ZHUN_QUE_DU_" jdbcType="VARCHAR"/>
-		<result property="liangCheng" column="LIANG_CHENG_" jdbcType="VARCHAR"/>
-		<result property="jianDingDanWei" column="JIAN_DING_DAN_WEI" jdbcType="VARCHAR"/>
-		<result property="jianDingZhouQi" column="JIAN_DING_ZHOU_QI" jdbcType="VARCHAR"/>
-		<result property="yiJianXiaoRiQ" column="YI_JIAN_XIAO_RI_Q" jdbcType="VARCHAR"/>
-		<result property="jiHuaRiQi" column="JI_HUA_RI_QI_" jdbcType="VARCHAR"/>
-		<result property="beiZhu" column="BEI_ZHU_" jdbcType="BLOB"/>
-		<result property="sheBeiMingChe" column="SHE_BEI_MING_CHE" jdbcType="VARCHAR"/>
-		<result property="songJianDanWei" column="SONG_JIAN_DAN_WEI" jdbcType="VARCHAR"/>
-		<result property="jianDingXiangM" column="JIAN_DING_XIANG_M" jdbcType="VARCHAR"/>
-		<result property="zuiDaYunCha" column="ZUI_DA_YUN_CHA_" jdbcType="VARCHAR"/>
+		<result property="jianDingXiaoZh" column="JIAN_DING_XIAO_ZH" jdbcType="BLOB"/>
+		<result property="yuQiShiYongFa" column="YU_QI_SHI_YONG_FA" jdbcType="BLOB"/>
+		<result property="fuJian" column="FU_JIAN_" jdbcType="BLOB"/>
+		<result property="xiaoZhunDianBi" column="XIAO_ZHUN_DIAN_BI" jdbcType="BLOB"/>
+		<result property="zhunQueDuCeLi" column="ZHUN_QUE_DU_CE_LI" jdbcType="BLOB"/>
+		<result property="xiaoZhunDanWei" column="XIAO_ZHUN_DAN_WEI" jdbcType="VARCHAR"/>
+		<result property="danWeiId" column="DAN_WEI_ID_" jdbcType="VARCHAR"/>
+		<result property="zhouQi" column="ZHOU_QI_" jdbcType="VARCHAR"/>
+		<result property="shangCiJianDin" column="SHANG_CI_JIAN_DIN" jdbcType="VARCHAR"/>
 		<result property="fuZeRen" column="FU_ZE_REN_" jdbcType="VARCHAR"/>
-		<result property="bianHaoZhongWe" column="BIAN_HAO_ZHONG_WE" jdbcType="VARCHAR"/>
-		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
-		<result property="sheBeiLeiXing" column="SHE_BEI_LEI_XING_" jdbcType="VARCHAR"/>
-		<result property="changJiaPinPai" column="CHANG_JIA_PIN_PAI" jdbcType="VARCHAR"/>
+		<result property="jiHuaRiQi" column="JI_HUA_RI_QI_" jdbcType="VARCHAR"/>
+		<result property="jiHuaZiBiaoId" column="JI_HUA_ZI_BIAO_ID" jdbcType="VARCHAR"/>
+		<result property="jiHuaZhuBiaoI" column="JI_HUA_ZHU_BIAO_I" jdbcType="VARCHAR"/>
 		<result property="shiShiRiQi" column="SHI_SHI_RI_QI_" jdbcType="VARCHAR"/>
-		<result property="xiuZhengYinZi" column="XIU_ZHENG_YIN_ZI_" jdbcType="VARCHAR"/>
-		<result property="jingBanRen" column="JING_BAN_REN_" jdbcType="VARCHAR"/>
-		<result property="danWeiId" column="DAN_WEI_ID" jdbcType="VARCHAR"/>
-		<result property="xiangMuId" column="XIANG_MU_ID_" jdbcType="VARCHAR"/>
-		<result property="canShu" column="CAN_SHU_" jdbcType="VARCHAR"/>
-		<result property="yuanSheBeiBian" column="YUAN_SHE_BEI_BIAN" jdbcType="VARCHAR"/>
-		<result property="marks" column="MARKS_" jdbcType="VARCHAR"/>
-		<result property="youXiaoQiZhi" column="YOU_XIAO_QI_ZHI_" jdbcType="VARCHAR"/>
-		<result property="recordParentid" column="RECORD_PARENTID_" jdbcType="VARCHAR"/>
+		<result property="xiaoZhunYouXia" column="XIAO_ZHUN_YOU_XIA" jdbcType="VARCHAR"/>
+		<result property="zhengShuBianHao" column="ZHENG_SHU_BIAN_HA" jdbcType="VARCHAR"/>
 	</resultMap>
-	
+
+
 	<sql id="columns">
-		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,SHE_BEI_MING_CHEN,SHE_BEI_BIAN_HAO_,XING_HAO_GUI_GE_,CHU_CHANG_BIAN_HA,ZHUN_QUE_DU_,LIANG_CHENG_,JIAN_DING_DAN_WEI,JIAN_DING_ZHOU_QI,YI_JIAN_XIAO_RI_Q,JI_HUA_RI_QI_,BEI_ZHU_,SHE_BEI_MING_CHE,SONG_JIAN_DAN_WEI,JIAN_DING_XIANG_M,ZUI_DA_YUN_CHA_,FU_ZE_REN_,BIAN_HAO_ZHONG_WE,DI_DIAN_,SHE_BEI_LEI_XING_,CHANG_JIA_PIN_PAI,SHI_SHI_RI_QI_,XIU_ZHENG_YIN_ZI_,JING_BAN_REN_,DAN_WEI_ID,XIANG_MU_ID_,CAN_SHU_,YUAN_SHE_BEI_BIAN,MARKS_,YOU_XIAO_QI_ZHI_,RECORD_PARENTID_
+		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_,SHE_BEI_ID_,SHE_BEI_BIAN_HAO_,SHE_BEI_MING_CHEN,JIAN_DING_XIAO_ZH,YU_QI_SHI_YONG_FA,FU_JIAN_,XIAO_ZHUN_DIAN_BI,ZHUN_QUE_DU_CE_LI,XIAO_ZHUN_DAN_WEI,DAN_WEI_ID_,ZHOU_QI_,SHANG_CI_JIAN_DIN,FU_ZE_REN_,JI_HUA_RI_QI_,JI_HUA_ZI_BIAO_ID,JI_HUA_ZHU_BIAO_I,SHI_SHI_RI_QI_,XIAO_ZHUN_YOU_XIA,ZHENG_SHU_BIAN_HA
 	</sql>
-	
+
 	<insert id="create" parameterType="com.lc.ibps.components.equipment.persistence.entity.CalibrationCheckRecordPo">
-		INSERT INTO T_MJSBJDXZJHZB
+		INSERT INTO T_XZJLB
 		(<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}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{sheBeiMingChen,jdbcType=VARCHAR}, #{sheBeiId,jdbcType=VARCHAR}, #{xingHaoGuiGe,jdbcType=VARCHAR}, #{chuChangBianHa,jdbcType=VARCHAR}, #{zhunQueDu,jdbcType=VARCHAR}, #{liangCheng,jdbcType=VARCHAR}, #{jianDingDanWei,jdbcType=VARCHAR}, #{jianDingZhouQi,jdbcType=VARCHAR}, #{yiJianXiaoRiQ,jdbcType=VARCHAR}, #{jiHuaRiQi,jdbcType=VARCHAR}, #{beiZhu,jdbcType=BLOB}, #{sheBeiMingChe,jdbcType=VARCHAR}, #{songJianDanWei,jdbcType=VARCHAR}, #{jianDingXiangM,jdbcType=VARCHAR}, #{zuiDaYunCha,jdbcType=VARCHAR}, #{fuZeRen,jdbcType=VARCHAR}, #{bianHaoZhongWe,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}, #{sheBeiLeiXing,jdbcType=VARCHAR}, #{changJiaPinPai,jdbcType=VARCHAR}, #{shiShiRiQi,jdbcType=VARCHAR}, #{xiuZhengYinZi,jdbcType=VARCHAR}, #{jingBanRen,jdbcType=VARCHAR}, #{danWeiId,jdbcType=VARCHAR}, #{xiangMuId,jdbcType=VARCHAR}, #{canShu,jdbcType=VARCHAR}, #{yuanSheBeiBian,jdbcType=VARCHAR}, #{marks,jdbcType=VARCHAR}, #{youXiaoQiZhi,jdbcType=VARCHAR}, #{recordParentid,jdbcType=VARCHAR})
+		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}, #{sheBeiId,jdbcType=VARCHAR}, #{sheBeiBianHao,jdbcType=VARCHAR}, #{sheBeiMingChen,jdbcType=VARCHAR}, #{jianDingXiaoZh,jdbcType=BLOB}, #{yuQiShiYongFa,jdbcType=BLOB}, #{fuJian,jdbcType=BLOB}, #{xiaoZhunDianBi,jdbcType=BLOB}, #{zhunQueDuCeLi,jdbcType=BLOB}, #{xiaoZhunDanWei,jdbcType=VARCHAR}, #{danWeiId,jdbcType=VARCHAR}, #{zhouQi,jdbcType=VARCHAR}, #{shangCiJianDin,jdbcType=VARCHAR}, #{fuZeRen,jdbcType=VARCHAR}, #{jiHuaRiQi,jdbcType=VARCHAR}, #{jiHuaZiBiaoId,jdbcType=VARCHAR}, #{jiHuaZhuBiaoI,jdbcType=VARCHAR}, #{shiShiRiQi,jdbcType=VARCHAR}, #{xiaoZhunYouXia,jdbcType=VARCHAR}, #{zhengShuBianHao,jdbcType=VARCHAR})
 	</insert>
-	
+
 	<select id="get" parameterType="java.lang.String" resultMap="CalibrationCheckRecordPo">
-		SELECT <include refid="columns"/> FROM T_MJSBJDXZJHZB 
-		WHERE 
+		SELECT <include refid="columns"/> FROM T_XZJLB
+		WHERE
 		ID_=#{id}
 	</select>
-	
-	
+
 	<sql id="querySql" >
-		SELECT <include refid="columns"/> FROM T_MJSBJDXZJHZB
+		SELECT <include refid="columns"/> FROM T_XZJLB
 		<where>
 			<if test="@o.Ognl@isNotEmpty(whereSql)">
 				${whereSql}
@@ -79,73 +69,63 @@
 			ORDER BY ID_ DESC
 		</if>
 	</sql>
-	
+
 	<select id="query" parameterType="java.util.Map" resultMap="CalibrationCheckRecordPo">
 		<include refid="querySql"/>
 	</select>
-	
+
 	<select id="queryIds" parameterType="java.util.Map" resultMap="CalibrationCheckRecordPo">
 		SELECT ID_ FROM (<include refid="querySql"/>) T
 	</select>
-	
+
 	<select id="findByIds" resultMap="CalibrationCheckRecordPo">
-		SELECT <include refid="columns"/> FROM T_MJSBJDXZJHZB
-			WHERE ID_ in 
-			<foreach item="id" index="index" collection="ids" open="(" separator="," close=")">  
-				#{id}  
-			</foreach>  		
-			ORDER BY ID_ DESC			
-	</select>	
-	
+		SELECT <include refid="columns"/> FROM T_XZJLB
+		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.equipment.persistence.entity.CalibrationCheckRecordPo">
-		UPDATE T_MJSBJDXZJHZB 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},
-		SHI_FOU_GUO_SHEN_=#{shiFouGuoShen,jdbcType=VARCHAR},
-		BIAN_ZHI_REN_=#{bianZhiRen,jdbcType=VARCHAR},
-		BIAN_ZHI_BU_MEN_=#{bianZhiBuMen,jdbcType=VARCHAR},
-		BIAN_ZHI_SHI_JIAN=#{bianZhiShiJian,jdbcType=VARCHAR},
-		SHE_BEI_MING_CHEN=#{sheBeiMingChen,jdbcType=VARCHAR},
-		SHE_BEI_BIAN_HAO_=#{sheBeiId,jdbcType=VARCHAR},
-		XING_HAO_GUI_GE_=#{xingHaoGuiGe,jdbcType=VARCHAR},
-		CHU_CHANG_BIAN_HA=#{chuChangBianHa,jdbcType=VARCHAR},
-		ZHUN_QUE_DU_=#{zhunQueDu,jdbcType=VARCHAR},
-		LIANG_CHENG_=#{liangCheng,jdbcType=VARCHAR},
-		JIAN_DING_DAN_WEI=#{jianDingDanWei,jdbcType=VARCHAR},
-		JIAN_DING_ZHOU_QI=#{jianDingZhouQi,jdbcType=VARCHAR},
-		YI_JIAN_XIAO_RI_Q=#{yiJianXiaoRiQ,jdbcType=VARCHAR},
-		JI_HUA_RI_QI_=#{jiHuaRiQi,jdbcType=VARCHAR},
-		BEI_ZHU_=#{beiZhu,jdbcType=BLOB},
-		SHE_BEI_MING_CHE=#{sheBeiMingChe,jdbcType=VARCHAR},
-		SONG_JIAN_DAN_WEI=#{songJianDanWei,jdbcType=VARCHAR},
-		JIAN_DING_XIANG_M=#{jianDingXiangM,jdbcType=VARCHAR},
-		ZUI_DA_YUN_CHA_=#{zuiDaYunCha,jdbcType=VARCHAR},
-		FU_ZE_REN_=#{fuZeRen,jdbcType=VARCHAR},
-		BIAN_HAO_ZHONG_WE=#{bianHaoZhongWe,jdbcType=VARCHAR},
-		DI_DIAN_=#{diDian,jdbcType=VARCHAR},
-		SHE_BEI_LEI_XING_=#{sheBeiLeiXing,jdbcType=VARCHAR},
-		CHANG_JIA_PIN_PAI=#{changJiaPinPai,jdbcType=VARCHAR},
-		SHI_SHI_RI_QI_=#{shiShiRiQi,jdbcType=VARCHAR},
-		XIU_ZHENG_YIN_ZI_=#{xiuZhengYinZi,jdbcType=VARCHAR},
-		JING_BAN_REN_=#{jingBanRen,jdbcType=VARCHAR},
-		DAN_WEI_ID=#{danWeiId,jdbcType=VARCHAR},
-		XIANG_MU_ID_=#{xiangMuId,jdbcType=VARCHAR},
-		CAN_SHU_=#{canShu,jdbcType=VARCHAR},
-		YUAN_SHE_BEI_BIAN=#{yuanSheBeiBian,jdbcType=VARCHAR},
-		MARKS_=#{marks,jdbcType=VARCHAR},
-		YOU_XIAO_QI_ZHI_=#{youXiaoQiZhi,jdbcType=VARCHAR},
-		RECORD_PARENTID_=#{recordParentid,jdbcType=VARCHAR}
+		UPDATE T_XZJLB SET
+						   TENANT_ID_=#{tenantId,jdbcType=VARCHAR},
+						   IP_=#{ip,jdbcType=VARCHAR},
+						   UPDATE_BY_=#{updateBy,jdbcType=VARCHAR},
+						   UPDATE_TIME_=#{updateTime,jdbcType=TIMESTAMP},
+						   SHI_FOU_GUO_SHEN_=#{shiFouGuoShen,jdbcType=VARCHAR},
+						   DI_DIAN_=#{diDian,jdbcType=VARCHAR},
+						   BIAN_ZHI_REN_=#{bianZhiRen,jdbcType=VARCHAR},
+						   BIAN_ZHI_BU_MEN_=#{bianZhiBuMen,jdbcType=VARCHAR},
+						   BIAN_ZHI_SHI_JIAN=#{bianZhiShiJian,jdbcType=VARCHAR},
+						   KUAI_ZHAO_=#{kuaiZhao,jdbcType=VARCHAR},
+						   SHE_BEI_ID_=#{sheBeiId,jdbcType=VARCHAR},
+						   SHE_BEI_BIAN_HAO_=#{sheBeiBianHao,jdbcType=VARCHAR},
+						   SHE_BEI_MING_CHEN=#{sheBeiMingChen,jdbcType=VARCHAR},
+						   JIAN_DING_XIAO_ZH=#{jianDingXiaoZh,jdbcType=BLOB},
+						   YU_QI_SHI_YONG_FA=#{yuQiShiYongFa,jdbcType=BLOB},
+						   FU_JIAN_=#{fuJian,jdbcType=BLOB},
+						   XIAO_ZHUN_DIAN_BI=#{xiaoZhunDianBi,jdbcType=BLOB},
+						   ZHUN_QUE_DU_CE_LI=#{zhunQueDuCeLi,jdbcType=BLOB},
+						   XIAO_ZHUN_DAN_WEI=#{xiaoZhunDanWei,jdbcType=VARCHAR},
+						   DAN_WEI_ID_=#{danWeiId,jdbcType=VARCHAR},
+						   ZHOU_QI_=#{zhouQi,jdbcType=VARCHAR},
+						   SHANG_CI_JIAN_DIN=#{shangCiJianDin,jdbcType=VARCHAR},
+						   FU_ZE_REN_=#{fuZeRen,jdbcType=VARCHAR},
+						   JI_HUA_RI_QI_=#{jiHuaRiQi,jdbcType=VARCHAR},
+						   JI_HUA_ZI_BIAO_ID=#{jiHuaZiBiaoId,jdbcType=VARCHAR},
+						   JI_HUA_ZHU_BIAO_I=#{jiHuaZhuBiaoI,jdbcType=VARCHAR},
+						   SHI_SHI_RI_QI_=#{shiShiRiQi,jdbcType=VARCHAR},
+						   XIAO_ZHUN_YOU_XIA=#{xiaoZhunYouXia,jdbcType=VARCHAR},
+						   ZHENG_SHU_BIAN_HA=#{zhengShuBianHao,jdbcType=VARCHAR}
 		WHERE
-		ID_=#{id}
+			ID_=#{id}
 	</update>
-	
+
 	<delete id="remove" parameterType="java.lang.String">
-		DELETE FROM T_MJSBJDXZJHZB 
+		DELETE FROM T_XZJLB
 		WHERE
-		ID_=#{id}
+			ID_=#{id}
 	</delete>