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

Merge remote-tracking branch 'origin/origin/Three' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2021-11-19 13:43:23 +08:00
parent c260cd5533 71a686b92b
commit 0f704dde0a
25 changed files with 183 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml
+9 -11
View File
@@ -18,13 +18,11 @@
and id = #{id}
</if>
<if test="scName != null and scName != ''">
and sc_name like concat('%',#{scName},'%')
</if>
<if test="sscName != null and sscName != ''">
and ssc_name like concat('%',#{sscName},'%')
</if>
<if test="wgName != null and wgName != ''">
and wg_name like concat('%',#{wgName},'%')
and (
sc_name like concat('%',#{scName} ,'%')
ssc_name like concat('%',#{scName} ,'%')
wg_name like concat('%',#{scName} ,'%')
)
</if>
<if test="payStandard != null and payStandard != ''">
and pay_standard = #{payStandard}
@@ -77,16 +75,16 @@
<if test="wgName != null and wgName != ''">
wg_name = #{wgName},
</if>
<if test="payStandard != null and payStandard != ''">
<if test="payStandard != null">
pay_standard = #{payStandard},
</if>
<if test="payReality != null and payReality != ''">
<if test="payReality != null">
pay_reality = #{payReality},
</if>
<if test="costOutlay != null and costOutlay != ''">
<if test="costOutlay != null">
cost_outlay = #{costOutlay},
</if>
<if test="annualPayment != null and annualPayment != ''">
<if test="annualPayment != null">
annual_payment = #{annualPayment},
</if>
</set>
adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml
+13 -12
View File
@@ -11,7 +11,7 @@
id,sc_name,ssc_name,wg_name,role,attend,standard,charge,leader,ini_time,
cur_time,cost_standard,cost_outlay,last_pay_time,pay_period,handler,
department,as_proper,as_status,as_contact,tel,mail,
p17,p18,p19,p20,p21,p22,p23,p34,p25,p26,p27,p28,p29,p30,p31,p32
p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32
</sql>
<sql id="Conditions">
WHERE 1=1
@@ -19,13 +19,11 @@
and id = #{id}
</if>
<if test="scName != null and scName != ''">
and sc_name like concat('%',#{scName},'%')
</if>
<if test="sscName != null and sscName != ''">
and ssc_name like concat('%',#{sscName},'%')
</if>
<if test="wgName != null and wgName != ''">
and wg_name like concat('%',#{wgName},'%')
and (
sc_name like concat('%',#{scName} ,'%')
ssc_name like concat('%',#{scName} ,'%')
wg_name like concat('%',#{scName} ,'%')
)
</if>
<if test="role != null and role != ''">
and role = #{role}
@@ -43,10 +41,10 @@
and leader = #{leader}
</if>
<if test="iniTime != null">
and ini_time = #{iniTime}
and DATE_FORMAT(ini_time,'%Y%m%d') = DATE_FORMAT(iniTime,'%Y%m%d')
</if>
<if test="curTime != null">
and cur_time = #{curTime}
and DATE_FORMAT(cur_time,'%Y%m%d') = DATE_FORMAT(curTime,'%Y%m%d')
</if>
<if test="costStandard != null and costStandard != ''">
and cost_standard = #{costStandard}
@@ -55,7 +53,7 @@
and cost_outlay = #{costOutlay}
</if>
<if test="lastPayTime != null">
and last_pay_time = #{lastPayTime}
and DATE_FORMAT(last_pay_time,'%Y%m%d') = DATE_FORMAT(lastPayTime,'%Y%m%d')
</if>
<if test="payPeriod != null and payPeriod != ''">
and pay_period = #{payPeriod}
@@ -90,6 +88,7 @@
<select id="selectAll" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo">
select <include refid="BaseInfo"></include> from wgd_assoc_info
</select>
<!-- 查询-->
<select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo">
select <include refid="BaseInfo"></include> from wgd_assoc_info
<include refid="Conditions"></include>
@@ -99,7 +98,7 @@
select <include refid="BaseInfo"></include> from wgd_assoc_info
where id = #{id}
</select>
<!-- 更新-->
<update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo">
update wgd_assoc_info
<set>
@@ -217,6 +216,7 @@
</set>
where id = #{id}
</update>
<!-- 新增-->
<insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo">
insert into wgd_assoc_info
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -456,6 +456,7 @@
<delete id="deleteOne" parameterType="java.lang.String">
delete from wgd_assoc_info where id = #{id}
</delete>
<!-- 删除-->
<delete id="deleteBatch" parameterType="java.lang.String">
delete from wgd_assoc_info where id in
<foreach item="id" collection="array" open="(" close=")" separator=",">
adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml
+8 -10
View File
@@ -19,13 +19,11 @@
and unit = #{unit}
</if>
<if test="scName != null and scName != ''">
and sc_name = #{scName}
</if>
<if test="sscName != null and sscName != ''">
and ssc_name = #{sscName}
</if>
<if test="wgName != null and wgName != ''">
and wg_name = #{wgName}
and (
sc_name like concat('%',#{scName} ,'%')
ssc_name like concat('%',#{scName} ,'%')
wg_name like concat('%',#{scName} ,'%')
)
</if>
<if test="role != null and role != ''">
and role = #{role}
@@ -34,7 +32,7 @@
and attend = #{attend}
</if>
<if test="curTime != null">
and cur_time = #{curTime}
and DATE_FORMAT(cur_time,'%Y%m%d') = DATE_FORMAT(curTime,'%Y%m%d')
</if>
<if test="job != null and job != ''">
and job = #{job}
@@ -234,9 +232,9 @@
<delete id="deleteOne" parameterType="java.lang.String">
delete from wgd_commi_info where id = #{id}
</delete>
<delete id="deleteBatch">
<delete id="deleteBatch" parameterType="java.lang.String">
delete from wgd_commi_info where id in
<foreach collection="array" item="id" separator="," close=")" open="(">
<foreach collection="array" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml
+19 -19
View File
@@ -50,19 +50,19 @@
<update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
update wgd_ex_revise_cost
<set>
<if test="type != null and type != ''">
<if test="type != null">
type = #{type},
</if>
<if test="proId != null and proId != ''">
<if test="proId != null">
pro_id = #{proId},
</if>
<if test="proName != null and proName != ''">
<if test="proName != null">
pro_name = #{proName},
</if>
<if test="cost != null and cost != ''">
<if test="cost != null">
cost = #{cost},
</if>
<if test="costOutlay != null and costOutlay != ''">
<if test="costOutlay != null">
cost_outlay = #{costOutlay},
</if>
</set>
@@ -71,43 +71,43 @@
<insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
insert into wgd_ex_revise_cost
<trim prefix="(" suffixOverrides="," suffix=")">
<if test="id != null and id != ''">
<if test="id != null">
id,
</if>
<if test="type != null and type != ''">
<if test="type != null">
type,
</if>
<if test="proId != null and proId != ''">
pro_id
<if test="proId != null">
pro_id,
</if>
<if test="proName != null and proName != ''">
<if test="proName != null">
pro_name,
</if>
<if test="cost != null and cost != ''">
<if test="cost != null">
cost,
</if>
<if test="costOutlay != null and costOutlay != ''">
<if test="costOutlay != null">
cost_outlay,
</if>
</trim>
values
<trim prefix="(" suffixOverrides="," suffix=")">
<if test="id != null and id != ''">
<if test="id != null">
#{id},
</if>
<if test="type != null and type != ''">
<if test="type != null">
#{type},
</if>
<if test="proId != null and proId != ''">
<if test="proId != null">
#{proId},
</if>
<if test="proName != null and proName != ''">
<if test="proName != null">
#{proName},
</if>
<if test="cost != null and cost != ''">
<if test="cost != null">
#{cost},
</if>
<if test="costOutlay != null and costOutlay != ''">
<if test="costOutlay != null">
#{costOutlay},
</if>
</trim>
@@ -115,7 +115,7 @@
<delete id="deleteOne" parameterType="java.lang.String">
delete from wgd_ex_revise_cost where id = #{id}
</delete>
<delete id="deleteBatch">
<delete id="deleteBatch" parameterType="java.lang.String">
delete from wgd_ex_revise_cost where id in
<foreach collection="array" item="id" open="(" separator="," close=")">
#{id}
adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml
+8 -8
View File
@@ -22,7 +22,7 @@
and meet_name = #{meetName}
</if>
<if test="meetTime != null">
and meet_time = #{meetTime}
and DATE_FORMAT(meet_time,'%Y%m%d') = DATE_FORMAT(#{meetTime},'%Y%m%d')
</if>
<if test="payStandard != null and payStandard != ''">
and pay_standard = #{payStandard}
@@ -54,22 +54,22 @@
<update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost">
update wgd_meet_cost
<set>
<if test="unit != null and unit != ''">
<if test="unit != null">
unit = #{unit},
</if>
<if test="meetName != null and meetName != ''">
<if test="meetName != null">
meet_name = #{meetName},
</if>
<if test="meetTime != null">
<if test="meetTime">
meet_time = #{meetTime},
</if>
<if test="payStandard != null and payStandard != ''">
<if test="payStandard != null">
pay_standard = #{payStandard},
</if>
<if test="payReality != null and payReality != ''">
<if test="payReality != null">
pay_reality = #{payReality},
</if>
<if test="costOutlay != null and costOutlay != ''">
<if test="costOutlay != null">
cost_outlay = #{costOutlay},
</if>
</set>
@@ -128,7 +128,7 @@
<delete id="deleteOne" parameterType="java.lang.String">
delete from wgd_meet_cost where id = #{id}
</delete>
<delete id="deleteBatch">
<delete id="deleteBatch" parameterType="java.lang.String">
delete from wgd_meet_cost where id in
<foreach collection="array" item="id" open="(" separator="," close=")">
#{id}