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

Merge branch 'feature/ml' into develop

Browse Source 
# Conflicts:
#	src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
pull/50/head
‘ml’ 3 years ago
parent 8f7e9889a8 ec8be58a45
commit 0da123fcef
9 changed files with 415 additions and 7 deletions
Show Stats Download Patch File Download Diff File

7
src/com/engine/organization/mapper/scheme/GradeMapper.java
Unescape Escape View File

@ -25,6 +25,13 @@ public interface GradeMapper {
*/
List<GradePO> listByNo(@Param("gradeNo") String gradeNo);
/**
* 根据No和scheme_id查询
* @param gradeNo
* @param schemeId
*/
GradePO getGradeByNoAndSid(@Param("gradeNo") String gradeNo,@Param("schemeId") long schemeId);
/**
* 根据等级方案查询数据
*

14
src/com/engine/organization/mapper/scheme/GradeMapper.xml
Unescape Escape View File

@ -13,6 +13,7 @@
<result column="delete_type" property="deleteType"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="is_used" property="isUsed"/>
</resultMap>
<!-- 表字段 -->
@ -30,6 +31,7 @@
, t.delete_type
, t.create_time
, t.update_time
, t.is_used
</sql>
<select id="getGradeByID" parameterType="com.engine.organization.entity.scheme.po.GradePO"
resultMap="BaseResultMap">
@ -43,6 +45,12 @@
<include refid="baseColumns"/>
from jcl_org_grade t where grade_no = #{gradeNo} AND delete_type = 0
</select>
<select id="getGradeByNoAndSid" parameterType="com.engine.organization.entity.scheme.po.GradePO" resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from jcl_org_grade t where grade_no = #{gradeNo} AND scheme_id = #{schemeId} AND delete_type = 0
</select>
<select id="getCountByTag" resultType="java.lang.Integer">
select count(1) from jcl_org_grade where 1=1 AND delete_type = 0
<if test=" tag != -1 ">
@ -123,6 +131,9 @@
<if test="levelId != null ">
level_id,
</if>
<if test="isUsed != null ">
is_used,
</if>
forbidden_tag,
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
@ -153,6 +164,9 @@
<if test="levelId != null ">
#{levelId},
</if>
<if test="isUsed != null ">
#{isUsed},
</if>
0,
</trim>
</insert>

7
src/com/engine/organization/mapper/scheme/LevelMapper.java
Unescape Escape View File

@ -27,6 +27,13 @@ public interface LevelMapper {
*/
List<LevelPO> listByNo(@Param("levelNo") String levelNo);
/**
* 根据No、schemeId查询
* @param levelNo
* @param schemeId
* */
LevelPO getLevelByNoAndSid(@Param("levelNo") String levelNo,@Param("schemeId") Long schemeId);
/**
* 查询所有被引用的ID
*

19
src/com/engine/organization/mapper/scheme/LevelMapper.xml
Unescape Escape View File

@ -12,6 +12,7 @@
<result column="delete_type" property="deleteType"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="is_used" property="isUsed"/>
</resultMap>
<resultMap id="TreeResultMap" type="com.engine.organization.entity.TreeData">
@ -33,6 +34,7 @@
, t.delete_type
, t.create_time
, t.update_time
, t.is_used
</sql>
@ -48,6 +50,11 @@
<include refid="baseColumns"/>
from jcl_org_level t where level_no = #{levelNo} AND delete_type = 0
</select>
<select id="getLevelByNoAndSid" parameterType="com.engine.organization.entity.scheme.po.LevelPO" resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from jcl_org_level t where level_no = #{levelNo} AND scheme_id = #{schemeId} AND delete_type = 0
</select>
<select id="getCountByTag" resultType="java.lang.Integer">
select count(1) from jcl_org_level where delete_type = 0
<if test=" tag != -1 ">
@ -142,6 +149,9 @@
<if test="schemeId != null ">
scheme_id,
</if>
<if test="isUsed != null ">
is_used,
</if>
forbidden_tag,
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
@ -169,6 +179,9 @@
<if test="schemeId != null ">
#{schemeId},
</if>
<if test="isUsed != null ">
#{isUsed},
</if>
0,
</trim>
</insert>
@ -203,6 +216,9 @@
<if test="schemeId != null ">
scheme_id,
</if>
<if test="isUsed != null ">
is_used,
</if>
forbidden_tag,
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
@ -230,6 +246,9 @@
<if test="schemeId != null ">
#{schemeId},
</if>
<if test="isUsed != null ">
#{isUsed},
</if>
0,
</trim>
</insert>

9
src/com/engine/organization/mapper/scheme/SchemeMapper.java
Unescape Escape View File

@ -28,6 +28,15 @@ public interface SchemeMapper {
*/
List<SchemePO> listByNo(@Param("schemeNo") String schemeNo);
/**
* 根据No查询登记方案
*
* @param schemeNo
* @return
*/
SchemePO getSchemeByNo(@Param("schemeNo") String schemeNo);
/**
* 查询所有被引用的ID
*

19
src/com/engine/organization/mapper/scheme/SchemeMapper.xml
Unescape Escape View File

@ -11,6 +11,7 @@
<result column="delete_type" property="deleteType"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="is_used" property="isUsed"/>
</resultMap>
<resultMap id="TreeResultMap" type="com.engine.organization.entity.TreeData">
@ -32,6 +33,7 @@
, t.delete_type
, t.create_time
, t.update_time
, t.is_used
</sql>
<select id="listByNo" parameterType="com.engine.organization.entity.scheme.po.SchemePO" resultMap="BaseResultMap">
@ -39,6 +41,11 @@
<include refid="baseColumns"/>
from jcl_org_scheme t where scheme_no = #{schemeNo} AND delete_type = 0
</select>
<select id="getSchemeByNo" parameterType="com.engine.organization.entity.scheme.po.SchemePO" resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from jcl_org_scheme t where scheme_no = #{schemeNo} AND delete_type = 0
</select>
<select id="getSchemeByID" parameterType="com.engine.organization.entity.scheme.po.SchemePO"
resultMap="BaseResultMap">
@ -115,6 +122,9 @@
<if test="schemeDescription != null ">
scheme_description,
</if>
<if test="isUsed != null ">
is_used,
</if>
forbidden_tag,
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
@ -139,6 +149,9 @@
<if test="schemeDescription != null ">
#{schemeDescription},
</if>
<if test="isUsed != null ">
#{isUsed},
</if>
0,
</trim>
</insert>
@ -170,6 +183,9 @@
<if test="schemeDescription != null ">
scheme_description,
</if>
<if test="isUsed != null ">
is_used,
</if>
forbidden_tag,
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
@ -194,6 +210,9 @@
<if test="schemeDescription != null ">
#{schemeDescription},
</if>
<if test="isUsed != null ">
#{isUsed},
</if>
0,
</trim>
</insert>

317
src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
Unescape Escape View File

@ -20,6 +20,9 @@ import com.engine.organization.entity.jclimport.po.JclImportHistoryDetailPO;
import com.engine.organization.entity.jclimport.po.JclImportHistoryPO;
import com.engine.organization.entity.jclimport.vo.JclImportHistoryDetailVO;
import com.engine.organization.entity.job.po.JobPO;
import com.engine.organization.entity.scheme.po.GradePO;
import com.engine.organization.entity.scheme.po.LevelPO;
import com.engine.organization.entity.scheme.po.SchemePO;
import com.engine.organization.enums.LogModuleNameEnum;
import com.engine.organization.enums.OperateTypeEnum;
import com.engine.organization.enums.OrgImportEnum;
@ -32,6 +35,9 @@ import com.engine.organization.mapper.hrmresource.SystemDataMapper;
import com.engine.organization.mapper.jclimport.JclImportHistoryDetailMapper;
import com.engine.organization.mapper.jclimport.JclImportHistoryMapper;
import com.engine.organization.mapper.job.JobMapper;
import com.engine.organization.mapper.scheme.GradeMapper;
import com.engine.organization.mapper.scheme.LevelMapper;
import com.engine.organization.mapper.scheme.SchemeMapper;
import com.engine.organization.service.ImportCommonService;
import com.engine.organization.thread.*;
import com.engine.organization.util.HasRightUtil;
@ -81,7 +87,20 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
private static final String HRM_DEPARTMENT = "hrmdepartment";
private static final String HRM_RESOURCE = "hrmresource";
static Map<String, ExtendInfoPO> importFieldsMap;
static {
importFieldsMap = new HashMap<>();
importFieldsMap.put("方案编号", ExtendInfoPO.builder().tableName("jcl_org_scheme").fieldName("scheme_no").fieldNameDesc("方案编号").isrequired(1).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("方案名称", ExtendInfoPO.builder().tableName("jcl_org_scheme").fieldName("scheme_name").fieldNameDesc("方案名称").isrequired(1).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("职级编号", ExtendInfoPO.builder().tableName("jcl_org_grade").fieldName("grade_no").fieldNameDesc("职级编号").isrequired(1).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("职级名称", ExtendInfoPO.builder().tableName("jcl_org_grade").fieldName("grade_name").fieldNameDesc("职级名称").isrequired(1).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("职等编号", ExtendInfoPO.builder().tableName("jcl_org_level").fieldName("level_no").fieldNameDesc("职等编号").isrequired(1).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("职等名称", ExtendInfoPO.builder().tableName("jcl_org_level").fieldName("level_name").fieldNameDesc("职等名称").isrequired(1).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("方案说明", ExtendInfoPO.builder().tableName("jcl_org_scheme").fieldName("scheme_description").fieldNameDesc("方案说明").isrequired(0).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("职等说明", ExtendInfoPO.builder().tableName("jcl_org_level").fieldName("level_description").fieldNameDesc("职等说明").isrequired(0).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("职级说明", ExtendInfoPO.builder().tableName("jcl_org_grade").fieldName("grade_description").fieldNameDesc("职级说明").isrequired(0).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
}
private ExtendInfoMapper getExtendInfoMapper() {
return MapperProxyFactory.getProxy(ExtendInfoMapper.class);
}
@ -126,6 +145,10 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
excludeFields.add("job_grade");
excludeFields.add("job_level");
break;
case "joblevel":
extendType = "0";
tableName = "JCL_ORG_SCHEME";
break;
default:
errorMsg = "未找到对应的导入类型，请确认";
break;
@ -138,12 +161,33 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
return returnMaps;
}
List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ExtendInfoOperateType.LIST.getValue(), "1");
List<ExtendInfoPO> filterList = infoPOList.stream().filter(item -> !excludeFields.contains(item.getFieldName()) && 6 != item.getControlType()).collect(Collectors.toList());
List<FieldTransferParam> fieldDatas = filterList.stream().map(item -> FieldTransferParam.builder().id(item.getId().toString()).name(item.getFieldNameDesc()).build()).collect(Collectors.toList());
List<String> selectedKeys = filterList.stream().filter(item -> (0 == item.getIsSystemDefault()) && 1 == item.getIsrequired()).map(item -> item.getId().toString()).collect(Collectors.toList());
returnMaps.put("data", fieldDatas);
returnMaps.put("selectedKeys", selectedKeys);
if("joblevel".equals(importType)){
List<FieldTransferParam> fieldDatas = new ArrayList<>();
fieldDatas.add(FieldTransferParam.builder().id("1").name("方案编号").build());
fieldDatas.add(FieldTransferParam.builder().id("2").name("方案名称").build());
fieldDatas.add(FieldTransferParam.builder().id("3").name("职级编号").build());
fieldDatas.add(FieldTransferParam.builder().id("4").name("职级名称").build());
fieldDatas.add(FieldTransferParam.builder().id("5").name("职等编号").build());
fieldDatas.add(FieldTransferParam.builder().id("6").name("职等名称").build());
fieldDatas.add(FieldTransferParam.builder().id("7").name("方案说明").build());
fieldDatas.add(FieldTransferParam.builder().id("8").name("职级说明").build());
fieldDatas.add(FieldTransferParam.builder().id("9").name("职等说明").build());
List<String> selectedKeys = new ArrayList<>();
for(int i=0;i<fieldDatas.size();i++){
selectedKeys.add(fieldDatas.get(i).getId());
}
returnMaps.put("data", fieldDatas);
returnMaps.put("selectedKeys", selectedKeys);
}else{
List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ExtendInfoOperateType.LIST.getValue(), "1");
List<ExtendInfoPO> filterList = infoPOList.stream().filter(item -> !excludeFields.contains(item.getFieldName()) && 6 != item.getControlType()).collect(Collectors.toList());
List<FieldTransferParam> fieldDatas = filterList.stream().map(item -> FieldTransferParam.builder().id(item.getId().toString()).name(item.getFieldNameDesc()).build()).collect(Collectors.toList());
List<String> selectedKeys = filterList.stream().filter(item -> (0 == item.getIsSystemDefault()) && 1 == item.getIsrequired()).map(item -> item.getId().toString()).collect(Collectors.toList());
returnMaps.put("data", fieldDatas);
returnMaps.put("selectedKeys", selectedKeys);
}
return returnMaps;
}
@ -167,6 +211,9 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
case "resource":
returnMap.put("condition", getResourceImportForm(templatePath));
break;
case "joblevel":
returnMap.put("condition", getJobTitleImportForm(templatePath));
break;
default:
returnMap.put("status", "-1");
returnMap.put("message", "请选择合适的导入类型");
@ -201,12 +248,40 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
returnMap.put("pId", jobImport(operateType, excelFile));
break;
case "resource":
//Long importHistoryId = saveImportLog("resource", operateType);
//HrmImportAdaptExcelE9 importAdapt = new HrmImportAdaptExcelE9();
//FileUploadToPath fu = new FileUploadToPath(request);
//
//List<String> errorInfo = importAdapt.creatImportMap(fu);
//
////如果读取数据和验证模板没有发生错误
//if (errorInfo.isEmpty()) {
// Map<String, HrmResourceVo> hrMap = importAdapt.getHrmImportMap();
//
// HrmImportProcessE9 importProcess = new HrmImportProcessE9();
// importProcess.init(request, importHistoryId);
//
//
// importProcess.processMap(hrMap);
//} else {
// for (String s : errorInfo) {
// MapperProxyFactory.getProxy(JclImportHistoryDetailMapper.class).insertHistoryDetail(JclImportHistoryDetailPO.builder().pid(importHistoryId).operateDetail(Util.null2String(s)).status("0").build());
// }
//}
//returnMap.put("pId", importHistoryId);
returnMap.put("pId", hrmResourceImport(operateType, excelFile,keyField));
break;
case "joblevel":
returnMap.put("pId", jobLevelImport(operateType, excelFile));
break;
default:
break;
}
}
// 列表
// importstatus
return returnMap;
}
@ -1418,6 +1493,236 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
return importHistoryId;
}
/**
* 方案职等职级导入
*/
private Long jobLevelImport(String operateType, String excelFile){
Long importHistoryId = saveImportLog("joblevel", operateType);
JclImportHistoryDetailPO historyDetailPO;
ImageFileManager manager = new ImageFileManager();
manager.getImageFileInfoById(Util.getIntValue(excelFile));
XSSFWorkbook workbook;
try {
workbook = new XSSFWorkbook(manager.getInputStream());
} catch (IOException e) {
throw new RuntimeException(e);
}
// 当前sheet
XSSFSheet sheetAt = workbook.getSheetAt(0);
int lastRow = sheetAt.getLastRowNum();
OrganizationAssert.isTrue(lastRow > 0, "导入数据为空");
short lastCellNum = sheetAt.getRow(0).getLastCellNum();
List<ExtendInfoPO> extendInfoPOS = new ArrayList<>();
// 遍历每一行数据
nextRow:
for (int i = 0; i <= lastRow; i++) {
historyDetailPO = new JclImportHistoryDetailPO();
historyDetailPO.setPid(importHistoryId);
XSSFRow row = sheetAt.getRow(i);
// 组装待处理数据
Map<String, Object> map = new HashMap<>();
SchemePO schemePO = new SchemePO();
SchemePO schemeNew = new SchemePO();;
GradePO gradePO = new GradePO();
GradePO gradeNew = new GradePO();
LevelPO levelPO = new LevelPO();
LevelPO levelNew = new LevelPO();
historyDetailPO.setRowNums(String.valueOf(i + 1));
for (int cellIndex = 0; cellIndex < lastCellNum; cellIndex++) {
XSSFCell cell = row.getCell((short) cellIndex);
String cellValue = getCellValue(cell).trim();
if (i == 0) {
// 首行 初始化字段信息
ExtendInfoPO extendInfoPO = importFieldsMap.get(cellValue);
extendInfoPOS.add(extendInfoPO);
}else{
ExtendInfoPO infoPO = extendInfoPOS.get(cellIndex);
// 数据校验
if (infoPO.getIsrequired() == 1 && StringUtils.isBlank(cellValue)) {
historyDetailPO.setOperateDetail(infoPO.getFieldNameDesc() + "为必填项");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue nextRow;
}
Object reallyValue;
try {
// 数据格式转换
reallyValue = getReallyValue(infoPO, cellValue);
} catch (Exception e) {
historyDetailPO.setOperateDetail(cellValue + "转换失败");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue nextRow;
}
if (StringUtils.isNotBlank(cellValue) && StringUtils.isBlank(Util.null2String(reallyValue)) && !"ec_company".equals(infoPO.getFieldName()) && !"ec_department".equals(infoPO.getFieldName())) {
historyDetailPO.setOperateDetail(infoPO.getFieldNameDesc() + "数据转换失败,未找到对应数据");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue nextRow;
}
map.put(infoPO.getFieldName(), reallyValue);
}
}
// 校验、数据交互
if (i == 0){
continue;
}
map.put("creator", user.getUID());
map.put("delete_type", 0);
Date currDate = new Date();
map.put("create_time", currDate);
map.put("update_time", currDate);
// 禁用表示为空，默认启用
map.put("forbidden_tag", 0);
map.put("is_used", 1);
if ("add".equals(operateType)) {
schemePO.setSchemeNo((String)map.get("scheme_no"));
schemePO.setSchemeName((String)map.get("scheme_name"));
schemePO.setSchemeDescription((String)map.get("scheme_description"));
schemePO.setForbiddenTag((int)map.get("forbidden_tag"));
schemePO.setIsUsed(1);
schemePO.setCreator((long) user.getUID());
schemePO.setDeleteType((int)map.get("delete_type"));
schemePO.setCreateTime((Date) map.get("create_time"));
schemePO.setUpdateTime((Date) map.get("update_time"));
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemePO.getSchemeNo());
if (schemeNew==null){
MapperProxyFactory.getProxy(SchemeMapper.class).insertIgnoreNull(schemePO);
}else{
historyDetailPO.setOperateDetail("方案编号"+schemePO.getSchemeNo()+"与原有编号重复");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
}
// 新增完成后，再次插入
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemePO.getSchemeNo());
levelPO.setLevelNo((String) map.get("level_no"));
levelPO.setLevelName((String) map.get("level_name"));
levelPO.setDescription((String) map.get("level_description"));
//关联方案id
levelPO.setSchemeId(schemeNew.getId());
levelPO.setForbiddenTag((int) map.get("forbidden_tag"));
levelPO.setIsUsed(1);
levelPO.setCreator((long) user.getUID());
levelPO.setDeleteType((int)map.get("delete_type"));
levelPO.setCreateTime((Date) map.get("create_time"));
levelPO.setUpdateTime((Date) map.get("update_time"));
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(levelPO.getLevelNo(),schemeNew.getId());
if(levelNew==null){
MapperProxyFactory.getProxy(LevelMapper.class).insertIgnoreNull(levelPO);
}
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(levelPO.getLevelNo(),schemeNew.getId());
gradePO.setGradeNo((String) map.get("grade_no"));
gradePO.setGradeName((String) map.get("grade_name"));
gradePO.setDescription((String) map.get("grade_description"));
// 关联方案id
gradePO.setSchemeId(schemeNew.getId());
// 关联职等id
gradePO.setLevelId(String.valueOf(levelNew.getId()));
gradePO.setGradeNo((String) map.get("grade_no"));
gradePO.setForbiddenTag((int) map.get("forbidden_tag"));
gradePO.setIsUsed(1);
gradePO.setCreator((long) user.getUID());
gradePO.setDeleteType((int)map.get("delete_type"));
gradePO.setCreateTime((Date) map.get("create_time"));
gradePO.setUpdateTime((Date) map.get("update_time"));
gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid(gradePO.getGradeNo(),gradePO.getSchemeId());
if (gradeNew != null) {
//职级已存在，重新拼接level_id
gradePO.setLevelId(gradeNew.getLevelId()+","+levelNew.getId());
gradePO.setId(gradeNew.getId());
gradePO.setCreateTime(null);
gradePO.setUpdateTime(new Date());
MapperProxyFactory.getProxy(GradeMapper.class).updateGrade(gradePO);
}else{
MapperProxyFactory.getProxy(GradeMapper.class).insertIgnoreNull(gradePO);
}
historyDetailPO.setOperateDetail("添加成功");
historyDetailPO.setStatus("1");
saveImportDetailLog(historyDetailPO);
}else if ("update".equals(operateType)) {
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo((String)map.get("scheme_no"));
if(schemeNew!=null){
schemeNew.setSchemeNo((String)map.get("scheme_no"));
schemeNew.setSchemeName((String)map.get("scheme_name"));
schemeNew.setSchemeDescription((String)map.get("scheme_description"));
schemeNew.setUpdateTime((Date) map.get("update_time"));
MapperProxyFactory.getProxy(SchemeMapper.class).updateScheme(schemeNew);
}else{
schemeNew.setSchemeNo((String)map.get("scheme_no"));
schemeNew.setSchemeName((String)map.get("scheme_name"));
schemeNew.setSchemeDescription((String)map.get("scheme_description"));
schemeNew.setForbiddenTag((int)map.get("forbidden_tag"));
schemeNew.setIsUsed(1);
schemeNew.setCreator((long) user.getUID());
schemeNew.setDeleteType((int)map.get("delete_type"));
schemeNew.setCreateTime((Date) map.get("create_time"));
schemeNew.setUpdateTime((Date) map.get("update_time"));
MapperProxyFactory.getProxy(SchemeMapper.class).insertIgnoreNull(schemeNew);
}
//查询职等信息
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo((String)map.get("scheme_no"));
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid((String) map.get("level_no"),schemeNew.getId());
if(levelNew!=null){
levelNew.setLevelNo((String) map.get("level_no"));
levelNew.setLevelName((String) map.get("level_name"));
levelNew.setDescription((String) map.get("level_description"));
//关联方案id
levelNew.setSchemeId(schemeNew.getId());
levelNew.setUpdateTime((Date) map.get("update_time"));
MapperProxyFactory.getProxy(LevelMapper.class).updateLevel(levelNew);
}else{
levelNew.setLevelNo((String) map.get("level_no"));
levelNew.setLevelName((String) map.get("level_name"));
levelNew.setDescription((String) map.get("level_description"));
//关联方案id
levelNew.setSchemeId(schemeNew.getId());
levelNew.setForbiddenTag((int) map.get("forbidden_tag"));
levelNew.setIsUsed(1);
levelNew.setCreator((long) user.getUID());
levelNew.setDeleteType((int)map.get("delete_type"));
levelNew.setCreateTime((Date) map.get("create_time"));
levelNew.setUpdateTime((Date) map.get("update_time"));
MapperProxyFactory.getProxy(LevelMapper.class).insertIgnoreNull(levelNew);
}
gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid((String) map.get("grade_no"),schemeNew.getId());
if(gradeNew!=null){
gradeNew.setGradeNo((String) map.get("grade_no"));
gradeNew.setGradeName((String) map.get("grade_name"));
gradeNew.setDescription((String) map.get("grade_description"));
// 关联方案id
gradeNew.setSchemeId(schemeNew.getId());
// 关联职等id
gradeNew.setLevelId(String.valueOf(levelNew.getId()));
gradeNew.setUpdateTime((Date) map.get("update_time"));
GradePO gradePOTmp = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByID(gradeNew.getId());
if(gradePOTmp!=null){
MapperProxyFactory.getProxy(GradeMapper.class).updateGrade(gradeNew);
}
}else{
MapperProxyFactory.getProxy(GradeMapper.class).insertIgnoreNull(gradePO);
}
}
}
return importHistoryId;
}
/**
* 读取表格文本内容

28
src/com/engine/organization/util/saveimport/PostInfoImportUtil.java
Unescape Escape View File

@ -0,0 +1,28 @@
package com.engine.organization.util.saveimport;
import com.engine.organization.entity.extend.po.ExtendInfoPO;
import java.util.HashMap;
import java.util.Map;
/**
* @author:ml
* @createTime:2022/11/9
* @version:1.0
*/
public class PostInfoImportUtil {
static Map<String, ExtendInfoPO> importFieldsMap;
static {
importFieldsMap = new HashMap<>();
importFieldsMap.put("编号", ExtendInfoPO.builder().tableName("jcl_org_post").fieldName("post_no").fieldNameDesc("方案编号").isrequired(1).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("名称", ExtendInfoPO.builder().tableName("jcl_org_post").fieldName("post_name").fieldNameDesc("方案名称").isrequired(0).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("权限", ExtendInfoPO.builder().tableName("jcl_org_post").fieldName("comp_id").fieldNameDesc("分部").isrequired(1).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("责任", ExtendInfoPO.builder().tableName("jcl_org_post").fieldName("dept_id").fieldNameDesc("部门").isrequired(0).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("资格", ExtendInfoPO.builder().tableName("jcl_org_post").fieldName("job_id").fieldNameDesc("岗位").isrequired(0).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("职务分类", ExtendInfoPO.builder().tableName("jcl_org_post").fieldName("staff_num").fieldNameDesc("编制数").isrequired(1).controlType(1).browserType("2").customValue("[\"input\",\"int\"]").build());
importFieldsMap.put("描述说明", ExtendInfoPO.builder().tableName("jcl_org_post").fieldName("staff_num").fieldNameDesc("编制数").isrequired(1).controlType(1).browserType("2").customValue("[\"input\",\"int\"]").build());
}
}

2
src/weaver/formmode/organization/modeexpand/VOModeExpand.java
Unescape Escape View File

@ -54,7 +54,7 @@ public class VOModeExpand extends AbstractModeExpandJavaCodeNew {
jclOrgMap.setId(Integer.valueOf(recordSet.getString("id")) + st);
jclOrgMap.setFName(recordSet.getString("fname"));
if (!"".equals(recordSet.getString("fparentid"))) {
jclOrgMap.setFParentId(Integer.valueOf(recordSet.getString("fparentid")));
jclOrgMap.setFParentId(Integer.valueOf(recordSet.getString("fparentid")) + st);
}
if ("1".equals(recordSet.getString("ftype"))) {
jclOrgMap.setFParentId(0);

Write Preview
Loading…
Cancel
Save