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
b020f289
Commit
b020f289
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
89ef7f2e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
64 additions
and
3 deletions
+64
-3
src/main/java/cn/timer/api/controller/LoginController.java
+3
-0
src/main/java/cn/timer/api/controller/htzz/HtzzController.java
+1
-1
src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java
+30
-1
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+1
-1
src/main/java/cn/timer/api/dto/sbgjj/VerifyInsuredDto.java
+15
-0
src/main/java/cn/timer/api/dto/sbgjj/VerifyInsuredDtoListDto.java
+14
-0
No files found.
src/main/java/cn/timer/api/controller/LoginController.java
View file @
b020f289
...
@@ -51,6 +51,7 @@ import cn.timer.api.bean.qyzx.QyzxAdminMenu;
...
@@ -51,6 +51,7 @@ import cn.timer.api.bean.qyzx.QyzxAdminMenu;
import
cn.timer.api.bean.qyzx.QyzxEmpEntAsso
;
import
cn.timer.api.bean.qyzx.QyzxEmpEntAsso
;
import
cn.timer.api.bean.qyzx.QyzxEmpLogin
;
import
cn.timer.api.bean.qyzx.QyzxEmpLogin
;
import
cn.timer.api.bean.qyzx.QyzxEntInfoM
;
import
cn.timer.api.bean.qyzx.QyzxEntInfoM
;
import
cn.timer.api.bean.xcgl.XcglAssoBszqsz
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.bean.zzgl.ZzglAuth
;
import
cn.timer.api.bean.zzgl.ZzglAuth
;
import
cn.timer.api.bean.zzgl.ZzglBmgwM
;
import
cn.timer.api.bean.zzgl.ZzglBmgwM
;
...
@@ -640,6 +641,8 @@ public class LoginController {
...
@@ -640,6 +641,8 @@ public class LoginController {
//加班基础设置
//加班基础设置
KqglAssoOvertimeBasics
.
builder
().
minimumUnit
(
3
).
modifyUserid
(
999
).
modifyTime
(
new
Date
().
getTime
()).
orgCode
(
qyzxEntInfoM
.
getId
()).
build
().
insert
();
KqglAssoOvertimeBasics
.
builder
().
minimumUnit
(
3
).
modifyUserid
(
999
).
modifyTime
(
new
Date
().
getTime
()).
orgCode
(
qyzxEntInfoM
.
getId
()).
build
().
insert
();
//报税周期设置
XcglAssoBszqsz
.
builder
().
taxReturnCycle
(
2
).
qyid
(
qyzxEntInfoM
.
getId
()).
build
().
insert
();
// 绩效设置初始化
// 绩效设置初始化
JxglBasicSetting
bS
=
jxglService
.
selectAT
(
qyId
);
JxglBasicSetting
bS
=
jxglService
.
selectAT
(
qyId
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/htzz/HtzzController.java
View file @
b020f289
...
@@ -162,7 +162,7 @@ public class HtzzController {
...
@@ -162,7 +162,7 @@ public class HtzzController {
QueryWrapper
<
HtzzAdminZzda
>
queryWrapper
=
new
QueryWrapper
<>();
QueryWrapper
<
HtzzAdminZzda
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"org_code"
,
userBean
.
getOrgCode
())
queryWrapper
.
eq
(
"org_code"
,
userBean
.
getOrgCode
())
.
select
(
"id"
,
"zjmc"
,
"czry"
,
"
czrdh
"
,
"fzrq"
,
"yxdqr"
,
"txkg_type"
).
eq
(
"is_delete"
,
0
).
eq
(
"document_type"
,
htzzQueryDto
.
getDocumentType
())
.
select
(
"id"
,
"zjmc"
,
"czry"
,
"
fzjg
"
,
"fzrq"
,
"yxdqr"
,
"txkg_type"
).
eq
(
"is_delete"
,
0
).
eq
(
"document_type"
,
htzzQueryDto
.
getDocumentType
())
.
gt
(!
StrUtil
.
hasBlank
(
e
),
"yxdqr"
,
!
StrUtil
.
hasBlank
(
e
)
?
e
:
"9999-01-01 00:00:00"
)
.
gt
(!
StrUtil
.
hasBlank
(
e
),
"yxdqr"
,
!
StrUtil
.
hasBlank
(
e
)
?
e
:
"9999-01-01 00:00:00"
)
.
and
(!
StrUtil
.
hasBlank
(
q
),
wq
->
wq
.
like
(
"zjmc"
,
q
).
or
().
like
(
"czry"
,
q
)).
orderByDesc
(
"lrsj_time"
);
.
and
(!
StrUtil
.
hasBlank
(
q
),
wq
->
wq
.
like
(
"zjmc"
,
q
).
or
().
like
(
"czry"
,
q
)).
orderByDesc
(
"lrsj_time"
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java
View file @
b020f289
...
@@ -35,7 +35,7 @@ import cn.timer.api.bean.sbgjj.SbgjjAssoDetailed;
...
@@ -35,7 +35,7 @@ import cn.timer.api.bean.sbgjj.SbgjjAssoDetailed;
import
cn.timer.api.bean.sbgjj.SbgjjAssoYjzd
;
import
cn.timer.api.bean.sbgjj.SbgjjAssoYjzd
;
import
cn.timer.api.bean.sbgjj.SbgjjTypeDetails
;
import
cn.timer.api.bean.sbgjj.SbgjjTypeDetails
;
import
cn.timer.api.bean.sbgjj.SbgjjYjCsbh
;
import
cn.timer.api.bean.sbgjj.SbgjjYjCsbh
;
import
cn.timer.api.bean.xcgl.XcglAsso
Jsgzzx
;
import
cn.timer.api.bean.xcgl.XcglAsso
Bszqsz
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.config.annotation.CurrentUser
;
import
cn.timer.api.config.annotation.CurrentUser
;
import
cn.timer.api.config.annotation.UserBean
;
import
cn.timer.api.config.annotation.UserBean
;
...
@@ -57,6 +57,8 @@ import cn.timer.api.dto.sbgjj.SearchPlanDto;
...
@@ -57,6 +57,8 @@ import cn.timer.api.dto.sbgjj.SearchPlanDto;
import
cn.timer.api.dto.sbgjj.SocialSecurityFundDto
;
import
cn.timer.api.dto.sbgjj.SocialSecurityFundDto
;
import
cn.timer.api.dto.sbgjj.SocialfundDto
;
import
cn.timer.api.dto.sbgjj.SocialfundDto
;
import
cn.timer.api.dto.sbgjj.StopimmediatelyDto
;
import
cn.timer.api.dto.sbgjj.StopimmediatelyDto
;
import
cn.timer.api.dto.sbgjj.VerifyInsuredDto
;
import
cn.timer.api.dto.sbgjj.VerifyInsuredDtoListDto
;
import
cn.timer.api.utils.ResponseResult
;
import
cn.timer.api.utils.ResponseResult
;
import
cn.timer.api.utils.Result
;
import
cn.timer.api.utils.Result
;
import
cn.timer.api.utils.ResultUtil
;
import
cn.timer.api.utils.ResultUtil
;
...
@@ -1514,6 +1516,33 @@ public class SocialSecurityFundController {
...
@@ -1514,6 +1516,33 @@ public class SocialSecurityFundController {
return
ResultUtil
.
data
(
yjzlist
,
"成功"
);
return
ResultUtil
.
data
(
yjzlist
,
"成功"
);
}
}
@PostMapping
(
value
=
"/verifytheinsured"
)
@ApiOperation
(
value
=
"验证参保人员"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
@ApiOperationSupport
(
order
=
40
)
public
Result
<
Object
>
Verifytheinsured
(
@CurrentUser
UserBean
userBean
,
@RequestBody
VerifyInsuredDtoListDto
verinlist
)
{
List
<
YgglMainEmp
>
ygs
=
new
ArrayList
<
YgglMainEmp
>();
VerifyInsuredDto
[]
verin
=
verinlist
.
getVerin
();
if
(
verin
.
length
>
0
){
for
(
int
n
=
0
;
n
<
verin
.
length
;
n
++){
YgglMainEmp
yg
=
YgglMainEmp
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getName
,
verin
[
n
].
getEmpname
()).
eq
(
YgglMainEmp:
:
getPhone
,
verin
[
n
].
getPhone
())
.
eq
(
YgglMainEmp:
:
getOrgCode
,
userBean
.
getOrgCode
()));
if
(
yg
!=
null
)
{
YgglMainEmp
ygl
=
YgglMainEmp
.
builder
().
build
();
ygl
.
setName
(
yg
.
getName
());
ygl
.
setEmpNum
(
yg
.
getEmpNum
());
ygs
.
add
(
ygl
);
}
}
}
return
ResultUtil
.
data
(
ygs
,
"成功"
);
}
@Value
(
"${config-8timer.environmental-science}"
)
@Value
(
"${config-8timer.environmental-science}"
)
public
String
environmental_science
;
public
String
environmental_science
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
b020f289
...
@@ -1520,7 +1520,7 @@ public class SalaryManagementController {
...
@@ -1520,7 +1520,7 @@ public class SalaryManagementController {
.
eq
(
YgglMainEmp:
:
getOrgCode
,
userBean
.
getOrgCode
()));
.
eq
(
YgglMainEmp:
:
getOrgCode
,
userBean
.
getOrgCode
()));
if
(
emp
!=
null
)
{
if
(
emp
!=
null
)
{
if
(
file
.
getSxrq
(
).
length
()
==
10
)
{
if
(
ClockInTool
.
Str_Time_formatting
(
file
.
getSxrq
().
replace
(
"/"
,
"-"
),
"yyyy-MM-dd"
).
length
()
==
10
)
{
//0:定薪 1:调薪
//0:定薪 1:调薪
if
(
file
.
getSfdx
()
==
0
)
{
if
(
file
.
getSfdx
()
==
0
)
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/sbgjj/VerifyInsuredDto.java
0 → 100644
View file @
b020f289
package
cn
.
timer
.
api
.
dto
.
sbgjj
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public
class
VerifyInsuredDto
{
private
String
empname
;
private
String
phone
;
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/sbgjj/VerifyInsuredDtoListDto.java
0 → 100644
View file @
b020f289
package
cn
.
timer
.
api
.
dto
.
sbgjj
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public
class
VerifyInsuredDtoListDto
{
VerifyInsuredDto
[]
verin
;
}
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