From c28d3bb363dde2afb44c168b93379b2bf6b1f67f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:26:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
production-server/src/main/resources/mapper/ManualTechnologyMapper.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml b/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml
index 752abcd..b6fe2a0 100644
--- a/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml
+++ b/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml
@@ -1,7 +1,6 @@
<?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.ManualTechnologyMapper">
-
<resultMap id="seleDatilMap" type="map">
<id property="lable" column="techfather"/>
<collection property="children" resultMap="seleDatilTowMap" javaType="List"/>
@@ -37,8 +36,13 @@
<result property="period" column="period"/>
</resultMap>
<select id="selectListTowTree" resultMap="selectListTowTreeFirstMap">
- SELECT p.`id`, t.`techfather`, t.`techname`, d.`name`, DATE_FORMAT(p.`start_time`, '%Y-%m-%d') start_time,
- DATE_FORMAT(p.`end_time`, '%Y-%m-%d') end_time, p.`period`
+ SELECT p.`id`,
+ t.`techfather`,
+ t.`techname`,
+ d.`name`,
+ DATE_FORMAT(p.`start_time`, '%Y-%m-%d') start_time,
+ DATE_FORMAT(p.`end_time`, '%Y-%m-%d') end_time,
+ p.`period`
FROM manufacture_order_process p
LEFT JOIN device d ON d.`id` = p.`device_id`
LEFT JOIN manual_technology t ON t.`id` = p.`manual_technology_id`
@@ -46,4 +50,13 @@
AND p.`manufacture_scheduling_id` = #{schedulingId}
ORDER BY p.`create_time` DESC
</select>
+
+ <!--鏍规嵁鐢熶骇璁㈠崟id鏌ヨ鎵�鏈�(鍊掑簭)-->
+ <select id="selAllByMoId" resultType="com.yuanchu.mom.pojo.ManualTechnology">
+ select *
+ from mom_ocean.manual_technology
+ where state = 1
+ and manufacture_order_id = #{id}
+ order by id desc
+ </select>
</mapper>
--
Gitblit v1.9.3