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
4ea96990
You need to sign in or sign up before continuing.
Commit
4ea96990
authored
Aug 03, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6
parents
9250eaab
b4c28267
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
229 additions
and
122 deletions
+229
-122
TDispatchFundSumVo.java
...yifu/cloud/plus/v1/yifu/social/vo/TDispatchFundSumVo.java
+3
-0
CustomCellStyleFourStrategy.java
...us/v1/yifu/social/config/CustomCellStyleFourStrategy.java
+1
-0
TDispatchInfoMapper.java
...cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
+3
-2
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+131
-92
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+91
-28
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchFundSumVo.java
View file @
4ea96990
...
@@ -17,4 +17,7 @@ public class TDispatchFundSumVo {
...
@@ -17,4 +17,7 @@ public class TDispatchFundSumVo {
@ExcelAttribute
(
name
=
"合计补缴金额(大写)"
)
@ExcelAttribute
(
name
=
"合计补缴金额(大写)"
)
@ExcelProperty
(
"合计补缴金额(大写)"
)
@ExcelProperty
(
"合计补缴金额(大写)"
)
private
BigDecimal
supplementaryAmountSum
;
private
BigDecimal
supplementaryAmountSum
;
private
String
number
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/CustomCellStyleFourStrategy.java
View file @
4ea96990
...
@@ -62,6 +62,7 @@ public class CustomCellStyleFourStrategy extends AbstractVerticalCellStyleStrate
...
@@ -62,6 +62,7 @@ public class CustomCellStyleFourStrategy extends AbstractVerticalCellStyleStrate
headWriteCellStyle
.
setFillForegroundColor
(
IndexedColors
.
BLACK
.
getIndex
());
headWriteCellStyle
.
setFillForegroundColor
(
IndexedColors
.
BLACK
.
getIndex
());
headWriteCellStyle
.
setWriteFont
(
headWriteFont
);
headWriteCellStyle
.
setWriteFont
(
headWriteFont
);
headWriteCellStyle
.
setHorizontalAlignment
(
HorizontalAlignment
.
LEFT
);
headWriteCellStyle
.
setHorizontalAlignment
(
HorizontalAlignment
.
LEFT
);
headWriteCellStyle
.
setVerticalAlignment
(
VerticalAlignment
.
CENTER
);
headWriteCellStyle
.
setBorderLeft
(
BorderStyle
.
THIN
);
headWriteCellStyle
.
setBorderLeft
(
BorderStyle
.
THIN
);
headWriteCellStyle
.
setBorderTop
(
BorderStyle
.
THIN
);
headWriteCellStyle
.
setBorderTop
(
BorderStyle
.
THIN
);
headWriteCellStyle
.
setBorderRight
(
BorderStyle
.
THIN
);
headWriteCellStyle
.
setBorderRight
(
BorderStyle
.
THIN
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
View file @
4ea96990
...
@@ -164,6 +164,7 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
...
@@ -164,6 +164,7 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
int
getSocialDisRecordCount
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
);
int
getSocialDisRecordCount
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
);
int
getFCount
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
);
/**
/**
* @Author huyc
* @Author huyc
...
@@ -239,11 +240,11 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
...
@@ -239,11 +240,11 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
List
<
TDispatchFundPersionExportVo
>
getFundPersionExportVo
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
);
List
<
TDispatchFundPersionExportVo
>
getFundPersionExportVo
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
);
List
<
TDispatchFundSupplementaryExportVo
>
getFundSupplementarynExportVo
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
);
List
<
TDispatchFundSupplementaryExportVo
>
getFundSupplementarynExportVo
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
,
@Param
(
"companyPro"
)
Double
companyPro
);
TDispatchFundSumExportVo
getFundSumExportVo
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
);
TDispatchFundSumExportVo
getFundSumExportVo
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
);
TDispatchFundSumVo
getFundSumExportVoOne
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
);
TDispatchFundSumVo
getFundSumExportVoOne
(
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
,
@Param
(
"companyPro"
)
Double
companyPro
);
CompanyProVo
getFundPersionExportVoOne
(
@Param
(
"houseName"
)
String
houseName
);
CompanyProVo
getFundPersionExportVoOne
(
@Param
(
"houseName"
)
String
houseName
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
4ea96990
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
4ea96990
...
@@ -209,7 +209,7 @@
...
@@ -209,7 +209,7 @@
<resultMap
id=
"FundSupplementary"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchFundSumVo"
>
<resultMap
id=
"FundSupplementary"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchFundSumVo"
>
<result
property=
"supplementaryAmountSum"
column=
"SUPPLEMENTART_AMOUNT_SUM"
/>
<result
property=
"supplementaryAmountSum"
column=
"SUPPLEMENTART_AMOUNT_SUM"
/>
<result
property=
"number"
column=
"NUMBER"
/>
</resultMap>
</resultMap>
<resultMap
id=
"FundSumExport"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchFundSumExportVo"
>
<resultMap
id=
"FundSumExport"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchFundSumExportVo"
>
...
@@ -1265,6 +1265,25 @@
...
@@ -1265,6 +1265,25 @@
group by a.EMP_IDCARD) h
group by a.EMP_IDCARD) h
</select>
</select>
<select
id=
"getFCount"
resultType=
"java.lang.Integer"
>
SELECT count(1) from (
SELECT 1
FROM t_dispatch_info a
<where>
<include
refid=
"where_getFundDisRecord"
/>
</where>
group by a.EMP_IDCARD ,a.TYPE) h
</select>
<select
id=
"getSocialDisRecordCount"
resultType=
"java.lang.Integer"
>
SELECT count(1) from (
SELECT 1
FROM t_dispatch_info a
<where>
<include
refid=
"where_getSocialDisRecord"
/>
</where>
group by a.EMP_IDCARD) h
</select>
<!--tDispatchInfo 社保医疗花名册派单数据-->
<!--tDispatchInfo 社保医疗花名册派单数据-->
<select
id=
"getSocialDisRecord"
resultMap=
"socialDisExportMap"
>
<select
id=
"getSocialDisRecord"
resultMap=
"socialDisExportMap"
>
...
@@ -1954,6 +1973,30 @@
...
@@ -1954,6 +1973,30 @@
</if>
</if>
</if>
</if>
</sql>
<sql
id=
"where_getFund"
>
a.DELETE_FLAG = 0
AND a.fund_id is not null
AND a.STATUS in ('2','4')
AND a.DISPATCH_ITEM like concat('%','公积金','%')
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"
>
AND a.PROVIDENT_HOUSEHOLD_NAME = #{tDispatchInfo.providentHouseholdName}
</if>
<if
test=
"tDispatchInfo.type != null and tDispatchInfo.type.trim() != ''"
>
AND a.TYPE = #{tDispatchInfo.type}
</if>
<if
test=
"tDispatchInfo.disMonth != null and tDispatchInfo.disMonth.trim() != ''"
>
AND replace(DATE_FORMAT(a.CREATE_TIME,"%Y-%m"),'-','') = #{tDispatchInfo.disMonth}
</if>
<if
test=
"tDispatchInfo.fundHandleStatus != null and tDispatchInfo.fundHandleStatus.trim() != ''"
>
AND a.FUND_HANDLE_STATUS = #{tDispatchInfo.fundHandleStatus}
</if>
<if
test=
"tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''"
>
${tDispatchInfo.authSql}
</if>
</if>
</sql>
</sql>
<sql
id=
"where_getSocialPersionDisRecord"
>
<sql
id=
"where_getSocialPersionDisRecord"
>
...
@@ -1999,41 +2042,62 @@
...
@@ -1999,41 +2042,62 @@
<!--tDispatchInfo 社保医疗花名册派单数据-->
<!--tDispatchInfo 社保医疗花名册派单数据-->
<select
id=
"getFundPersionExportVo"
resultMap=
"FundExport"
>
<select
id=
"getFundPersionExportVo"
resultMap=
"FundExport"
>
SELECT
SELECT
(@i :=@i+1) as NUM,
( @i := @i + 1 ) AS NUM,
h.EMP_NAME,
h.EMP_IDCARD,
h.DEPOSIT_BASE,
h.MOTHLY_INCREASE,
h.MOTHLY_DECREASE,
h.CAUSE_CHANGE
FROM
(
SELECT
a.EMP_NAME,
a.EMP_NAME,
a.EMP_IDCARD,
a.EMP_IDCARD,
s.UNIT_PROVIDENG_CARDINAL AS DEPOSIT_BASE ,
s.UNIT_PROVIDENG_CARDINAL AS DEPOSIT_BASE,
IF(a.TYPE=0 ,s.UNIT_PROVIDENT_FEE*2,NULL) as MOTHLY_INCREASE,
IF
IF(a.TYPE=1 ,s.UNIT_PROVIDENT_FEE*2,NULL) as MOTHLY_DECREASE,
( a.TYPE = 0, s.UNIT_PROVIDENT_FEE * 2, NULL ) AS MOTHLY_INCREASE,
case when a.TYPE=0 then "新增"
IF
else "减少" end as CAUSE_CHANGE
( a.TYPE = 1, s.UNIT_PROVIDENT_FEE * 2, NULL ) AS MOTHLY_DECREASE,
FROM t_dispatch_info a
CASE
left join t_provident_fund s on s.id=a.FUND_ID
,(select @i:=0) as itable
WHEN a.TYPE = 0 THEN
"新增" ELSE "减少"
END AS CAUSE_CHANGE
FROM
t_dispatch_info a
LEFT JOIN t_provident_fund s ON s.id = a.FUND_ID
<where>
<where>
<include
refid=
"where_getFundDisRecord"
/>
<include
refid=
"where_getFundDisRecord"
/>
</where>
</where>
GROUP BY
a.EMP_IDCARD,
a.TYPE
ORDER BY
a.TYPE
) h,(select @i:=0) as itable
</select>
</select>
<!--tDispatchInfo 社保医疗花名册派单数据-->
<!--tDispatchInfo 社保医疗花名册派单数据-->
<select
id=
"getFundSupplementarynExportVo"
resultMap=
"FundSupplementaryExport"
>
<select
id=
"getFundSupplementarynExportVo"
resultMap=
"FundSupplementaryExport"
>
SELECT
SELECT
(
@i :=@i+1) as
NUM,
(
@i := @i + 1 ) AS
NUM,
a.EMP_NAME,
a.EMP_NAME,
a.EMP_IDCARD,
a.EMP_IDCARD,
s.UNIT_PROVIDENG_CARDINAL AS DEPOSIT_BASE
,
s.UNIT_PROVIDENG_CARDINAL AS DEPOSIT_BASE,
replace( DATE_FORMAT(s.PROVIDENT_START,"%Y-%m"),'-','') as
ORIGINATE,
REPLACE ( DATE_FORMAT( s.PROVIDENT_START, "%Y-%m" ), '-', '' ) AS
ORIGINATE,
replace( DATE_FORMAT(DATE(CURDATE()),"%Y-%m"),'-','') as
END,
#{tDispatchInfo.disMonth} AS
END,
ROUND(
SUM((abs(PERIOD_DIFF(replace(DATE_FORMAT(s.PROVIDENT_START,"%Y-%m"), '-', ''),
ROUND(
(PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( s.PROVIDENT_START, "%Y-%m" ), '-', '' )))*#{companyPro}*s.UNIT_PROVIDENG_CARDINAL*0.01 ) AS SUPPLEMENTART_AMOUNT
#{tDispatchInfo.disMonth})))*s.UNIT_PROVIDENT_PER*s.UNIT_PROVIDENG_CARDINAL )
FROM
)
t_dispatch_info a
AS SUPPLEMENTART_AMOUNT
LEFT JOIN t_provident_fund s ON s.id = a.FUND_ID,(
FROM t_dispatch_info a
SELECT
left join t_provident_fund s on s.id=a.FUND_ID
@i := 0
,(select @i:=0) as
itable
) AS
itable
<where>
<where>
<include
refid=
"where_getFund
DisRecord
"
/>
<include
refid=
"where_getFund"
/>
</where>
</where>
</select>
</select>
<select
id=
"getFundSumExportVo"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchFundSumExportVo"
>
<select
id=
"getFundSumExportVo"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchFundSumExportVo"
>
...
@@ -2050,13 +2114,12 @@
...
@@ -2050,13 +2114,12 @@
</select>
</select>
<select
id=
"getFundSumExportVoOne"
resultMap=
"FundSupplementary"
>
<select
id=
"getFundSumExportVoOne"
resultMap=
"FundSupplementary"
>
SELECT
SELECT
ROUND(SUM((abs(PERIOD_DIFF(replace(DATE_FORMAT(s.PROVIDENT_START,"%Y-%m"), '-', ''),
count(a.EMP_IDCARD) as NUMBER,
#{tDispatchInfo.disMonth})))*0.1*s.UNIT_PROVIDENG_CARDINAL )
SUM(ROUND((PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE (DATE_FORMAT( DATE_ADD(s.PROVIDENT_START,INTERVAL 1 MONTH), "%Y-%m" ), '-', '' )))*#{companyPro}*s.UNIT_PROVIDENG_CARDINAL*0.01 )) AS SUPPLEMENTART_AMOUNT_SUM
) AS SUPPLEMENTART_AMOUNT_SUM
FROM t_dispatch_info a
FROM t_dispatch_info a
left join t_provident_fund s on s.id = a.FUND_ID
left join t_provident_fund s on s.id = a.FUND_ID
<where>
<where>
<include
refid=
"where_getFund
DisRecord
"
/>
<include
refid=
"where_getFund"
/>
</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