Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
0039186d
Commit
0039186d
authored
Aug 15, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
薪資配置
parent
829737d6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
25 deletions
+11
-25
ChecksUtil.java
...n/java/com/yifu/cloud/plus/v1/check/utils/ChecksUtil.java
+1
-0
TMinSalary.java
...com/yifu/cloud/plus/v1/yifu/salary/entity/TMinSalary.java
+2
-14
TMinSalaryController.java
.../plus/v1/yifu/salary/controller/TMinSalaryController.java
+2
-2
TMinSalaryMapper.xml
...salary-biz/src/main/resources/mapper/TMinSalaryMapper.xml
+6
-9
No files found.
yifu-check/yifu-check-api/src/main/java/com/yifu/cloud/plus/v1/check/utils/ChecksUtil.java
View file @
0039186d
...
@@ -30,6 +30,7 @@ public class ChecksUtil {
...
@@ -30,6 +30,7 @@ public class ChecksUtil {
private
static
final
String
API_URL
=
"https://api.253.com/open/idcard/id-card-auth"
;
private
static
final
String
API_URL
=
"https://api.253.com/open/idcard/id-card-auth"
;
private
static
final
String
API_URL_MOBILE
=
"https://api.253.com/open/unn/batch-ucheck"
;
private
static
final
String
API_URL_MOBILE
=
"https://api.253.com/open/unn/batch-ucheck"
;
private
static
final
String
API_URL_BANK_NO
=
"https://api.253.com/open/bankcard/card-auth"
;
private
static
final
String
API_URL_BANK_NO
=
"https://api.253.com/open/bankcard/card-auth"
;
private
static
final
String
API_URL_BANK_NO_THREE
=
"https://api.253.com/open/bankcard/card-two-auth"
;
private
static
JsonParser
jsonParser
=
new
JsonParser
();
private
static
JsonParser
jsonParser
=
new
JsonParser
();
public
static
void
checkIdCard
(
TCheckIdCard
checkIdCard
,
boolean
canCheck
)
{
public
static
void
checkIdCard
(
TCheckIdCard
checkIdCard
,
boolean
canCheck
)
{
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TMinSalary.java
View file @
0039186d
...
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
...
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
...
@@ -27,7 +28,7 @@ import java.time.LocalDateTime;
...
@@ -27,7 +28,7 @@ import java.time.LocalDateTime;
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@TableName
(
"t_min_salary"
)
@TableName
(
"t_min_salary"
)
@Tag
(
name
=
"薪资配置-最低工资配置"
)
@Tag
(
name
=
"薪资配置-最低工资配置"
)
public
class
TMinSalary
extends
Model
<
TMinSalary
>
{
public
class
TMinSalary
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/**
/**
* id
* id
...
@@ -80,17 +81,4 @@ public class TMinSalary extends Model<TMinSalary> {
...
@@ -80,17 +81,4 @@ public class TMinSalary extends Model<TMinSalary> {
@ExcelAttribute
(
name
=
"终止时间"
)
@ExcelAttribute
(
name
=
"终止时间"
)
@ExcelProperty
(
value
=
"终止时间"
)
@ExcelProperty
(
value
=
"终止时间"
)
private
LocalDate
endDate
;
private
LocalDate
endDate
;
/**
* 创建人
*/
@Length
(
max
=
32
,
message
=
"创建人不能超过32个字符"
)
@ExcelAttribute
(
name
=
"创建人"
,
maxLength
=
32
)
@ExcelProperty
(
value
=
"创建人"
)
private
String
createUser
;
/**
* 创建时间
*/
@ExcelAttribute
(
name
=
"创建时间"
)
@ExcelProperty
(
value
=
"创建时间"
)
private
LocalDateTime
createDate
;
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TMinSalaryController.java
View file @
0039186d
...
@@ -73,8 +73,8 @@ public class TMinSalaryController {
...
@@ -73,8 +73,8 @@ public class TMinSalaryController {
if
(
null
==
user
||
null
==
user
.
getId
())
{
if
(
null
==
user
||
null
==
user
.
getId
())
{
return
R
.
failed
(
"获取登录用户信息失败!"
);
return
R
.
failed
(
"获取登录用户信息失败!"
);
}
}
tMinSalary
.
setCreate
Dat
e
(
LocalDateTime
.
now
());
tMinSalary
.
setCreate
Tim
e
(
LocalDateTime
.
now
());
tMinSalary
.
setCreate
User
(
String
.
valueOf
(
user
.
getId
()));
tMinSalary
.
setCreate
By
(
String
.
valueOf
(
user
.
getId
()));
return
new
R
<>(
tMinSalaryService
.
save
(
tMinSalary
));
return
new
R
<>(
tMinSalaryService
.
save
(
tMinSalary
));
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TMinSalaryMapper.xml
View file @
0039186d
...
@@ -13,8 +13,8 @@
...
@@ -13,8 +13,8 @@
<result
property=
"status"
column=
"status"
/>
<result
property=
"status"
column=
"status"
/>
<result
property=
"startDate"
column=
"start_date"
/>
<result
property=
"startDate"
column=
"start_date"
/>
<result
property=
"endDate"
column=
"end_date"
/>
<result
property=
"endDate"
column=
"end_date"
/>
<result
property=
"create
User
"
column=
"create_user"
/>
<result
property=
"create
By
"
column=
"create_user"
/>
<result
property=
"create
Date"
column=
"create_date
"
/>
<result
property=
"create
Time"
column=
"CREATE_TIME
"
/>
</resultMap>
</resultMap>
<!--tMinSalary简单分页查询-->
<!--tMinSalary简单分页查询-->
...
@@ -28,8 +28,8 @@
...
@@ -28,8 +28,8 @@
status,
status,
start_date,
start_date,
end_date,
end_date,
create_
user
,
create_
by
,
create_date
CREATE_TIME
FROM t_min_salary
FROM t_min_salary
<where>
<where>
1=1
1=1
...
@@ -57,11 +57,8 @@
...
@@ -57,11 +57,8 @@
<if
test=
"tMinSalary.endDate != null"
>
<if
test=
"tMinSalary.endDate != null"
>
AND end_date = #{tMinSalary.endDate}
AND end_date = #{tMinSalary.endDate}
</if>
</if>
<if
test=
"tMinSalary.createUser != null and tMinSalary.createUser.trim() != ''"
>
<if
test=
"tMinSalary.createBy != null and tMinSalary.createBy.trim() != ''"
>
AND create_user = #{tMinSalary.createUser}
AND create_user = #{tMinSalary.createBy}
</if>
<if
test=
"tMinSalary.createDate != null"
>
AND create_date = #{tMinSalary.createDate}
</if>
</if>
</where>
</where>
</select>
</select>
...
...
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