Commit 176a17bc authored by fangxinjiang's avatar fangxinjiang

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

parents 1495b2be 9acf4fc6
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
<module>yifu-ekp</module> <module>yifu-ekp</module>
<module>yifu-process</module> <module>yifu-process</module>
<module>yifu-csp</module> <module>yifu-csp</module>
<module>yifu-batch</module>
</modules> </modules>
<dependencyManagement> <dependencyManagement>
......
...@@ -13,8 +13,8 @@ spring: ...@@ -13,8 +13,8 @@ spring:
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
username: root username: root
password: ll_mysql password: yf_zsk
url: jdbc:mysql://192.168.1.122:33306/batch?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.1.65:43306/mvp_batch?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
hikari: hikari:
driver-class-name: ${spring.datasource.driver-class-name} driver-class-name: ${spring.datasource.driver-class-name}
jdbc-url: ${spring.datasource.url} jdbc-url: ${spring.datasource.url}
......
...@@ -4,8 +4,8 @@ spring: ...@@ -4,8 +4,8 @@ spring:
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
username: root username: root
password: ll_mysql password: yf_zsk
url: jdbc:mysql://192.168.0.143:3306/batch?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.0.222:22306/mvp_batch?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
hikari: hikari:
driver-class-name: ${spring.datasource.driver-class-name} driver-class-name: ${spring.datasource.driver-class-name}
jdbc-url: ${spring.datasource.url} jdbc-url: ${spring.datasource.url}
......
...@@ -13,8 +13,8 @@ spring: ...@@ -13,8 +13,8 @@ spring:
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
username: root username: root
password: ll_mysql password: yf_zsk
url: jdbc:mysql://192.168.1.122:33306/batch?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.1.65:43306/mvp_batch?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
hikari: hikari:
driver-class-name: ${spring.datasource.driver-class-name} driver-class-name: ${spring.datasource.driver-class-name}
jdbc-url: ${spring.datasource.url} jdbc-url: ${spring.datasource.url}
......
...@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo; ...@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.insurances.util.LocalDateConverter; import com.yifu.cloud.plus.v1.yifu.insurances.util.LocalDateConverter;
...@@ -20,6 +21,7 @@ import java.time.LocalDateTime; ...@@ -20,6 +21,7 @@ import java.time.LocalDateTime;
* @date 2025-12-12 * @date 2025-12-12
*/ */
@Data @Data
@ColumnWidth(17)
@Tag(name = "商险明细项目变更日志导出VO") @Tag(name = "商险明细项目变更日志导出VO")
public class InsuranceChangeLogExportVo implements Serializable { public class InsuranceChangeLogExportVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -119,3 +121,4 @@ public class InsuranceChangeLogExportVo implements Serializable { ...@@ -119,3 +121,4 @@ public class InsuranceChangeLogExportVo implements Serializable {
private String reason; private String reason;
} }
...@@ -357,7 +357,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> { ...@@ -357,7 +357,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
* *
* @author huych * @author huych
* @param param 查询参数 * @param param 查询参数
* @return {@link long} * @return
*/ */
long getInsuranceChangeLogExportCount(@Param("param") InsuredParam param); long getInsuranceChangeLogExportCount(@Param("param") InsuredParam param);
......
...@@ -7,12 +7,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -7,12 +7,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.equator.HrEquator; import com.yifu.cloud.plus.v1.yifu.common.core.util.equator.HrEquator;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TBusinessOperate; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TBusinessOperate;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancesChangeLog;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TBusinessOperateMapper; import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TBusinessOperateMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TBusinessOperateService; import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TBusinessOperateService;
import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsurancesChangeLogService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import static com.alibaba.fastjson.serializer.SerializerFeature.*; import static com.alibaba.fastjson.serializer.SerializerFeature.*;
...@@ -24,6 +30,9 @@ import static com.alibaba.fastjson.serializer.SerializerFeature.*; ...@@ -24,6 +30,9 @@ import static com.alibaba.fastjson.serializer.SerializerFeature.*;
@Service @Service
public class TBusinessOperateServiceImpl extends ServiceImpl<TBusinessOperateMapper, TBusinessOperate> implements TBusinessOperateService { public class TBusinessOperateServiceImpl extends ServiceImpl<TBusinessOperateMapper, TBusinessOperate> implements TBusinessOperateService {
@Resource
private TInsurancesChangeLogService insurancesChangeLogService;
/** /**
* 保存修改记录 * 保存修改记录
* *
...@@ -69,7 +78,27 @@ public class TBusinessOperateServiceImpl extends ServiceImpl<TBusinessOperateMap ...@@ -69,7 +78,27 @@ public class TBusinessOperateServiceImpl extends ServiceImpl<TBusinessOperateMap
public List<TBusinessOperate> getOperateListByBusinessId(String businessId) { public List<TBusinessOperate> getOperateListByBusinessId(String businessId) {
List<TBusinessOperate> list = this.baseMapper.selectList(Wrappers.<TBusinessOperate>query().lambda() List<TBusinessOperate> list = this.baseMapper.selectList(Wrappers.<TBusinessOperate>query().lambda()
.eq(TBusinessOperate::getBusinessId,businessId)); .eq(TBusinessOperate::getBusinessId,businessId));
return list; //查询项目变更的操作记录
List<TInsurancesChangeLog> changeLogList = insurancesChangeLogService.getTInsurancesChangeLoglList(businessId);
if (Common.isNotNull(changeLogList)) {
changeLogList.forEach(changeLog -> {
TBusinessOperate operate = new TBusinessOperate();
operate.setId(changeLog.getId());
operate.setBusinessId(changeLog.getPreId());
operate.setDifferenceInfo(changeLog.getDifferenceInfo());
operate.setOldInfo(changeLog.getOldInfo());
operate.setNewInfo(changeLog.getNewInfo());
operate.setRemark(changeLog.getReason());
operate.setCreateName(changeLog.getCreateName());
operate.setCreateTime(changeLog.getCreateTime());
list.add(operate);
});
}
List<TBusinessOperate> backList = new ArrayList<>();
if (!list.isEmpty()) {
backList = list.stream().sorted(Comparator.comparing(TBusinessOperate::getCreateTime)).collect(Collectors.toList());
}
return backList;
} }
private SerializerFeature[] features = new SerializerFeature[] { private SerializerFeature[] features = new SerializerFeature[] {
......
...@@ -5139,6 +5139,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5139,6 +5139,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
response.setContentType(CommonConstants.MULTIPART_FORM_DATA); response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
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 > 10000) {
out.write("不可导出超过一万行数据,请修改筛选条件后重新导出".getBytes("GBK"));
out.close();
return;
}
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭 // 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
ExcelWriter excelWriter = EasyExcel.write(out, InsuranceChangeLogExportVo.class).build(); ExcelWriter excelWriter = EasyExcel.write(out, InsuranceChangeLogExportVo.class).build();
int index = 0; int index = 0;
...@@ -6490,7 +6496,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -6490,7 +6496,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
insuranceOperate.setCreateName(user.getNickname()); insuranceOperate.setCreateName(user.getNickname());
insuranceOperate.setCreateTime(LocalDateTime.now()); insuranceOperate.setCreateTime(LocalDateTime.now());
insuranceOperate.setReason("项目变更"); insuranceOperate.setReason("项目变更");
insuranceOperate.setDifferenceInfo("项目名称,项目编码"); insuranceOperate.setDifferenceInfo("deptName,deptNo");
Map<String, String> oldMap = new HashMap<>(); Map<String, String> oldMap = new HashMap<>();
oldMap.put("deptName", success.getOldDeptName()); oldMap.put("deptName", success.getOldDeptName());
oldMap.put("deptNo", success.getOldDeptNo()); oldMap.put("deptNo", success.getOldDeptNo());
......
...@@ -2340,10 +2340,10 @@ ...@@ -2340,10 +2340,10 @@
${param.authSql} ${param.authSql}
</if> </if>
and b.PRE_ID is not null and b.PRE_ID is not null
order by b.CREATE_TIME desc
<if test="param.limitStart != null and param.limitEnd != null"> <if test="param.limitStart != null and param.limitEnd != null">
limit #{param.limitStart}, #{param.limitEnd} limit #{param.limitStart}, #{param.limitEnd}
</if> </if>
order by b.CREATE_TIME desc
</select> </select>
<!-- 导出商险明细项目变更日志统计 --> <!-- 导出商险明细项目变更日志统计 -->
......
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