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-06-17 11:48:15 +08:00
parent 445507d10d
commit e9aa68229d
10 changed files with 55 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java
View File

@ -23,7 +23,7 @@ public class ExtendGroupBO {
public static List<TypeTreeVO> buildTypeTree(List<ExtendGroupPO> extendGroupPOS) {
if(CollectionUtils.isEmpty(extendGroupPOS)){
if (CollectionUtils.isEmpty(extendGroupPOS)) {
return Collections.emptyList();
}
@ -42,10 +42,12 @@ public class ExtendGroupBO {
.build()).collect(Collectors.toList());
//获取非一级
Map<Long, List<TypeTreeVO>> collects = typeTreeVOS.stream().filter(item -> item.getPid() != null).collect(Collectors.groupingBy(TypeTreeVO :: getPid));
Map<Long, List<TypeTreeVO>> collects = typeTreeVOS.stream().filter(item -> item.getPid() != null).collect(Collectors.groupingBy(TypeTreeVO::getPid));
return typeTreeVOS.stream().peek(e -> {e.setChilds(collects.get(e.getKey())); e.setHaschild(collects.get(e.getKey()) != null && collects.get(e.getKey()).size() > 0);
}).filter(item -> item.getPid() == null).collect(Collectors.toList());
return typeTreeVOS.stream().peek(e -> {
e.setChilds(collects.get(e.getKey()));
e.setHaschild(collects.get(e.getKey()) != null && collects.get(e.getKey()).size() > 0);
}).filter(item -> item.getPid() == null).collect(Collectors.toList());
}
@ -76,7 +78,7 @@ public class ExtendGroupBO {
break;
}
if (extendGroupPO.getId() < 0) {
if (extendGroupPO.getIsSystemDefault() == 0) {
} else if (null == extendGroupPO.getPid()) {
tableName += "EXT";

2
src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
View File

@ -108,6 +108,8 @@ public class ExtendInfoBO {
.browserShow(1)
.customValue(infoFieldParam.getFieldType().toString())
.showOrder(showOrder)
// 非系统初始化字段
.isSystemDefault(1)
.creator((long) user.getUID())
.deleteType(0)
.createTime(new Date())

2
src/com/engine/organization/entity/extend/po/ExtendGroupPO.java
View File

@ -42,7 +42,7 @@ public class ExtendGroupPO {
private Integer showOrder;
private Integer systemGroup;
private Integer isSystemDefault;
private Long creator;
private int deleteType;

2
src/com/engine/organization/entity/extend/po/ExtendInfoPO.java
View File

@ -109,7 +109,7 @@ public class ExtendInfoPO {
*/
private Integer showOrder;
private Integer systemColumn;
private Integer isSystemDefault;
private Long creator;
private int deleteType;

2
src/com/engine/organization/entity/extend/po/ExtendTitlePO.java
View File

@ -41,7 +41,7 @@ public class ExtendTitlePO {
*/
private String isShow;
private Integer systemDefault;
private Integer isSystemDefault;
private Long creator;
private Integer deleteType;

14
src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml
View File

@ -5,6 +5,7 @@
<result column="id" property="id"/>
<result column="extend_type" property="extendType"/>
<result column="group_name" property="groupName"/>
<result column="is_system_default" property="isSystemDefault"/>
<result column="creator" property="creator"/>
<result column="delete_type" property="deleteType"/>
<result column="create_time" property="createTime"/>
@ -19,6 +20,7 @@
, t.pid
, t.extend_type
, t.group_name
, t.is_system_default
, t.creator
, t.delete_type
, t.create_time
@ -97,6 +99,9 @@
<if test="isShow != null ">
is_show,
</if>
<if test="isSystemDefault != null ">
is_system_default,
</if>
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="creator != null">
@ -123,10 +128,13 @@
<if test="isShow != null ">
#{isShow},
</if>
<if test="isSystemDefault != null ">
#{isSystemDefault},
</if>
</trim>
</insert>
<update id="update" >
<update id="update">
update jcl_field_extendgroup
<set>
group_name=#{name},
@ -134,7 +142,7 @@
WHERE id = #{id} AND delete_type = 0
</update>
<delete id="delete" >
<delete id="delete">
update jcl_field_extendgroup
<set>
delete_type=1,
@ -142,7 +150,7 @@
WHERE id = #{id} AND delete_type = 0
</delete>
<update id="updateNameAndOrder" >
<update id="updateNameAndOrder">
update jcl_field_extendgroup
<set>
group_name=#{groupName},

8
src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml
View File

@ -20,6 +20,7 @@
<result column="browser_show" property="browserShow"/>
<result column="custom_value" property="customValue"/>
<result column="show_order" property="showOrder"/>
<result column="is_system_default" property="isSystemDefault"/>
<result column="creator" property="creator"/>
<result column="delete_type" property="deleteType"/>
<result column="create_time" property="createTime"/>
@ -48,6 +49,7 @@
, t.browser_show
, t.custom_value
, t.show_order
, t.is_system_default
, t.creator
, t.delete_type
, t.create_time
@ -121,6 +123,9 @@
<if test="showOrder != null ">
show_order,
</if>
<if test="isSystemDefault != null ">
is_system_default,
</if>
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="creator != null">
@ -186,6 +191,9 @@
<if test="showOrder != null ">
#{showOrder},
</if>
<if test="isSystemDefault != null ">
#{isSystemDefault},
</if>
</trim>
</insert>
<update id="addTableColumn">

8
src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml
View File

@ -7,6 +7,7 @@
<result column="title" property="title"/>
<result column="show_order" property="showOrder"/>
<result column="is_show" property="isShow"/>
<result column="is_system_default" property="isSystemDefault"/>
<result column="creator" property="creator"/>
<result column="delete_type" property="deleteType"/>
<result column="create_time" property="createTime"/>
@ -22,6 +23,7 @@
, t.title
, t.show_order
, t.is_show
, t.is_system_default
, t.creator
, t.delete_type
, t.create_time
@ -57,6 +59,9 @@
<if test="isShow != null ">
is_show,
</if>
<if test="isSystemDefault != null ">
is_system_default,
</if>
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="creator != null">
@ -84,6 +89,9 @@
<if test="isShow != null ">
#{isShow},
</if>
<if test="isSystemDefault != null ">
#{isSystemDefault},
</if>
</trim>
</insert>
<update id="updateExtendTitle" parameterType="com.engine.organization.entity.extend.po.ExtendTitlePO">

22
src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
View File

@ -76,7 +76,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
tab.put("title", extendTitle.getTitle());
tab.put("isShow", extendTitle.getIsShow());
tab.put("groupid", extendTitle.getId());
tab.put("viewAttr", extendTitle.getGroupId() < 0 ? 1 : 2);
tab.put("viewAttr", extendTitle.getIsSystemDefault() == 0 ? 1 : 2);
tab.put("editable", getExtendInfoMapper().countFieldsByGroupId(tableName, extendTitle.getId()) == 0);
tabs.add(tab);
}
@ -113,6 +113,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
// 获取操作表最大id,生成字段名
Long maxId = getExtendInfoMapper().getMaxId();
extendInfo.setFieldName("field" + (maxId + 1));
extendInfo.setIsSystemDefault(1);
updateCount += getExtendInfoMapper().insertExtendInfo(extendInfo);
// 新增表结构
getExtendInfoMapper().addTableColumn(extendInfo.getTableName(), extendInfo.getFieldName(), extendInfo.getFieldType());
@ -152,6 +153,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
}
if (null == extendTitle.getId()) {
extendTitle.setIsSystemDefault(1);
extendTitle.setCreator((long) user.getUID());
extendTitle.setCreateTime(new Date());
extendTitle.setDeleteType(0);
@ -185,6 +187,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
extendTitle.setCreator((long) user.getUID());
extendTitle.setCreateTime(new Date());
extendTitle.setDeleteType(0);
extendTitle.setIsSystemDefault(1);
getExtendTitleMapper().insertIgnoreNull(extendTitle);
ids.add(extendTitle.getId());
@ -244,9 +247,8 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
String fieldIdRowKey;
int showOrder = extendInfoPO.getShowOrder();
boolean isUsed = false;
// TODO 去除脏数据后调整为extendInfoPO.getId() > 0
// 系统字段id<0
boolean isSysField = extendInfoPO.getExtendGroupId() < 0;
// 是否为系统字段
boolean isSysField = extendInfoPO.getIsSystemDefault() == 0;
if (isSysField) {
fieldIdRowKey = fieldId + "_hrm";
} else {
@ -255,9 +257,6 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
if (!isSysField) {
isUsed = ExtendInfoBO.fieldIsUsed(extendInfoPO.getTableName(), extendInfoPO.getFieldName());
}
// TODO 去除脏数据后调整为extendInfoPO.getId() > 0
boolean allowHide = extendInfoPO.getExtendGroupId() > 0;
boolean allowModify = extendInfoPO.getExtendGroupId() > 0;
BrowserComInfo BrowserComInfo = new BrowserComInfo();
List<Object> fieldTypeObj = new ArrayList<>();
@ -355,9 +354,9 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
//允许个人修改字段check框属性
Map<String, Object> checkPropsModifyInfo = new HashMap<>();
checkPropsEnableInfo.put("viewAttr", allowHide ? 2 : 1);
checkPropsModifyInfo.put("viewAttr", allowModify ? 2 : 1);
checkPropsRequiredInfo.put("viewAttr", allowHide ? 2 : 1);
checkPropsEnableInfo.put("viewAttr", !isSysField ? 2 : 1);
checkPropsModifyInfo.put("viewAttr", !isSysField ? 2 : 1);
checkPropsRequiredInfo.put("viewAttr", !isSysField ? 2 : 1);
checkPropsInfo.put("enable", checkPropsEnableInfo);
checkPropsInfo.put("required", checkPropsRequiredInfo);
@ -454,6 +453,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
e.setPid(fieldTypeTreeParam.getParentId());
e.setIsShow(fieldTypeTreeParam.getIsShow());
e.setShowOrder(showOrder + 1);
e.setIsSystemDefault(1);
e.setCreator((long) user.getUID());
e.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue());
e.setCreateTime(new Date());
@ -501,6 +501,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
.title(extendGroupPO.getGroupName())
.showOrder(++max)
.isShow("1")
.isSystemDefault(1)
.creator((long) user.getUID())
.deleteType(DeleteTypeEnum.NOT_DELETED.getValue())
.createTime(new Date())
@ -513,6 +514,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
.extendType(moduleTypeEnum.getValue())
.groupName(fieldTypeTreeParam.getName())
.showOrder(++max)
.isSystemDefault(1)
.creator((long) user.getUID())
.deleteType(DeleteTypeEnum.NOT_DELETED.getValue())
.createTime(new Date())

8
src/com/engine/organization/web/FieldDefinedController.java
View File

@ -154,12 +154,12 @@ public class FieldDefinedController {
@Path("/{moduleTypeEnum}/saveFields")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult saveFields(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) {
try {
//try {
User user = HrmUserVarify.getUser(request, response);
return ReturnResult.successed(getFieldDefinedWrapper(user).saveFields(param.getData()));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e.getMessage());
}
//} catch (Exception e) {
// return ReturnResult.exceptionHandle(e.getMessage());
//}
}
@GET