退检模块,检验项目 BUG修改
This commit is contained in:
parent
42ed699e0a
commit
d43aaa9e83
@ -189,6 +189,8 @@ public class ReportItemServiceImpl implements ReportItemService {
|
|||||||
if(xmRefNewRow.getXmid() == null || xmRefNewRow.getXmid().equals("")) xmRefNewRow.setXmid(xmInfoNew.getXmid());
|
if(xmRefNewRow.getXmid() == null || xmRefNewRow.getXmid().equals("")) xmRefNewRow.setXmid(xmInfoNew.getXmid());
|
||||||
XmRefNew newXmRef = new XmRefNew();
|
XmRefNew newXmRef = new XmRefNew();
|
||||||
newXmRef.setXmid(xmRefNewRow.getXmid());
|
newXmRef.setXmid(xmRefNewRow.getXmid());
|
||||||
|
newXmRef.setXh(xmRefNewRow.getXh());
|
||||||
|
newXmRef.setYq(xmRefNewRow.getYq());
|
||||||
List<XmRefNew> xmRefNews = reportItemMapper.queryXmRefNew(newXmRef);
|
List<XmRefNew> xmRefNews = reportItemMapper.queryXmRefNew(newXmRef);
|
||||||
if(xmRefNews.size() > 0){
|
if(xmRefNews.size() > 0){
|
||||||
reportItemMapper.updateXmRefNewRow(xmRefNewRow);
|
reportItemMapper.updateXmRefNewRow(xmRefNewRow);
|
||||||
|
|||||||
@ -63,6 +63,7 @@ public class CancelCheckServiceImpl implements CancelCheckService {
|
|||||||
|
|
||||||
//写日志
|
//写日志
|
||||||
Integer labReqsteplogMax = labReqsteplogMapper.getLabReqsteplogMax(cancelCheckVO.getSqh());
|
Integer labReqsteplogMax = labReqsteplogMapper.getLabReqsteplogMax(cancelCheckVO.getSqh());
|
||||||
|
if(labReqsteplogMax == null) labReqsteplogMax = 0;
|
||||||
LabReqsteplog labReqsteplog = new LabReqsteplog();
|
LabReqsteplog labReqsteplog = new LabReqsteplog();
|
||||||
labReqsteplog.setSqh(cancelCheckVO.getSqh());
|
labReqsteplog.setSqh(cancelCheckVO.getSqh());
|
||||||
labReqsteplog.setXh(labReqsteplogMax + 1);
|
labReqsteplog.setXh(labReqsteplogMax + 1);
|
||||||
|
|||||||
@ -374,11 +374,13 @@
|
|||||||
|
|
||||||
<delete id="deleteXmTextResult">
|
<delete id="deleteXmTextResult">
|
||||||
delete from xm_textresult_new where xmid = #{xmid}
|
delete from xm_textresult_new where xmid = #{xmid}
|
||||||
|
<if test="xh != null">and xh = #{xh}</if>
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<delete id="deleteXmRefNew">
|
<delete id="deleteXmRefNew">
|
||||||
delete from xm_ref_new where xmid = #{xmid}
|
delete from xm_ref_new where xmid = #{xmid}
|
||||||
<if test="xh != null">and xh = #{xh}</if>
|
<if test="xh != null">and xh = #{xh}</if>
|
||||||
|
<if test="yq != null and yq != ''">and yq = #{yq}</if>
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<delete id="deleteXmValNew">
|
<delete id="deleteXmValNew">
|
||||||
@ -466,9 +468,9 @@
|
|||||||
<if test="zd != null and zd != ''">zd = #{zd},</if>
|
<if test="zd != null and zd != ''">zd = #{zd},</if>
|
||||||
<if test="instrid != null and instrid != ''">instrid = #{instrid},</if>
|
<if test="instrid != null and instrid != ''">instrid = #{instrid},</if>
|
||||||
<if test="yq != null and yq != ''">yq = #{yq},</if>
|
<if test="yq != null and yq != ''">yq = #{yq},</if>
|
||||||
xmid = #{xmid},xmdh = #{xmdh},xh = #{xh}
|
xmid = #{xmid},xmdh = #{xmdh}
|
||||||
</set>
|
</set>
|
||||||
where xmid = #{xmid}
|
where xmid = #{xmid} and xh = #{xh} and yq = #{yq}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<update id="updateXmValNewRow">
|
<update id="updateXmValNewRow">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user