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
91c7aa8d
Commit
91c7aa8d
authored
Jan 16, 2025
by
chenyuxi
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5
parents
780027d4
66ab61f0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
12 deletions
+21
-12
TInsuranceUnpurchaseApplyServiceImpl.java
...ry/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java
+9
-6
TInsuranceUnpurchasePersonServiceImpl.java
...y/service/impl/TInsuranceUnpurchasePersonServiceImpl.java
+6
-2
TInsuranceUnpurchaseApplyMapper.xml
...main/resources/mapper/TInsuranceUnpurchaseApplyMapper.xml
+6
-4
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java
View file @
91c7aa8d
...
@@ -28,10 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.service.TInsuranceUnpurchaseApplyServi
...
@@ -28,10 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.service.TInsuranceUnpurchaseApplyServi
import
com.yifu.cloud.plus.v1.yifu.salary.service.TInsuranceUnpurchasePersonService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TInsuranceUnpurchasePersonService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryAttaService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryAttaService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.impl.process.TInsuranceUnpurchaseApplyAuditProcess
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.impl.process.TInsuranceUnpurchaseApplyAuditProcess
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchaseApplySearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchaseApplyVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonAddVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonCardVo
;
import
lombok.extern.log4j.Log4j2
;
import
lombok.extern.log4j.Log4j2
;
import
org.apache.commons.lang.ArrayUtils
;
import
org.apache.commons.lang.ArrayUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
...
@@ -117,11 +114,14 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
...
@@ -117,11 +114,14 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
ExcelWriter
excelWriter
=
EasyExcel
.
write
(
out
,
TInsuranceUnpurchaseApplyVo
.
class
).
build
();
ExcelWriter
excelWriter
=
EasyExcel
.
write
(
out
,
TInsuranceUnpurchaseApplyVo
.
class
).
build
();
int
index
=
0
;
int
index
=
0
;
// if (count > CommonConstants.EXCEL_EXPORT_LIMIT_NEW) {
// list.add(new ExportErrorVo("导出条数最大为20000条"));
// }
if
(
count
>
CommonConstants
.
ZERO_INT
)
{
if
(
count
>
CommonConstants
.
ZERO_INT
)
{
for
(
int
i
=
0
;
i
<=
count
;
i
=
i
+
CommonConstants
.
EXCEL_EXPORT_LIMIT
)
{
for
(
int
i
=
0
;
i
<=
count
;
i
=
i
+
CommonConstants
.
EXCEL_EXPORT_LIMIT
_NEW
)
{
// 获取实际记录
// 获取实际记录
searchVo
.
setLimitStart
(
i
);
searchVo
.
setLimitStart
(
i
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
_NEW
);
list
=
baseMapper
.
getTInsuranceUnpurchaseApplyExportList
(
searchVo
);
list
=
baseMapper
.
getTInsuranceUnpurchaseApplyExportList
(
searchVo
);
if
(
Common
.
isNotNull
(
list
))
{
if
(
Common
.
isNotNull
(
list
))
{
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"含风险项目不购买申请表"
+
index
).
build
();
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"含风险项目不购买申请表"
+
index
).
build
();
...
@@ -200,6 +200,9 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
...
@@ -200,6 +200,9 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
//申请人是否属于子分公司和该项目是否有审批通过记录赋值
//申请人是否属于子分公司和该项目是否有审批通过记录赋值
setValue
(
tInsuranceUnpurchaseApply
,
user
);
setValue
(
tInsuranceUnpurchaseApply
,
user
);
if
(
Common
.
isNotNull
(
tInsuranceUnpurchaseApply
.
getId
()))
{
if
(
Common
.
isNotNull
(
tInsuranceUnpurchaseApply
.
getId
()))
{
if
(
Common
.
isEmpty
(
tInsuranceUnpurchaseApply
.
getApplyNo
()))
{
tInsuranceUnpurchaseApply
.
setApplyNo
(
applyNo
);
}
tInsuranceUnpurchaseApply
.
setCreateTimeZc
(
LocalDateTime
.
now
());
tInsuranceUnpurchaseApply
.
setCreateTimeZc
(
LocalDateTime
.
now
());
baseMapper
.
updateById
(
tInsuranceUnpurchaseApply
);
baseMapper
.
updateById
(
tInsuranceUnpurchaseApply
);
//更新附件
//更新附件
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchasePersonServiceImpl.java
View file @
91c7aa8d
...
@@ -83,11 +83,15 @@ public class TInsuranceUnpurchasePersonServiceImpl extends ServiceImpl<TInsuranc
...
@@ -83,11 +83,15 @@ public class TInsuranceUnpurchasePersonServiceImpl extends ServiceImpl<TInsuranc
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
ExcelWriter
excelWriter
=
EasyExcel
.
write
(
out
,
TInsuranceUnpurchasePersonVo
.
class
).
build
();
ExcelWriter
excelWriter
=
EasyExcel
.
write
(
out
,
TInsuranceUnpurchasePersonVo
.
class
).
build
();
int
index
=
0
;
int
index
=
0
;
if
(
count
>
CommonConstants
.
EXCEL_EXPORT_LIMIT_NEW
){
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"含风险项目不购买申请明细表"
+
index
).
build
();
excelWriter
.
write
(
list
,
writeSheet
);
}
if
(
count
>
CommonConstants
.
ZERO_INT
){
if
(
count
>
CommonConstants
.
ZERO_INT
){
for
(
int
i
=
0
;
i
<=
count
;
i
=
i
+
CommonConstants
.
EXCEL_EXPORT_LIMIT
)
{
for
(
int
i
=
0
;
i
<=
count
;
i
=
i
+
CommonConstants
.
EXCEL_EXPORT_LIMIT
_NEW
)
{
// 获取实际记录
// 获取实际记录
searchVo
.
setLimitStart
(
i
);
searchVo
.
setLimitStart
(
i
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
_NEW
);
list
=
baseMapper
.
getTInsuranceUnpurchaseInfoExportList
(
searchVo
);
list
=
baseMapper
.
getTInsuranceUnpurchaseInfoExportList
(
searchVo
);
if
(
Common
.
isNotNull
(
list
)){
if
(
Common
.
isNotNull
(
list
)){
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"含风险项目不购买申请明细表"
+
index
).
build
();
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"含风险项目不购买申请明细表"
+
index
).
build
();
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TInsuranceUnpurchaseApplyMapper.xml
View file @
91c7aa8d
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
<result
property=
"insuranceFlag"
column=
"INSURANCE_FLAG"
/>
<result
property=
"insuranceFlag"
column=
"INSURANCE_FLAG"
/>
<result
property=
"auditUser"
column=
"AUDIT_USER"
/>
<result
property=
"auditUser"
column=
"AUDIT_USER"
/>
<result
property=
"auditUserId"
column=
"AUDIT_USER_ID"
/>
<result
property=
"auditUserId"
column=
"AUDIT_USER_ID"
/>
<result
property=
"unbuyNum"
column=
"UNBUY_NUM"
/>
</resultMap>
</resultMap>
<resultMap
id=
"tInsuranceUnpurchaseApplyExportMap"
<resultMap
id=
"tInsuranceUnpurchaseApplyExportMap"
...
@@ -50,7 +51,7 @@
...
@@ -50,7 +51,7 @@
a.CREATE_USER_DEPT_NAME, a.REASON_TYPE, a.REASON_INFO, a.APPLY_NO,
a.CREATE_USER_DEPT_NAME, a.REASON_TYPE, a.REASON_INFO, a.APPLY_NO,
a.AUDIT_FLAG, a.COMPANY_FLAG, a.CREATE_BY, a.CREATE_NAME, a.CREATE_TIME,
a.AUDIT_FLAG, a.COMPANY_FLAG, a.CREATE_BY, a.CREATE_NAME, a.CREATE_TIME,
a.UPDATE_BY, a.UPDATE_TIME, a.DELETE_FLAG, a.STATUS, a.HAS_CONTAIN_RISKS,
a.UPDATE_BY, a.UPDATE_TIME, a.DELETE_FLAG, a.STATUS, a.HAS_CONTAIN_RISKS,
a.NEW_LINE, a.DIVISION, a.INSURANCE_FLAG, a.AUDIT_USER, a.AUDIT_USER_ID,a.CREATE_TIME_ZC
a.NEW_LINE, a.DIVISION, a.INSURANCE_FLAG, a.AUDIT_USER, a.AUDIT_USER_ID,a.CREATE_TIME_ZC
,UNBUY_NUM
</sql>
</sql>
<sql
id=
"tInsuranceUnpurchaseApply_where"
>
<sql
id=
"tInsuranceUnpurchaseApply_where"
>
<if
test=
"tInsuranceUnpurchaseApply != null"
>
<if
test=
"tInsuranceUnpurchaseApply != null"
>
...
@@ -102,7 +103,8 @@
...
@@ -102,7 +103,8 @@
1=1 and a.DELETE_FLAG = '0'
1=1 and a.DELETE_FLAG = '0'
<include
refid=
"tInsuranceUnpurchaseApply_where"
/>
<include
refid=
"tInsuranceUnpurchaseApply_where"
/>
</where>
</where>
order by a.CREATE_TIME_ZC desc
order by
ifnull(a.CREATE_TIME_ZC,'2999-12-31 00:00:00') DESC
</select>
</select>
<!-- tInsuranceUnpurchaseApply简单分页查询 -->
<!-- tInsuranceUnpurchaseApply简单分页查询 -->
...
@@ -138,7 +140,7 @@
...
@@ -138,7 +140,7 @@
a.DELETE_FLAG = '0'
a.DELETE_FLAG = '0'
<include
refid=
"tInsuranceUnpurchaseApply_where"
/>
<include
refid=
"tInsuranceUnpurchaseApply_where"
/>
</where>
</where>
order by a.CREATE_TIME_ZC desc
ifnull(a.CREATE_TIME_ZC,'2999-12-31 00:00:00') DESC
<if
test=
"tInsuranceUnpurchaseApply.limitStart != null"
>
<if
test=
"tInsuranceUnpurchaseApply.limitStart != null"
>
limit #{tInsuranceUnpurchaseApply.limitStart},#{tInsuranceUnpurchaseApply.limitEnd}
limit #{tInsuranceUnpurchaseApply.limitStart},#{tInsuranceUnpurchaseApply.limitEnd}
</if>
</if>
...
@@ -213,7 +215,7 @@
...
@@ -213,7 +215,7 @@
SELECT ifnull(max(right (e.APPLY_NO, 3)), 0) EMP_CODE
SELECT ifnull(max(right (e.APPLY_NO, 3)), 0) EMP_CODE
FROM t_insurance_unpurchase_apply e
FROM t_insurance_unpurchase_apply e
where e.DELETE_FLAG = '0'
where e.DELETE_FLAG = '0'
and e.CREATE_TIME_ZC > DATE_FORMAT(now(), '%Y-%m-%d')
and e.CREATE_TIME_ZC > DATE_FORMAT(now(), '%Y-%m-%d')
</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