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

docs/表结构SQL/MySQL.sql

@@ -483,7 +483,7 @@ CREATE TABLE HR_LOG (
     operator_name varchar(100) NULL,
     create_time date NULL,
     operate_type int NULL,
-    params_str varchar(100) NULL,
+    params_str varchar(2000) NULL,
     client_ip varchar(100) NULL,
     method_name varchar(100) NULL,
     delete_type int NULL,
@@ -491,5 +491,6 @@ CREATE TABLE HR_LOG (
     operate_module_name varchar(100) NULL,
     operate_module int NULL,
     message varchar(2000) NULL,
+    value varchar(100) NULL,
     CONSTRAINT HR_LOG_PK PRIMARY KEY (id)
 );

docs/表结构SQL/Oracle.sql

@@ -452,7 +452,7 @@ CREATE TABLE HR_LOG (
     OPERATOR_NAME NVARCHAR2(100) NULL,
     CREATE_TIME DATE NULL,
     OPERATE_TYPE NUMBER NULL,
-    PARAMS_STR NVARCHAR2(100) NULL,
+    PARAMS_STR NVARCHAR2(2000) NULL,
     CLIENT_IP NVARCHAR2(100) NULL,
     METHOD_NAME NVARCHAR2(100) NULL,
     DELETE_TYPE NUMBER NULL,
@@ -460,5 +460,6 @@ CREATE TABLE HR_LOG (
     OPERATE_MODULE_NAME NVARCHAR2(100) NULL,
     OPERATE_MODULE NUMBER NULL,
     MESSAGE NVARCHAR2(2000) NULL,
+    VALUE NVARCHAR2(100) NULL,
     CONSTRAINT HR_LOG_PK PRIMARY KEY (ID)
 );

docs/表结构SQL/SqlServer.sql

@@ -451,7 +451,7 @@ CREATE TABLE HR_LOG (
     operator_name varchar(100) NULL,
     create_time datetime NULL,
     operate_type int NULL,
-    params_str varchar(100) NULL,
+    params_str varchar(2000) NULL,
     client_ip varchar(100) NULL,
     method_name varchar(100) NULL,
     delete_type int NULL,
@@ -459,5 +459,6 @@ CREATE TABLE HR_LOG (
     operate_module_name varchar(100) NULL,
     operate_module int NULL,
     message varchar(2000) NULL,
+    value varchar(100) NULL,
     CONSTRAINT HR_LOG_PK PRIMARY KEY (id)
 );

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

@@ -310,8 +310,8 @@ public class JobServiceImpl extends Service implements JobService {
 
         params.put("is_key", null == searchParam.getIsKey() ? 0 : searchParam.getIsKey());
         // TODO  处理ec表关联关系
-        DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(searchParam.getParentDept());
+        //DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(searchParam.getParentDept());
-        params.put("parent_comp", departmentPO.getParentComp());
+        //params.put("parent_comp", departmentPO.getParentComp());
         if (StringUtils.isBlank(params.get("show_order").toString())) {
             int maxShowOrder = getJobMapper().getMaxShowOrder();
             params.put("show_order", maxShowOrder + 1);
@@ -350,8 +350,8 @@ public class JobServiceImpl extends Service implements JobService {
         // 更新主表数据
         params.put("is_key", searchParam.getIsKey());
         // TODO  处理ec表关联关系
-        DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(searchParam.getParentDept());
+        //DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(searchParam.getParentDept());
-        params.put("parent_comp", departmentPO.getParentComp());
+        //params.put("parent_comp", departmentPO.getParentComp());
         getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", searchParam.getId());
         // 更新主表拓展表
         getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOBEXT, params, groupId, searchParam.getId());

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

@@ -22,7 +22,6 @@ import com.engine.organization.util.db.DBType;
 import com.engine.organization.util.db.MapperProxyFactory;
 import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
-import weaver.general.StringUtil;
 import weaver.general.Util;
 
 import java.util.*;
@@ -143,7 +142,8 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
 
         // 编辑状态下赋值操作
         String id = Util.null2String(params.get("id"));
-        if (!StringUtil.isEmpty(id)) {
+        String planId = Util.null2String(params.get("planId"));
+        if (StringUtils.isNotBlank(id)) {
             PostInfoPO postInfoPO = getPostInfoMapper().getPostInfoByID(Integer.parseInt(id));
             OrganizationAssert.notNull(postInfoPO, "选择的数据不存在，或数据已删除");
 
@@ -161,6 +161,11 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
             postIdBrowser.setBrowserConditionParam(browserBean);
             // 编辑状态下,编号只读
             // noItem.setViewAttr(1);
+        }else if(StringUtils.isNotBlank(planId)){
+            BrowserBean browserBean = postIdBrowser.getBrowserConditionParam();
+            List<Map<String, Object>> maps = getPostMapper().listPostsByIds(DeleteParam.builder().ids(planId).build().getIds());
+            browserBean.setReplaceDatas(maps);
+            postIdBrowser.setBrowserConditionParam(browserBean);
         }
 
         selectItems.add(noItem);

src/com/engine/organization/transmethod/LogViewTransMethod.java

@@ -44,7 +44,7 @@ public class LogViewTransMethod {
 
     public String getDateTimeFormat(String dateTime) {
         if (StringUtils.isNotBlank(dateTime)) {
-            dateTime = dateTime.substring(0, dateTime.length() - 2);
+            dateTime = dateTime.substring(0,19);
         }
         return dateTime;
     }