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
33948722
Commit
33948722
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
84324072
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
9 deletions
+18
-9
src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java
+17
-8
src/main/resources/mapping/sbgjj/SbgjjAdminCbryMapper.xml
+1
-1
No files found.
src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java
View file @
33948722
...
@@ -962,18 +962,18 @@ public class SocialSecurityFundController {
...
@@ -962,18 +962,18 @@ public class SocialSecurityFundController {
// cbry.setId(insuredto.getId());
// cbry.setId(insuredto.getId());
// cbry.updateById();
// cbry.updateById();
int
isUse
=
1
;
//是否使用 0:否 1:是
//
int isUse = 1;//是否使用 0:否 1:是
//
SbgjjAdminCbry
ascb
=
SbgjjAdminCbry
.
builder
().
id
(
insuredto
.
getId
()).
build
().
selectById
();
//
SbgjjAdminCbry ascb = SbgjjAdminCbry.builder().id(insuredto.getId()).build().selectById();
//
if
(
ascb
.
getSbjlStatime
().
equals
(
insuredto
.
getJnmouth
())
||
ascb
.
getGjjjlStatime
().
equals
(
insuredto
.
getGjjJnmouth
()))
{
//
if(ascb.getSbjlStatime().equals(insuredto.getJnmouth()) || ascb.getGjjjlStatime().equals(insuredto.getGjjJnmouth())) {
isUse
=
0
;
//
isUse = 0;
}
//
}
SbgjjAdminCbry
cbrytwo
=
SbgjjAdminCbry
.
builder
().
build
();
SbgjjAdminCbry
cbrytwo
=
SbgjjAdminCbry
.
builder
().
build
();
cbrytwo
.
setState
(
0
);
//状态 1:使用中;0:历史记录
cbrytwo
.
setState
(
0
);
//状态 1:使用中;0:历史记录
cbrytwo
.
setId
(
insuredto
.
getId
());
cbrytwo
.
setId
(
insuredto
.
getId
());
cbrytwo
.
setIsUse
(
isUse
);
cbrytwo
.
setIsUse
(
0
);
cbrytwo
.
updateById
();
cbrytwo
.
updateById
();
...
@@ -1051,6 +1051,11 @@ public class SocialSecurityFundController {
...
@@ -1051,6 +1051,11 @@ public class SocialSecurityFundController {
preval
=
formatDouble1
(
Double
.
valueOf
(
jishuxx
)*
gsh
);
preval
=
formatDouble1
(
Double
.
valueOf
(
jishuxx
)*
gsh
);
}
}
SbgjjAssoDetailed
.
builder
().
build
().
delete
(
new
QueryWrapper
<
SbgjjAssoDetailed
>().
lambda
().
eq
(
SbgjjAssoDetailed:
:
getUserId
,
insuredto
.
getUsernum
())
.
eq
(
SbgjjAssoDetailed:
:
getAttributionTime
,
insuredto
.
getJnmouth
()).
eq
(
SbgjjAssoDetailed:
:
getCbfzmxId
,
sbjs
.
getId
()).
eq
(
SbgjjAssoDetailed:
:
getCoverageName
,
sbjs
.
getXz
())
.
eq
(
SbgjjAssoDetailed:
:
getOrgCode
,
userBean
.
getOrgCode
()));
SbgjjAssoDetailed
deta
=
SbgjjAssoDetailed
.
builder
().
build
();
SbgjjAssoDetailed
deta
=
SbgjjAssoDetailed
.
builder
().
build
();
deta
.
setUserId
(
insuredto
.
getUsernum
());
deta
.
setUserId
(
insuredto
.
getUsernum
());
deta
.
setAttributionTime
(
insuredto
.
getJnmouth
());
//
deta
.
setAttributionTime
(
insuredto
.
getJnmouth
());
//
...
@@ -1171,6 +1176,10 @@ public class SocialSecurityFundController {
...
@@ -1171,6 +1176,10 @@ public class SocialSecurityFundController {
preval
=
formatDouble1
(
Double
.
valueOf
(
jishuxx
)*
gsh
);
preval
=
formatDouble1
(
Double
.
valueOf
(
jishuxx
)*
gsh
);
}
}
SbgjjAssoDetailed
.
builder
().
build
().
delete
(
new
QueryWrapper
<
SbgjjAssoDetailed
>().
lambda
().
eq
(
SbgjjAssoDetailed:
:
getUserId
,
insuredto
.
getUsernum
())
.
eq
(
SbgjjAssoDetailed:
:
getAttributionTime
,
insuredto
.
getGjjJnmouth
()).
eq
(
SbgjjAssoDetailed:
:
getCbfzmxId
,
gjjgs
.
getId
()).
eq
(
SbgjjAssoDetailed:
:
getCoverageName
,
gjjgs
.
getXz
())
.
eq
(
SbgjjAssoDetailed:
:
getOrgCode
,
userBean
.
getOrgCode
()));
SbgjjAssoDetailed
deta
=
SbgjjAssoDetailed
.
builder
().
build
();
SbgjjAssoDetailed
deta
=
SbgjjAssoDetailed
.
builder
().
build
();
deta
.
setUserId
(
insuredto
.
getUsernum
());
deta
.
setUserId
(
insuredto
.
getUsernum
());
deta
.
setAttributionTime
(
insuredto
.
getGjjJnmouth
());
//
deta
.
setAttributionTime
(
insuredto
.
getGjjJnmouth
());
//
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/sbgjj/SbgjjAdminCbryMapper.xml
View file @
33948722
...
@@ -183,7 +183,7 @@
...
@@ -183,7 +183,7 @@
cbry.gjjjl_statime as gjjjlstatime,
cbry.gjjjl_statime as gjjjlstatime,
cbry.gjjjljs as gjjjljs
cbry.gjjjljs as gjjjljs
from yggl_main_emp emp
from yggl_main_emp emp
LEFT JOIN sbgjj_admin_cbry as cbry on cbry.user_num = emp.emp_num and cbry.state = 1
LEFT JOIN sbgjj_admin_cbry as cbry on cbry.user_num = emp.emp_num and cbry.state = 1
and cbry.qyid = #{orgcode}
LEFT JOIN (select m.name as post,um.name as dept,m.id as mid
LEFT JOIN (select m.name as post,um.name as dept,m.id as mid
from zzgl_bmgw_m m
from zzgl_bmgw_m m
left join zzgl_bmgw_m um on um.id = m.up_id
left join zzgl_bmgw_m um on um.id = m.up_id
...
...
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