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

职等职级导入接口

Browse Source
pull/50/head
‘ml’ 3 years ago
parent ddafc854b6
commit ec8be58a45
9 changed files with 247 additions and 118 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); 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="delete_type" property="deleteType"/>
<result column="create_time" property="createTime"/> <result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/> <result column="update_time" property="updateTime"/>
<result column="is_used" property="isUsed"/>
</resultMap> </resultMap>
<!-- 表字段 --> <!-- 表字段 -->
@ -30,6 +31,7 @@
, t.delete_type , t.delete_type
, t.create_time , t.create_time
, t.update_time , t.update_time
, t.is_used
</sql> </sql>
<select id="getGradeByID" parameterType="com.engine.organization.entity.scheme.po.GradePO" <select id="getGradeByID" parameterType="com.engine.organization.entity.scheme.po.GradePO"
resultMap="BaseResultMap"> resultMap="BaseResultMap">
@ -43,6 +45,12 @@
<include refid="baseColumns"/> <include refid="baseColumns"/>
from jcl_org_grade t where grade_no = #{gradeNo} AND delete_type = 0 from jcl_org_grade t where grade_no = #{gradeNo} AND delete_type = 0
</select> </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 id="getCountByTag" resultType="java.lang.Integer">
select count(1) from jcl_org_grade where 1=1 AND delete_type = 0 select count(1) from jcl_org_grade where 1=1 AND delete_type = 0
<if test=" tag != -1 "> <if test=" tag != -1 ">
@ -123,6 +131,9 @@
<if test="levelId != null "> <if test="levelId != null ">
level_id, level_id,
</if> </if>
<if test="isUsed != null ">
is_used,
</if>
forbidden_tag, forbidden_tag,
</trim> </trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=","> <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
@ -153,6 +164,9 @@
<if test="levelId != null "> <if test="levelId != null ">
#{levelId}, #{levelId},
</if> </if>
<if test="isUsed != null ">
#{isUsed},
</if>
0, 0,
</trim> </trim>
</insert> </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); List<LevelPO> listByNo(@Param("levelNo") String levelNo);
/**
* 根据No、schemeId查询
* @param levelNo
* @param schemeId
* */
LevelPO getLevelByNoAndSid(@Param("levelNo") String levelNo,@Param("schemeId") Long schemeId);
/** /**
* 查询所有被引用的ID * 查询所有被引用的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="delete_type" property="deleteType"/>
<result column="create_time" property="createTime"/> <result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/> <result column="update_time" property="updateTime"/>
<result column="is_used" property="isUsed"/>
</resultMap> </resultMap>
<resultMap id="TreeResultMap" type="com.engine.organization.entity.TreeData"> <resultMap id="TreeResultMap" type="com.engine.organization.entity.TreeData">
@ -33,6 +34,7 @@
, t.delete_type , t.delete_type
, t.create_time , t.create_time
, t.update_time , t.update_time
, t.is_used
</sql> </sql>
@ -48,6 +50,11 @@
<include refid="baseColumns"/> <include refid="baseColumns"/>
from jcl_org_level t where level_no = #{levelNo} AND delete_type = 0 from jcl_org_level t where level_no = #{levelNo} AND delete_type = 0
</select> </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 id="getCountByTag" resultType="java.lang.Integer">
select count(1) from jcl_org_level where delete_type = 0 select count(1) from jcl_org_level where delete_type = 0
<if test=" tag != -1 "> <if test=" tag != -1 ">
@ -142,6 +149,9 @@
<if test="schemeId != null "> <if test="schemeId != null ">
scheme_id, scheme_id,
</if> </if>
<if test="isUsed != null ">
is_used,
</if>
forbidden_tag, forbidden_tag,
</trim> </trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=","> <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
@ -169,6 +179,9 @@
<if test="schemeId != null "> <if test="schemeId != null ">
#{schemeId}, #{schemeId},
</if> </if>
<if test="isUsed != null ">
#{isUsed},
</if>
0, 0,
</trim> </trim>
</insert> </insert>
@ -203,6 +216,9 @@
<if test="schemeId != null "> <if test="schemeId != null ">
scheme_id, scheme_id,
</if> </if>
<if test="isUsed != null ">
is_used,
</if>
forbidden_tag, forbidden_tag,
</trim> </trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=","> <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
@ -230,6 +246,9 @@
<if test="schemeId != null "> <if test="schemeId != null ">
#{schemeId}, #{schemeId},
</if> </if>
<if test="isUsed != null ">
#{isUsed},
</if>
0, 0,
</trim> </trim>
</insert> </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); List<SchemePO> listByNo(@Param("schemeNo") String schemeNo);
/**
* 根据No查询登记方案
*
* @param schemeNo
* @return
*/
SchemePO getSchemeByNo(@Param("schemeNo") String schemeNo);
/** /**
* 查询所有被引用的ID * 查询所有被引用的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="delete_type" property="deleteType"/>
<result column="create_time" property="createTime"/> <result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/> <result column="update_time" property="updateTime"/>
<result column="is_used" property="isUsed"/>
</resultMap> </resultMap>
<resultMap id="TreeResultMap" type="com.engine.organization.entity.TreeData"> <resultMap id="TreeResultMap" type="com.engine.organization.entity.TreeData">
@ -32,6 +33,7 @@
, t.delete_type , t.delete_type
, t.create_time , t.create_time
, t.update_time , t.update_time
, t.is_used
</sql> </sql>
<select id="listByNo" parameterType="com.engine.organization.entity.scheme.po.SchemePO" resultMap="BaseResultMap"> <select id="listByNo" parameterType="com.engine.organization.entity.scheme.po.SchemePO" resultMap="BaseResultMap">
@ -39,6 +41,11 @@
<include refid="baseColumns"/> <include refid="baseColumns"/>
from jcl_org_scheme t where scheme_no = #{schemeNo} AND delete_type = 0 from jcl_org_scheme t where scheme_no = #{schemeNo} AND delete_type = 0
</select> </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" <select id="getSchemeByID" parameterType="com.engine.organization.entity.scheme.po.SchemePO"
resultMap="BaseResultMap"> resultMap="BaseResultMap">
@ -115,6 +122,9 @@
<if test="schemeDescription != null "> <if test="schemeDescription != null ">
scheme_description, scheme_description,
</if> </if>
<if test="isUsed != null ">
is_used,
</if>
forbidden_tag, forbidden_tag,
</trim> </trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=","> <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
@ -139,6 +149,9 @@
<if test="schemeDescription != null "> <if test="schemeDescription != null ">
#{schemeDescription}, #{schemeDescription},
</if> </if>
<if test="isUsed != null ">
#{isUsed},
</if>
0, 0,
</trim> </trim>
</insert> </insert>
@ -170,6 +183,9 @@
<if test="schemeDescription != null "> <if test="schemeDescription != null ">
scheme_description, scheme_description,
</if> </if>
<if test="isUsed != null ">
is_used,
</if>
forbidden_tag, forbidden_tag,
</trim> </trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=","> <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
@ -194,6 +210,9 @@
<if test="schemeDescription != null "> <if test="schemeDescription != null ">
#{schemeDescription}, #{schemeDescription},
</if> </if>
<if test="isUsed != null ">
#{isUsed},
</if>
0, 0,
</trim> </trim>
</insert> </insert>

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

@ -1525,11 +1525,11 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
// 组装待处理数据 // 组装待处理数据
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
SchemePO schemePO = new SchemePO(); SchemePO schemePO = new SchemePO();
SchemePO schemeNew = null; SchemePO schemeNew = new SchemePO();;
GradePO gradePO = new GradePO(); GradePO gradePO = new GradePO();
GradePO gradeNew = null; GradePO gradeNew = new GradePO();
LevelPO levelPO = new LevelPO(); LevelPO levelPO = new LevelPO();
LevelPO levelNew = null; LevelPO levelNew = new LevelPO();
historyDetailPO.setRowNums(String.valueOf(i + 1)); historyDetailPO.setRowNums(String.valueOf(i + 1));
for (int cellIndex = 0; cellIndex < lastCellNum; cellIndex++) { for (int cellIndex = 0; cellIndex < lastCellNum; cellIndex++) {
@ -1566,133 +1566,159 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
continue nextRow; continue nextRow;
} }
map.put(infoPO.getFieldName(), reallyValue); map.put(infoPO.getFieldName(), reallyValue);
// 方案
if("scheme_no".equals(infoPO.getFieldName())){
List<SchemePO> schemePOS = MapperProxyFactory.getProxy(SchemeMapper.class).listByNo(Util.null2String(reallyValue));
if(schemePOS.size()>0){
historyDetailPO.setOperateDetail("方案编号"+reallyValue+"与原有编号重复");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue nextRow;
}
}
// 职等
// if ("level_no".equals(infoPO.getFieldName())){
// List<LevelPO> levelPOS = MapperProxyFactory.getProxy(LevelMapper.class).listByNo(Util.null2String(reallyValue));
// if(levelPOS.size()>0){
// historyDetailPO.setOperateDetail("职等编号"+reallyValue+"与原有编号重复");
// historyDetailPO.setStatus("0");
// saveImportDetailLog(historyDetailPO);
// continue nextRow;
// }
// }
// 职级
// if("grade_no".equals(infoPO.getFieldName())){
// List<GradePO> gradePOS = MapperProxyFactory.getProxy(GradeMapper.class).listByNo(Util.null2String(reallyValue));
// if(gradePOS.size()>0){
// historyDetailPO.setOperateDetail("职级编号"+reallyValue+"与原有编号重复");
// historyDetailPO.setStatus("0");
// saveImportDetailLog(historyDetailPO);
// continue nextRow;
// }
// }
} }
} }
// 校验、数据交互 // 校验、数据交互
if (i == 0){ if (i == 0){
continue; continue;
} }
String schemeNo = (String) map.get("scheme_no");
//Long schemeId = MapperProxyFactory.getProxy(SchemeMapper.class)
if("add".equals(operateType)){
map.put("creator", user.getUID()); map.put("creator", user.getUID());
map.put("delete_type", 0); map.put("delete_type", 0);
Date currDate = new Date(); Date currDate = new Date();
map.put("create_time", currDate); map.put("create_time", currDate);
map.put("update_time", currDate); map.put("update_time", currDate);
// 禁用表示为空，默认启用 // 禁用表示为空，默认启用
map.put("forbidden_tag", 0); map.put("forbidden_tag", 0);
map.put("is_used", 1); map.put("is_used", 1);
// param = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), StaffSearchParam.class); if ("add".equals(operateType)) {
schemePO.setSchemeNo((String)map.get("scheme_no"));
} schemePO.setSchemeName((String)map.get("scheme_name"));
schemePO.setSchemeNo((String)map.get("scheme_no")); schemePO.setSchemeDescription((String)map.get("scheme_description"));
schemePO.setSchemeName((String)map.get("scheme_name")); schemePO.setForbiddenTag((int)map.get("forbidden_tag"));
schemePO.setSchemeDescription((String)map.get("scheme_description")); schemePO.setIsUsed(1);
schemePO.setForbiddenTag((int)map.get("forbidden_tag")); schemePO.setCreator((long) user.getUID());
schemePO.setIsUsed(1); schemePO.setDeleteType((int)map.get("delete_type"));
schemePO.setCreator((long) user.getUID()); schemePO.setCreateTime((Date) map.get("create_time"));
schemePO.setDeleteType((int)map.get("delete_type")); schemePO.setUpdateTime((Date) map.get("update_time"));
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){
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemePO.getSchemeNo()); MapperProxyFactory.getProxy(SchemeMapper.class).insertIgnoreNull(schemePO);
if (schemeNew==null){ }else{
MapperProxyFactory.getProxy(SchemeMapper.class).insertIgnoreNull(schemePO); historyDetailPO.setOperateDetail("方案编号"+schemePO.getSchemeNo()+"与原有编号重复");
}else{ historyDetailPO.setStatus("0");
historyDetailPO.setOperateDetail("方案编号"+schemePO.getSchemeNo()+"与原有编号重复"); saveImportDetailLog(historyDetailPO);
historyDetailPO.setStatus("0"); }
saveImportDetailLog(historyDetailPO);
}
// 新增完成后，再次插入 // 新增完成后，再次插入
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemePO.getSchemeNo()); schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemePO.getSchemeNo());
levelPO.setLevelNo((String) map.get("level_no")); levelPO.setLevelNo((String) map.get("level_no"));
levelPO.setLevelName((String) map.get("level_name")); levelPO.setLevelName((String) map.get("level_name"));
levelPO.setDescription((String) map.get("level_description")); levelPO.setDescription((String) map.get("level_description"));
//关联方案id //关联方案id
levelPO.setSchemeId(schemeNew.getId()); levelPO.setSchemeId(schemeNew.getId());
levelPO.setForbiddenTag((int) map.get("forbidden_tag")); levelPO.setForbiddenTag((int) map.get("forbidden_tag"));
levelPO.setIsUsed(1); levelPO.setIsUsed(1);
levelPO.setCreator((long) user.getUID()); levelPO.setCreator((long) user.getUID());
levelPO.setDeleteType((int)map.get("delete_type")); levelPO.setDeleteType((int)map.get("delete_type"));
levelPO.setCreateTime((Date) map.get("create_time")); levelPO.setCreateTime((Date) map.get("create_time"));
levelPO.setUpdateTime((Date) map.get("update_time")); levelPO.setUpdateTime((Date) map.get("update_time"));
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(levelPO.getLevelNo(),schemeNew.getId()); levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(levelPO.getLevelNo(),schemeNew.getId());
if(levelNew==null){ if(levelNew==null){
MapperProxyFactory.getProxy(LevelMapper.class).insertIgnoreNull(levelPO); MapperProxyFactory.getProxy(LevelMapper.class).insertIgnoreNull(levelPO);
} }
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(levelPO.getLevelNo(),schemeNew.getId()); levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(levelPO.getLevelNo(),schemeNew.getId());
gradePO.setGradeNo((String) map.get("grade_no")); gradePO.setGradeNo((String) map.get("grade_no"));
gradePO.setGradeName((String) map.get("grade_name")); gradePO.setGradeName((String) map.get("grade_name"));
gradePO.setDescription((String) map.get("grade_description")); gradePO.setDescription((String) map.get("grade_description"));
// 关联方案id // 关联方案id
gradePO.setSchemeId(schemeNew.getId()); gradePO.setSchemeId(schemeNew.getId());
// 关联职等id // 关联职等id
gradePO.setLevelId(String.valueOf(levelNew.getId())); gradePO.setLevelId(String.valueOf(levelNew.getId()));
gradePO.setGradeNo((String) map.get("grade_no")); gradePO.setGradeNo((String) map.get("grade_no"));
gradePO.setForbiddenTag((int) map.get("forbidden_tag")); gradePO.setForbiddenTag((int) map.get("forbidden_tag"));
gradePO.setIsUsed(1); gradePO.setIsUsed(1);
gradePO.setCreator((long) user.getUID()); gradePO.setCreator((long) user.getUID());
gradePO.setDeleteType((int)map.get("delete_type")); gradePO.setDeleteType((int)map.get("delete_type"));
gradePO.setCreateTime((Date) map.get("create_time")); gradePO.setCreateTime((Date) map.get("create_time"));
gradePO.setUpdateTime((Date) map.get("update_time")); gradePO.setUpdateTime((Date) map.get("update_time"));
gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid(gradePO.getGradeNo(),gradePO.getSchemeId());
gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid(gradePO.getGradeNo(),gradePO.getSchemeId()); if (gradeNew != null) {
if (gradeNew != null) { //职级已存在，重新拼接level_id
//职级已存在，重新拼接level_id gradePO.setLevelId(gradeNew.getLevelId()+","+levelNew.getId());
gradePO.setLevelId(gradeNew.getLevelId()+","+levelNew.getId());
gradePO.setId(gradeNew.getId());
gradePO.setId(gradeNew.getId()); gradePO.setCreateTime(null);
gradePO.setCreateTime(null); gradePO.setUpdateTime(new Date());
gradePO.setUpdateTime(new Date()); MapperProxyFactory.getProxy(GradeMapper.class).updateGrade(gradePO);
MapperProxyFactory.getProxy(GradeMapper.class).updateGrade(gradePO); }else{
}else{ MapperProxyFactory.getProxy(GradeMapper.class).insertIgnoreNull(gradePO);
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);
}
historyDetailPO.setOperateDetail("添加成功"); gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid((String) map.get("grade_no"),schemeNew.getId());
historyDetailPO.setStatus("1"); if(gradeNew!=null){
saveImportDetailLog(historyDetailPO); 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; 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.setId(Integer.valueOf(recordSet.getString("id")) + st);
jclOrgMap.setFName(recordSet.getString("fname")); jclOrgMap.setFName(recordSet.getString("fname"));
if (!"".equals(recordSet.getString("fparentid"))) { 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"))) { if ("1".equals(recordSet.getString("ftype"))) {
jclOrgMap.setFParentId(0); jclOrgMap.setFParentId(0);

Write Preview
Loading…
Cancel
Save