diff --git a/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java b/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java index 3546758a..4e4e7939 100644 --- a/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java +++ b/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java @@ -49,7 +49,7 @@ public class CardAccessVO { @OrganizationTableColumn(labelId = 547390, text = "所有人可见", width = "15%", column = "all_people") private Integer allPeople; - @OrganizationTableColumn(labelId = 547392, text = "上级可见", width = "15%", column = "superior") + @OrganizationTableColumn(labelId = 547391, text = "上级可见", width = "15%", column = "superior") private Integer superior; @OrganizationTableColumn(labelId = 547392, text = "所有上级可见", width = "15%", column = "all_superior") diff --git a/src/com/engine/organization/service/ChartService.java b/src/com/engine/organization/service/ChartService.java index be26495e..99b0f721 100644 --- a/src/com/engine/organization/service/ChartService.java +++ b/src/com/engine/organization/service/ChartService.java @@ -101,4 +101,13 @@ public interface ChartService { * @return: java.util.Map */ Map selectLabel(); + + /** + * @Description: 历史版本删除 + * @Author: liang.cheng + * @Date: 2024/8/1 4:30 PM + * @param: [] + * @return: java.util.Map + */ + Map versionDelete(Integer versionId); } diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index b3c3b360..5a361d0c 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -701,6 +701,32 @@ public class ChartServiceImpl extends Service implements ChartService { return labelData; } + @Override + public Map versionDelete(Integer versionId) { + + Map data = new HashMap<>(); + + + RecordSet rs = new RecordSet(); + //1.删除版本表 + rs.executeUpdate("delete from jcl_org_chartversion where id = ?",versionId); + + //2.删除历史分部表 + rs.executeUpdate("delete from jcl_chart_subcompany where versionid = ?",versionId); + + //3.删除历史部门表 + rs.executeUpdate("delete from jcl_chart_department where versionid = ?",versionId); + + //4.删除历史聚才林岗位表 + rs.executeUpdate("delete from jcl_chart_job where versionid = ?",versionId); + + //5.删除历史人员表 + rs.executeUpdate("delete from jcl_chart_resource where versionid = ?",versionId); + + data.put("versionId",versionId); + return data; + } + /** * 生成人数 * @param stp diff --git a/src/com/engine/organization/util/OrganizationDateUtil.java b/src/com/engine/organization/util/OrganizationDateUtil.java index da57c62d..30a4c961 100644 --- a/src/com/engine/organization/util/OrganizationDateUtil.java +++ b/src/com/engine/organization/util/OrganizationDateUtil.java @@ -11,6 +11,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.*; import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; import java.util.Calendar; import java.util.Date; import java.util.Objects; @@ -470,6 +471,62 @@ public class OrganizationDateUtil { return localDate; } + + /** + * 获取一个月后的日期 + * @param firstDate + * @return + */ + public static String getLastMonthDate(String firstDate) { + // 定义日期格式 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + String nextMonthDateString = ""; + + try { + LocalDate date = LocalDate.parse(firstDate, formatter); + LocalDate nextMonthDate = date.plusMonths(1); + nextMonthDateString = nextMonthDate.format(formatter); + + } catch (DateTimeParseException e) { + e.printStackTrace(); + } + return nextMonthDateString; + } + + /** + * 获取一年后的日期 + * @param firstDate + * @return + */ + public static String getLastYearDate(String firstDate) { + // 定义日期格式 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + String nextYearDateString = ""; + + try { + LocalDate date = LocalDate.parse(firstDate, formatter); + LocalDate nextYearDate = date.plusYears(1); + nextYearDateString = nextYearDate.format(formatter); + + } catch (DateTimeParseException e) { + e.printStackTrace(); + } + return nextYearDateString; + } + + + /** + * 格式化日期 + * @return + */ + public static String dateExample(LocalDate date) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd"); + return date.format(formatter); + } + + + + } diff --git a/src/com/engine/organization/web/OrgChartController.java b/src/com/engine/organization/web/OrgChartController.java index 42a17209..281bb548 100644 --- a/src/com/engine/organization/web/OrgChartController.java +++ b/src/com/engine/organization/web/OrgChartController.java @@ -12,10 +12,7 @@ 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.*; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import java.util.HashMap; @@ -100,6 +97,24 @@ public class OrgChartController { return JSONObject.toJSONString(apidatas); } + @GET + @Path("/versionDelete") + @Produces(MediaType.APPLICATION_JSON) + public String versionDelete(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam("versionId") Integer versionId) { + Map apidatas = new HashMap<>(4); + try { + User user = HrmUserVarify.getUser(request, response); + apidatas = getOrgChartWrapper(user).versionDelete(versionId); + apidatas.put("api_status", true); + } catch (Exception e) { + //异常处理 + e.printStackTrace(); + apidatas.put("api_status", false); + apidatas.put("api_errormsg", "catch exception : " + e.getMessage()); + } + return JSONObject.toJSONString(apidatas); + } + @GET @Path("/getSubCompanyTree") diff --git a/src/com/engine/organization/wrapper/OrgChartWrapper.java b/src/com/engine/organization/wrapper/OrgChartWrapper.java index d7d46c32..5346546a 100644 --- a/src/com/engine/organization/wrapper/OrgChartWrapper.java +++ b/src/com/engine/organization/wrapper/OrgChartWrapper.java @@ -94,4 +94,8 @@ public class OrgChartWrapper extends Service { public Map selectLabel() { return getChartService(user).selectLabel(); } + + public Map versionDelete(Integer versionId) { + return getChartService(user).versionDelete(versionId); + } }