Skip to content

Y
yifu-mvp
Commit 8051e2bc authored by hongguangwu's avatar hongguangwu
Browse files
Options

Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6

parents 3e6c8bc9 8ef4a357
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 26 deletions
yifu-salary/yifu-salary-biz/src/main/resources/application-dev.yml
View file @ 8051e2bc
......@@ -8,7 +8,6 @@ spring:
redis:
host: 127.0.0.1
port: 6379
password: '@yf_2017'
datasource:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/CustomCellStyleFiveStrategy.java 0 → 100644
View file @ 8051e2bc
package com.yifu.cloud.plus.v1.yifu.social.config;
import com.alibaba.excel.metadata.Head;
import com.alibaba.excel.write.metadata.style.WriteCellStyle;
import com.alibaba.excel.write.metadata.style.WriteFont;
import com.alibaba.excel.write.style.AbstractVerticalCellStyleStrategy;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.IndexedColors;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public class CustomCellStyleFiveStrategy extends AbstractVerticalCellStyleStrategy {
/**
* 操作列
*/
private List<Integer> columnIndexes;
public CustomCellStyleFiveStrategy(List<Integer> columnIndexes ) {
this.columnIndexes = columnIndexes;
}
@Override
protected WriteCellStyle headCellStyle(Head head) {
// 获取样式实例
WriteCellStyle headWriteCellStyle = new WriteCellStyle();
// 获取字体实例
WriteFont headWriteFont = new WriteFont();
// 设置字体样式
headWriteFont.setFontName("宋体");
// 设置字体大小
headWriteFont.setFontHeightInPoints((short)12);
// 边框
headWriteFont.setBold(false);
headWriteCellStyle.setFillForegroundColor(IndexedColors.WHITE.getIndex());
headWriteCellStyle.setWriteFont(headWriteFont);
headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
headWriteCellStyle.setBorderLeft(BorderStyle.NONE);
headWriteCellStyle.setBorderBottom(BorderStyle.NONE);
headWriteCellStyle.setBorderRight(BorderStyle.NONE);
headWriteCellStyle.setBorderTop(BorderStyle.NONE);
return headWriteCellStyle;
}
}
\ No newline at end of file
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 8051e2bc
......@@ -6020,10 +6020,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
@Override
public void doexportFundInfo(HttpServletResponse response, SocialHandleSearchVo searchVo) {
String fileName = DispatchConstants.FUND_RECORD_EXPORT + DateUtil.getThisTime() + CommonConstants.XLSX;
String fileName = DispatchConstants.FUND_RECORD_EXPORT + "_"+searchVo.getProvidentHouseholdName() + "_" + searchVo.getDisMonth() + CommonConstants.XLSX;
//获取要导出的列表
List<TDispatchFundPersionExportVo> list = new ArrayList<>();
List<TDispatchFundSumExportVo> listOne = new ArrayList<>();
try (ServletOutputStream out = response.getOutputStream()){
response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, CommonConstants.UTF8));
......@@ -6045,7 +6044,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
CustomCellStyleTwoStrategy customCellStyleStrategyTwo = new CustomCellStyleTwoStrategy(columnIndexes);
CustomCellStyleThreeStrategy customCellStyleStrategyThree = new CustomCellStyleThreeStrategy(columnIndexes);
CustomCellStyleFourStrategy customCellStyleStrategyFour= new CustomCellStyleFourStrategy(columnIndexes);
CustomCellStyleFiveStrategy customCellStyleStrategyFive= new CustomCellStyleFiveStrategy(columnIndexes);
writeTable0 = EasyExcel.writerTable(0).
head(headFisrt()).
registerWriteHandler(customCellStyleStrategy).
......@@ -6072,7 +6071,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//但是这里的设值是8648，具体原因请看下面的计算逻辑
sheet.setColumnWidth(0, 3000);
sheet.setColumnWidth(1, 4000);
sheet.setColumnWidth(2, 2000);
sheet.setColumnWidth(2, 4000);
sheet.setColumnWidth(3, 6000);
sheet.setColumnWidth(4, 4000);
sheet.setColumnWidth(6, 5000);
......@@ -6088,16 +6087,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
writeTable3 = EasyExcel.writerTable(3).
head(headQ(searchVo)).
registerWriteHandler(customCellStyleStrategyThree).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)50,(short)20))
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20))
.build();
writeTable4 = EasyExcel.writerTable(4).
head(FundHeadR()).
registerWriteHandler(customCellStyleStrategyFour).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)50,(short)20))
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20))
.build();
writeTable5 = EasyExcel.writerTable(5).
head(FundHeadT()).
registerWriteHandler(customCellStyleStrategyTwo).
registerWriteHandler(customCellStyleStrategyFive).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20))
.build();
//派增的数据
......@@ -6116,7 +6115,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
list.add(vo);
}
}
writeSheet = EasyExcel.writerSheet("变更清册").build();
writeSheet = EasyExcel.writerSheet(searchVo.getDisMonth()).build();
// 第一次写入会创建头
excelWriter.write(new ArrayList<>(), writeSheet, writeTable0);
excelWriter.write(new ArrayList<>(), writeSheet, writeTable1);
......@@ -6654,9 +6653,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if(houseName!=null) {
CompanyProVo companyProVo = companyProVo(houseName);
HouseNameConfigVo vo =getFundSumExportVoTwo(houseName);
if (fundAccount == null) {
fundAccount = "";
}
String a = "单位名称(签章): " + houseName + " 单位公积金账号:" + vo.getCustomerNo() + " 单边缴纳比例:" + companyProVo.getCompanyPro()+"%";
//第一列-第十八列
......@@ -6708,12 +6705,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
List<List<String>> list = new ArrayList<>();
//表头数据
String a ="";
String b ="";
String c ="";
String d ="";
String b =" ";
String c =" ";
String d =" ";
//第一列
TDispatchFundSumExportVo dispatchFundSumExportVo =getFundSumExportVo(searchVo);
if(Common.isNotNull(dispatchFundSumExportVo)) {
if(dispatchFundSumExportVo.getNumOne()!=null) {
a = dispatchFundSumExportVo.getNumOne().toString();
}
......@@ -6728,17 +6727,25 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
d = dispatchFundSumExportVo.getMonenyTwo().toString();
}
if(dispatchFundSumExportVo.getNumOne()==0){
a="";
}
if(dispatchFundSumExportVo.getNumTwo()==0){
b=" ";
}
list.add(Lists.newArrayList("项目合计", "项目合计", "本月小计"));
//第二列
list.add(Lists.newArrayList("项目合计", "项目合计", "本月小计"));
//第三列
list.add(Lists.newArrayList("本月增加汇款", "人数", a));
list.add(Lists.newArrayList("本月增加汇款", "人数", b));
list.add(Lists.newArrayList("本月增加汇款", "金额", c));
//第四列
list.add(Lists.newArrayList("本月减少汇款", "人数", b));
list.add(Lists.newArrayList("本月减少汇款", "人数", a));
//第五列
list.add(Lists.newArrayList("本月减少汇款", "金额", d));
//第六列
......@@ -6777,10 +6784,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//表头数据
list.add(Lists.newArrayList("备注", "备注"));
list.add(Lists.newArrayList("备注", "备注"));
String a="1、新增人员必须填写身份证号码。\n"+
"2、本表只提供单位缴存人数变动使用。\n"+
"3、对于工资基数调整及个人补缴业务不得使用此表。\n"+
"4.单位封存人员启封时，如缴存基数发生变化须附基数调整清册。 本单位承诺变更清册中所填内容均真实、 \n" +"合法、有效，如有不实之处，单位承担相应的法律责任及由此产生的一切后果。";
String a="1.新增人员必须填写身份证号码。\n"+
"2.本表只提供单位缴存人数变动使用。\n"+
"3.对于工资基数调整及个人补缴业务不得使用此表。\n"+
"4.单位封存人员启封时，如缴存基数发生变化须附基数调整清册\n"+"本单位承诺变更清册中所填内容均真实、合法、有效，如有不实之处，单位承担相应的法律责任及由此产生的一切后果。";
for (int i = 2; i <= 7; i++) {
list.add(Lists.newArrayList(a));
}
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @ 8051e2bc
......@@ -1934,7 +1934,7 @@
<sql id="where_getFundDisRecord">
a.DELETE_FLAG = 0
AND a.fund_id is not null
AND a.STATUS = "2"
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() != ''">
......@@ -2025,7 +2025,9 @@
s.UNIT_PROVIDENG_CARDINAL AS DEPOSIT_BASE ,
replace( DATE_FORMAT(s.PROVIDENT_START,"%Y-%m"),'-','') as ORIGINATE,
replace( DATE_FORMAT(DATE(CURDATE()),"%Y-%m"),'-','') as END,
(abs(PERIOD_DIFF( replace( DATE_FORMAT(s.PROVIDENT_START,"%m"),'-',''),replace( DATE_FORMAT(DATE(CURDATE()),"%m"),'-','')))+1) *S.UNIT_PROVIDENG_CARDINAL*0.12
ROUND(SUM((abs(PERIOD_DIFF(replace(DATE_FORMAT(s.PROVIDENT_START,"%Y-%m"), '-', ''),
#{tDispatchInfo.disMonth})))*s.UNIT_PROVIDENT_PER*s.UNIT_PROVIDENG_CARDINAL )
)
AS SUPPLEMENTART_AMOUNT
FROM t_dispatch_info a
left join t_provident_fund s on s.id=a.FUND_ID
......@@ -2047,9 +2049,9 @@
</where>
</select>
<select id="getFundSumExportVoOne" resultMap="FundSupplementary">
SELECT ROUND(SUM((abs(PERIOD_DIFF(replace(DATE_FORMAT(s.PROVIDENT_START, "%m"), '-', ''),
replace(DATE_FORMAT(DATE(CURDATE()),"%m"), '-', ''))) + 1) *
S.UNIT_PROVIDENG_CARDINAL * 0.12)
SELECT
ROUND(SUM((abs(PERIOD_DIFF(replace(DATE_FORMAT(s.PROVIDENT_START,"%Y-%m"), '-', ''),
#{tDispatchInfo.disMonth})))*0.1*s.UNIT_PROVIDENG_CARDINAL )
) AS SUPPLEMENTART_AMOUNT_SUM
FROM t_dispatch_info a
left join t_provident_fund s on s.id = a.FUND_ID
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment