From 825da6ff9fbab76ca933930e35575cc8b0e811bd Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 19 三月 2024 17:11:23 +0800
Subject: [PATCH] 功能大调整
---
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 75 +++++++++++++++++--------------------
1 files changed, 34 insertions(+), 41 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index de4133c..220c796 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -5,50 +5,43 @@
<mapper namespace="com.yuanchu.mom.mapper.InsProductMapper">
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsProduct">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
- <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
- <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
- <result property="factory" column="factory" jdbcType="VARCHAR"/>
- <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
- <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
- <result property="sample" column="sample" jdbcType="VARCHAR"/>
- <result property="model" column="model" jdbcType="VARCHAR"/>
- <result property="unit" column="unit" jdbcType="VARCHAR"/>
- <result property="price" column="price" jdbcType="DECIMAL"/>
- <result property="manHour" column="man_hour" jdbcType="INTEGER"/>
- <result property="manHourGroup" column="man_hour_group" jdbcType="VARCHAR"/>
- <result property="inspectionItemType" column="inspection_item_type" jdbcType="VARCHAR"/>
- <result property="inspectionValueType" column="inspection_value_type" jdbcType="VARCHAR"/>
- <result property="deviceGroup" column="device_group" jdbcType="VARCHAR"/>
- <result property="checkoutNumber" column="checkout_number" jdbcType="INTEGER"/>
- <result property="section" column="section" jdbcType="VARCHAR"/>
- <result property="valueType" column="value_type" jdbcType="VARCHAR"/>
- <result property="method" column="method" jdbcType="VARCHAR"/>
- <result property="manDay" column="man_day" jdbcType="INTEGER"/>
- <result property="bsm" column="bsm" jdbcType="VARCHAR"/>
- <result property="ask" column="ask" jdbcType="VARCHAR"/>
- <result property="state" column="state" jdbcType="INTEGER"/>
- <result property="createUser" column="create_user" jdbcType="INTEGER"/>
- <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
+ <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
+ <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
+ <result property="factory" column="factory" jdbcType="VARCHAR"/>
+ <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
+ <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
+ <result property="sample" column="sample" jdbcType="VARCHAR"/>
+ <result property="model" column="model" jdbcType="VARCHAR"/>
+ <result property="sonLaboratory" column="son_laboratory" jdbcType="VARCHAR"/>
+ <result property="unit" column="unit" jdbcType="VARCHAR"/>
+ <result property="price" column="price" jdbcType="DECIMAL"/>
+ <result property="manHour" column="man_hour" jdbcType="DOUBLE"/>
+ <result property="manHourGroup" column="man_hour_group" jdbcType="VARCHAR"/>
+ <result property="inspectionItemType" column="inspection_item_type" jdbcType="VARCHAR"/>
+ <result property="inspectionValueType" column="inspection_value_type" jdbcType="VARCHAR"/>
+ <result property="deviceGroup" column="device_group" jdbcType="VARCHAR"/>
+ <result property="checkoutNumber" column="checkout_number" jdbcType="INTEGER"/>
+ <result property="section" column="section" jdbcType="VARCHAR"/>
+ <result property="valueType" column="value_type" jdbcType="VARCHAR"/>
+ <result property="method" column="method" jdbcType="VARCHAR"/>
+ <result property="manDay" column="man_day" jdbcType="INTEGER"/>
+ <result property="bsm" column="bsm" jdbcType="VARCHAR"/>
+ <result property="ask" column="ask" jdbcType="VARCHAR"/>
+ <result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
+ <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
+ <result property="state" column="state" jdbcType="INTEGER"/>
+ <result property="insSampleId" column="ins_sample_id" jdbcType="INTEGER"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="templateId" column="template_id" jdbcType="INTEGER"/>
</resultMap>
- <sql id="Base_Column_List">
- id,inspection_item,inspection_item_classify,
- inspection_item_subclass,factory,laboratory,
- sample_type,sample,model,
- unit,price,man_hour,
- man_hour_group,inspection_item_type,inspection_value_type,
- device_group,checkout_number,section,
- value_type,method,man_day,
- bsm,ask,state,
- create_user,update_user,create_time,
- update_time
- </sql>
<select id="selectOrderManDay" resultType="java.lang.Integer">
- select coalesce(sum(ip.man_day), 0) from ins_sample i
+ select coalesce(max(ip.man_day), 0) from ins_sample i
left join ins_product ip on i.id = ip.ins_sample_id
where i.id = #{sampleId}
</select>
--
Gitblit v1.9.3