Commit 4f2937f8 authored by huyuchen's avatar huyuchen

huych-商险和社保基数配置日志新增

parent e9a0b6ae
...@@ -5140,7 +5140,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5140,7 +5140,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
response.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8");
response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, "UTF-8")); response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, "UTF-8"));
if (count > 0) { if (count > 10000) {
out.write("不可导出超过一万行数据,请修改筛选条件后重新导出".getBytes("GBK")); out.write("不可导出超过一万行数据,请修改筛选条件后重新导出".getBytes("GBK"));
out.close(); out.close();
return; return;
...@@ -5155,11 +5155,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5155,11 +5155,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
param.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT); param.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
list = this.baseMapper.getInsuranceChangeLogExportList(param); list = this.baseMapper.getInsuranceChangeLogExportList(param);
if (Common.isNotNull(list)) { if (Common.isNotNull(list)) {
for(InsuranceChangeLogExportVo vo: list) {
if (Common.isNotNull(vo.getOperateContent())) {
vo.setOperateContent(vo.getOperateContent().replace("||", "\n"));
}
}
WriteSheet writeSheet = EasyExcel.writerSheet("sheet" + index).build(); WriteSheet writeSheet = EasyExcel.writerSheet("sheet" + index).build();
excelWriter.write(list, writeSheet); excelWriter.write(list, writeSheet);
index++; index++;
......
...@@ -2245,7 +2245,7 @@ ...@@ -2245,7 +2245,7 @@
b.CREATE_TIME as createTime, b.CREATE_TIME as createTime,
CONCAT( CONCAT(
'项目编码:旧值为:', IFNULL(JSON_UNQUOTE(JSON_EXTRACT(b.OLD_INFO, '$.deptNo')), ''), ',新值为:', IFNULL(JSON_UNQUOTE(JSON_EXTRACT(b.NEW_INFO, '$.deptNo')), ''), '项目编码:旧值为:', IFNULL(JSON_UNQUOTE(JSON_EXTRACT(b.OLD_INFO, '$.deptNo')), ''), ',新值为:', IFNULL(JSON_UNQUOTE(JSON_EXTRACT(b.NEW_INFO, '$.deptNo')), ''),
'||', '项目名称:旧值为:', IFNULL(JSON_UNQUOTE(JSON_EXTRACT(b.OLD_INFO, '$.deptName')), ''), ',新值为:', IFNULL(JSON_UNQUOTE(JSON_EXTRACT(b.NEW_INFO, '$.deptName')), '') '\n项目名称:旧值为:', IFNULL(JSON_UNQUOTE(JSON_EXTRACT(b.OLD_INFO, '$.deptName')), ''), ',新值为:', IFNULL(JSON_UNQUOTE(JSON_EXTRACT(b.NEW_INFO, '$.deptName')), '')
) as operateContent, ) as operateContent,
b.REASON as reason b.REASON as reason
from t_insurance_detail a from t_insurance_detail a
......
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