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
c4e4631b
Commit
c4e4631b
authored
Aug 12, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
6d1e122b
3b9f5414
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
170 additions
and
73 deletions
+170
-73
yifu-insurances-deployment.yaml
k8s-bash-test/yifu-insurances-deployment.yaml
+1
-1
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+2
-2
TSalaryAccount.java
...yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java
+15
-15
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+12
-12
TSocialFundInfo.java
...ifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
+5
-0
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+135
-43
No files found.
k8s-bash-test/yifu-insurances-deployment.yaml
View file @
c4e4631b
...
...
@@ -46,7 +46,7 @@ spec: # 资源规范字段
-
name
:
yifu-insurances
# 容器的名字
image
:
localhost:5000/qas-mvp/yifu-insurances-biz:1.0.0
#临时地址
# image: 192.168.1.110:5500/qas-mvp/yifu-insurances-biz:1.0.0 # 容器镜像地址
imagePullPolicy
:
IfNotPresent
# 每次Pod启动拉取镜像策略,三个选择 Always、Never、IfNotPresent
imagePullPolicy
:
Always
# 每次Pod启动拉取镜像策略,三个选择 Always、Never、IfNotPresent
# Always,每次都检查;Never,每次都不检查(不管本地是否有);IfNotPresent,如果本地有就不检查,如果没有就拉取(手动测试时,
# 已经打好镜像存在docker容器中时,使用存在不检查级别,
# 默认为每次都检查,然后会进行拉取新镜像,因镜像仓库不存在,导致部署失败)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
c4e4631b
...
...
@@ -588,10 +588,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//档案柜存在就自动归档
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getAttaList
()))
{
this
.
updateFileMainId
(
tEmployeeContractInfo
);
this
.
setFileInfo
(
tEmployeeContractInfo
.
getId
(),
"
添加附件
"
);
this
.
setFileInfo
(
tEmployeeContractInfo
.
getId
(),
""
);
tEmployeeContractInfo
.
setIsFile
(
CommonConstants
.
ZERO_STRING
);
}
else
{
this
.
setFileInfo
(
tEmployeeContractInfo
.
getId
(),
"
清空附件
"
);
this
.
setFileInfo
(
tEmployeeContractInfo
.
getId
(),
""
);
tEmployeeContractInfo
.
setIsFile
(
CommonConstants
.
ONE_STRING
);
}
this
.
updateById
(
tEmployeeContractInfo
);
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java
View file @
c4e4631b
...
...
@@ -110,28 +110,28 @@ public class TSalaryAccount {
@ExcelProperty
(
"开户行总行"
)
private
String
bankName
;
/**
*
结算部门
id
*
项目
id
*/
@ExcelAttribute
(
name
=
"
结算部门id"
,
isNotEmpty
=
true
,
errorInfo
=
"结算部门
id不能为空"
,
maxLength
=
32
)
@NotBlank
(
message
=
"
结算部门
id不能为空"
)
@Length
(
max
=
32
,
message
=
"
结算部门
id不能超过32个字符"
)
@ExcelProperty
(
"
结算部门
id"
)
@ExcelAttribute
(
name
=
"
项目id"
,
isNotEmpty
=
true
,
errorInfo
=
"项目
id不能为空"
,
maxLength
=
32
)
@NotBlank
(
message
=
"
项目
id不能为空"
)
@Length
(
max
=
32
,
message
=
"
项目
id不能超过32个字符"
)
@ExcelProperty
(
"
项目
id"
)
private
String
deptId
;
/**
*
结算部门
no
*
项目
no
*/
@ExcelAttribute
(
name
=
"
结算部门no"
,
isNotEmpty
=
true
,
errorInfo
=
"结算部门
no不能为空"
,
maxLength
=
50
)
@NotBlank
(
message
=
"
结算部门no
不能为空"
)
@Length
(
max
=
50
,
message
=
"
结算部门no
不能超过50个字符"
)
@ExcelProperty
(
"
结算部门no
"
)
@ExcelAttribute
(
name
=
"
项目编码"
,
isNotEmpty
=
true
,
errorInfo
=
"项目
no不能为空"
,
maxLength
=
50
)
@NotBlank
(
message
=
"
项目编码
不能为空"
)
@Length
(
max
=
50
,
message
=
"
项目编码
不能超过50个字符"
)
@ExcelProperty
(
"
项目编码
"
)
private
String
deptNo
;
/**
*
结算部门
name
*
项目
name
*/
@ExcelAttribute
(
name
=
"
结算部门name"
,
isNotEmpty
=
true
,
errorInfo
=
"结算部门
name不能为空"
,
maxLength
=
50
)
@NotBlank
(
message
=
"
结算部门name
不能为空"
)
@Length
(
max
=
50
,
message
=
"
结算部门name
不能超过50个字符"
)
@ExcelProperty
(
"
结算部门name
"
)
@ExcelAttribute
(
name
=
"
项目名称"
,
isNotEmpty
=
true
,
errorInfo
=
"项目
name不能为空"
,
maxLength
=
50
)
@NotBlank
(
message
=
"
项目名称
不能为空"
)
@Length
(
max
=
50
,
message
=
"
项目名称
不能超过50个字符"
)
@ExcelProperty
(
"
项目名称
"
)
private
String
deptName
;
/**
* 工资发放方式(0现金/1银行)/2线下
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
c4e4631b
...
...
@@ -210,27 +210,27 @@ public class SalaryAccountUtil implements Serializable {
}
field
=
fieldsMap
.
get
(
scs
.
getJavaFiedName
());
if
(
field
==
null
)
{
try
{
cellValueBig
=
new
BigDecimal
(
cellValueStr
);
cellValueBig
=
cellValueBig
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
//四舍五入
if
(
cellValueBig
.
toString
().
length
()
>
11
)
{
error
=
"第"
+
(
i
+
2
)
+
"行金额太大了,请检查一下:"
+
cellValueBig
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
break
;
}
sai
=
new
TSalaryAccountItemVo
();
sai
.
setCnName
(
dbFiedName
);
sai
.
setJavaFiedName
(
scs
.
getJavaFiedName
());
sai
.
setSalaryMoney
(
cellValueBig
);
if
(
scs
.
getIsTax
()
!=
null
)
{
sai
.
setIsTax
(
scs
.
getIsTax
());
}
else
{
sai
.
setIsTax
(
CommonConstants
.
ZERO_INT
);
}
saiList
.
add
(
sai
);
try
{
cellValueBig
=
new
BigDecimal
(
cellValueStr
);
cellValueBig
=
cellValueBig
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
//四舍五入
if
(
cellValueBig
.
toString
().
length
()
>
11
)
{
sai
.
setTextValue
(
cellValueBig
.
toString
());
}
else
{
sai
.
setSalaryMoney
(
cellValueBig
);
}
}
catch
(
NumberFormatException
e
)
{
sai
.
setTextValue
(
cellValueStr
);
//非数字,不保存
}
saiList
.
add
(
sai
);
}
else
{
attr
=
field
.
getAnnotation
(
ExcelAttribute
.
class
);
error
=
validateUtil
(
cellValueStr
,
attr
,
(
i
+
2
));
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @
c4e4631b
...
...
@@ -1043,4 +1043,9 @@ public class TSocialFundInfo extends BaseEntity {
// 执行月份,整体调基使用的
@TableField
(
exist
=
false
)
private
String
doMonth
;
// 基数配置,户调基使用的
@TableField
(
exist
=
false
)
private
SysBaseSetInfo
socialSetInfo
;
@TableField
(
exist
=
false
)
private
SysBaseSetInfo
fundSetInfo
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
c4e4631b
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