Pre Merge pull request !71 from dxfeng/feature/dxf

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")
+    @OrganizationTableColumn(text = "时间开始", width = "16%", column = "time_start", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString")
-    private Date timeStart;
+    private String timeStart;
     /**
      * 时间结束
      */
-    @OrganizationTableColumn(text = "时间结束", width = "16%", column = "time_end")
+    @OrganizationTableColumn(text = "时间结束", width = "16%", column = "time_end", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString")
-    private Date timeEnd;
+    private String timeEnd;
     /**
      * 状态
      */

src/com/engine/organization/service/impl/JobServiceImpl.java

@@ -658,7 +658,7 @@ public class JobServiceImpl extends Service implements JobService {
             BrowserBean browserBean = parentJobBrowserItem.getBrowserConditionParam();
             List<Map<String, Object>> deptMaps = getJobMapper().listJobsByIds(DeleteParam.builder().ids(jobPO.getParentJob().toString()).build().getIds());
             browserBean.setReplaceDatas(deptMaps);
-            schemeBrowserItem.setBrowserConditionParam(browserBean);
+            parentJobBrowserItem.setBrowserConditionParam(browserBean);
         }
 
         // 查看，全部置为只读

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");
+        SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "适用公司", "162", "companyId", "compBrowser");
-        companyIdtItem.setRules("required|string");
+        //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()));
+            timeStartItem.setValue(DateUtil.getDate(staffPlanPO.getTimeStart(),"yyyy-MM-dd"));
-            timeEndItem.setValue(DateUtil.getDate(staffPlanPO.getTimeEnd()));
+            timeEndItem.setValue(DateUtil.getDate(staffPlanPO.getTimeEnd(),"yyyy-MM-dd"));
 
             BrowserBean browserBean = companyIdtItem.getBrowserConditionParam();
             List<Map<String, Object>> maps = getCompMapper().listCompsByIds(DeleteParam.builder().ids(staffPlanPO.getCompanyId()).build().getIds());

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 "";
+    }
 }