From 2f50c3b23a14aa649e58c63d62862b6e0eada7ac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 05 九月 2023 17:04:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml | 82 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 13 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml b/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
index 40924a7..5dc7ac5 100644
--- a/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
@@ -1,21 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.FinishedInspectMapper">
-
<select id="selectFinishedInspectPage" resultType="map">
- SELECT f.`id`, f.`order_number`, f.`customer_name`, f.`project_name`, f.`quality_traceability`, f.`material_code`, f.`material`, f.`specifications_model`, f.`unit`,
- f.`quantity`, u.`name`, DATE_FORMAT(f.`create_time`, '%Y-%m-%d') detectionPeriod, f.`result`
+ SELECT f.`id`, f.`order_number`, f.`customer_name`, f.`project_name`, f.`quality_traceability`,
+ f.`material_code`, f.`material`, f.`specifications_model`, f.`unit`,
+ f.`quantity`, u.`name`, DATE_FORMAT(f.`create_time`, '%Y-%m-%d') detectionPeriod, f.`result`
FROM finished_inspect f, `user` u
WHERE f.`user_id` = u.`id`
- AND f.`state` = 1
- <if test="inspectResult != null and inspectResult != ''">
- AND f.result = #{inspectResult}
- </if>
- <if test="inspectDate != null and inspectDate != ''">
- AND DATE_FORMAT(f.`create_time`, '%Y-%m-%d') = #{inspectDate}
- </if>
- <if test="inspectUsername != null and inspectUsername != ''">
- AND u.`name` LIKE CONCAT('%',#{inspectUsername},'%')
- </if>
+ AND f.`state` = 1
+ <if test="inspectResult != null and inspectResult != ''">
+ AND f.result = #{inspectResult}
+ </if>
+ <if test="inspectDate != null and inspectDate != ''">
+ AND DATE_FORMAT(f.`create_time`, '%Y-%m-%d') = #{inspectDate}
+ </if>
+ <if test="inspectUsername != null and inspectUsername != ''">
+ AND u.`name` LIKE CONCAT('%',#{inspectUsername},'%')
+ </if>
+ </select>
+ <select id="selCountFin" resultType="java.lang.Integer">
+ select count(id)
+ from mom_ocean.finished_inspect
+ where state=1
+ and result=#{result}
+ and type=#{type}
+ <if test="begin != null and begin!=''">
+ and finished_inspect.create_time >= #{begin}
+ </if>
+ <if test="end != null and end!=''">
+ and finished_inspect.create_time <= #{end}
+ </if>
+ </select>
+ <select id="seAllCount" resultType="java.lang.Long">
+ select count(id)
+ from mom_ocean.finished_inspect
+ where state=1
+ and type=#{type}
+ <if test="begin != null and begin!=''">
+ and finished_inspect.create_time >= #{begin}
+ </if>
+ <if test="end != null and end!=''">
+ and finished_inspect.create_time <= #{end}
+ </if>
+ </select>
+ <!--鏂板杩囩▼妫�楠屽崟-鏍规嵁璁㈠崟鍙烽�夋嫨浜у搧淇℃伅-->
+ <resultMap id="oneMap" type="map">
+ <id property="name" column="material"/>
+ <result property="code" column="code"/>
+ <result property="specifications" column="specifications"/>
+ <result property="unit" column="unit"/>
+ <collection property="children" resultMap="twoMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="twoMap" type="map">
+ <result property="name" column="techfather"/>
+ <collection property="children" resultMap="threeMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="threeMap" type="map">
+ <id property="id" column="technologyId"/>
+ <result property="name" column="techname"/>
+ </resultMap>
+ <select id="chooseMater" resultMap="oneMap">
+ select mo.name material,
+ code,
+ specifications,
+ unit,
+ technology_id technologyId,
+ techfather,
+ techname
+ from mom_ocean.manual_technology mt
+ left join mom_ocean.manufacture_order mo on mt.manufacture_order_id = mo.id
+ left join mom_ocean.material m on m.name = mo.name
+ where mo.state = 1
+ and type = 1
+ and order_code = #{orderNumber}
</select>
</mapper>
--
Gitblit v1.9.3