diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/UploadService.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/UploadService.java index 8c50843..27ad79c 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/UploadService.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/UploadService.java @@ -8,10 +8,6 @@ import java.util.Map; public interface UploadService { - Map uploadFile(Map fileMap,String folderId, ModuleSource module, Long refId, SimpleEmployee employee, String chunks); - - Map importData(List> dataList,String tableName,SimpleEmployee employee); - Map jcluploadFile(List> list,String tableName,String folderId,SimpleEmployee employee) throws Exception; } diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java index 5d59d96..b3ce191 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java @@ -171,7 +171,7 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic Map condition = Maps.newHashMap(); condition.put("id",pendingEmployee.getId()); Map param = Maps.newHashMap(); - param.put("tableName","uf_jcl_rzgl"); + param.put("tableName",uf_jcl_rzgl); param.put("dataMap",dataMap); param.put("condition",condition); commonService.updateCommon(param); @@ -622,25 +622,28 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic Map uf_jcl_employee_information_Info = recruitModuleUtils.getEbTableInfo("uf_jcl_employee_information_apptag", "uf_jcl_employee_information_tag"); String uf_jcl_employee_information = uf_jcl_employee_information_Info.get("table_name"); + Map uf_jcl_querycondition_Info = recruitModuleUtils.getEbTableInfo("uf_jcl_querycondition_apptag", "uf_jcl_querycondition_tag"); + String uf_jcl_querycondition = uf_jcl_querycondition_Info.get("table_name"); + String rootdata = params.get("rootdata"); String sqltj = CommonUtils.null2String(params.get("sqltj")); Map param = Maps.newHashMap(); Map dataMap = Maps.newHashMap(); - param.put("tableName","uf_jcl_querycondition"); + param.put("tableName",uf_jcl_querycondition); param.put("dataMap",dataMap); dataMap.put("ry",String.valueOf(simpleEmployee.getId())); dataMap.put("sxtj",rootdata); dataMap.put("bm",uf_jcl_employee_information); - String sql = "select id,ry from uf_jcl_querycondition where ry=? and bm=? and delete_type='0'"; + String sql = "select id,ry from "+uf_jcl_querycondition+" where ry=? and bm=? and delete_type='0'"; List> dataList = databaseUtils.getSqlList(sql,CommonUtils.getParamList(String.valueOf(simpleEmployee.getId()),uf_jcl_employee_information)); if (dataList.size() > 0){ if (rootdata.equals("")){ - sql = "update uf_jcl_querycondition set sqltj=? where id=?"; + sql = "update "+uf_jcl_querycondition+" set sqltj=? where id=?"; databaseUtils.execute(sql,CommonUtils.getParamList(sqltj,String.valueOf(dataList.get(0).get("id")))); }else { - sql = "update uf_jcl_querycondition set sxtj=? where id=?"; + sql = "update "+uf_jcl_querycondition+" set sxtj=? where id=?"; databaseUtils.execute(sql,CommonUtils.getParamList(rootdata,String.valueOf(dataList.get(0).get("id")))); } @@ -677,6 +680,16 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic int current = Integer.valueOf(CommonUtils.null2String(params.get("current"))); int pageSize = Integer.valueOf(CommonUtils.null2String(params.get("pageSize"))); String sql = "select id,app_id,form_id from ebdf_obj where table_name='"+tableName+"' and delete_type='0'"; + + Map uf_jcl_querycondition_Info = recruitModuleUtils.getEbTableInfo("uf_jcl_querycondition_apptag", "uf_jcl_querycondition_tag"); + String uf_jcl_querycondition = uf_jcl_querycondition_Info.get("table_name"); + + if (tableName.equals("uf_jcl_employee_information")){ + Map uf_jcl_employee_information_Info = recruitModuleUtils.getEbTableInfo("uf_jcl_employee_information_apptag", "uf_jcl_employee_information_tag"); + tableName = uf_jcl_employee_information_Info.get("table_name"); + } + + List> recordList = databaseUtils.getSqlList(sql); String objId = CommonUtils.null2String(recordList.get(0).get("id")); String appId = CommonUtils.null2String(recordList.get(0).get("appId")); @@ -685,7 +698,7 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic List> objListId = databaseUtils.getSqlList(sql,CommonUtils.getParamList(objId)); sql = "select b.title,b.data_key,b.component_key,a.* from ebdf_list_field a left join form_field b on a.field_id=b.id where a.list_id=? and b.form_id=? and a.delete_type='0' and b.delete_type='0'"; List> columnList = databaseUtils.getSqlList(sql,CommonUtils.getParamList(objListId.get(0).get("id").toString(),formId)); - sql = "select sqltj from uf_jcl_querycondition where ry=? and bm=?"; + sql = "select sqltj from "+uf_jcl_querycondition+" where ry=? and bm=?"; List> conditionSqlList = databaseUtils.getSqlList(sql,CommonUtils.getParamList(String.valueOf(simpleEmployee.getId()),tableName)); List columns = Lists.newArrayList(); @@ -840,8 +853,12 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic @Override public String getallEmployeeConditon(SimpleEmployee simpleEmployee) { + Map uf_jcl_querycondition_Info = recruitModuleUtils.getEbTableInfo("uf_jcl_querycondition_apptag", "uf_jcl_querycondition_tag"); + String uf_jcl_querycondition = uf_jcl_querycondition_Info.get("table_name"); + + StringJoiner andCondition = new StringJoiner(""); - String sql = "select sqltj from uf_jcl_querycondition where ry=? and bm=? and delete_type='0'"; + String sql = "select sqltj from "+uf_jcl_querycondition+" where ry=? and bm=? and delete_type='0'"; List> conditionSqlList = databaseUtils.getSqlList(sql,CommonUtils.getParamList(String.valueOf(simpleEmployee.getId()),"uf_jcl_employee_information")); if (conditionSqlList.size() > 0){ andCondition.add(String.valueOf(conditionSqlList.get(0).get("sqltj"))); @@ -852,9 +869,11 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic @Override public Map getinitCondition(SimpleEmployee simpleEmployee) { + Map uf_jcl_querycondition_Info = recruitModuleUtils.getEbTableInfo("uf_jcl_querycondition_apptag", "uf_jcl_querycondition_tag"); + String uf_jcl_querycondition = uf_jcl_querycondition_Info.get("table_name"); - String sql = "select sqltj,sxtj from uf_jcl_querycondition where ry=? and bm=? and delete_type='0'"; - List> conditionSqlList = databaseUtils.getSqlList(sql,CommonUtils.getParamList(String.valueOf(simpleEmployee.getId()),"uf_jcl_employee_information")); + String sql = "select sqltj,sxtj from "+uf_jcl_querycondition+" where ry=? and bm=? and delete_type='0'"; + List> conditionSqlList = databaseUtils.getSqlList(sql,CommonUtils.getParamList(String.valueOf(simpleEmployee.getId()),uf_jcl_querycondition)); Map resultMap = Maps.newHashMap(); if (conditionSqlList.size() > 0){ resultMap.put("sqltj",CommonUtils.null2String(conditionSqlList.get(0).get("sqltj"))); @@ -1448,7 +1467,10 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic * @return */ public Map getMapping(){ - String sql = "select ygxxzdkey,rlxtzdkey from uf_jcl_zdtbysb"; + Map uf_jcl_zdtbysb_Info = recruitModuleUtils.getEbTableInfo("uf_jcl_employee_information_apptag", "uf_jcl_zdtbysb_tag"); + String uf_jcl_zdtbysb = uf_jcl_zdtbysb_Info.get("table_name"); + + String sql = "select ygxxzdkey,rlxtzdkey from "+uf_jcl_zdtbysb; List> recordList = databaseUtils.getSqlList(sql); Map resultMap = recordList.stream().collect(Collectors.toMap(e->e.get("ygxxzdkey").toString(),e -> e.get("rlxtzdkey").toString())); diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/UploadServiceImpl.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/UploadServiceImpl.java index 1bd6bc3..1581499 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/UploadServiceImpl.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/UploadServiceImpl.java @@ -66,6 +66,10 @@ public class UploadServiceImpl implements UploadService { public Map jcluploadFile(List> list,String tableName,String folderId,SimpleEmployee employee) throws Exception { Map returnMap = Maps.newHashMap(); List> importList = Lists.newArrayList(); + String sql = "select a.* from form_field a left join form_table b on a.form_id=b.form_id where b.table_name=? and a.delete_type='0'"; + List> fieldList = databaseUtils.getSqlList(sql,CommonUtils.getParamList(tableName)); + Map>> fieldGroupByTitle = fieldList.stream().collect(Collectors.groupingBy(e->e.get("title").toString())); + for (Map resultMap:list){ FileData fileData = new FileData(); fileData.setLoadUrl(fileDownloadService.getDownloadUrl(CommonUtils.null2String(resultMap.get("url")),CommonUtils.null2String(resultMap.get("tenant_key")),CommonUtils.null2String(resultMap.get("name")))); @@ -112,14 +116,25 @@ public class UploadServiceImpl implements UploadService { Map fileUploadMap = uploadFile(fileMap,folderId,ModuleSource.ebuildercard,0L,employee,null); long docId = ((FileObj)fileUploadMap.get("fileObj")).getDocId(); + long fileid = ((FileObj)fileUploadMap.get("fileObj")).getFileid(); + long id = ((FileObj)fileUploadMap.get("fileObj")).getId(); + log.error("docId : [{}],fileid:[{}],id:[{}]",docId,fileid,id); dataList.get(rowNum-1).put(titles.get(colNum),String.valueOf(docId)); Map updataMap = Maps.newHashMap(); updataMap.put("id",dataList.get(rowNum-1).get("数据ID")); - updataMap.put(titles.get(colNum),String.valueOf(docId)); + if (fieldGroupByTitle.get(titles.get(colNum)).get(0).get("component_key").equals("FileComponent")){ + //附件 + log.error("附件字段"); + updataMap.put(titles.get(colNum),String.valueOf(fileid)); + }else{ + log.error("文档字段"); + log.error("字段key："+fieldGroupByTitle.get(titles.get(colNum)).get(0).get("component_key")); + updataMap.put(titles.get(colNum),String.valueOf(docId)); + } needUpdataList.add(updataMap); } - Map importResult = importData(needUpdataList,tableName,employee); + Map importResult = importData(needUpdataList,tableName,fieldGroupByTitle); importList.add(importResult); } returnMap.put("importList",importList); @@ -219,15 +234,12 @@ public class UploadServiceImpl implements UploadService { return result; } - @Override - public Map importData(List> dataList,String tableName,SimpleEmployee employee) { + public Map importData(List> dataList,String tableName,Map>> fieldGroupByTitle) { Map resultMap = Maps.newHashMap(); List> updateData = Lists.newArrayList(); - String sql = "select a.* from form_field a left join form_table b on a.form_id=b.form_id where b.table_name=? and a.delete_type='0'"; - List> fieldList = databaseUtils.getSqlList(sql,CommonUtils.getParamList(tableName)); - Map>> fieldGroupByTitle = fieldList.stream().collect(Collectors.groupingBy(e->e.get("title").toString())); + Map>> dataGroupById = dataList.stream().collect(Collectors.groupingBy(e->e.get("id").toString())); for (Map.Entry>>entry : dataGroupById.entrySet()){ Map updataMap = Maps.newHashMap();