diff --git a/src/com/engine/organization/entity/hrmresource/po/ResourcePO.java b/src/com/engine/organization/entity/hrmresource/po/ResourcePO.java new file mode 100644 index 00000000..b55c8cdb --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/po/ResourcePO.java @@ -0,0 +1,29 @@ +package com.engine.organization.entity.hrmresource.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/12/15 + * @Version V1.0 + **/ + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ResourcePO { + + private Long id; + + private Integer subcompanyid1; + + private Integer departmentid; + + private Integer jobtitle; + +} diff --git a/src/com/engine/organization/mapper/job/JobMapper.java b/src/com/engine/organization/mapper/job/JobMapper.java index 3663058c..cb45b39e 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.java +++ b/src/com/engine/organization/mapper/job/JobMapper.java @@ -1,5 +1,6 @@ package com.engine.organization.mapper.job; +import com.engine.organization.entity.hrmresource.po.ResourcePO; import com.engine.organization.entity.job.dto.JobListDTO; import com.engine.organization.entity.job.po.JobPO; import org.apache.ibatis.annotations.Param; @@ -141,5 +142,5 @@ public interface JobMapper { int updateJobCompany(@Param("ids") Collection ids, @Param("parentCompany") Integer parentCompany, @Param("ecCompany") Integer ecCompany); - + int selectByConditions(@Param("resourcePO") ResourcePO resourcePO); } diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 3fa37c9f..6e268409 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -8,6 +8,7 @@ + @@ -104,6 +105,9 @@ ec_department, + + ec_jobTitle, + forbidden_tag, @@ -155,6 +159,9 @@ #{ecDepartment}, + + #{ecJobTitle}, + 0, @@ -214,6 +221,9 @@ ec_department, + + ec_jobTitle, + forbidden_tag, @@ -265,6 +275,9 @@ #{ecDepartment}, + + #{ecJobTitle}, + 0, @@ -450,6 +463,14 @@ select max(show_order) from jcl_org_job + + + + + + update jcl_org_job diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java new file mode 100644 index 00000000..61d85294 --- /dev/null +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java @@ -0,0 +1,16 @@ +package com.engine.organization.mapper.resource; + +import com.engine.organization.entity.hrmresource.po.ResourcePO; + +import java.util.List; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/12/15 + * @Version V1.0 + **/ +public interface HrmResourceMapper { + + List selectFilterDatas(); +} diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml new file mode 100644 index 00000000..438baad3 --- /dev/null +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + \ 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 index ac130ba5..3883e6fd 100644 --- a/src/com/engine/organization/mapper/resource/ResourceMapper.java +++ b/src/com/engine/organization/mapper/resource/ResourceMapper.java @@ -37,4 +37,6 @@ public interface ResourceMapper { * @return */ List getIdByKeyField(@Param("keyField") String keyField, @Param("keyFieldValue") String keyFieldValue); + + } diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index a426d0fc..e06337d5 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -20,6 +20,7 @@ import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.employee.vo.EmployeeTableVO; import com.engine.organization.entity.extend.po.ExtendTitlePO; +import com.engine.organization.entity.hrmresource.po.ResourcePO; import com.engine.organization.entity.job.bo.JobBO; import com.engine.organization.entity.job.dto.JobListDTO; import com.engine.organization.entity.job.param.JobMergeParam; @@ -28,6 +29,7 @@ import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.entity.scheme.po.GradePO; import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.entity.searchtree.SearchTreeParams; +import com.engine.organization.enums.DeleteTypeEnum; import com.engine.organization.exception.OrganizationRunTimeException; import com.engine.organization.mapper.codesetting.CodeRuleMapper; import com.engine.organization.mapper.comp.CompMapper; @@ -36,6 +38,8 @@ import com.engine.organization.mapper.extend.ExtDTMapper; import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.extend.ExtendTitleMapper; import com.engine.organization.mapper.job.JobMapper; +import com.engine.organization.mapper.resource.HrmResourceMapper; +import com.engine.organization.mapper.resource.ResourceMapper; import com.engine.organization.mapper.scheme.GradeMapper; import com.engine.organization.service.ExtService; import com.engine.organization.service.JobService; @@ -121,6 +125,10 @@ public class JobServiceImpl extends Service implements JobService { return ServiceUtil.getService(ExtServiceImpl.class, user); } + private HrmResourceMapper getHrmResourceMapper() { + return MapperProxyFactory.getProxy(HrmResourceMapper.class); + } + @@ -190,7 +198,7 @@ public class JobServiceImpl extends Service implements JobService { ArrayList rightMenuList = new ArrayList<>(); // 批量删除 topMenuList.add(MenuBtn.topMenu_batchDelete()); - topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName("新增").type("BTN_REFRESH").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName("刷新").type("BTN_REFRESH").build()); btnDatas.put("topMenu", topMenuList); // 日志 rightMenuList.add(MenuBtn.rightMenu_btnLog()); @@ -567,6 +575,26 @@ public class JobServiceImpl extends Service implements JobService { @Override public void refresh() { + //1.人员表查询 + List resourcePOS = getHrmResourceMapper().selectFilterDatas(); + //2.数据过滤 + //3.数据插入 + resourcePOS.forEach(resourcePO -> { + if (Objects.nonNull(resourcePO)) { + int count = getJobMapper().selectByConditions(resourcePO); + if (count == 0) { + JobPO jobPO = JobPO.builder() + .ecCompany(resourcePO.getSubcompanyid1()) + .ecDepartment(resourcePO.getDepartmentid()) + .ecJobTitle(resourcePO.getJobtitle()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .createTime(new Date()) + .updateTime(new Date()) + .build(); + getJobMapper().insertIgnoreNull(jobPO); + } + } + }); }