Commit a3b1fdeb authored by huyuchen's avatar huyuchen

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

parents 4fdf842d bae27eff
......@@ -131,6 +131,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
WriteNullStringAsEmpty, WriteDateUseDateFormat
};
// 修改入职确认信息,忽略的字段变更日志。
// 2025-4-15 15:44:34 倩倩与龙弟确认:processStatus 不做忽略,如果点确认重置了状态,要有日志,只是目前日志没体现状态。
private static final List<String> IGNORE_FIELD = new ArrayList<>();
static {
IGNORE_FIELD.add("joinLeaveDate");
......
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
......@@ -187,4 +189,12 @@ public class InsuranceExportListOneVO implements Serializable {
*/
@Schema(description = "是否地市自购")
private String isAdress;
/**
* 派单备注
*/
@Schema(description = "派单备注")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "派单备注")
private String remarkDispatch;
}
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
......@@ -194,4 +196,12 @@ public class InsuranceExportListVO implements Serializable {
@Schema(description = "是否地市自购")
private String isAdress;
/**
* 派单备注
*/
@Schema(description = "派单备注")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "派单备注")
private String remarkDispatch;
}
......@@ -1125,6 +1125,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List<InsuranceExportListOneVO> list = new ArrayList<>();
if(CollectionUtils.isNotEmpty(listVOS)){
for (InsuranceExportListOneVO listVO : listVOS) {
listVO.setDieDisableQuota(listVO.getRemark());
listVO.setRemark(InsurancesConstants.INSERT);
TInsuranceReplace one = tInsuranceReplaceService.getOne(Wrappers.<TInsuranceReplace>query().lambda()
.eq(TInsuranceReplace::getToInsuranceDetailId, listVO.getId())
......@@ -1289,6 +1290,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List<InsuranceExportListVO> list = new ArrayList<>();
if(CollectionUtils.isNotEmpty(listVOS)){
for (InsuranceExportListVO listVO : listVOS) {
listVO.setRemarkDispatch(listVO.getRemark());
listVO.setRemark(InsurancesConstants.INSERT);
TInsuranceReplace one = tInsuranceReplaceService.getOne(Wrappers.<TInsuranceReplace>query().lambda()
.eq(TInsuranceReplace::getToInsuranceDetailId, listVO.getId())
......
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