Commit 0ddedeba authored by hongguangwu's avatar hongguangwu

模糊搜索

parent a1172bf7
...@@ -17,10 +17,7 @@ ...@@ -17,10 +17,7 @@
package com.yifu.cloud.plus.v1.yifu.archives.entity; package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
...@@ -156,6 +153,7 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -156,6 +153,7 @@ public class TEmployeeContractInfo extends BaseEntity {
@Length(max = 50, message = "合同编码不能超过50个字符") @Length(max = 50, message = "合同编码不能超过50个字符")
@ExcelAttribute(name = "合同编码", maxLength = 50) @ExcelAttribute(name = "合同编码", maxLength = 50)
@Schema(description = "合同编码", name = "contractNo") @Schema(description = "合同编码", name = "contractNo")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String contractNo; private String contractNo;
/** /**
* 备注 * 备注
...@@ -230,6 +228,7 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -230,6 +228,7 @@ public class TEmployeeContractInfo extends BaseEntity {
@Length(max = 50, message = "档案柜号不能超过50个字符") @Length(max = 50, message = "档案柜号不能超过50个字符")
@ExcelAttribute(name = "档案柜号", maxLength = 50) @ExcelAttribute(name = "档案柜号", maxLength = 50)
@Schema(description = "档案柜号", name = "fileCabinetNo") @Schema(description = "档案柜号", name = "fileCabinetNo")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String fileCabinetNo; private String fileCabinetNo;
/** /**
......
...@@ -570,12 +570,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -570,12 +570,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
@Override @Override
public R<String> filingContract(TEmployeeContractInfo tEmployeeContractInfo) { public R<String> filingContract(TEmployeeContractInfo tEmployeeContractInfo) {
if (tEmployeeContractInfo != null) { if (tEmployeeContractInfo != null) {
if (Common.isEmpty(tEmployeeContractInfo.getContractNo()) if ((Common.isNotNull(tEmployeeContractInfo.getContractNo()) && tEmployeeContractInfo.getContractNo().length() > 50)
|| Common.isEmpty(tEmployeeContractInfo.getFileCabinetNo())) { || (Common.isNotNull(tEmployeeContractInfo.getFileCabinetNo()) && tEmployeeContractInfo.getFileCabinetNo().length() > 50)) {
return R.failed("合同编号、档案柜号必填!");
}
if (tEmployeeContractInfo.getContractNo().length() > 50
|| tEmployeeContractInfo.getFileCabinetNo().length() > 50) {
return R.failed("合同编号、档案柜号不可超过50字!"); return R.failed("合同编号、档案柜号不可超过50字!");
} }
//档案柜存在就自动归档 //档案柜存在就自动归档
......
...@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants; ...@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex; import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.io.Serializable; import java.io.Serializable;
...@@ -480,4 +481,47 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable { ...@@ -480,4 +481,47 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable {
@ExcelProperty("委托备注") @ExcelProperty("委托备注")
private String trustRemark; private String trustRemark;
/**
* 养老办理状态:0待办理1办理成功2办理失败3已派减
*/
@ExcelAttribute(name = "养老办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema(description = "养老办理状态:0待办理1办理成功2办理失败3已派减" )
@ExcelProperty("养老办理状态" )
private String pensionHandle;
/**
* 医疗办理状态:0待办理1办理成功2办理失败3已派减
*/
@ExcelAttribute(name = "医疗办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema(description = "医疗办理状态:0待办理1办理成功2办理失败3已派减" )
@ExcelProperty("医疗办理状态" )
private String medicalHandle;
/**
* 失业办理状态:0待办理1办理成功2办理失败3已派减
*/
@ExcelAttribute(name = "失业办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema(description = "失业办理状态:0待办理1办理成功2办理失败3已派减" )
@ExcelProperty("失业办理状态" )
private String unemployHandle;
/**
* 工伤办理状态:0待办理1办理成功2办理失败3已派减
*/
@ExcelAttribute(name = "工伤办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema(description = "工伤办理状态:0待办理1办理成功2办理失败3已派减" )
@ExcelProperty("工伤办理状态" )
private String workInjuryHandle;
/**
* 生育办理状态:0待办理1办理成功2办理失败3已派减
*/
@ExcelAttribute(name = "生育办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema(description = "生育办理状态:0待办理1办理成功2办理失败3已派减" )
@ExcelProperty("生育办理状态" )
private String birthHandle;
/**
* 大病办理状态:0待办理1办理成功2办理失败3已派减
*/
@ExcelAttribute(name = "大病办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema(description = "大病办理状态:0待办理1办理成功2办理失败3已派减" )
@ExcelProperty("大病办理状态" )
private String bigailmentHandle;
} }
...@@ -288,12 +288,16 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -288,12 +288,16 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
} }
if (Common.isNotNull(library.getId())) { if (Common.isNotNull(library.getId())) {
baseMapper.updateById(library); baseMapper.updateById(library);
isSaveAndUpdate = true;
} else { } else {
if (BigDecimal.ZERO.compareTo(BigDecimalUtils.isNullToZero(library.getUnitSocialSum())) != CommonConstants.ZERO_INT
|| BigDecimal.ZERO.compareTo(BigDecimalUtils.isNullToZero(library.getUnitFundSum())) != CommonConstants.ZERO_INT) {
library.setCreateTime(LocalDateTime.now()); library.setCreateTime(LocalDateTime.now());
baseMapper.insert(library); baseMapper.insert(library);
}
isSaveAndUpdate = true; isSaveAndUpdate = true;
} }
}
}
if (isSaveAndUpdate) { if (isSaveAndUpdate) {
return R.ok(null, "执行成功!"); return R.ok(null, "执行成功!");
} else { } else {
......
...@@ -1021,7 +1021,13 @@ ...@@ -1021,7 +1021,13 @@
a.UNIT_FUND_SUM UNIT_FUND_SUM2, a.UNIT_FUND_SUM UNIT_FUND_SUM2,
a.PERSONAL_FUND_SUM PERSONAL_FUND_SUM2, a.PERSONAL_FUND_SUM PERSONAL_FUND_SUM2,
ifnull(a.UNIT_FUND_SUM,0) + ifnull(a.PERSONAL_FUND_SUM,0) FUND_SUM, ifnull(a.UNIT_FUND_SUM,0) + ifnull(a.PERSONAL_FUND_SUM,0) FUND_SUM,
a.TRUST_REMARK a.TRUST_REMARK,
a.PENSION_HANDLE,
a.MEDICAL_HANDLE,
a.UNEMPLOY_HANDLE,
a.WORK_INJURY_HANDLE,
a.BIRTH_HANDLE,
a.BIGAILMENT_HANDLE
from t_social_fund_info a from t_social_fund_info a
left join t_dispatch_info d on a.DISPATCH_ID=d.ID left join t_dispatch_info d on a.DISPATCH_ID=d.ID
<where> <where>
......
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