liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

记录操作日志

This commit is contained in:
dxfeng 2022-07-08 14:07:55 +08:00
parent 2175d7ca6a
commit d760367a95
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/engine/organization/service/impl/JobServiceImpl.java
View File

@ -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());
params.put("parent_comp", departmentPO.getParentComp());
//DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(searchParam.getParentDept());
//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());
params.put("parent_comp", departmentPO.getParentComp());
//DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(searchParam.getParentDept());
//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());

9
src/com/engine/organization/service/impl/PostInfoServiceImpl.java
View File

@ -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);

2
src/com/engine/organization/transmethod/LogViewTransMethod.java
View File

@ -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;
}