diff --git a/docs/脚本/Mysql/浏览按钮mysql.sql b/docs/脚本/Mysql/浏览按钮mysql.sql index e860d602..c1b5e785 100644 --- a/docs/脚本/Mysql/浏览按钮mysql.sql +++ b/docs/脚本/Mysql/浏览按钮mysql.sql @@ -6,6 +6,9 @@ INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, cr INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (@datashowset_id, '编号', 'scheme_no', '', 0, 1, uuid(), NULL); INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (@datashowset_id, '方案名称', 'scheme_name', '', 1, 2, uuid(), NULL); INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (@datashowset_id, '方案说明', 'scheme_description', '', 0, 3, uuid(), NULL); +INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (@datashowset_id, '编号', 'scheme_no', '2', '', 1, uuid(), ''); +INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (@datashowset_id, '方案名称', 'scheme_name', '2', '', 2, uuid(), ''); + select @current_date:= date_format( now(),'%Y-%m-%d'); @@ -16,6 +19,9 @@ INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, cr INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '编号', 'level_no', '', 0, 1, uuid(), NULL); INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'level_name', '', 1, 2, uuid(), NULL); INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '描述说明', 'description', '', 0, 3, uuid(), NULL); +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '编号', 'level_no', '2', '', 1, uuid(), ''); +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'level_name', '2', '', 2, uuid(), ''); + select @current_date:= date_format( now(),'%Y-%m-%d'); select @current_time:= date_format( now(),'%T'); @@ -24,6 +30,9 @@ select @datashowset_id:= max(id) from datashowset; INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('postBrowser', '0', 0, @current_date, @current_time, NULL, NULL); INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'post_name', '', 1, 1, uuid(), NULL); INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '说明', 'description', '', 0, 2, uuid(), NULL); +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'post_name', '2', '', 1, uuid(), '0'); +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '说明', 'description', '2', '', 2, uuid(), ''); + INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('compBrowser', '1', '1', '', 'select * from jcl_org_comp where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '2', 'id', 'parent_company', 'comp_name', '', '', '', '', 2, '公司分部浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', @current_date, @current_time, NULL, NULL, '', '', '0', uuid(), '', '', '', '', '2', 0, 1); INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('compBrowser', '0', 0, @current_date, @current_time, NULL, NULL); @@ -40,6 +49,8 @@ INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, d INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'sequence_name', '', 1, 2, uuid(), NULL); INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '等级方案', 'scheme_id', 'select scheme_name from jcl_org_scheme where id={?currentvalue}', 0, 3, uuid(), NULL); INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '等级方案id', 'scheme_value', '', 0, 4, uuid(), NULL); +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '编号', 'sequence_no', '2', '', 1, uuid(), ''); +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'sequence_name', '2', '', 2, uuid(), ''); select @current_date:= date_format( now(),'%Y-%m-%d'); select @current_time:= date_format( now(),'%T'); @@ -50,6 +61,8 @@ INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, d INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'plan_name', '', 1, 2, uuid(), NULL); INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '年度', 'plan_year', '', 0, 3, uuid(), NULL); INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '控制维度', 'control_dimension', '', 0, 4, uuid(), NULL); +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '编号', 'plan_no', '2', '', 1, uuid(), ''); +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'plan_name', '2', '', 2, uuid(), ''); INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('deptBrowserPrepare', '1', '1', '', 'select * from jcl_org_dept where delete_type = 0 and forbidden_tag = 0 and parent_comp = $parentComp$', '', '', '', '', '2', 'id', 'parent_dept', 'dept_name', '', '', '', '', 2, '部门浏览', NULL, '', NULL, NULL, NULL, NULL, '', '', @current_date, @current_time, NULL, NULL, '', '', '0', uuid(), '', '', '', '', '2', 0, 1); INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('deptBrowserPrepare', '0', 0, @current_date, @current_time, NULL, NULL); @@ -64,6 +77,8 @@ INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, d INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '描述方案', 'description', '', 0, 3, uuid(), NULL); INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '等级方案', 'scheme_id', 'select scheme_name from jcl_org_scheme where id={?currentvalue}', 0, 4, uuid(), NULL); INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '职等', 'level_id', 'select group_concat(level_name) from jcl_org_level where id in ( {?currentvalue})', 0, 5, uuid(), NULL); +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '编号', 'grade_no', '2', '', 1, uuid(), ''); +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'grade_name', '2', '', 2, uuid(), ''); INSERT INTO WF_BROWSER_CONFIG(TYPE,CLAZZ,DESCRIPTION,TITELEBEL) VALUES ('666','com.api.browser.service.impl.JobBrowserService','聚才林岗位管理',538781); INSERT INTO WORKFLOW_BROWSERURL(ID, LABELID, FIELDDBTYPE, BROWSERURL, TABLENAME, COLUMNAME, KEYCOLUMNAME, LINKURL, TYPEID, USEABLE, ORDERID) VALUES ( '666', '538781', 'varchar(4000)','/systeminfo/BrowserMain.jsp?url=','jcl_org_job', 'job_name', 'id', '/spa/organization/static/index.html#/main/organization/jobExtend/:id', '8', '1', '0' ); diff --git a/docs/脚本/Oracle/浏览按钮Oracle.sql b/docs/脚本/Oracle/浏览按钮Oracle.sql new file mode 100644 index 00000000..e69de29b diff --git a/docs/脚本/SqlServer/浏览按钮sqlserver.sql b/docs/脚本/SqlServer/浏览按钮sqlserver.sql index ecf87852..421f816f 100644 --- a/docs/脚本/SqlServer/浏览按钮sqlserver.sql +++ b/docs/脚本/SqlServer/浏览按钮sqlserver.sql @@ -11,6 +11,8 @@ INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, cr INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (@datashowset_id, '编号', 'scheme_no', '', 0, 1, newid(), NULL) INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (@datashowset_id, '方案名称', 'scheme_name', '', 1, 2, newid(), NULL) INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (@datashowset_id, '方案说明', 'scheme_description', '', 0, 3, newid(), NULL) +INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (@datashowset_id, '编号', 'scheme_no', '2', '', 1, newid(), '') +INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (@datashowset_id, '方案名称', 'scheme_name', '2', '', 2, newid(), '') GO @@ -26,6 +28,8 @@ INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, cr INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '编号', 'level_no', '', 0, 1, newid(), NULL) INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'level_name', '', 1, 2, newid(), NULL) INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '描述说明', 'description', '', 0, 3, newid(), NULL) +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '编号', 'level_no', '2', '', 1, newid(), '') +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'level_name', '2', '', 2, newid(), '') GO @@ -40,6 +44,8 @@ set @datashowset_id = (select max(id) from datashowset) INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('postBrowser', '0', 0, @current_date, @current_time, NULL, NULL) INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'post_name', '', 1, 1, newid(), NULL) INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '说明', 'description', '', 0, 2, newid(), NULL) +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'post_name', '2', '', 1, newid(), '0') +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '说明', 'description', '2', '', 2, newid(), '') GO @@ -78,6 +84,8 @@ INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, d INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'sequence_name', '', 1, 2, newid(), NULL) INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '等级方案', 'scheme_id', 'select scheme_name from jcl_org_scheme where id={?currentvalue}', 0, 3, newid(), NULL) INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '等级方案id', 'scheme_value', '', 0, 4, newid(), NULL) +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '编号', 'sequence_no', '2', '', 1, newid(), '') +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'sequence_name', '2', '', 2, newid(), '') GO @@ -94,6 +102,8 @@ INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, d INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'plan_name', '', 1, 2, newid(), NULL) INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '年度', 'plan_year', '', 0, 3, newid(), NULL) INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '控制维度', 'control_dimension', '', 0, 4, newid(), NULL) +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '编号', 'plan_no', '2', '', 1, newid(), '') +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'plan_name', '2', '', 2, newid(), '') GO @@ -122,6 +132,8 @@ INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, d INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '描述方案', 'description', '', 0, 3, newid(), NULL) INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '等级方案', 'scheme_id', 'select scheme_name from jcl_org_scheme where id={?currentvalue}', 0, 4, newid(), NULL) INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '职等', 'level_id', 'select group_concat(level_name) from jcl_org_level where id in ( {?currentvalue})', 0, 5, newid(), NULL) +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '编号', 'grade_no', '2', '', 1, newid(), '') +INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'grade_name', '2', '', 2, newid(), '') GO diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index d5869058..1e389522 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -336,7 +336,7 @@ public class ExtendInfoBO { } else { searchConditionItem = conditionFactory.createCondition(ConditionType.BROWSER, fieldlabel, fieldname, detailtype); } - //TODO 岗位浏览按钮 + // 岗位浏览按钮 if ("666".equals(detailtype)) { BrowserBean browserBean = searchConditionItem.getBrowserConditionParam(); String s = JSONObject.toJSONString(browserBean); diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 4e5c52ca..4631b02d 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -410,7 +410,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService insertCount += getDepartmentMapper().insertIgnoreNull(deptById); // 更新EC表部门 updateEcDepartment(deptById); - // TODO 新增岗位信息 + // 新增岗位信息 if ("1".equals(copyParam.getCopyJob())) { List jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listJobsByDepartmentId(idList.get(i)); Integer maxJobOrder = MapperProxyFactory.getProxy(JobMapper.class).getMaxShowOrder(); diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java index c2f8f660..63ee03d1 100644 --- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java @@ -261,7 +261,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ returnMap.put("condition", getJobTitleImportForm(templatePath)); break; case "resource": - // TODO returnMap.put("condition", getResourceImportForm(templatePath)); break; default: @@ -297,7 +296,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ returnMap.put("pId", jobImport(operateType, excelFile)); break; case "resource": - // TODO List lsErrorInfo = new ArrayList<>(); HrmImportAdaptExcelE9 importAdapt = new HrmImportAdaptExcelE9(); FileUploadToPath fu = new FileUploadToPath(request); @@ -309,7 +307,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ Map hrMap = importAdapt.getHrmImportMap(); HrmImportProcessE9 importProcess = new HrmImportProcessE9(); - // TODO 日志记录 Map map = importProcess.init(request); int pId = Util.getIntValue(Util.null2String(map.get("pId"))); returnMap.put("pId", pId); @@ -1110,7 +1107,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ if (i == 0) { continue; } - // TODO String jobNo = (String) map.get("job_no"); Long jobId = MapperProxyFactory.getProxy(JobMapper.class).getIdByNameAndPid(jobName, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId, parentJobId == null ? 0 : parentJobId); if ("add".equals(operateType)) { diff --git a/src/com/engine/organization/util/MenuBtn.java b/src/com/engine/organization/util/MenuBtn.java index 7ce1b077..1125aa45 100644 --- a/src/com/engine/organization/util/MenuBtn.java +++ b/src/com/engine/organization/util/MenuBtn.java @@ -131,7 +131,7 @@ public class MenuBtn { // 日志 rightMenuList.add(MenuBtn.rightMenu_btnLog()); // 显示列定制 - rightMenuList.add(MenuBtn.rightMenu_btnColumn()); + // rightMenuList.add(MenuBtn.rightMenu_btnColumn()); btnDatas.put("rightMenu", rightMenuList); return btnDatas; }