diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java index 7a598cbd..f7477ffe 100644 --- a/src/com/api/browser/service/impl/JobBrowserService.java +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -19,15 +19,12 @@ import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; -import com.engine.organization.util.detach.DetachUtil; import com.engine.organization.util.tree.SearchTreeUtil; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import weaver.conn.RecordSet; import weaver.general.Util; import java.util.*; -import java.util.stream.Collectors; /** * @author:dxfeng @@ -127,11 +124,6 @@ public class JobBrowserService extends BrowserService { } } } - // 分权 - DetachUtil detachUtil = new DetachUtil(user.getUID()); - if (detachUtil.isDETACH()) { - sqlWhere += " AND t.parent_comp in (" + detachUtil.getJclRoleLevels() + ")"; - } return sqlWhere; } @@ -143,59 +135,26 @@ public class JobBrowserService extends BrowserService { */ private List getCurrentTreeNode(SearchTreeParams params) { // 分权 - DetachUtil detachUtil = new DetachUtil(user.getUID()); - List jclRoleLevelList; - if (StringUtils.isNotBlank(detachUtil.getJclRoleLevels())) { - jclRoleLevelList = Arrays.stream(detachUtil.getJclRoleLevels().split(",")).map(Long::parseLong).collect(Collectors.toList()); - }else{ - jclRoleLevelList = new ArrayList<>(); - } List treeNodes = new ArrayList<>(); if (StringUtils.isBlank(params.getId())) { // 集团总部 SearchTree topGroup = SearchTreeUtil.getTopGroup(); - if(detachUtil.isDETACH()&& StringUtils.isNotBlank(detachUtil.getJclRoleLevels())) { - topGroup.setIsParent(true); - }else{ - topGroup.setIsParent(false); - } + topGroup.setIsParent(true); treeNodes.add(topGroup); } else { // 分部存在下级的ID - List compHasSubs; - if (detachUtil.isDETACH()) { - if(CollectionUtils.isNotEmpty(jclRoleLevelList)) { - compHasSubs = MapperProxyFactory.getProxy(CompMapper.class).hasDetachSubs(jclRoleLevelList); - }else{ - compHasSubs = new ArrayList<>(); - } - } else { - compHasSubs = MapperProxyFactory.getProxy(CompMapper.class).hasSubs(); - } + List compHasSubs = MapperProxyFactory.getProxy(CompMapper.class).hasSubs(); // 部门存在下级的ID List hasSubDepartment = MapperProxyFactory.getProxy(DepartmentMapper.class).hasSubs(); if ("0".equals(params.getId())) { - List compList; - if (detachUtil.isDETACH()) { - if(CollectionUtils.isNotEmpty(jclRoleLevelList)) { - compList = MapperProxyFactory.getProxy(CompMapper.class).getCompsByIds(jclRoleLevelList); - detachUtil.filterCompanyList(compList); - }else{ - compList = new ArrayList<>(); - } - }else{ - compList = MapperProxyFactory.getProxy(CompMapper.class).listParent(); - } + List compList = MapperProxyFactory.getProxy(CompMapper.class).listParent(); // 获取顶层分部 compList.stream().sorted(Comparator.comparing(CompPO::getShowOrder)).forEach(item -> buildCompNodes(treeNodes, compHasSubs, item)); } else if ("1".equals(params.getType())) { // 当前节点下的元素 CompPO compBuild = CompPO.builder().parentCompany(Long.parseLong(params.getId())).forbiddenTag(0).deleteType(0).build(); List compList = MapperProxyFactory.getProxy(CompMapper.class).listByFilter(compBuild, "show_order"); - if (detachUtil.isDETACH()) { - detachUtil.filterCompanyList(compList); - } DepartmentPO departmentBuild = DepartmentPO.builder().parentComp(Long.parseLong(params.getId())).forbiddenTag(0).deleteType(0).build(); List departmentList = MapperProxyFactory.getProxy(DepartmentMapper.class).listByFilter(departmentBuild, "show_order"); compList.forEach(item -> buildCompNodes(treeNodes, compHasSubs, item)); diff --git a/src/com/api/organization/web/HrmResourceController.java b/src/com/api/organization/web/HrmResourceController.java deleted file mode 100644 index bcb62d46..00000000 --- a/src/com/api/organization/web/HrmResourceController.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.api.organization.web; - -import javax.ws.rs.Path; - -/** - * @author:dxfeng - * @createTime: 2022/06/21 - * @version: 1.0 - */ -@Path("/bs/hrmorganization/hrmresource") -public class HrmResourceController extends com.engine.organization.web.HrmResourceController{ -} diff --git a/src/com/api/organization/web/ManagerDetachController.java b/src/com/api/organization/web/ManagerDetachController.java deleted file mode 100644 index 9a985c6c..00000000 --- a/src/com/api/organization/web/ManagerDetachController.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.api.organization.web; - -import javax.ws.rs.Path; - -/** - * @Author weaver_cl - * @Description: - * @Date 2022/10/21 - * @Version V1.0 - **/ -@Path("/bs/hrmorganization/detach") -public class ManagerDetachController extends com.engine.organization.web.ManagerDetachController { -} diff --git a/src/com/api/organization/web/PersonnelCardController.java b/src/com/api/organization/web/PersonnelCardController.java deleted file mode 100644 index cde89535..00000000 --- a/src/com/api/organization/web/PersonnelCardController.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.api.organization.web; - -import javax.ws.rs.Path; - -/** - * @author:dxfeng - * @createTime: 2022/10/09 - * @version: 1.0 - */ -@Path("/bs/hrmorganization/personnelcard") -public class PersonnelCardController extends com.engine.organization.web.PersonnelCardController { -} diff --git a/src/com/engine/organization/entity/cusfielddata/po/CusFieldData.java b/src/com/engine/organization/entity/cusfielddata/po/CusFieldData.java new file mode 100644 index 00000000..617f349b --- /dev/null +++ b/src/com/engine/organization/entity/cusfielddata/po/CusFieldData.java @@ -0,0 +1,66 @@ +package com.engine.organization.entity.cusfielddata.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author:dxfeng + * @createTime: 2022/08/01 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class CusFieldData { + private Integer seqOrder; + private String scope; + private Long scopeId; + private Long id; + /** + * 职等职级字段，内容其实是职等树 + */ + private String field100001; + /** + * 担任岗位，内容其实是树id + */ + private String field100002; + /** + * 职务，内容是树id + */ + private String field100003; + /** + * 虚线上级 + */ + private String field100004; + /** + * 岗位序列 + */ + private String field100005; + /** + * 职等职级方案 + */ + private String field100006; + /** + * 职级 + */ + private String field100007; + /** + * 职等 + */ + private String field100008; + /** + * 职务类型 + */ + private String field100009; + /** + * 职务信息 + */ + private String field100010; + private String field100011; + private String field100012; + private String field100013; + private String field100014; +} diff --git a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java index dbe1d060..96895d8d 100644 --- a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java +++ b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java @@ -21,11 +21,11 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @OrganizationTable(pageId = "80e7830c-18e8-4e14-8241-18821195ef31", fields = "t.id," + - "t.last_name," + + "t.lastname," + "t.mobile," + - "t.company_start_date," + + "t.companystartdate," + "t.sex", - fromSql = "FROM jcl_org_hrmresource t ", + fromSql = "FROM hrmresource t ", orderby = "id", primarykey = "id", tableType = WeaTableType.NONE @@ -35,7 +35,7 @@ public class EmployeeTableVO { @OrganizationTableColumn(column = "id", display = false) private Long id; - @OrganizationTableColumn(text = "姓名", width = "25%", column = "last_name") + @OrganizationTableColumn(text = "姓名", width = "25%", column = "lastname") private String lastname; @OrganizationTableColumn(text = "性别", width = "25%", column = "sex",transmethod = "com.engine.organization.transmethod.JobTransMethod.getSexName") @@ -44,7 +44,7 @@ public class EmployeeTableVO { @OrganizationTableColumn(text = "手机", width = "25%", column = "mobile") private String mobile; - @OrganizationTableColumn(text = "入职日期", width = "25%", column = "company_start_date") + @OrganizationTableColumn(text = "入职日期", width = "25%", column = "companystartdate") private String companystartdate; diff --git a/src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java b/src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java deleted file mode 100644 index d8469773..00000000 --- a/src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java +++ /dev/null @@ -1,151 +0,0 @@ -package com.engine.organization.entity.hrmresource.po; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * @author:dxfeng - * @createTime: 2022/06/21 - * @version: 1.0 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class HrmResourcePO { - /** - * id - */ - private Long id; - - /** - * 编号 - */ - private String workCode; - - /** - * 姓名 - */ - private String lastName; - - /** - * 性别 - */ - private String sex; - - /** - * 账号类型 - */ - private Integer accountType; - - /** - * 主账号 - */ - private Long belongTo; - - /** - * 部门 - */ - private Long departmentId; - - /** - * 分部 - */ - private Long companyId; - - /** - * 职务 - */ - private Long jobActivity; - - /** - * 岗位 - */ - private Long jobTitle; - - /** - * 职等 - */ - private String jobLevel; - - /** - * 职务类别 - */ - private Long jobGroupId; - - /** - * 职责描述 - */ - private String jobActivityDesc; - - /** - * 状态 - */ - private Integer status; - - /** - * 照片 - */ - private String resourceImageId; - - /** - * 办公地点 - */ - private Integer locationId; - - /** - * 移动电话 - */ - private String mobile; - - /** - * 办公室电话 - */ - private String telephone; - - /** - * 电子邮件 - */ - private String email; - - private Long creator; - private int deleteType; - private Date createTime; - private Date updateTime; - - /** - * 入职日期 - */ - private String companyStartDate; - - /** - * 参加工作日期 - */ - private String workStartDate; - - /** - * 显示顺序 - */ - private Integer showOrder; - - private Long ecDepartment; - - private Long ecCompany; - - private String uuid; - - private String jobGrade; - - private String schemeId; - - private String sequenceId; - - private String baseFieldsValue; - - private String baseFields; - -} diff --git a/src/com/engine/organization/mapper/comp/CompMapper.xml b/src/com/engine/organization/mapper/comp/CompMapper.xml index 63e2fcf2..ad6b65d5 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.xml +++ b/src/com/engine/organization/mapper/comp/CompMapper.xml @@ -399,10 +399,6 @@ select company_id from JCL_ORG_STAFFPLAN where delete_type = 0 - union - select jcl_rolelevel - from jcl_org_detach - where delete_type = 0 - select max(id) - from jcl_org_hrmresource - - - + select t.lastname as lastname, d.departmentname as departmentname, c.subcompanyname as companyname, t.mobile, + t.telephone, t1.lastname as managername from hrmresource t left join hrmdepartment d on t.departmentid = d.id + left join hrmsubcompany c on t.subcompanyid1 = c.id left join hrmresource t1 on t.managerid = t1.id where 1 = 1 + + AND t.id IN + + #{id} + + - - - - - - - \ No newline at end of file diff --git a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java index 4e6353a6..9c07ff46 100644 --- a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java +++ b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java @@ -2,6 +2,7 @@ package com.engine.organization.mapper.hrmresource; import com.engine.organization.entity.commom.RecordInfo; +import com.engine.organization.entity.cusfielddata.po.CusFieldData; import com.engine.organization.entity.jclimport.po.CusFormFieldPO; import com.engine.organization.entity.jclimport.po.JclSelectItem; import org.apache.ibatis.annotations.Param; @@ -61,4 +62,10 @@ public interface SystemDataMapper { List getBatchUuidByIds(@Param("tableName") String tableName,@Param("ecIds") List ecIds); + CusFieldData getHrmCusFieldDataByIdAndScopeId(@Param("id") Long id, @Param("scopeId") Long scopeId); + + int insertCusFieldData(CusFieldData cusFieldData); + + int updateCusFieldData(CusFieldData cusFieldData); + } diff --git a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml index bf7783c0..a6eefa3c 100644 --- a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml +++ b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml @@ -154,9 +154,11 @@ from hrmresource + + + + update cus_fielddata + + field100001=#{field100001}, + field100002=#{field100002}, + field100003=#{field100003}, + field100008=#{field100008}, + field100006=#{field100006}, + field100007=#{field100007}, + field100005=#{field100005}, + field100010=#{field100010}, + field100009=#{field100009}, + + where scope = 'HrmCustomFieldByInfoType' + and id = #{id} + and scopeid = #{scopeId} + + + + insert into cus_fielddata(scope, scopeid, id) + values ('HrmCustomFieldByInfoType', #{scopeId}, #{id}) + \ No newline at end of file diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 12498ca0..12d050a2 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -468,8 +468,11 @@ from JCL_ORG_STAFF where delete_type = 0 union - select job_title - from jcl_org_hrmresource + select field100002 + from cus_fielddata + inner join + hrmresource on + cus_fielddata.ID = hrmresource.ID where STATUS < 4 diff --git a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.java b/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.java deleted file mode 100644 index 167e3844..00000000 --- a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.engine.organization.mapper.personnelcard; - -import com.engine.organization.entity.detach.po.ManagerDetachPO; -import com.engine.organization.entity.personnelcard.po.CardAccessPO; -import org.apache.ibatis.annotations.Param; - -import java.util.Collection; -import java.util.List; - -/** - * @Author weaver_cl - * @Description: - * @Date 2022/10/24 - * @Version V1.0 - **/ -public interface CardAccessMapper { - - int insertIgnoreNull(CardAccessPO cardAccessPO); - - int updateCardAccess(CardAccessPO cardAccessPO); - - int deleteByIds(@Param("ids") Collection ids); - - ManagerDetachPO selectById(@Param("id") Integer id); -} diff --git a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml b/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml deleted file mode 100644 index f7f00d9a..00000000 --- a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - t.id - , t.type_id - , t.type_name - , t.status - , t.all_people - , t.superior - , t.all_superior - , t.custom - , t.creator - , t.delete_type - , t.create_time - , t.update_time - - - - - - INSERT INTO jcl_org_cardaccess - - - type_id, - - - type_name, - - - status, - - - all_people, - - - superior, - - - all_superior, - - - custom, - - - creator, - - - delete_type, - - - create_time, - - - update_time, - - - - - #{typeId}, - - - #{typeName}, - - - #{status}, - - - #{allPeople}, - - - #{superior}, - - - #{allSuperior}, - - - #{creator}, - - - #{custom}, - - - #{deleteType}, - - - #{createTime}, - - - #{updateTime}, - - - - - - - select JCL_ORG_CARDACCESS_ID.currval from dual - - INSERT INTO jcl_org_cardaccess - - - type_id, - - - type_name, - - - status, - - - all_people, - - - superior, - - - all_superior, - - - custom, - - - creator, - - - delete_type, - - - create_time, - - - update_time, - - - - - #{typeId}, - - - #{typeName}, - - - #{status}, - - - #{allPeople}, - - - #{superior}, - - - #{allSuperior}, - - - #{creator}, - - - #{custom}, - - - #{deleteType}, - - - #{createTime}, - - - #{updateTime}, - - - - - - update jcl_org_cardaccess - - type_id=#{typeId}, - type_name=#{typeName}, - status=#{status}, - all_people=#{allPeople}, - all_superior=#{allSuperior}, - custom=#{custom}, - update_time=#{updateTime}, - - WHERE id = #{id} AND delete_type = 0 - - - - - UPDATE jcl_org_cardaccess - SET delete_type = 1 - WHERE delete_type = 0 - AND id IN - - #{id} - - - - - - - - \ No newline at end of file diff --git a/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.java b/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.java deleted file mode 100644 index 8671c926..00000000 --- a/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.engine.organization.mapper.personnelcard; - -import com.engine.organization.entity.personnelcard.ResourceBaseTab; -import com.engine.organization.entity.personnelcard.User; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author:dxfeng - * @createTime: 2022/10/08 - * @version: 1.0 - */ -public interface PersonnelCardMapper { - /** - * 获取人员卡片User对象 - * - * @param id - * @return - */ - User getUserById(@Param("id") Long id); - - /** - * 获取自定义显示栏目 - * @return - */ - List getResourceBaseTabList(); -} diff --git a/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml b/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml deleted file mode 100644 index 535c9bd6..00000000 --- a/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/com/engine/organization/mapper/resource/ResourceMapper.java b/src/com/engine/organization/mapper/resource/ResourceMapper.java deleted file mode 100644 index 1dfe0889..00000000 --- a/src/com/engine/organization/mapper/resource/ResourceMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.engine.organization.mapper.resource; - - -import com.engine.organization.entity.hrmresource.po.HrmResourcePO; -import com.engine.organization.entity.hrmresource.vo.HrmResourceVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Author weaver_cl - * @Description: - * @Date 2022/6/28 - * @Version V1.0 - **/ -public interface ResourceMapper { - - List listAll(@Param("ids")List ids); - - List listDetachAll(@Param("ids") List ids, @Param("companyIds") List companyIds); - - List getResourceListByJobId(@Param("jobId") Long jobId); - - int updateResourceJob(@Param("originalJobId") Long originalJobId, @Param("targetJobId") Long targetJobId, @Param("parentComp") Long parentComp, @Param("parentDept") Long parentDept, @Param("ecCompany") Long ecCompany, @Param("ecDepartment") Long ecDepartment); - - HrmResourcePO getResourceById(@Param("id") String id); - - List listByNo(@Param("workCode") String workCode); -} diff --git a/src/com/engine/organization/mapper/resource/ResourceMapper.xml b/src/com/engine/organization/mapper/resource/ResourceMapper.xml deleted file mode 100644 index d6410eba..00000000 --- a/src/com/engine/organization/mapper/resource/ResourceMapper.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - t.id,t.work_code,t.last_name,t.sex,t.status,t.account_type, - t.belong_to,t.ec_company,t.job_title,t.ec_department,t. - scheme_id,t.sequence_id,t.job_grade,t.job_level,t.job_group_id, - t.job_activity,t.location_id,t.show_order,t.company_start_date, - t.work_start_date,t.job_activity_desc,t.resource_image_id,t.mobile, - t.telephone,t.email,t.uuid - - - update jcl_org_hrmresource - - job_title = #{targetJobId}, - company_id = #{parentComp}, - department_id = #{parentDept}, - ec_company = #{ecCompany}, - ec_department = #{ecDepartment}, - - where delete_type = 0 and job_title =#{originalJobId} - - - - - - - - - - - AND t.last_name like CONCAT('%',#{param.lastName},'%') - - - - - AND t.last_name like '%'||#{param.lastName}||'%' - - - - - AND t.last_name like '%'+#{param.lastName}+'%' - - - - - \ No newline at end of file diff --git a/src/com/engine/organization/mapper/trigger/CompTriggerMapper.java b/src/com/engine/organization/mapper/trigger/CompTriggerMapper.java index 4ad23e77..2fa69782 100644 --- a/src/com/engine/organization/mapper/trigger/CompTriggerMapper.java +++ b/src/com/engine/organization/mapper/trigger/CompTriggerMapper.java @@ -1,7 +1,7 @@ package com.engine.organization.mapper.trigger; -import com.engine.organization.entity.hrmresource.po.HrmResourcePO; +import com.engine.organization.entity.cusfielddata.po.CusFieldData; import org.apache.ibatis.annotations.Param; import weaver.hrm.passwordprotection.domain.HrmResource; @@ -20,11 +20,11 @@ public interface CompTriggerMapper { String getJobTitleMarkById(@Param("id") Integer id); + CusFieldData getCusFieldDataById(@Param("id") Integer id); + Integer sumStaffNum(@Param("fdatebegin") Date fdatebegin, @Param("compId") Integer compId); int deleteMap(@Param("ftype") Integer ftype, @Param("fobjid") Integer fobjid, @Param("fdatebegin") Date fdatebegin); int updateMap(@Param("ftype") Integer ftype, @Param("fobjid") Integer fobjid, @Param("fdatebegin") Date fdatebegin, @Param("fdate") Date fdate); - - HrmResourcePO getResourceByEcId(@Param("ecId") Integer ecId); } diff --git a/src/com/engine/organization/mapper/trigger/CompTriggerMapper.xml b/src/com/engine/organization/mapper/trigger/CompTriggerMapper.xml index 7204e3cb..45d5839a 100644 --- a/src/com/engine/organization/mapper/trigger/CompTriggerMapper.xml +++ b/src/com/engine/organization/mapper/trigger/CompTriggerMapper.xml @@ -31,6 +31,13 @@ from hrmjobtitles where id = #{id} + - \ No newline at end of file diff --git a/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java b/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java index 2fb269fe..78e6b3dd 100644 --- a/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java +++ b/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java @@ -1,5 +1,6 @@ package com.engine.organization.mapper.trigger; +import com.engine.organization.entity.cusfielddata.po.CusFieldData; import org.apache.ibatis.annotations.Param; import weaver.hrm.passwordprotection.domain.HrmResource; @@ -14,6 +15,11 @@ import java.util.List; public interface HrmResourceTriggerMapper { HrmResource getHrmResource(@Param("id") Long id); + CusFieldData getCusFieldDataById(@Param("fObjId") Integer fObjId); + + String getField100002(@Param("fObjId") Integer fObjId); + + List getFidsByFleader(@Param("fLeader") String fLeader, @Param("currentDate") Date currentDate); int updateLeaders(@Param("currentDate") Date currentDate,@Param("fLeader") String fLeader, @Param("fLeaderImg") String fLeaderImg, @Param("fLeaderName") String fLeaderName, @Param("fLeaderJobId") Integer fLeaderJobId, @Param("fLeaderJob") String fLeaderJob, @Param("fLeaderLv") String fLeaderLv, @Param("fLeaderSt") String fLeaderSt); diff --git a/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.xml b/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.xml index cd09e5ac..711f8e30 100644 --- a/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.xml +++ b/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.xml @@ -20,6 +20,13 @@ from hrmresource where id = #{id} + + \ No newline at end of file diff --git a/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.xml b/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.xml index a74be740..1711e648 100644 --- a/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.xml +++ b/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.xml @@ -96,8 +96,11 @@ AND FDATEEND >= #{currentDate} \ No newline at end of file diff --git a/src/com/engine/organization/service/HrmPersonnelCardService.java b/src/com/engine/organization/service/HrmPersonnelCardService.java deleted file mode 100644 index f12888b1..00000000 --- a/src/com/engine/organization/service/HrmPersonnelCardService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.engine.organization.service; - -import com.engine.organization.entity.personnelcard.Iframe; - -import java.util.List; -import java.util.Map; - -/** - * @author:dxfeng - * @createTime: 2022/10/08 - * @version: 1.0 - */ -public interface HrmPersonnelCardService { - /** - * 获取人事卡片信息 - * - * @param uId - * @return - */ - Map getPersonnelCard(Long uId); - - /** - * 获取人事自定义显示栏目 - * - * @return - */ - List