Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
9cafb016
Commit
9cafb016
authored
4 years ago
by
ilal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
89e8f4a6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
3 deletions
+18
-3
src/main/java/cn/timer/api/dto/xcgl/PayTermDto.java
+2
-0
src/main/resources/mapping/sbgjj/SbgjjAssoYjzdMapper.xml
+13
-2
src/main/resources/mapping/xcgl/XcglAssoJxgzMapper.xml
+3
-1
No files found.
src/main/java/cn/timer/api/dto/xcgl/PayTermDto.java
View file @
9cafb016
...
...
@@ -23,6 +23,8 @@ public class PayTermDto implements Serializable {
Integer
xgsid
;
// 项对应的公式id
String
xgsgs
;
// 项公式
Integer
zxzzid
;
Integer
xiscustom
;
//是否自定义项(0:否;1:是)
Integer
xrulestate
;
//
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/sbgjj/SbgjjAssoYjzdMapper.xml
View file @
9cafb016
...
...
@@ -86,7 +86,7 @@
</sql>
<select
id=
"IndividualTotalsbgjj"
resultMap=
"BaseResultMap"
>
select * from sbgjj_asso_yjzd yj
<!--
select * from sbgjj_asso_yjzd yj
where yj.cbryid = (
select cb.id from sbgjj_admin_cbry cb
where cb.user_num = #{usernum}
...
...
@@ -97,7 +97,18 @@
and cb.state = 1
and cb.is_use = 1
)
and yj.qyid = #{qyid}
and yj.qyid = #{qyid} -->
select * from sbgjj_asso_yjzd yj
where yj.zymonth = #{zymonth}
and yj.user_num = #{usernum}
and yj.cbryid = (
select cb.id from sbgjj_admin_cbry cb
where cb.user_num = #{usernum}
and cb.state = 1
and cb.is_use = 1
and cb.qyid = #{qyid})
and yj.qyid = #{qyid}
</select>
<select
id=
"MonthlycheckoutsheetList"
resultMap=
"MonthlyCheckoutSheetMap"
>
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/xcgl/XcglAssoJxgzMapper.xml
View file @
9cafb016
...
...
@@ -35,6 +35,7 @@
<result
column=
"xoptionid"
property=
"xoptionid"
/>
<result
column=
"xiscustom"
property=
"xiscustom"
/>
<result
column=
"xrulestate"
property=
"xrulestate"
/>
<result
column=
"zxzzid"
property=
"zxzzid"
/>
</collection>
</resultMap>
...
...
@@ -190,7 +191,8 @@
gzzx.optionid as xoptionid,
jxgz.xzzid as zxzzid,
gzzx.is_custom as xiscustom,
gzzx.rulestate as xrulestate
gzzx.rulestate as xrulestate,
gzzx.xzzid as zxzzid
from xcgl_asso_jxgz jxgz
LEFT JOIN xcgl_asso_jsgzzx as gzzx on gzzx.jxgzid = jxgz.id
where jxgz.xzzid = #{xzzid}
...
...
This diff is collapsed.
Click to expand it.
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