FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
feat: There is no way the Buss and Convert

See merge request !120
This commit is contained in:
super_liu
2021-08-20 10:12:39 +00:00
parent 27e72dca2e fe89ba9c60
commit a242b9ac56
27 changed files with 401 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/otConvertMq/OtConvertMqMapper.xml
+167
View File
@@ -0,0 +1,167 @@
<?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.adc.da.slrs.otConvertMq.dao.OtConvertMqDao">
<!-- Result Map-->
<resultMap id="BaseResultMap" type="com.adc.da.slrs.otConvertMq.entity.OtConvertMq" >
<id column="id" property="id" />
<result column="modify_time" property="modifyTime" />
<result column="creation_time" property="creationTime" />
<result column="valid_flag" property="validFlag" />
<result column="att_id" property="attId" />
<result column="file_path" property="filePath" />
<result column="user_id" property="userId" />
<result column="mq_state" property="mqState" />
<result column="mq_code" property="mqCode" />
</resultMap>
<!-- OT_CONVERT_MQ table all fields -->
<sql id="Base_Column_List" >
modify_time, creation_time, valid_flag, att_id, file_path, user_id, mq_state, mq_code, id
</sql>
<!-- 查询条件 -->
<sql id="Base_Where_Clause">
where 1=1
<trim suffixOverrides="," >
<if test="modifyTime != null" >
and modify_time ${modifyTimeOperator} #{modifyTime}
</if>
<if test="modifyTime1 != null" >
and modify_time &gt;= #{modifyTime1}
</if>
<if test="modifyTime2 != null" >
and modify_time &lt;= #{modifyTime2}
</if>
<if test="creationTime != null" >
and creation_time ${creationTimeOperator} #{creationTime}
</if>
<if test="creationTime1 != null" >
and creation_time &gt;= #{creationTime1}
</if>
<if test="creationTime2 != null" >
and creation_time &lt;= #{creationTime2}
</if>
<if test="validFlag != null" >
and valid_flag ${validFlagOperator} #{validFlag}
</if>
<if test="attId != null" >
and att_id ${attIdOperator} #{attId}
</if>
<if test="filePath != null" >
and file_path ${filePathOperator} #{filePath}
</if>
<if test="userId != null" >
and user_id ${userIdOperator} #{userId}
</if>
<if test="mqState != null" >
and mq_state ${mqStateOperator} #{mqState}
</if>
<if test="mqCode != null" >
and mq_code ${mqCodeOperator} #{mqCode}
</if>
<if test="id != null" >
and id ${idOperator} #{id}
</if>
</trim>
</sql>
<!-- 插入记录 -->
<insert id="insert" parameterType="com.adc.da.slrs.otConvertMq.entity.OtConvertMq" >
<!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
SELECT SEQ_OT_CONVERT_MQ.NEXTVAL FROM DUAL
</selectKey> -->
insert into OT_CONVERT_MQ(<include refid="Base_Column_List" />)
values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER}, #{attId, jdbcType=VARCHAR}, #{filePath, jdbcType=VARCHAR}, #{userId, jdbcType=VARCHAR}, #{mqState, jdbcType=INTEGER}, #{mqCode, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR})
</insert>
<!-- 动态插入记录 主键是序列 -->
<insert id="insertSelective" parameterType="com.adc.da.slrs.otConvertMq.entity.OtConvertMq" >
<!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
SELECT SEQ_OT_CONVERT_MQ.NEXTVAL FROM DUAL
</selectKey> -->
insert into OT_CONVERT_MQ
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="modifyTime != null" >modify_time,</if>
<if test="creationTime != null" >creation_time,</if>
<if test="validFlag != null" >valid_flag,</if>
<if test="attId != null" >att_id,</if>
<if test="filePath != null" >file_path,</if>
<if test="userId != null" >user_id,</if>
<if test="mqState != null" >mq_state,</if>
<if test="mqCode != null" >mq_code,</if>
<if test="id != null" >id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
<if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
<if test="validFlag != null" >#{validFlag, jdbcType=INTEGER},</if>
<if test="attId != null" >#{attId, jdbcType=VARCHAR},</if>
<if test="filePath != null" >#{filePath, jdbcType=VARCHAR},</if>
<if test="userId != null" >#{userId, jdbcType=VARCHAR},</if>
<if test="mqState != null" >#{mqState, jdbcType=INTEGER},</if>
<if test="mqCode != null" >#{mqCode, jdbcType=VARCHAR},</if>
<if test="id != null" >#{id, jdbcType=VARCHAR},</if>
</trim>
</insert>
<!-- 根据pk，修改记录-->
<update id="updateByPrimaryKey" parameterType="com.adc.da.slrs.otConvertMq.entity.OtConvertMq" >
update OT_CONVERT_MQ
set modify_time = #{modifyTime},
creation_time = #{creationTime},
valid_flag = #{validFlag},
att_id = #{attId},
file_path = #{filePath},
user_id = #{userId},
mq_state = #{mqState},
mq_code = #{mqCode}
where id = #{id}
</update>
<!-- 修改记录，只修改只不为空的字段 -->
<update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.otConvertMq.entity.OtConvertMq" >
update OT_CONVERT_MQ
<set >
<if test="modifyTime != null" >
modify_time = #{modifyTime},
</if>
<if test="creationTime != null" >
creation_time = #{creationTime},
</if>
<if test="validFlag != null" >
valid_flag = #{validFlag},
</if>
<if test="attId != null" >
att_id = #{attId},
</if>
<if test="filePath != null" >
file_path = #{filePath},
</if>
<if test="userId != null" >
user_id = #{userId},
</if>
<if test="mqState != null" >
mq_state = #{mqState},
</if>
<if test="mqCode != null" >
mq_code = #{mqCode},
</if>
</set>
where id = #{id}
</update>
<!-- 根据id查询 OT_CONVERT_MQ -->
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select <include refid="Base_Column_List" />
from OT_CONVERT_MQ
where id = #{value}
and valid_flag=0
</select>
<delete id="deleteByAttId" parameterType="java.lang.String">
delete from OT_CONVERT_MQ
where att_id = #{value}
</delete>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandFile/SarStandFileMapper.xml
+2 -2
View File
@@ -228,9 +228,9 @@
<if test="standId != null" >
and stand_id = #{standId}
</if>
<if test="idlist != null">
<if test="idList != null">
and id not in
<foreach collection="idlist" index="index" item="item" open="(" separator="," close=")">
<foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>