Commit 23e658ce authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent cdbcbc22
...@@ -1380,7 +1380,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1380,7 +1380,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
// 添加年数和月数 // 添加年数和月数
localDate = localDate localDate = localDate
.plusYears(vo.getYearAfter()) .plusYears(vo.getYearAfter())
.plusMonths(vo.getMonthAfter()); .plusMonths(vo.getMonthAfter())
.minusDays(1);
// 转回Date类型 // 转回Date类型
return Date.from(localDate.atStartOfDay() return Date.from(localDate.atStartOfDay()
.atZone(ZoneId.systemDefault()) .atZone(ZoneId.systemDefault())
......
...@@ -236,10 +236,9 @@ public class SysHouseHoldInfoController { ...@@ -236,10 +236,9 @@ public class SysHouseHoldInfoController {
* @date 2024-12-5 10:18:05 * @date 2024-12-5 10:18:05
**/ **/
@SneakyThrows @SneakyThrows
@Operation(description = "批量更新社保户配置数据 hasPermission('syshouseholdinfo_batch_update')") @Operation(description = "批量更新社保户配置数据")
@SysLog("批量更新社保户配置数据") @SysLog("批量更新社保户配置数据")
@PostMapping("/importListUpdate") @PostMapping("/importListUpdate")
@PreAuthorize("@pms.hasPermission('syshouseholdinfo_batch_add')")
public R<List<ErrorMessage>> importListUpdate(@RequestBody MultipartFile file){ public R<List<ErrorMessage>> importListUpdate(@RequestBody MultipartFile file){
return sysHouseHoldInfoService.importListUpdate(file.getInputStream()); return sysHouseHoldInfoService.importListUpdate(file.getInputStream());
} }
......
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