From b364530ee03f8b28b64863f6a633daf05dc94e91 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期三, 18 十二月 2024 15:55:19 +0800 Subject: [PATCH] 查询站点的检验时长+产量工时bug+检验任务提交撤销+首页待办查最近七天的信息+高低温检验增加检验表字段 --- inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml index 673b974..f8decca 100644 --- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml +++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml @@ -23,7 +23,6 @@ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/> </resultMap> - <select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO"> select * from( select * from( @@ -267,7 +266,9 @@ ipr.equip_value, ipr.equip_name, ipr.before_check, + ipr.before_note, ipr.after_check, + ipr.after_note, ipr2.frequency, ipr2.often, ipr2.port, @@ -337,7 +338,9 @@ ipr.equip_value, ipr.equip_name, ipr.before_check, + ipr.before_note, ipr.after_check, + ipr.after_note, ipr2.frequency, ipr2.often, ipr2.port, @@ -537,7 +540,9 @@ ipr.equip_value, ipr.equip_name, ipr.before_check, + ipr.before_note, ipr.after_check, + ipr.after_note, ipr2.frequency, ipr2.often, ipr2.port, @@ -605,7 +610,9 @@ ipr.equip_value, ipr.equip_name, ipr.before_check, + ipr.before_note, ipr.after_check, + ipr.after_note, ipr2.frequency, ipr2.often, ipr2.port, @@ -671,7 +678,9 @@ ipr.equip_value, ipr.equip_name, ipr.before_check, + ipr.before_note, ipr.after_check, + ipr.after_note, ipr2.frequency, ipr2.often, ipr2.port, @@ -809,7 +818,9 @@ <result property="comValue" column="com_value" jdbcType="VARCHAR"/> <result property="equipValue" column="equip_value" jdbcType="VARCHAR"/> <result property="beforeCheck" column="before_check" jdbcType="VARCHAR"/> + <result property="beforeNote" column="before_note" jdbcType="VARCHAR"/> <result property="afterCheck" column="after_check" jdbcType="VARCHAR"/> + <result property="afterNote" column="after_note" jdbcType="VARCHAR"/> <result property="equipName" column="equip_name" jdbcType="VARBINARY"/> </resultMap> <resultMap id="insProductResult2" type="com.yuanchu.mom.pojo.InsProductResult2"> -- Gitblit v1.9.3