Pre Merge pull request !217 from reset/feature/cl
Gitee
commit
d43511fa69
@ -0,0 +1,28 @@
|
||||
update jcl_field_extendinfo set isrequired = 1 where table_name ='JCL_ORG_JOB' and field_name ='job_name';
|
||||
update jcl_field_extendinfo set isrequired = 1 where table_name ='JCL_ORG_JOB' and field_name ='ec_company';
|
||||
update jcl_field_extendinfo set custom_value='["browser",{"valueSpan":"行业","replaceDatas":[{"itemorderid":"63","name":"行业","id":"63","parenttitle":"客户","title":"客户-行业"}],"value":"63"}]' where table_name ='JCL_ORG_COMP' and field_name='industry' ;
|
||||
update jcl_field_extendinfo set custom_value='["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]' where table_name ='JCL_ORG_COMP' and field_name='comp_principal' ;
|
||||
update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_COMP' and field_name='description' ;
|
||||
update jcl_field_extendinfo set custom_value='["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]' where table_name ='JCL_ORG_DEPT' and field_name='dept_principal' ;
|
||||
update jcl_field_extendinfo set custom_value='["input","int"]' where table_name ='JCL_ORG_DEPT' and field_name='show_order' ;
|
||||
update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_DEPT' and field_name='description' ;
|
||||
update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_JOB' and field_name='description' ;
|
||||
update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_JOB' and field_name='work_duty' ;
|
||||
update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_JOB' and field_name='work_authority';
|
||||
update jcl_field_extendinfo set browser_type='666', custom_value='["browser",{"valueSpan":"聚才林岗位","replaceDatas":[{"itemorderid":"0","name":"聚才林岗位","id":"666","parenttitle":"资产","title":"资产-聚才林岗位"}],"value":"666"}]' where table_name ='JCL_ORG_JOB' and field_name='parent_job';
|
||||
|
||||
|
||||
delete from SystemRightDetail where rightid =2714;
|
||||
delete from SystemRightsLanguage where id =2714;
|
||||
delete from SystemRights where id =2714;
|
||||
delete from SystemRightToGroup where rightid =2714;
|
||||
delete from SystemRightType where id =37;
|
||||
delete from SystemRightGroups where id =-23;
|
||||
insert into SystemRights (id,rightdesc,righttype,detachable) values (2714,'组织数据导入','37',0);
|
||||
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2714,8,'Organization data import','Organization data import');
|
||||
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2714,9,'組織數據導入','組織數據導入');
|
||||
insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2714,7,'组织数据导入','组织数据导入');
|
||||
insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (43998,'组织数据导入权限','DataImport:All',2714);
|
||||
insert into SystemRightToGroup(rightid,groupid) values (2714,-23);
|
||||
insert into SystemRightGroups (id,rightgroupmark, rightgroupname, rightgroupremark) values(-23,'ORGANIZATION','组织管理权限组','组织管理');
|
||||
insert into SystemRightType(id,rightTypeName,rightTypeDesc) VALUES (37,'组织管理','组织管理');
|
||||
@ -0,0 +1,13 @@
|
||||
package com.api.organization.web;
|
||||
|
||||
import javax.ws.rs.Path;
|
||||
|
||||
/**
|
||||
* @Author weaver_cl
|
||||
* @Description:
|
||||
* @Date 2022/8/23
|
||||
* @Version V1.0
|
||||
**/
|
||||
@Path("/bs/hrmorganization/resourceBasicInfo")
|
||||
public class ResourceBasicInfoController extends com.engine.organization.web.ResourceBasicInfoController{
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package com.engine.organization.entity.hrmresource.po;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Author weaver_cl
|
||||
* @Description:
|
||||
* @Date 2022/8/24
|
||||
* @Version V1.0
|
||||
**/
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ResourceItemClassPO {
|
||||
|
||||
private Integer fid;
|
||||
|
||||
private String fno;
|
||||
|
||||
private String fname;
|
||||
|
||||
private String fmemo;
|
||||
|
||||
private Long creator;
|
||||
private Date createTime;
|
||||
private Date updateTime;
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package com.engine.organization.entity.hrmresource.po;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Author weaver_cl
|
||||
* @Description:
|
||||
* @Date 2022/8/24
|
||||
* @Version V1.0
|
||||
**/
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ResourceItemPO {
|
||||
|
||||
private Integer fid;
|
||||
|
||||
private Integer fclassid;
|
||||
|
||||
private String fno;
|
||||
|
||||
private String fname;
|
||||
|
||||
private String fmemo;
|
||||
|
||||
private Integer fdelete;
|
||||
|
||||
private Long creator;
|
||||
private Date createTime;
|
||||
private Date updateTime;
|
||||
}
|
||||
@ -0,0 +1,77 @@
|
||||
package com.engine.organization.entity.hrmresource.vo;
|
||||
|
||||
import com.cloudstore.eccom.pc.table.WeaTableType;
|
||||
import com.engine.organization.annotation.OperatePopedom;
|
||||
import com.engine.organization.annotation.OrganizationTable;
|
||||
import com.engine.organization.annotation.OrganizationTableColumn;
|
||||
import com.engine.organization.annotation.OrganizationTableOperate;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @Author weaver_cl
|
||||
* @Description:
|
||||
* @Date 2022/8/23
|
||||
* @Version V1.0
|
||||
**/
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@OrganizationTable(pageId = "516e81fb-65d4-4010-b916-9f6ab337b199",
|
||||
fields = "t.fid," +
|
||||
"t.fno," +
|
||||
"t.fname," +
|
||||
"t.fmemo,"+
|
||||
"t.fdelete",
|
||||
fromSql = "FROM jcl_org_item t ",
|
||||
orderby = "fno",
|
||||
sortway = "asc",
|
||||
primarykey = "fid",
|
||||
operates = {
|
||||
@OrganizationTableOperate(index = "0", text = "编辑"),
|
||||
@OrganizationTableOperate(index = "1", text = "删除"),
|
||||
@OrganizationTableOperate(index = "2", text = "恢复")
|
||||
},
|
||||
tableType = WeaTableType.CHECKBOX,
|
||||
operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatResourceOperates", otherpara = "column:fdelete"
|
||||
)
|
||||
|
||||
|
||||
)
|
||||
public class ResourceBasicInfoVO {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@OrganizationTableColumn(column = "fid", display = false)
|
||||
private Integer fId;
|
||||
|
||||
|
||||
/**
|
||||
* 编号
|
||||
*/
|
||||
@OrganizationTableColumn(text = "编号", width = "20%", column = "fno", orderkey = "fno")
|
||||
private String fNo;
|
||||
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
@OrganizationTableColumn(text = "名称", width = "20%", column = "fname")
|
||||
private String fName;
|
||||
|
||||
/**
|
||||
* 说明
|
||||
*/
|
||||
@OrganizationTableColumn(text = "说明", width = "20%", column = "fmemo")
|
||||
private String fMemo;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@OrganizationTableColumn(text = "状态", width = "20%", column = "fdelete")
|
||||
private String fDelete;
|
||||
}
|
||||
@ -0,0 +1,291 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="com.engine.organization.mapper.hrmresource.ResourceBasicInfoMapper">
|
||||
|
||||
<resultMap id="ItemResultMap" type="com.engine.organization.entity.hrmresource.po.ResourceItemPO">
|
||||
<result column="fid" property="fid"/>
|
||||
<result column="fclassid" property="fclassid"/>
|
||||
<result column="fno" property="fno"/>
|
||||
<result column="fname" property="fname"/>
|
||||
<result column="fmemo" property="fmemo"/>
|
||||
<result column="fdelete" property="fdelete"/>
|
||||
</resultMap>
|
||||
<resultMap id="ItemClassResultMap" type="com.engine.organization.entity.hrmresource.po.ResourceItemClassPO">
|
||||
<result column="fid" property="fid"/>
|
||||
<result column="fno" property="fno"/>
|
||||
<result column="fname" property="fname"/>
|
||||
<result column="fmemo" property="fmemo"/>
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="TreeResultMap" type="com.engine.organization.entity.TreeData">
|
||||
<result column="fid" property="key"/>
|
||||
<result column="fname" property="title"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="getTreeData" resultMap="TreeResultMap">
|
||||
select fid, fname
|
||||
from jcl_org_itemclass
|
||||
</select>
|
||||
|
||||
<select id="browserDatas" resultType="java.util.Map">
|
||||
select
|
||||
fid as `id`,
|
||||
fname as `name`
|
||||
from jcl_org_itemclass
|
||||
where fid IN
|
||||
<foreach collection="ids" open="(" item="id" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</select>
|
||||
|
||||
|
||||
<select id="getResourceItemByFid" resultType="com.engine.organization.entity.hrmresource.po.ResourceItemPO">
|
||||
select fid,
|
||||
fclassid,
|
||||
fno,
|
||||
fname,
|
||||
fmemo,
|
||||
fdelete,
|
||||
creator,
|
||||
create_time,
|
||||
update_time
|
||||
from jcl_org_item
|
||||
where fdelete = 0
|
||||
and fid = #{fid}
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectItemByIds" resultMap="ItemResultMap">
|
||||
select fid,fclassid,fno,fname,fmemo,fdelete,creator,create_time,update_time
|
||||
from jcl_org_item
|
||||
where fdelete = 0
|
||||
AND fid IN
|
||||
<foreach collection="ids" open="(" item="id" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectItemByFNo" resultMap="ItemResultMap">
|
||||
select fid,
|
||||
fclassid,
|
||||
fno,
|
||||
fname,
|
||||
fmemo,
|
||||
fdelete,
|
||||
creator,
|
||||
create_time,
|
||||
update_time
|
||||
from jcl_org_item
|
||||
where fno = #{fno}
|
||||
and fclassid = #{fclassid}
|
||||
</select>
|
||||
|
||||
<update id="deleteByIds">
|
||||
UPDATE jcl_org_item
|
||||
SET fdelete = 1
|
||||
WHERE fdelete = 0
|
||||
AND fid IN
|
||||
<foreach collection="ids" open="(" item="id" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
|
||||
<update id="recoverByIds">
|
||||
UPDATE jcl_org_item
|
||||
SET fdelete = 0
|
||||
WHERE fdelete = 1
|
||||
AND fid IN
|
||||
<foreach collection="ids" open="(" item="id" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
|
||||
<insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.hrmresource.po.ResourceItemPO"
|
||||
keyProperty="fid"
|
||||
keyColumn="fid" useGeneratedKeys="true">
|
||||
INSERT INTO jcl_org_item
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="fclassid != null">
|
||||
fclassid,
|
||||
</if>
|
||||
<if test="fno != null">
|
||||
fno,
|
||||
</if>
|
||||
<if test="fname != null">
|
||||
fname,
|
||||
</if>
|
||||
<if test="fmemo != null">
|
||||
fmemo,
|
||||
</if>
|
||||
<if test="fdelete != null">
|
||||
fdelete,
|
||||
</if>
|
||||
<if test="creator != null">
|
||||
creator,
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
create_time,
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
update_time,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
|
||||
<if test="fclassid != null">
|
||||
#{fclassid},
|
||||
</if>
|
||||
<if test="fno != null">
|
||||
#{fno},
|
||||
</if>
|
||||
<if test="fname != null">
|
||||
#{fname},
|
||||
</if>
|
||||
<if test="fmemo != null">
|
||||
#{fmemo},
|
||||
</if>
|
||||
<if test="fdelete != null">
|
||||
#{fdelete},
|
||||
</if>
|
||||
<if test="creator != null">
|
||||
#{creator},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
#{createTime},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
#{updateTime},
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
||||
<!--oracle未处理-->
|
||||
<!--<insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.hrmresource.po.ResourceItemPO"-->
|
||||
<!--databaseId="oracle">-->
|
||||
<!--</insert>-->
|
||||
|
||||
<update id="update" parameterType="com.engine.organization.entity.hrmresource.po.ResourceItemPO">
|
||||
update jcl_org_item
|
||||
<set>
|
||||
fname=#{fname},
|
||||
fmemo=#{fmemo},
|
||||
update_time=#{updateTime},
|
||||
</set>
|
||||
WHERE fid = #{fid} AND fdelete = 0
|
||||
</update>
|
||||
|
||||
<select id="getResourceItemClassByFid" resultMap="ItemClassResultMap">
|
||||
select fid,
|
||||
fno,
|
||||
fname,
|
||||
fmemo,
|
||||
creator,
|
||||
create_time,
|
||||
update_time
|
||||
from jcl_org_itemclass
|
||||
where fid = #{fid}
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="saveResourceItemClass">
|
||||
INSERT INTO jcl_org_itemclass
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="fno != null">
|
||||
fno,
|
||||
</if>
|
||||
<if test="fname != null">
|
||||
fname,
|
||||
</if>
|
||||
<if test="fmemo != null">
|
||||
fmemo,
|
||||
</if>
|
||||
<if test="creator != null">
|
||||
creator,
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
create_time,
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
update_time,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
|
||||
<if test="fno != null">
|
||||
#{fno},
|
||||
</if>
|
||||
<if test="fname != null">
|
||||
#{fname},
|
||||
</if>
|
||||
<if test="fmemo != null">
|
||||
#{fmemo},
|
||||
</if>
|
||||
<if test="creator != null">
|
||||
#{creator},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
#{createTime},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
#{updateTime},
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<select id="selectItemClassByFNo" resultMap="ItemClassResultMap">
|
||||
select fid,
|
||||
fno,
|
||||
fname,
|
||||
fmemo,
|
||||
creator,
|
||||
create_time,
|
||||
update_time
|
||||
from jcl_org_itemclass
|
||||
where fno = #{fno}
|
||||
<if test=" fid !=null ">
|
||||
and fid != #{fid}
|
||||
</if>
|
||||
</select>
|
||||
<select id="getItemByClassId" resultMap="ItemResultMap">
|
||||
select fid,
|
||||
fclassid,
|
||||
fno,
|
||||
fname,
|
||||
fmemo,
|
||||
fdelete,
|
||||
creator,
|
||||
create_time,
|
||||
update_time
|
||||
from jcl_org_item
|
||||
where fclassid = #{fclassid}
|
||||
<if test="fdelete!=null">
|
||||
and fdelete = #{fdelete}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<update id="updateResourceItemClass">
|
||||
update jcl_org_itemclass
|
||||
<set>
|
||||
fname=#{fname},
|
||||
fmemo=#{fmemo},
|
||||
update_time=#{updateTime},
|
||||
</set>
|
||||
WHERE fid = #{fid}
|
||||
</update>
|
||||
|
||||
<delete id="deleteResourceItemClass">
|
||||
delete
|
||||
from jcl_org_itemclass
|
||||
where fid = #{fid}
|
||||
</delete>
|
||||
<delete id="deleteItemByIds">
|
||||
delete
|
||||
from jcl_org_item
|
||||
where fid IN
|
||||
<foreach collection="ids" open="(" item="id" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -0,0 +1,240 @@
|
||||
package com.engine.organization.service.impl;
|
||||
|
||||
import com.api.browser.bean.BrowserBean;
|
||||
import com.api.browser.bean.SearchConditionGroup;
|
||||
import com.api.browser.bean.SearchConditionItem;
|
||||
import com.cloudstore.eccom.result.WeaResultMsg;
|
||||
import com.engine.core.impl.Service;
|
||||
import com.engine.organization.component.OrganizationWeaTable;
|
||||
import com.engine.organization.entity.DeleteParam;
|
||||
import com.engine.organization.entity.TreeData;
|
||||
import com.engine.organization.entity.fieldset.vo.TypeTreeVO;
|
||||
import com.engine.organization.entity.hrmresource.po.ResourceItemClassPO;
|
||||
import com.engine.organization.entity.hrmresource.po.ResourceItemPO;
|
||||
import com.engine.organization.entity.hrmresource.vo.ResourceBasicInfoVO;
|
||||
import com.engine.organization.mapper.hrmresource.ResourceBasicInfoMapper;
|
||||
import com.engine.organization.service.ResourceBasicInfoService;
|
||||
import com.engine.organization.util.HasRightUtil;
|
||||
import com.engine.organization.util.OrganizationAssert;
|
||||
import com.engine.organization.util.OrganizationFormItemUtil;
|
||||
import com.engine.organization.util.db.DBType;
|
||||
import com.engine.organization.util.db.MapperProxyFactory;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import weaver.conn.RecordSet;
|
||||
import weaver.general.Util;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Author weaver_cl
|
||||
* @Description:
|
||||
* @Date 2022/8/23
|
||||
* @Version V1.0
|
||||
**/
|
||||
public class ResourceBasicInfoServiceImpl extends Service implements ResourceBasicInfoService {
|
||||
|
||||
private static final String RIGHT_NAME = "ResourceBasicInfo:All";
|
||||
|
||||
private ResourceBasicInfoMapper getResourceBasicInfoMapper() {
|
||||
return MapperProxyFactory.getProxy(ResourceBasicInfoMapper.class);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Map<String, Object> listPage(Map<String, Object> params) {
|
||||
Map<String, Object> resultMap = new HashMap<>();
|
||||
boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true);
|
||||
resultMap.put("hasRight", hasRight);
|
||||
if (!hasRight) {
|
||||
return resultMap;
|
||||
}
|
||||
OrganizationWeaTable<ResourceBasicInfoVO> table = new OrganizationWeaTable<>(user, ResourceBasicInfoVO.class);
|
||||
String sqlWhere = buildSqlWhere(params);
|
||||
table.setSqlwhere(sqlWhere);
|
||||
WeaResultMsg result = new WeaResultMsg(false);
|
||||
result.putAll(table.makeDataResult());
|
||||
result.success();
|
||||
resultMap.putAll(result.getResultMap());
|
||||
return resultMap;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<TypeTreeVO> getTreeData() {
|
||||
ArrayList<TreeData> treeDataList = getResourceBasicInfoMapper().getTreeData();
|
||||
TypeTreeVO build = TypeTreeVO.builder()
|
||||
.childs(treeDataList.stream().map(e ->
|
||||
TypeTreeVO.builder()
|
||||
.domid(e.getKey())
|
||||
.key(Long.parseLong(e.getKey()))
|
||||
.name(e.getTitle())
|
||||
.build()).collect(Collectors.toList()))
|
||||
.haschild(true)
|
||||
.domid("-1")
|
||||
.key(-1L)
|
||||
.name("全部类型").build();
|
||||
List<TypeTreeVO> typeTreeVOS = new ArrayList<>();
|
||||
typeTreeVOS.add(build);
|
||||
return typeTreeVOS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SearchConditionGroup> getForm(Map<String, Object> params) {
|
||||
|
||||
String id = Util.null2String(params.get("fid"));
|
||||
String fClassId = Util.null2String(params.get("fclassid"));
|
||||
List<SearchConditionItem> selectItems = new ArrayList<>();
|
||||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
SearchConditionItem resourceTypeItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "类型", "161", "fclassid", "resourceTypeBrowser");
|
||||
resourceTypeItem.setRules("required|string");
|
||||
if (StringUtils.isNotBlank(fClassId) && !"-1".equals(fClassId)) {
|
||||
BrowserBean browserBean = resourceTypeItem.getBrowserConditionParam();
|
||||
List<Map<String, Object>> maps = getResourceBasicInfoMapper().browserDatas(DeleteParam.builder().ids(fClassId).build().getIds());
|
||||
browserBean.setReplaceDatas(maps);
|
||||
resourceTypeItem.setBrowserConditionParam(browserBean);
|
||||
}
|
||||
|
||||
SearchConditionItem fNo = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "fno");
|
||||
fNo.setRules("required|string");
|
||||
SearchConditionItem fName = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "fname");
|
||||
fName.setRules("required|string");
|
||||
SearchConditionItem fMemo = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "说明", "fmemo");
|
||||
|
||||
if (StringUtils.isNotBlank(id)) {
|
||||
ResourceItemPO resourceItemPO = getResourceBasicInfoMapper().getResourceItemByFid(Integer.parseInt(id));
|
||||
OrganizationAssert.notNull(resourceItemPO, "选择的数据不存在");
|
||||
BrowserBean browserBean = resourceTypeItem.getBrowserConditionParam();
|
||||
List<Map<String, Object>> maps = getResourceBasicInfoMapper().browserDatas(DeleteParam.builder().ids(resourceItemPO.getFclassid().toString()).build().getIds());
|
||||
browserBean.setReplaceDatas(maps);
|
||||
resourceTypeItem.setBrowserConditionParam(browserBean);
|
||||
|
||||
fNo.setValue(resourceItemPO.getFno());
|
||||
fNo.setViewAttr(1);
|
||||
fName.setValue(resourceItemPO.getFname());
|
||||
fMemo.setValue(resourceItemPO.getFmemo());
|
||||
}
|
||||
|
||||
selectItems.add(resourceTypeItem);
|
||||
selectItems.add(fNo);
|
||||
selectItems.add(fName);
|
||||
selectItems.add(fMemo);
|
||||
addGroups.add(new SearchConditionGroup("基本信息", true, selectItems));
|
||||
return addGroups;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int deletByIds(Collection<Long> ids) {
|
||||
OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
|
||||
return getResourceBasicInfoMapper().deleteByIds(ids);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int recoverByIds(Collection<Long> ids) {
|
||||
OrganizationAssert.notEmpty(ids, "请选择要恢复的数据");
|
||||
return getResourceBasicInfoMapper().recoverByIds(ids);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int save(ResourceItemPO resourceItemPO) {
|
||||
List<ResourceItemPO> list = getResourceBasicInfoMapper().selectItemByFNo(resourceItemPO.getFno(), resourceItemPO.getFclassid());
|
||||
OrganizationAssert.isEmpty(list, "编号不允许重复");
|
||||
return getResourceBasicInfoMapper().insertIgnoreNull(resourceItemPO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceItemPO selectById(Integer fid) {
|
||||
return getResourceBasicInfoMapper().getResourceItemByFid(fid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int update(ResourceItemPO resourceItemPO) {
|
||||
return getResourceBasicInfoMapper().update(resourceItemPO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SearchConditionGroup> getItemClassForm(Map<String, Object> params) {
|
||||
String id = Util.null2String(params.get("fid"));
|
||||
List<SearchConditionItem> selectItems = new ArrayList<>();
|
||||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
SearchConditionItem fNo = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "fno");
|
||||
fNo.setRules("required|string");
|
||||
SearchConditionItem fName = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "fname");
|
||||
fName.setRules("required|string");
|
||||
SearchConditionItem fMemo = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "说明", "fmemo");
|
||||
|
||||
if (!"-1".equals(id) && StringUtils.isNotBlank(id)) {
|
||||
ResourceItemClassPO resourceItemClassPO = getResourceBasicInfoMapper().getResourceItemClassByFid(Integer.parseInt(id));
|
||||
OrganizationAssert.notNull(resourceItemClassPO, "选择的数据不存在");
|
||||
fNo.setValue(resourceItemClassPO.getFno());
|
||||
fNo.setViewAttr(1);
|
||||
fName.setValue(resourceItemClassPO.getFname());
|
||||
fMemo.setValue(resourceItemClassPO.getFmemo());
|
||||
}
|
||||
selectItems.add(fNo);
|
||||
selectItems.add(fName);
|
||||
selectItems.add(fMemo);
|
||||
addGroups.add(new SearchConditionGroup("基本信息", true, selectItems));
|
||||
return addGroups;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int saveResourceItemClass(ResourceItemClassPO itemClassPO) {
|
||||
List<ResourceItemClassPO> list = getResourceBasicInfoMapper().selectItemClassByFNo(itemClassPO.getFno(), null);
|
||||
OrganizationAssert.isEmpty(list, "编号不允许重复");
|
||||
itemClassPO.setCreator((long) user.getUID());
|
||||
itemClassPO.setCreateTime(new Date());
|
||||
return getResourceBasicInfoMapper().saveResourceItemClass(itemClassPO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int updateResourceItemClass(ResourceItemClassPO itemClassPO) {
|
||||
itemClassPO.setUpdateTime(new Date());
|
||||
return getResourceBasicInfoMapper().updateResourceItemClass(itemClassPO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int deleteResourceItemClass(Integer fid) {
|
||||
OrganizationAssert.notNull(fid, "选择的数据不存在");
|
||||
// 判断该分类下是否有数据
|
||||
List<ResourceItemPO> itemByClassId = getResourceBasicInfoMapper().getItemByClassId(fid, 0);
|
||||
OrganizationAssert.isTrue(CollectionUtils.isEmpty(itemByClassId), "当前分类下存在数据，无法删除");
|
||||
List<ResourceItemPO> deleteItems = getResourceBasicInfoMapper().getItemByClassId(fid, 1);
|
||||
// 级联删除已停用数据
|
||||
if (CollectionUtils.isNotEmpty(deleteItems)) {
|
||||
getResourceBasicInfoMapper().deleteItemByIds((deleteItems.stream().map(ResourceItemPO::getFid).collect(Collectors.toList())));
|
||||
}
|
||||
return getResourceBasicInfoMapper().deleteResourceItemClass(fid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SearchConditionGroup> getSearchCondition() {
|
||||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> conditionItems = new ArrayList<>();
|
||||
SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "fname");
|
||||
SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "fno");
|
||||
conditionItems.add(schemeNameCondition);
|
||||
conditionItems.add(schemeNoCondition);
|
||||
addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
|
||||
return addGroups;
|
||||
}
|
||||
|
||||
private String buildSqlWhere(Map<String, Object> params) {
|
||||
DBType dbType = DBType.get(new RecordSet().getDBType());
|
||||
String sqlWhere = " where 1 = 1 ";
|
||||
String fclassid = (String) params.get("fclassid");
|
||||
if (StringUtils.isNotBlank(fclassid) && !"-1".equals(fclassid)) {
|
||||
sqlWhere += " AND t.fclassid = '" + fclassid + "'";
|
||||
}
|
||||
String fno = (String) params.get("fno");
|
||||
if (StringUtils.isNotBlank(fno)) {
|
||||
sqlWhere += " AND t.fno = '" + fno + "'";
|
||||
}
|
||||
String fname = (String) params.get("fname");
|
||||
if (StringUtils.isNotBlank(fname)) {
|
||||
sqlWhere += " AND t.fname " + dbType.like(fname);
|
||||
}
|
||||
|
||||
return sqlWhere;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,199 @@
|
||||
package com.engine.organization.web;
|
||||
|
||||
import com.engine.common.util.ParamUtil;
|
||||
import com.engine.common.util.ServiceUtil;
|
||||
import com.engine.organization.entity.DeleteParam;
|
||||
import com.engine.organization.entity.hrmresource.po.ResourceItemClassPO;
|
||||
import com.engine.organization.entity.hrmresource.po.ResourceItemPO;
|
||||
import com.engine.organization.util.response.ReturnResult;
|
||||
import com.engine.organization.wrapper.ResourceBasicInfoWrapper;
|
||||
import io.swagger.v3.oas.annotations.parameters.RequestBody;
|
||||
import weaver.hrm.HrmUserVarify;
|
||||
import weaver.hrm.User;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.ws.rs.GET;
|
||||
import javax.ws.rs.POST;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.core.Context;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Author weaver_cl
|
||||
* @Description:
|
||||
* @Date 2022/8/23
|
||||
* @Version V1.0
|
||||
**/
|
||||
public class ResourceBasicInfoController {
|
||||
|
||||
private ResourceBasicInfoWrapper getResourceBasicInfoWrapper(User user) {
|
||||
return ServiceUtil.getService(ResourceBasicInfoWrapper.class, user);
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("/getHasRight")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
return ReturnResult.successed(getResourceBasicInfoWrapper(user).getHasRight());
|
||||
} catch (Exception e) {
|
||||
return ReturnResult.exceptionHandle(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GET
|
||||
@Path("/getTable")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public ReturnResult getResourceBasicInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
Map<String, Object> map = ParamUtil.request2Map(request);
|
||||
return ReturnResult.successed(getResourceBasicInfoWrapper(user).getResourceBasicInfo(map));
|
||||
} catch (Exception e) {
|
||||
return ReturnResult.exceptionHandle(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GET
|
||||
@Path("/getTreeData")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
return ReturnResult.successed(getResourceBasicInfoWrapper(user).getTreeData());
|
||||
} catch (Exception e) {
|
||||
return ReturnResult.exceptionHandle(e);
|
||||
}
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("/getForm")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public ReturnResult getForm(@Context HttpServletRequest request, @Context HttpServletResponse response) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
Map<String, Object> map = ParamUtil.request2Map(request);
|
||||
return ReturnResult.successed(getResourceBasicInfoWrapper(user).getForm(map));
|
||||
} catch (Exception e) {
|
||||
return ReturnResult.exceptionHandle(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@POST
|
||||
@Path("/delete")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public ReturnResult delete(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
return ReturnResult.successed(getResourceBasicInfoWrapper(user).deleteByIds(param.getIds()));
|
||||
} catch (Exception e) {
|
||||
return ReturnResult.exceptionHandle(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@POST
|
||||
@Path("/recover")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public ReturnResult recover(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
return ReturnResult.successed(getResourceBasicInfoWrapper(user).recoverByIds(param.getIds()));
|
||||
} catch (Exception e) {
|
||||
return ReturnResult.exceptionHandle(e);
|
||||
}
|
||||
}
|
||||
|
||||
@POST
|
||||
@Path("/save")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public ReturnResult save(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ResourceItemPO resourceItemPO) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
return ReturnResult.successed(getResourceBasicInfoWrapper(user).save(resourceItemPO));
|
||||
} catch (Exception e) {
|
||||
return ReturnResult.exceptionHandle(e);
|
||||
}
|
||||
}
|
||||
|
||||
@POST
|
||||
@Path("/update")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public ReturnResult update(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ResourceItemPO resourceItemPO) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
return ReturnResult.successed(getResourceBasicInfoWrapper(user).update(resourceItemPO));
|
||||
} catch (Exception e) {
|
||||
return ReturnResult.exceptionHandle(e);
|
||||
}
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("/getItemClassForm")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public ReturnResult getItemClassForm(@Context HttpServletRequest request, @Context HttpServletResponse response) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
Map<String, Object> map = ParamUtil.request2Map(request);
|
||||
return ReturnResult.successed(getResourceBasicInfoWrapper(user).getItemClassForm(map));
|
||||
} catch (Exception e) {
|
||||
return ReturnResult.exceptionHandle(e);
|
||||
}
|
||||
}
|
||||
|
||||
@POST
|
||||
@Path("/saveResourceItemClass")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public ReturnResult saveResourceItemClass(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ResourceItemClassPO resourceItemClassPO) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
return ReturnResult.successed(getResourceBasicInfoWrapper(user).saveResourceItemClass(resourceItemClassPO));
|
||||
} catch (Exception e) {
|
||||
return ReturnResult.exceptionHandle(e);
|
||||
}
|
||||
}
|
||||
|
||||
@POST
|
||||
@Path("/updateResourceItemClass")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public ReturnResult updateResourceItemClass(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ResourceItemClassPO resourceItemClassPO) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
return ReturnResult.successed(getResourceBasicInfoWrapper(user).updateResourceItemClass(resourceItemClassPO));
|
||||
} catch (Exception e) {
|
||||
return ReturnResult.exceptionHandle(e);
|
||||
}
|
||||
}
|
||||
|
||||
@POST
|
||||
@Path("/deleteResourceItemClass")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public ReturnResult deleteResourceItemClass(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Integer fid) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
return ReturnResult.successed(getResourceBasicInfoWrapper(user).deleteResourceItemClass(fid));
|
||||
} catch (Exception e) {
|
||||
return ReturnResult.exceptionHandle(e);
|
||||
}
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("/getSearchCondition")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
return ReturnResult.successed(getResourceBasicInfoWrapper(user).getSearchCondition());
|
||||
} catch (Exception e) {
|
||||
return ReturnResult.exceptionHandle(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,154 @@
|
||||
package com.engine.organization.wrapper;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.api.browser.bean.SearchConditionGroup;
|
||||
import com.engine.common.util.ServiceUtil;
|
||||
import com.engine.organization.annotation.Log;
|
||||
import com.engine.organization.entity.fieldset.vo.TypeTreeVO;
|
||||
import com.engine.organization.entity.hrmresource.po.ResourceItemClassPO;
|
||||
import com.engine.organization.entity.hrmresource.po.ResourceItemPO;
|
||||
import com.engine.organization.enums.DeleteTypeEnum;
|
||||
import com.engine.organization.enums.LogModuleNameEnum;
|
||||
import com.engine.organization.enums.OperateTypeEnum;
|
||||
import com.engine.organization.mapper.hrmresource.ResourceBasicInfoMapper;
|
||||
import com.engine.organization.service.ResourceBasicInfoService;
|
||||
import com.engine.organization.service.impl.ResourceBasicInfoServiceImpl;
|
||||
import com.engine.organization.util.MenuBtn;
|
||||
import com.engine.organization.util.OrganizationWrapper;
|
||||
import com.engine.organization.util.db.MapperProxyFactory;
|
||||
import weaver.hrm.User;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* @Author weaver_cl
|
||||
* @Description:
|
||||
* @Date 2022/8/23
|
||||
* @Version V1.0
|
||||
**/
|
||||
public class ResourceBasicInfoWrapper extends OrganizationWrapper {
|
||||
|
||||
private ResourceBasicInfoService getResourceBasicInfoService(User user) {
|
||||
return ServiceUtil.getService(ResourceBasicInfoServiceImpl.class, user);
|
||||
}
|
||||
|
||||
private ResourceBasicInfoMapper getResourceBasicInfoMapper() {
|
||||
return MapperProxyFactory.getProxy(ResourceBasicInfoMapper.class);
|
||||
}
|
||||
|
||||
public Map<String, Object> getResourceBasicInfo(Map<String, Object> params) {
|
||||
return getResourceBasicInfoService(user).listPage(params);
|
||||
}
|
||||
|
||||
public List<TypeTreeVO> getTreeData() {
|
||||
return getResourceBasicInfoService(user).getTreeData();
|
||||
}
|
||||
|
||||
|
||||
public List<SearchConditionGroup> getForm(Map<String, Object> params) {
|
||||
return getResourceBasicInfoService(user).getForm(params);
|
||||
}
|
||||
|
||||
public Map<String, Object> getHasRight() {
|
||||
Map<String, Object> btnDatas = new HashMap<>();
|
||||
ArrayList<MenuBtn> topMenuList = new ArrayList<>();
|
||||
ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
|
||||
// 新增
|
||||
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("addItemClass").menuIcon("icon-coms-New-Flow").menuName("新增类型").type("BTN_AddItemClass").build());
|
||||
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("editItemClass").menuIcon("icon-coms-edit").menuName("修改类型").type("BTN_EditItemClass").build());
|
||||
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("delItemClass").menuIcon("icon-coms-Delete").menuName("删除类型").type("BTN_DelItemClass").build());
|
||||
topMenuList.add(MenuBtn.topMenu_addNew());
|
||||
// 批量删除
|
||||
topMenuList.add(MenuBtn.topMenu_batchDelete());
|
||||
btnDatas.put("topMenu", topMenuList);
|
||||
// 新增
|
||||
rightMenuList.add(MenuBtn.rightMenu_addNew());
|
||||
// 日志
|
||||
rightMenuList.add(MenuBtn.rightMenu_btnLog());
|
||||
// 显示列定制
|
||||
rightMenuList.add(MenuBtn.rightMenu_btnColumn());
|
||||
btnDatas.put("rightMenu", rightMenuList);
|
||||
return btnDatas;
|
||||
}
|
||||
|
||||
@Log(operateType = OperateTypeEnum.DELETE, operateModule = LogModuleNameEnum.RESOURCE, operateDesc = "删除人员信息资料")
|
||||
public int deleteByIds(Collection<Long> ids) {
|
||||
List<ResourceItemPO> resourceItemPOS = getResourceBasicInfoMapper().selectItemByIds(ids);
|
||||
int result = getResourceBasicInfoService(user).deletByIds(ids);
|
||||
for (ResourceItemPO resourceItemPO : resourceItemPOS) {
|
||||
writeOperateLog(new Object() {
|
||||
}.getClass(), resourceItemPO.getFname(), JSON.toJSONString(ids), "删除人员信息资料");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@Log(operateType = OperateTypeEnum.RECOVER, operateModule = LogModuleNameEnum.RESOURCE, operateDesc = "恢复人员信息资料")
|
||||
public int recoverByIds(Collection<Long> ids) {
|
||||
List<ResourceItemPO> resourceItemPOS = getResourceBasicInfoMapper().selectItemByIds(ids);
|
||||
int result = getResourceBasicInfoService(user).recoverByIds(ids);
|
||||
for (ResourceItemPO resourceItemPO : resourceItemPOS) {
|
||||
writeOperateLog(new Object() {
|
||||
}.getClass(), resourceItemPO.getFname(), JSON.toJSONString(ids), "恢复人员信息资料");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Log(operateType = OperateTypeEnum.ADD, operateModule = LogModuleNameEnum.RESOURCE, operateDesc = "新增人员信息资料")
|
||||
public int save(ResourceItemPO resourceItemPO) {
|
||||
resourceItemPO.setCreateTime(new Date());
|
||||
resourceItemPO.setCreator((long) user.getUID());
|
||||
resourceItemPO.setFdelete(DeleteTypeEnum.NOT_DELETED.getValue());
|
||||
int result = getResourceBasicInfoService(user).save(resourceItemPO);
|
||||
writeOperateLog(new Object() {
|
||||
}.getClass(), resourceItemPO.getFname(), JSON.toJSONString(resourceItemPO), "新增人员信息资料");
|
||||
return result;
|
||||
}
|
||||
|
||||
@Log(operateType = OperateTypeEnum.UPDATE, operateModule = LogModuleNameEnum.RESOURCE, operateDesc = "更新人员信息资料")
|
||||
public int update(ResourceItemPO resourceItemPO) {
|
||||
resourceItemPO.setUpdateTime(new Date());
|
||||
ResourceItemPO resourceItem = getResourceBasicInfoService(user).selectById(resourceItemPO.getFid());
|
||||
int result = getResourceBasicInfoService(user).update(resourceItemPO);
|
||||
writeOperateLog(new Object() {
|
||||
}.getClass(), resourceItem.getFname(), JSON.toJSONString(resourceItemPO), resourceItem,
|
||||
getResourceBasicInfoService(user).selectById(resourceItemPO.getFid()));
|
||||
return result;
|
||||
}
|
||||
|
||||
public List<SearchConditionGroup> getItemClassForm(Map<String, Object> params) {
|
||||
return getResourceBasicInfoService(user).getItemClassForm(params);
|
||||
}
|
||||
|
||||
@Log(operateType = OperateTypeEnum.ADD, operateModule = LogModuleNameEnum.RESOURCE, operateDesc = "新增人员信息分类")
|
||||
public int saveResourceItemClass(ResourceItemClassPO resourceItemClassPO) {
|
||||
int result = getResourceBasicInfoService(user).saveResourceItemClass(resourceItemClassPO);
|
||||
writeOperateLog(new Object() {
|
||||
}.getClass(), resourceItemClassPO.getFname(), JSON.toJSONString(resourceItemClassPO), "新增人员信息分类");
|
||||
return result;
|
||||
}
|
||||
|
||||
@Log(operateType = OperateTypeEnum.UPDATE, operateModule = LogModuleNameEnum.RESOURCE, operateDesc = "更新人员信息分类")
|
||||
public int updateResourceItemClass(ResourceItemClassPO resourceItemClassPO) {
|
||||
ResourceItemClassPO resourceItemClass = getResourceBasicInfoMapper().getResourceItemClassByFid(resourceItemClassPO.getFid());
|
||||
int result = getResourceBasicInfoService(user).updateResourceItemClass(resourceItemClassPO);
|
||||
writeOperateLog(new Object() {
|
||||
}.getClass(), resourceItemClassPO.getFname(), JSON.toJSONString(resourceItemClassPO), resourceItemClass,
|
||||
getResourceBasicInfoMapper().getResourceItemClassByFid(resourceItemClassPO.getFid()));
|
||||
return result;
|
||||
}
|
||||
|
||||
@Log(operateType = OperateTypeEnum.DELETE, operateModule = LogModuleNameEnum.RESOURCE, operateDesc = "删除人员信息分类")
|
||||
public int deleteResourceItemClass(Integer fid) {
|
||||
ResourceItemClassPO resourceItemClass = getResourceBasicInfoMapper().getResourceItemClassByFid(fid);
|
||||
int result = getResourceBasicInfoService(user).deleteResourceItemClass(fid);
|
||||
writeOperateLog(new Object() {
|
||||
}.getClass(), resourceItemClass.getFname(), JSON.toJSONString(fid), "删除人员信息分类");
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public List<SearchConditionGroup> getSearchCondition() {
|
||||
return getResourceBasicInfoService(user).getSearchCondition();
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue