Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
K
klck
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
位宇华
klck
Commits
ca108cfe
Commit
ca108cfe
authored
Jun 05, 2024
by
Fuzy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
重构计算方法
parent
959f7df4
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
128 additions
and
68 deletions
+128
-68
ruoyi-wages/src/main/resources/mapper/system/WagesDetailsOriginalDataMapper.xml
...esources/mapper/system/WagesDetailsOriginalDataMapper.xml
+97
-52
ruoyi-wages/src/main/resources/mapper/system/WagesOverviewOriginalDataMapper.xml
...sources/mapper/system/WagesOverviewOriginalDataMapper.xml
+31
-16
No files found.
ruoyi-wages/src/main/resources/mapper/system/WagesDetailsOriginalDataMapper.xml
View file @
ca108cfe
This diff is collapsed.
Click to expand it.
ruoyi-wages/src/main/resources/mapper/system/WagesOverviewOriginalDataMapper.xml
View file @
ca108cfe
...
@@ -33,21 +33,36 @@
...
@@ -33,21 +33,36 @@
from wages_overview_original_data
from wages_overview_original_data
where import_time = #{date}
where import_time = #{date}
</sql>
</sql>
<select
id=
"selectAll"
resultMap=
"WagesOverviewOriginalDataResult"
>
<select
id=
"selectAll"
parameterType=
"com.ruoyi.system.model.wages.dao.WagesOverviewOriginalExcelDAO"
select id,
resultMap=
"WagesOverviewOriginalDataResult"
>
year,
<include
refid=
"selectWagesOverviewOriginalDataVo"
/>
month,
<where>
unit_code,
<if
test=
"year != null and year != ''"
>
and year = #{year}
</if>
unit_name,
<if
test=
"month != null and month != ''"
>
and month = #{month}
</if>
worker_count,
<if
test=
"unitCode != null and unitCode != ''"
>
and unit_code = #{unitCode}
</if>
worker_wages_payable,
<if
test=
"unitName != null and unitName != ''"
>
and unit_name like concat('%', #{unitName}, '%')
</if>
cadre_count,
<if
test=
"workerCount != null "
>
and worker_count = #{workerCount}
</if>
cadre_wages_payable,
<if
test=
"workerWagesPayable != null "
>
and worker_wages_payable = #{workerWagesPayable}
</if>
total_count,
<if
test=
"cadreCount != null "
>
and cadre_count = #{cadreCount}
</if>
total_wages_payable
<if
test=
"cadreWagesPayable != null "
>
and cadre_wages_payable = #{cadreWagesPayable}
</if>
from wages_overview_original_data
<if
test=
"totalCount != null "
>
and total_count = #{totalCount}
</if>
where import_time = #{date}
<if
test=
"totalWagesPayable != null "
>
and total_wages_payable = #{totalWagesPayable}
</if>
</where>
</select>
</select>
<!-- <select id="selectAll" parameterType="com.ruoyi.system.model.wages.dao.WagesOverviewOriginalExcelDAO"-->
<!-- resultMap="WagesOverviewOriginalDataResult">-->
<!-- <include refid="selectWagesOverviewOriginalDataVo"/>-->
<!-- <where>-->
<!-- <if test="year != null and year != ''">and year = #{year}</if>-->
<!-- <if test="month != null and month != ''">and month = #{month}</if>-->
<!-- <if test="unitCode != null and unitCode != ''">and unit_code = #{unitCode}</if>-->
<!-- <if test="unitName != null and unitName != ''">and unit_name like concat('%', #{unitName}, '%')</if>-->
<!-- <if test="workerCount != null ">and worker_count = #{workerCount}</if>-->
<!-- <if test="workerWagesPayable != null ">and worker_wages_payable = #{workerWagesPayable}</if>-->
<!-- <if test="cadreCount != null ">and cadre_count = #{cadreCount}</if>-->
<!-- <if test="cadreWagesPayable != null ">and cadre_wages_payable = #{cadreWagesPayable}</if>-->
<!-- <if test="totalCount != null ">and total_count = #{totalCount}</if>-->
<!-- <if test="totalWagesPayable != null ">and total_wages_payable = #{totalWagesPayable}</if>-->
<!-- </where>-->
<!-- </select>-->
</mapper>
</mapper>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment