From 14725e499016fcbda67f056d5a5eb545b2d4af5d Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 8 Jun 2022 15:21:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/service/impl/JobServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index d0799d13..5d43d31c 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -658,7 +658,7 @@ public class JobServiceImpl extends Service implements JobService { BrowserBean browserBean = parentJobBrowserItem.getBrowserConditionParam(); List> deptMaps = getJobMapper().listJobsByIds(DeleteParam.builder().ids(jobPO.getParentJob().toString()).build().getIds()); browserBean.setReplaceDatas(deptMaps); - schemeBrowserItem.setBrowserConditionParam(browserBean); + parentJobBrowserItem.setBrowserConditionParam(browserBean); } // 查看，全部置为只读 From 497ed928e337d305deae1c41671e6ecfd9e94d5e Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 8 Jun 2022 15:52:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/staff/vo/StaffPlanTableVO.java | 10 ++++------ .../service/impl/StaffPlanServiceImpl.java | 8 ++++---- .../organization/transmethod/StaffPlanTransMethod.java | 8 ++++++++ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java index 68f3ef9e..4b2ae5ad 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java @@ -7,8 +7,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; - /** * @description: TODO * @author:dxfeng @@ -63,13 +61,13 @@ public class StaffPlanTableVO { /** * 时间开始 */ - @OrganizationTableColumn(text = "时间开始", width = "16%", column = "time_start") - private Date timeStart; + @OrganizationTableColumn(text = "时间开始", width = "16%", column = "time_start", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString") + private String timeStart; /** * 时间结束 */ - @OrganizationTableColumn(text = "时间结束", width = "16%", column = "time_end") - private Date timeEnd; + @OrganizationTableColumn(text = "时间结束", width = "16%", column = "time_end", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString") + private String timeEnd; /** * 状态 */ diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index 4ef165ac..0c2de1d6 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -160,8 +160,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { SearchConditionItem timeEndItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "时间结束", "timeEnd"); timeEndItem.setRules("required|string"); // 适用公司 - SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "适用公司", "162", "companyId", "compBrowser"); - companyIdtItem.setRules("required|string"); + SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "适用公司", "162", "companyId", "compBrowser"); + //companyIdtItem.setRules("required|string"); // 说明 SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "说明", "description"); @@ -173,8 +173,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { planNoItem.setValue(staffPlanPO.getPlanNo()); planNameItem.setValue(staffPlanPO.getPlanName()); planYearItem.setValue(staffPlanPO.getPlanYear() + ""); - timeStartItem.setValue(DateUtil.getDate(staffPlanPO.getTimeStart())); - timeEndItem.setValue(DateUtil.getDate(staffPlanPO.getTimeEnd())); + timeStartItem.setValue(DateUtil.getDate(staffPlanPO.getTimeStart(),"yyyy-MM-dd")); + timeEndItem.setValue(DateUtil.getDate(staffPlanPO.getTimeEnd(),"yyyy-MM-dd")); BrowserBean browserBean = companyIdtItem.getBrowserConditionParam(); List> maps = getCompMapper().listCompsByIds(DeleteParam.builder().ids(staffPlanPO.getCompanyId()).build().getIds()); diff --git a/src/com/engine/organization/transmethod/StaffPlanTransMethod.java b/src/com/engine/organization/transmethod/StaffPlanTransMethod.java index deaedfeb..d1a92f5d 100644 --- a/src/com/engine/organization/transmethod/StaffPlanTransMethod.java +++ b/src/com/engine/organization/transmethod/StaffPlanTransMethod.java @@ -3,6 +3,7 @@ package com.engine.organization.transmethod; import com.engine.organization.entity.DeleteParam; import com.engine.organization.mapper.staff.StaffPlanMapper; import com.engine.organization.util.db.MapperProxyFactory; +import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.Map; @@ -22,4 +23,11 @@ public class StaffPlanTransMethod { String names = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); return names; } + + public static String getFormatDateString(String dateStr) { + if (StringUtils.isNotBlank(dateStr)) { + return dateStr.substring(0, 10); + } + return ""; + } }