Commit 0b74d35d authored by huyuchen's avatar huyuchen

接口修改

parent 0816da27
...@@ -17,14 +17,19 @@ ...@@ -17,14 +17,19 @@
package com.yifu.cloud.plus.v1.yifu.social.vo; package com.yifu.cloud.plus.v1.yifu.social.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.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.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;
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.NotNull;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
/** /**
* 派单导出Vo * 派单导出Vo
...@@ -35,22 +40,17 @@ import java.time.LocalDateTime; ...@@ -35,22 +40,17 @@ import java.time.LocalDateTime;
@Schema(description = "派单导出Vo") @Schema(description = "派单导出Vo")
public class TDispatchInfoExportVo { public class TDispatchInfoExportVo {
@Schema(description = "主键") @ExcelAttribute(name = "派单类型", readConverterExp = "0=增加派单,1=减少派单")
@HeadFontStyle(fontHeightInPoints = 11) @Schema(description = "派单类型:0派增1派减")
@ExcelProperty("主键")
private String id;
@ExcelAttribute(name = "申请编码", maxLength = 30)
@Schema(description = "申请编码")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("申请编码") @ExcelProperty("派单类型")
private String applyNo; private String type;
@ExcelAttribute(name = "员工编码", maxLength = 30) @Schema(description = "创建时间")
@Schema(description = "员工编码") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("员工编码") @ExcelProperty("创建时间")
private String empNo; private LocalDateTime createTime;
@ExcelAttribute(name = "员工姓名", maxLength = 50) @ExcelAttribute(name = "员工姓名", maxLength = 50)
@Schema(description = "员工姓名") @Schema(description = "员工姓名")
...@@ -58,24 +58,12 @@ public class TDispatchInfoExportVo { ...@@ -58,24 +58,12 @@ public class TDispatchInfoExportVo {
@ExcelProperty("员工姓名") @ExcelProperty("员工姓名")
private String empName; private String empName;
@ExcelAttribute(name = "身份证号", maxLength = 20) @ExcelAttribute(name = "员工身份证", maxLength = 20)
@Schema(description = "身份证号") @Schema(description = "员工身份证")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("身份证号") @ExcelProperty("员工身份证")
private String empIdcard; private String empIdcard;
@ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
@Schema(description = "员工类型")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("员工类型")
private String empType;
@ExcelAttribute(name = "社保公积金类型", readConverterExp = "0=社保,1=公积金")
@Schema(description = "社保公积金类型:0社保1公积金")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保公积金类型")
private String typeSub;
@ExcelAttribute(name = "客户名称", maxLength = 50) @ExcelAttribute(name = "客户名称", maxLength = 50)
@Schema(description = "客户名称") @Schema(description = "客户名称")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
...@@ -94,17 +82,63 @@ public class TDispatchInfoExportVo { ...@@ -94,17 +82,63 @@ public class TDispatchInfoExportVo {
@ExcelProperty("项目编码") @ExcelProperty("项目编码")
private String settleDomainCode; private String settleDomainCode;
@ExcelAttribute(name = "派单类型", readConverterExp = "0=派增,1=派减") @ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
@Schema(description = "派单类型:0派增1派减") @Schema(description = "员工类型")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("派单类型") @ExcelProperty("员工类型")
private String type; private String empType;
/**
* 合同类型(字典值)
*/
@NotNull(message = "合同类型不能为空")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="合同类型")
@ExcelAttribute(name = "合同类型",isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_TYPE)
private String contractType;
/**
* 业务细分
*/
@ExcelAttribute(name = "业务细分", dataType = ExcelAttributeConstants.PERSONNEL_TYPE_SUB, needExport = true)
@Schema(description = "业务细分(存lable)", name = "contractName")
private String contractSubName;
/**
* 合同期限
*/
@ExcelAttribute(name = "合同期限")
@Schema(description = "合同期限" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("合同期限" )
private String contractTerm;
/**
* 合同起始时间
*/
@ExcelAttribute(name = "合同起始时间", isDate = true)
@Schema(description = "合同起始时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("合同起始时间" )
private Date contractStart;
/**
* 合同到期时间
*/
@ExcelAttribute(name = "合同到期时间", isDate = true)
@Schema(description = "合同到期时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("合同到期时间" )
private Date contractEnd;
@ExcelAttribute(name = "派单项", maxLength = 50) /**
@Schema(description = "派单项:如 养老、公积金") * 备案基数
*/
@Length(max = 255, message = "备案基数 不能超过255 个字符" )
@ExcelAttribute(name = "备案基数", isFloat = true,max = "999999999.99")
@Schema(description = "备案基数:购买社保时必填" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("派单项") @ExcelProperty("备案基数" )
private String dispatchItem; private BigDecimal recordBase;
@ExcelAttribute(name = "社保户", maxLength = 50) @ExcelAttribute(name = "社保户", maxLength = 50)
@Schema(description = "社保户") @Schema(description = "社保户")
...@@ -118,11 +152,227 @@ public class TDispatchInfoExportVo { ...@@ -118,11 +152,227 @@ public class TDispatchInfoExportVo {
@ExcelProperty("公积金户") @ExcelProperty("公积金户")
private String providentHouseholdName; private String providentHouseholdName;
@ExcelAttribute(name = "审核状态", readConverterExp = "1=待审核,2=审核通过,3=审核不通过,4=已办结") /**
@Schema(description = "审核状态:1待审核2审核通过3审核不通过4已办结") * 社保起缴日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "社保起缴日期", isDate = true)
@Schema(description = "社保起缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保起缴日期" )
private Date socialStartDate;
/**
* 社保停缴日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "社保停缴日期", isDate = true)
@Schema(description = "社保停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保停缴日期" )
private Date socialReduceDate;
/**
* 公积金起缴日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "公积金起缴日期", isDate = true)
@Schema(description = "公积金起缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金起缴日期" )
private Date providentStart;
/**
* 公积金停缴日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "公积金停缴日期", isDate = true)
@Schema(description = "公积金停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金停缴日期" )
private Date fundReduceDate;
@ExcelAttribute(name = "社保审核状态", readConverterExp = "0=待审核,1=审核通过,2=审核不通过")
@Schema(description = "社保审核状态:1待审核2审核通过3审核不通过4已办结")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保审核状态")
private String auditStatus;
/**
* 审核人姓名
*/
@Length(max = 32, message = "社保审核人" )
@Schema(description = "社保审核人" )
@ExcelAttribute(name = "社保审核人")
@ExcelProperty("社保审核人" )
private String auditUserName;
/**
* 审核意见
*/
@Length(max = 255, message = "审核意见 不能超过255个字符" )
@ExcelAttribute(name = "审核意见", maxLength = 255)
@Schema(description = "审核意见" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("审核意见" )
private String auditRemark;
/**
* 社保办理人
*/
@Length(max = 32, message = "社保办理人 不能超过32个字符" )
@ExcelAttribute(name = "社保办理人", maxLength = 32)
@Schema(description = "社保办理人" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保办理人" )
private String handleUser;
/**
* 社保办理时间
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "社保办理时间", isDate = true)
@Schema(description = "社保办理时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保办理时间" )
private Date handleTime;
/**
* 审核状态(0待审核/1已审核)
*/
@ExcelAttribute(name = "公积金审核状态",readConverterExp = "0=待审核,1=已审核")
@Schema(description = "公积金审核状态:(0待审核/1已审核)" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("审核状态") @ExcelProperty("公积金审核状态(0待审核/1已审核)" )
private String status; private String fundAuditStatus;
/**
* 审核人
*/
@Length(max = 32, message = "公积金审核人 不能超过32个字符" )
@ExcelAttribute(name = "公积金审核人", maxLength = 32)
@Schema(description = "公积金审核人" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金审核人" )
private String fundAuditUser;
@ExcelAttribute(name = "公积金办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema(description = "公积金办理状态:0 待办理 1办理成功 2 办理失败 3 已派减")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金办理状态")
private String fundHandleStatus;
/**
* 公积金办理人
*/
@Length(max = 32, message = "公积金办理人 不能超过32个字符" )
@ExcelAttribute(name = "公积金办理人", maxLength = 32)
@Schema(description = "公积金办理人" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金办理人" )
private String fundhHandleUser;
/**
* 公积金办理时间
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "公积金办理时间", isDate = true)
@Schema(description = "公积金办理时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金办理时间" )
private Date fundHandleTime;
/**
* 养老基数
*/
@ExcelAttribute(name = "养老基数", isFloat = true,max = "999999999.99" )
@Schema(description = "养老基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老基数" )
private BigDecimal pensionCardinal;
/**
* 医疗基数
*/
@ExcelAttribute(name = "医疗基数", isFloat = true,max = "999999999.99" )
@Schema(description = "医疗基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗基数" )
private BigDecimal medicalCardinal;
/**
* 失业基数
*/
@ExcelAttribute(name = "失业基数", isFloat = true,max = "999999999.99" )
@Schema(description = "失业基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业基数" )
private BigDecimal unemploymentCardinal;
/**
* 工伤基数
*/
@ExcelAttribute(name = "工伤基数", isFloat = true,max = "999999999.99" )
@Schema(description = "工伤基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤基数" )
private BigDecimal workInjuryCardinal;
/**
* 生育基数
*/
@ExcelAttribute(name = "生育基数", isFloat = true,max = "999999999.99" )
@Schema(description = "生育基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育基数" )
private BigDecimal birthCardinal;
/**
* 委托备注
*/
@Length(max = 100, message = "委托备注 不能超过100 个字符" )
@ExcelAttribute(name = "委托备注", maxLength = 100)
@Schema(description = "委托备注" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("委托备注" )
private String trustRemark;
/**
* 大病基数
*/
@ExcelAttribute(name = "大病基数" , isFloat = true,max = "999999999.99" )
@Schema(description = "大病基数" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数" )
private BigDecimal bigailmentCardinal;
/**
* 离职日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "离职日期", isDate = true)
@Schema(description = "离职日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("离职日期" )
private Date leaveDate;
/**
* 减少原因
*/
@Length(max = 32, message = "减少原因 不能超过32个字符" )
@ExcelAttribute(name = "减少原因", maxLength = 32)
@Schema(description = "减少原因" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("减少原因" )
private String reduceReason;
@Schema(description = "创建人姓名")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("创建人姓名")
private String createName;
@ExcelAttribute(name = "派单人所属部门", maxLength = 50)
@Schema(description = "派单人所属部门")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("派单人所属部门")
private String organName;
@ExcelAttribute(name = "申请编码", maxLength = 30)
@Schema(description = "申请编码")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("申请编码")
private String applyNo;
@ExcelAttribute(name = "社保办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=部分办理成功,4=办理中") @ExcelAttribute(name = "社保办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=部分办理成功,4=办理中")
@Schema(description = "社保办理状态 0 待办理 1 办理成功 2 办理失败 3 部分办理成功 4 办理中") @Schema(description = "社保办理状态 0 待办理 1 办理成功 2 办理失败 3 部分办理成功 4 办理中")
...@@ -130,63 +380,75 @@ public class TDispatchInfoExportVo { ...@@ -130,63 +380,75 @@ public class TDispatchInfoExportVo {
@ExcelProperty("社保办理状态") @ExcelProperty("社保办理状态")
private String socialHandleStatus; private String socialHandleStatus;
@ExcelAttribute(name = "养老状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减") @ExcelAttribute(name = "养老办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema(description = "养老办理状态:0待办理1办理成功2办理失败3已派减" ) @Schema(description = "养老办理状态:0待办理1办理成功2办理失败3已派减" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老状态" ) @ExcelProperty("养老办理状态" )
private String pensionHandle; private String pensionHandle;
@ExcelAttribute(name = "医疗状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减") @ExcelAttribute(name = "医疗办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema(description = "医疗状态:0待办理1办理成功2办理失败3已派减" ) @Schema(description = "医疗办理状态:0待办理1办理成功2办理失败3已派减" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗状态" ) @ExcelProperty("医疗办理状态" )
private String medicalHandle; private String medicalHandle;
@ExcelAttribute(name = "失业状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减") @ExcelAttribute(name = "失业办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema(description = "失业办理状态:0待办理1办理成功2办理失败3已派减" ) @Schema(description = "失业办理状态:0待办理1办理成功2办理失败3已派减" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业状态" ) @ExcelProperty("失业办理状态" )
private String unemployHandle; private String unemployHandle;
@ExcelAttribute(name = "工伤状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减") @ExcelAttribute(name = "工伤办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema(description = "工伤状态:0待办理1办理成功2办理失败3已派减" ) @Schema(description = "工伤办理状态:0待办理1办理成功2办理失败3已派减" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤状态" ) @ExcelProperty("工伤办理状态" )
private String workInjuryHandle; private String workInjuryHandle;
@ExcelAttribute(name = "生育状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减") @ExcelAttribute(name = "生育办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema(description = "生育状态:0待办理1办理成功2办理失败3已派减" ) @Schema(description = "生育办理状态:0待办理1办理成功2办理失败3已派减" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育状态" ) @ExcelProperty("生育办理状态" )
private String birthHandle; private String birthHandle;
@ExcelAttribute(name = "大病状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减") @ExcelAttribute(name = "大病办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema(description = "大病状态:0待办理1办理成功2办理失败3已派减" ) @Schema(description = "大病办理状态:0待办理1办理成功2办理失败3已派减" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病状态" ) @ExcelProperty("大病办理状态" )
private String bigailmentHandle; private String bigailmentHandle;
@ExcelAttribute(name = "公积金办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减") /**
@Schema(description = "公积金办理状态:0 待办理 1办理成功 2 办理失败 3 已派减") * 派单审核人
@HeadFontStyle(fontHeightInPoints = 11) */
@ExcelProperty("公积金办理状态") @Length(max = 32, message = "派单审核人 不能超过32个字符" )
private String fundHandleStatus; @Schema(description = "派单审核人" )
@ExcelProperty("派单审核人" )
@Schema(description = "申请人") private String auditUser;
/**
* 审核时间
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "派单审核时间", isDate = true)
@Schema(description = "派单审核时间" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("申请人") @ExcelProperty("派单审核时间" )
private String createName; private Date auditTime;
/**
@ExcelAttribute(name = "申请人所在部门", maxLength = 50) * 社保办理备注
@Schema(description = "申请人所在部门") */
@Length(max = 255, message = "社保办理备注 不能超过255个字符" )
@ExcelAttribute(name = "社保办理备注", maxLength = 255)
@Schema(description = "社保办理备注" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("申请人所在部门") @ExcelProperty("社保办理备注" )
private String organName; private String socialHandleRemark;
/**
@Schema(description = "申请时间") * 公积金办理备注
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") */
@Length(max = 255, message = "公积金办理备注 不能超过255个字符" )
@ExcelAttribute(name = "公积金办理备注", maxLength = 255)
@Schema(description = "公积金办理备注" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("申请时间") @ExcelProperty("公积金办理备注" )
private LocalDateTime createTime; private String fundHandleRemark;
} }
...@@ -3257,13 +3257,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3257,13 +3257,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD); temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
temp.append(Common.isNullToString(socialTypeRemark)); temp.append(Common.isNullToString(socialTypeRemark));
temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS); temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS);
initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.THREE_STRING, user, temp.toString(), remark); initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.THREE_STRING, user, temp.toString().concat(handleRemark), remark);
} else { } else {
temp.setLength(CommonConstants.ZERO_INT); temp.setLength(CommonConstants.ZERO_INT);
temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD); temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
temp.append(Common.isNullToString(socialTypeRemark)); temp.append(Common.isNullToString(socialTypeRemark));
temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL); temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.FOUR_STRING, user, temp.toString(), remark); initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.FOUR_STRING, user, temp.toString().concat(handleRemark), remark);
} }
auditInfo.setSocialId(dis.getId()); auditInfo.setSocialId(dis.getId());
} }
...@@ -3326,9 +3326,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3326,9 +3326,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark)); dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
if (CommonConstants.ZERO_INT == flag) { if (CommonConstants.ZERO_INT == flag) {
initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_ADD_SUCCESS + handleRemark), CommonConstants.THREE_STRING, user, DispatchConstants.DISPATCH_FUND_ADD_SUCCESS, remark); initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_ADD_SUCCESS + handleRemark), CommonConstants.THREE_STRING, user, (DispatchConstants.DISPATCH_FUND_ADD_SUCCESS + handleRemark), remark);
} else { } else {
initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_ADD_FAIL + handleRemark), CommonConstants.FOUR_STRING, user, DispatchConstants.DISPATCH_FUND_ADD_FAIL, remark); initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_ADD_FAIL + handleRemark), CommonConstants.FOUR_STRING, user, (DispatchConstants.DISPATCH_FUND_ADD_FAIL + handleRemark), remark);
} }
auditInfo.setProvidentId(dis.getId()); auditInfo.setProvidentId(dis.getId());
} else { } else {
...@@ -3416,10 +3416,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3416,10 +3416,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
fundMapper.updateById(providentFund); fundMapper.updateById(providentFund);
dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark)); dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
if (CommonConstants.ZERO_INT == flag) { if (CommonConstants.ZERO_INT == flag) {
initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_REDUCE_SUCCESS + handleRemark), CommonConstants.SIX_STRING, user, DispatchConstants.DISPATCH_FUND_REDUCE_SUCCESS, remark); initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_REDUCE_SUCCESS + handleRemark), CommonConstants.SIX_STRING, user, (DispatchConstants.DISPATCH_FUND_REDUCE_SUCCESS + handleRemark), remark);
dis.setFundHandleStatus(CommonConstants.ONE_STRING); dis.setFundHandleStatus(CommonConstants.ONE_STRING);
} else { } else {
initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_REDUCE_FAIL + handleRemark), CommonConstants.FOUR_STRING, user, DispatchConstants.DISPATCH_FUND_REDUCE_FAIL, remark); initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_REDUCE_FAIL + handleRemark), CommonConstants.FOUR_STRING, user, (DispatchConstants.DISPATCH_FUND_REDUCE_SUCCESS + handleRemark), remark);
dis.setFundHandleStatus(CommonConstants.TWO_STRING); dis.setFundHandleStatus(CommonConstants.TWO_STRING);
} }
auditInfo.setProvidentId(dis.getId()); auditInfo.setProvidentId(dis.getId());
......
...@@ -105,21 +105,15 @@ ...@@ -105,21 +105,15 @@
</resultMap> </resultMap>
<!-- 派单导出vo --> <!-- 派单导出vo -->
<resultMap id="exportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo"> <resultMap id="exportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo">
<id property="id" column="ID"/>
<result property="applyNo" column="APPLY_NO"/>
<result property="empNo" column="EMP_NO"/>
<result property="empName" column="EMP_NAME"/> <result property="empName" column="EMP_NAME"/>
<result property="empIdcard" column="EMP_IDCARD"/> <result property="empIdcard" column="EMP_IDCARD"/>
<result property="empType" column="EMP_TYPE"/> <result property="empType" column="EMP_TYPE"/>
<result property="typeSub" column="TYPE_SUB"/>
<result property="belongUnitName" column="BELONG_UNIT_NAME"/> <result property="belongUnitName" column="BELONG_UNIT_NAME"/>
<result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/> <result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/>
<result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/> <result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
<result property="type" column="TYPE"/> <result property="type" column="TYPE"/>
<result property="dispatchItem" column="DISPATCH_ITEM"/>
<result property="socialHouseholdName" column="SOCIAL_HOUSEHOLD_NAME"/> <result property="socialHouseholdName" column="SOCIAL_HOUSEHOLD_NAME"/>
<result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/> <result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/>
<result property="status" column="STATUS"/>
<result property="socialHandleStatus" column="SOCIAL_HANDLE_STATUS"/> <result property="socialHandleStatus" column="SOCIAL_HANDLE_STATUS"/>
<result property="pensionHandle" column="PENSION_HANDLE"/> <result property="pensionHandle" column="PENSION_HANDLE"/>
<result property="medicalHandle" column="MEDICAL_HANDLE"/> <result property="medicalHandle" column="MEDICAL_HANDLE"/>
...@@ -571,18 +565,13 @@ ...@@ -571,18 +565,13 @@
<!-- 派单导出 --> <!-- 派单导出 -->
<select id="exportDispatch" resultMap="exportMap"> <select id="exportDispatch" resultMap="exportMap">
select select
a.ID,
a.APPLY_NO,
a.EMP_NO,
a.EMP_NAME, a.EMP_NAME,
a.EMP_IDCARD, a.EMP_IDCARD,
a.EMP_TYPE, a.EMP_TYPE,
a.TYPE_SUB,
a.BELONG_UNIT_NAME, a.BELONG_UNIT_NAME,
a.SETTLE_DOMAIN_NAME, a.SETTLE_DOMAIN_NAME,
a.SETTLE_DOMAIN_CODE, a.SETTLE_DOMAIN_CODE,
a.TYPE, a.TYPE,
a.DISPATCH_ITEM,
a.SOCIAL_HOUSEHOLD_NAME, a.SOCIAL_HOUSEHOLD_NAME,
a.PROVIDENT_HOUSEHOLD_NAME, a.PROVIDENT_HOUSEHOLD_NAME,
a.STATUS, a.STATUS,
......
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