diff --git a/src/com/engine/salary/cmd/TaxAgent/TaxAgentSaveCmd.java b/src/com/engine/salary/cmd/TaxAgent/TaxAgentSaveCmd.java index 8763f4c92..a05d2eefb 100644 --- a/src/com/engine/salary/cmd/TaxAgent/TaxAgentSaveCmd.java +++ b/src/com/engine/salary/cmd/TaxAgent/TaxAgentSaveCmd.java @@ -3,8 +3,6 @@ package com.engine.salary.cmd.TaxAgent; import com.engine.common.biz.AbstractCommonCommand; import com.engine.common.entity.BizLogContext; 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.exception.SalaryRunTimeException; import com.engine.salary.mapper.TaxAgentMapper; @@ -42,7 +40,7 @@ public class TaxAgentSaveCmd extends AbstractCommonCommand> throw new SalaryRunTimeException("名称不允许重复"); } - TaxAgent taxAgent = TaxAgentBO.convertToPO(params, (long) user.getUID()); + TaxAgent taxAgent = TaxAgent.convertToPO(params, (long) user.getUID()); mapper.insert(taxAgent); } finally { diff --git a/src/com/engine/salary/cmd/TaxAgent/TaxAgentUpdateCmd.java b/src/com/engine/salary/cmd/TaxAgent/TaxAgentUpdateCmd.java index c2b8fcf6c..cd3fd76b4 100644 --- a/src/com/engine/salary/cmd/TaxAgent/TaxAgentUpdateCmd.java +++ b/src/com/engine/salary/cmd/TaxAgent/TaxAgentUpdateCmd.java @@ -3,7 +3,6 @@ package com.engine.salary.cmd.TaxAgent; import com.engine.common.biz.AbstractCommonCommand; import com.engine.common.entity.BizLogContext; 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.exception.SalaryRunTimeException; import com.engine.salary.mapper.TaxAgentMapper; @@ -15,10 +14,7 @@ import weaver.general.Util; import weaver.hrm.User; import java.time.LocalDateTime; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; public class TaxAgentUpdateCmd extends AbstractCommonCommand> { @@ -60,7 +56,7 @@ public class TaxAgentUpdateCmd extends AbstractCommonCommand BeanUtils.copyProperties(taxAgent, taxAgentNew); taxAgentNew.setName(name); taxAgentNew.setDescription(Util.null2String(params.get("description"))); - taxAgentNew.setUpdateTime(LocalDateTime.now()); + taxAgentNew.setUpdateTime(new Date()); taxAgentMapper.updateIgnoreNull(taxAgentNew); diff --git a/src/com/engine/salary/entity/taxrate/TaxAgent.java b/src/com/engine/salary/entity/taxrate/TaxAgent.java index f0281680f..59762bbb2 100644 --- a/src/com/engine/salary/entity/taxrate/TaxAgent.java +++ b/src/com/engine/salary/entity/taxrate/TaxAgent.java @@ -2,6 +2,7 @@ package com.engine.salary.entity.taxrate; import java.time.LocalDateTime; import java.util.Date; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.Builder; @@ -47,6 +48,22 @@ public class TaxAgent { /** * 更新时间 */ - private LocalDateTime updateTime; + private Date updateTime; + + + public static TaxAgent convertToPO(Map 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(); + } } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/DemoMapper.java b/src/com/engine/salary/mapper/DemoMapper.java index 6ffe82775..a91e33baf 100644 --- a/src/com/engine/salary/mapper/DemoMapper.java +++ b/src/com/engine/salary/mapper/DemoMapper.java @@ -2,7 +2,6 @@ package com.engine.salary.mapper; 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.Param; import org.apache.ibatis.annotations.Select;