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

Merge branch 'origin/Three' into 'develop_master'

Browse Source 
Origin/three

See merge request LiuChao/foton-slrs-system-rest!265
This commit is contained in:
王夏晖
2021-12-02 10:49:56 +08:00
parent 542433742b 90d92b4a16
commit a0924c6893
8 changed files with 106 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml
+21 -22
View File
@@ -3,7 +3,7 @@
<mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdZcbDao">
<!-- 基础信息-->
<sql id="BaseInfo">
id,name,cost,use,annex
id,name,cost,purposes,annexs
</sql>
<!-- 查询条件-->
<sql id="Conditions">
@@ -12,18 +12,17 @@
and id = #{id}
</if>
<if test="name != null and name != ''">
and name like concat('%',#{name},'%')
and name = #{name}
</if>
<if test="cost != null and cost != ''">
and cost like concat('%',#{cost},'%')
and cost = #{cost}
</if>
<if test="use != null and use != ''">
and use like concat('%',#{use},'%')
<if test="purposes != null and purposes != ''">
and purposes = #{purposes}
</if>
<if test="annex != null and annex != ''">
and annex = #{annex}
<if test="annexs != null and annexs != ''">
and annexs = #{annexs}
</if>
</where>
</sql>
<select id="getTotal" resultType="java.lang.Integer">
@@ -57,13 +56,13 @@
<if test="cost != null and cost != ''">
cost = #{cost},
</if>
<if test="use != null and use != ''">
use = #{use},
<if test="purposes != null and purposes != ''">
purposes = #{purposes},
</if>
<if test="annex != null and annex != ''">
annex = #{annex},
<if test="annexs != null and annexs != ''">
annexs = #{annexs},
</if>
</set>
where id = #{id}
</update>
@@ -80,13 +79,13 @@
<if test="cost != null and cost != ''">
cost,
</if>
<if test="use != null and use != ''">
use,
<if test="purposes != null and purposes != ''">
purposes,
</if>
<if test="annex != null and annex != ''">
annex,
<if test="annexs != null and annexs != ''">
annexs,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -99,11 +98,11 @@
<if test="cost != null and cost != ''">
#{cost},
</if>
<if test="use != null and use != ''">
#{use},
<if test="purposes != null and purposes != ''">
#{purposes},
</if>
<if test="annex != null and annex != ''">
#{annex},
<if test="annexs != null and annexs != ''">
#{annexs},
</if>
</trim>
adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml
+2 -2
View File
@@ -19,8 +19,8 @@
</if>
<if test="scName != null and scName != ''">
and (
sc_name like concat('%',#{scName} ,'%')
ssc_name like concat('%',#{scName} ,'%')
sc_name like concat('%',#{scName} ,'%') or
ssc_name like concat('%',#{scName} ,'%') or
wg_name like concat('%',#{scName} ,'%')
)
</if>
adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml
+2 -2
View File
@@ -20,8 +20,8 @@
</if>
<if test="scName != null and scName != ''">
and (
sc_name like concat('%',#{scName} ,'%')
ssc_name like concat('%',#{scName} ,'%')
sc_name like concat('%',#{scName} ,'%') or
ssc_name like concat('%',#{scName} ,'%') or
wg_name like concat('%',#{scName} ,'%')
)
</if>
adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml
+4 -4
View File
@@ -20,10 +20,10 @@
</if>
<if test="scName != null and scName != ''">
and (
sc_name like concat('%',#{scName} ,'%')
ssc_name like concat('%',#{scName} ,'%')
wg_name like concat('%',#{scName} ,'%')
)
sc_name like concat('%',#{scName} ,'%') or
ssc_name like concat('%',#{scName} ,'%') or
wg_name like concat('%',#{scName} ,'%')
)
</if>
<if test="role != null and role != ''">
and role = #{role}