diff --git a/src/com/engine/jclproduct/entity/po/DepartmentPo.java b/src/com/engine/jclproduct/entity/po/DepartmentPo.java new file mode 100644 index 0000000..a0e8add --- /dev/null +++ b/src/com/engine/jclproduct/entity/po/DepartmentPo.java @@ -0,0 +1,35 @@ +package com.engine.jclproduct.entity.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author liang.cheng + * @Date 2024/11/7 2:58 PM + * @Description: TODO + * @Version 1.0 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DepartmentPo { + + private Integer departmentId; + + private String departmentmark; + + private Integer subcompanyId; + + private Integer supdepId; + + private float showorder; + + private Integer canceled; + + private String departmentCode; + + private Integer bmfzr; +} diff --git a/src/com/engine/jclproduct/entity/po/SubCompanyPo.java b/src/com/engine/jclproduct/entity/po/SubCompanyPo.java new file mode 100644 index 0000000..7f28d4d --- /dev/null +++ b/src/com/engine/jclproduct/entity/po/SubCompanyPo.java @@ -0,0 +1,33 @@ +package com.engine.jclproduct.entity.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author liang.cheng + * @Date 2024/11/7 2:53 PM + * @Description: TODO + * @Version 1.0 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SubCompanyPo { + + private Integer subcompanyId; + + private String subcompanyName; + + private Integer companyId; + + private Integer supsubcomId; + + private float showorder; + + private Integer canceled; + + private String subcompanyCode; +} diff --git a/src/com/engine/jclproduct/service/EmploymentRecordService.java b/src/com/engine/jclproduct/service/EmploymentRecordService.java index 0ea2bed..7bf6052 100644 --- a/src/com/engine/jclproduct/service/EmploymentRecordService.java +++ b/src/com/engine/jclproduct/service/EmploymentRecordService.java @@ -18,4 +18,13 @@ public interface EmploymentRecordService { * @return: java.util.Map */ Map initPerson(); + + /** + * @Description: 初始化组织变动表 人员资源分部(部门)中间表 (只初始化一次) + * @Author: liang.cheng + * @Date: 2024/11/7 2:24 PM + * @param: [] + * @return: java.lang.Object + */ + Map initOrganization(); } diff --git a/src/com/engine/jclproduct/service/impl/EmploymentRecordServiceImpl.java b/src/com/engine/jclproduct/service/impl/EmploymentRecordServiceImpl.java index d30e2ee..26dc102 100644 --- a/src/com/engine/jclproduct/service/impl/EmploymentRecordServiceImpl.java +++ b/src/com/engine/jclproduct/service/impl/EmploymentRecordServiceImpl.java @@ -69,6 +69,30 @@ public class EmploymentRecordServiceImpl extends Service implements EmploymentRe return map; } + @Override + public Map initOrganization() { + Map map = new HashMap<>(); + //1.任职记录表初始化数据 只执行一次 + RecordSet rs = new RecordSet(); + rs.executeQuery("select count(1) as num from uf_orgChange"); + rs.next(); + int num = Util.getIntValue(rs.getString("num")); + if (num > 0) { + map.put("msg","组织变更记录表已经初始化,不可重复执行"); + return map; + } + + //1.人力资源分部中间表 + + + //2.人力资源部门中间表 + + + //3.组织变更记录表 + + + return map; + } } diff --git a/src/com/engine/jclproduct/utils/EmploymentUtil.java b/src/com/engine/jclproduct/utils/EmploymentUtil.java index 03003b4..9f79bf0 100644 --- a/src/com/engine/jclproduct/utils/EmploymentUtil.java +++ b/src/com/engine/jclproduct/utils/EmploymentUtil.java @@ -98,6 +98,8 @@ public class EmploymentUtil { } + + /** * 任职记录 各种状态下 相关变动日期记录 * @param recordPo diff --git a/src/com/engine/jclproduct/web/EmploymentRecordAction.java b/src/com/engine/jclproduct/web/EmploymentRecordAction.java index d62b2f5..b3b60a5 100644 --- a/src/com/engine/jclproduct/web/EmploymentRecordAction.java +++ b/src/com/engine/jclproduct/web/EmploymentRecordAction.java @@ -46,4 +46,20 @@ public class EmploymentRecordAction { } return JSONObject.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect); } + + @GET + @Path("/initOrganization") + @Produces(MediaType.TEXT_PLAIN) + public String initOrganization(@Context HttpServletRequest request, @Context HttpServletResponse response){ + Map data = new HashMap<>(8); + try { + User user = HrmUserVarify.getUser(request, response); + data.put("datas",getService(user).initOrganization()); + data.put("api_status", true); + } catch (Exception e) { + data.put("api_status", false); + data.put("msg", "catch exception : " + e.getMessage()); + } + return JSONObject.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect); + } }