修复mybatis版本不支持locadatatime的bug
This commit is contained in:
parent
4a081d6ad9
commit
b4a60e00da
|
|
@ -3,8 +3,6 @@ package com.engine.salary.cmd.TaxAgent;
|
||||||
import com.engine.common.biz.AbstractCommonCommand;
|
import com.engine.common.biz.AbstractCommonCommand;
|
||||||
import com.engine.common.entity.BizLogContext;
|
import com.engine.common.entity.BizLogContext;
|
||||||
import com.engine.core.interceptor.CommandContext;
|
import com.engine.core.interceptor.CommandContext;
|
||||||
import com.engine.salary.entity.salaryarchive.bo.TaxAgentBO;
|
|
||||||
import com.engine.salary.entity.salaryarchive.po.TaxAgentPO;
|
|
||||||
import com.engine.salary.entity.taxrate.TaxAgent;
|
import com.engine.salary.entity.taxrate.TaxAgent;
|
||||||
import com.engine.salary.exception.SalaryRunTimeException;
|
import com.engine.salary.exception.SalaryRunTimeException;
|
||||||
import com.engine.salary.mapper.TaxAgentMapper;
|
import com.engine.salary.mapper.TaxAgentMapper;
|
||||||
|
|
@ -42,7 +40,7 @@ public class TaxAgentSaveCmd extends AbstractCommonCommand<Map<String, Object>>
|
||||||
throw new SalaryRunTimeException("名称不允许重复");
|
throw new SalaryRunTimeException("名称不允许重复");
|
||||||
}
|
}
|
||||||
|
|
||||||
TaxAgent taxAgent = TaxAgentBO.convertToPO(params, (long) user.getUID());
|
TaxAgent taxAgent = TaxAgent.convertToPO(params, (long) user.getUID());
|
||||||
mapper.insert(taxAgent);
|
mapper.insert(taxAgent);
|
||||||
|
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ package com.engine.salary.cmd.TaxAgent;
|
||||||
import com.engine.common.biz.AbstractCommonCommand;
|
import com.engine.common.biz.AbstractCommonCommand;
|
||||||
import com.engine.common.entity.BizLogContext;
|
import com.engine.common.entity.BizLogContext;
|
||||||
import com.engine.core.interceptor.CommandContext;
|
import com.engine.core.interceptor.CommandContext;
|
||||||
import com.engine.salary.entity.salaryarchive.po.TaxAgentPO;
|
|
||||||
import com.engine.salary.entity.taxrate.TaxAgent;
|
import com.engine.salary.entity.taxrate.TaxAgent;
|
||||||
import com.engine.salary.exception.SalaryRunTimeException;
|
import com.engine.salary.exception.SalaryRunTimeException;
|
||||||
import com.engine.salary.mapper.TaxAgentMapper;
|
import com.engine.salary.mapper.TaxAgentMapper;
|
||||||
|
|
@ -15,10 +14,7 @@ import weaver.general.Util;
|
||||||
import weaver.hrm.User;
|
import weaver.hrm.User;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.HashMap;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public class TaxAgentUpdateCmd extends AbstractCommonCommand<Map<String, Object>> {
|
public class TaxAgentUpdateCmd extends AbstractCommonCommand<Map<String, Object>> {
|
||||||
|
|
||||||
|
|
@ -60,7 +56,7 @@ public class TaxAgentUpdateCmd extends AbstractCommonCommand<Map<String, Object>
|
||||||
BeanUtils.copyProperties(taxAgent, taxAgentNew);
|
BeanUtils.copyProperties(taxAgent, taxAgentNew);
|
||||||
taxAgentNew.setName(name);
|
taxAgentNew.setName(name);
|
||||||
taxAgentNew.setDescription(Util.null2String(params.get("description")));
|
taxAgentNew.setDescription(Util.null2String(params.get("description")));
|
||||||
taxAgentNew.setUpdateTime(LocalDateTime.now());
|
taxAgentNew.setUpdateTime(new Date());
|
||||||
|
|
||||||
taxAgentMapper.updateIgnoreNull(taxAgentNew);
|
taxAgentMapper.updateIgnoreNull(taxAgentNew);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package com.engine.salary.entity.taxrate;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
|
|
@ -47,6 +48,22 @@ public class TaxAgent {
|
||||||
/**
|
/**
|
||||||
* 更新时间
|
* 更新时间
|
||||||
*/
|
*/
|
||||||
private LocalDateTime updateTime;
|
private Date updateTime;
|
||||||
|
|
||||||
|
|
||||||
|
public static TaxAgent convertToPO(Map<String,Object> param, Long employeeId) {
|
||||||
|
if (param == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return TaxAgent.builder()
|
||||||
|
.id((long)param.get("id"))
|
||||||
|
.name((String) param.get("name"))
|
||||||
|
.description((String) param.get("description"))
|
||||||
|
.createTime(new Date())
|
||||||
|
.updateTime(new Date())
|
||||||
|
.creator(employeeId)
|
||||||
|
// .tenantKey(tenantKey)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -2,7 +2,6 @@ package com.engine.salary.mapper;
|
||||||
|
|
||||||
|
|
||||||
import com.engine.salary.entity.DemoPo;
|
import com.engine.salary.entity.DemoPo;
|
||||||
import com.engine.salary.entity.salaryarchive.po.TaxAgentPO;
|
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
import org.apache.ibatis.annotations.Select;
|
import org.apache.ibatis.annotations.Select;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue