bonus
/
gz_att
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

组织架构考勤规则修改二次提交

This commit is contained in:
fl 2024-12-02 19:26:56 +08:00
parent 425347b8ce
commit f71fd51557
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/OrgChangeController.java
View File

@ -32,7 +32,7 @@ public class OrgChangeController extends BaseController {
/**
* 获取组织架构列表
*/
@RequiresPermissions("att:org:change:list")
// @RequiresPermissions("att:org:change:list")
@GetMapping("/list")
@Log(title = "考勤设置->组织架构变更->列表查询", businessType = BusinessType.QUERY)
public TableDataInfo list(OrgChangeBean bean) {
@ -52,7 +52,7 @@ public class OrgChangeController extends BaseController {
/**
* 获取组织架构变更列表 - 人资
*/
@RequiresPermissions("att:org:change:list")
// @RequiresPermissions("att:org:change:list")
@GetMapping("/getAllList")
@Log(title = "考勤设置->组织架构变更->列表查询人资", businessType = BusinessType.QUERY)
public TableDataInfo getAllList(OrgChangeBean bean) {
@ -70,7 +70,7 @@ public class OrgChangeController extends BaseController {
/**
* 新增组织架构变更单
*/
@RequiresPermissions("att:org:change:add")
// @RequiresPermissions("att:org:change:add")
@PostMapping
@Log(title = "考勤设置->组织架构变更->组织架构新增", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody OrgChangeBean bean) {
@ -85,7 +85,7 @@ public class OrgChangeController extends BaseController {
/**
* 根据组织架构编号获取详细信息
*/
@RequiresPermissions("att:org:change:query")
// @RequiresPermissions("att:org:change:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable Long id) {
try{
@ -99,7 +99,7 @@ public class OrgChangeController extends BaseController {
/**
* 修改组织架构
*/
@RequiresPermissions("att:org:change:edit")
// @RequiresPermissions("att:org:change:edit")
@PutMapping
@Log(title = "考勤设置->组织架构变更->组织架构修改", businessType = BusinessType.UPDATE)
public AjaxResult edit(@RequestBody OrgChangeBean bean) {
@ -114,7 +114,7 @@ public class OrgChangeController extends BaseController {
/**
* 删除组织架构
*/
@RequiresPermissions("att:org:change:remove")
// @RequiresPermissions("att:org:change:remove")
@DeleteMapping("/{id}")
@Log(title = "考勤设置->组织架构变更->组织架构删除", businessType = BusinessType.DELETE)
public AjaxResult remove(@PathVariable("id") Long id) {
@ -129,7 +129,7 @@ public class OrgChangeController extends BaseController {
/**
* 提交/撤回 审核
*/
@RequiresPermissions("att:org:change:edit")
// @RequiresPermissions("att:org:change:edit")
@PutMapping("orgChangeCheck")
@Log(title = "考勤设置->组织架构变更->组织架构审核", businessType = BusinessType.UPDATE)
public AjaxResult orgChangeCheck(@Validated @RequestBody OrgChangeBean o) {
@ -144,7 +144,7 @@ public class OrgChangeController extends BaseController {
/**
* 获取考勤组
*/
@RequiresPermissions("att:org:change:edit")
// @RequiresPermissions("att:org:change:edit")
@PutMapping("getAttGroupList")
@Log(title = "考勤设置->组织架构变更->组织架构审核", businessType = BusinessType.UPDATE)
public AjaxResult getAttGroupList() {

12
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/OrgChangeBean.java
View File

@ -1,5 +1,6 @@
package com.bonus.system.att.entity;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.bonus.system.basic.domain.SysTree;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@ -19,6 +20,7 @@ public class OrgChangeBean {
/**
* 编号
*/
@Excel(name = "序号", width = 10.0,height = 20.0, orderNum = "0")
private Long id;
/**
@ -39,6 +41,7 @@ public class OrgChangeBean {
/**
* 变更前部门
*/
@Excel(name = "变更前部门", width = 10.0,height = 20.0, orderNum = "2")
private String oldOrgName;
/**
@ -49,11 +52,13 @@ public class OrgChangeBean {
/**
* 变更后部门
*/
@Excel(name = "变更后部门", width = 10.0,height = 20.0, orderNum = "3")
private String newOrgName;
/**
* 是否变更考勤组 0 不变 1 变
*/
@Excel(name = "是否变更考勤组", width = 10.0,height = 20.0, orderNum = "4")
private String isChangeAttGroup;
/**
@ -69,11 +74,13 @@ public class OrgChangeBean {
/**
* 生效日期
*/
private Long changeEffectiveDate;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date changeEffectiveDate;
/**
* 是否审核通过 0 未审核 1 已通过 2 未通过 3撤回
*/
@Excel(name = "审批状态", width = 10.0,height = 20.0, orderNum = "5")
private String isCheck;
/**
@ -84,7 +91,7 @@ public class OrgChangeBean {
/**
* 审核时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "申请时间", width = 10.0,height = 20.0, orderNum = "1")
private Date createTime;
/**
@ -106,6 +113,7 @@ public class OrgChangeBean {
/**
* 开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private String startTime;
/**

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java
View File

@ -70,7 +70,7 @@ public class AttTasks {
/**
* 历史考勤数据
*/
@Scheduled(fixedDelay = 60000 * 30)
// @Scheduled(fixedDelay = 60000 * 30)
@Async
public void getHisAttTasks() {
log.info("--------考勤定时器开启------");

6
bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java
View File

@ -559,7 +559,7 @@ public class ExportFileController {
* @author：fly
* @date：2024-10-14-10:30
*/
@RequiresPermissions("att:org:change:export")
// @RequiresPermissions("att:org:change:export")
@GetMapping("/exportOrgChange")
public void exportOrgChange(HttpServletResponse response, OrgChangeBean bean) {
try {
@ -569,13 +569,15 @@ public class ExportFileController {
OrgChangeBean vo = personLists.get(i);
vo.setId((i + 1L));
vo.setIsCheck(BusinessConstants.WAIT_CHECK.equals(vo.getIsCheck()) ? "待审核" : BusinessConstants.PASS_CHECK.equals(vo.getIsCheck()) ? "已通过" : BusinessConstants.NOT_PASS_CHECK.equals(vo.getIsCheck()) ? "未通过" : "撤回");
vo.setIsChangeAttGroup(BusinessConstants.WAIT_CHECK.equals(vo.getIsChangeAttGroup()) ? "不变" : "变更");
// 创建一个 SimpleDateFormat 对象，用于格式化日期
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// 将 Date 转换为 String
String dateString = formatter.format(vo.getCreateTime());
vo.setStartTime(dateString);
personExportVoList.add(vo);
}
extracted(personExportVoList, SubOrgBean.class, "组织架构变更记录导出", "组织架构变更记录导出", "组织架构变更记录导出", response);
extracted(personExportVoList, OrgChangeBean.class, "组织架构变更记录导出", "组织架构变更记录导出", "组织架构变更记录导出", response);
} catch (Exception e) {
log.error(e.toString(), e);
}