Pārlūkot izejas kodu

1.考勤和年假添加日志

main
wangqiang pirms 3 dienas
vecāks
revīzija
18e7349543

+ 5
- 0
zs-manager/src/main/java/com/ruoyi/zhushi/controller/DkAttendanceGroupController.java Parādīt failu

package com.ruoyi.zhushi.controller; package com.ruoyi.zhushi.controller;


import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.zhushi.entity.AppDTO; import com.ruoyi.zhushi.entity.AppDTO;
import com.ruoyi.zhushi.entity.DkAttendanceGroupDTO; import com.ruoyi.zhushi.entity.DkAttendanceGroupDTO;
import com.ruoyi.zhushi.entity.DkCheckInConfigDTO; import com.ruoyi.zhushi.entity.DkCheckInConfigDTO;


// 新增打卡配置 // 新增打卡配置
@PostMapping("/add") @PostMapping("/add")
@Log(title = "考勤组", businessType = BusinessType.INSERT)
public R<String> addOrUpdate(@RequestBody DkAttendanceGroupDTO dkAttendanceGroupDTO) { public R<String> addOrUpdate(@RequestBody DkAttendanceGroupDTO dkAttendanceGroupDTO) {
return R.ok(dkAttendanceGroupService.addOrUpdate(dkAttendanceGroupDTO)); return R.ok(dkAttendanceGroupService.addOrUpdate(dkAttendanceGroupDTO));
} }


// 删除打卡配置 // 删除打卡配置
@DeleteMapping("/del/{id}") @DeleteMapping("/del/{id}")
@Log(title = "考勤组", businessType = BusinessType.DELETE)
public R<Void> del(@PathVariable Long id) { public R<Void> del(@PathVariable Long id) {
return toAjax(dkAttendanceGroupService.del(id)); return toAjax(dkAttendanceGroupService.del(id));
} }


// 删除用户配置 // 删除用户配置
@DeleteMapping("/delUser/{id}") @DeleteMapping("/delUser/{id}")
@Log(title = "考勤组-用户", businessType = BusinessType.DELETE)
public R<Void> delUser(@PathVariable long id) { public R<Void> delUser(@PathVariable long id) {
return toAjax(dkAttendanceGroupService.deleteConfig(id)); return toAjax(dkAttendanceGroupService.deleteConfig(id));
} }

+ 5
- 0
zs-manager/src/main/java/com/ruoyi/zhushi/controller/DkConfigController.java Parādīt failu

package com.ruoyi.zhushi.controller; package com.ruoyi.zhushi.controller;


import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.zhushi.entity.DkCheckInConfigDTO; import com.ruoyi.zhushi.entity.DkCheckInConfigDTO;
import com.ruoyi.zhushi.service.DkConfigService; import com.ruoyi.zhushi.service.DkConfigService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;


// 新增 // 新增
@PostMapping("/add") @PostMapping("/add")
@Log(title = "打卡设置", businessType = BusinessType.INSERT)
public R<Void> add(@Validated(AddGroup.class) @RequestBody DkCheckInConfigDTO dkCheckInConfigDTO) { public R<Void> add(@Validated(AddGroup.class) @RequestBody DkCheckInConfigDTO dkCheckInConfigDTO) {
return toAjax(dkConfigService.addConfig(dkCheckInConfigDTO)); return toAjax(dkConfigService.addConfig(dkCheckInConfigDTO));
} }


// 删除 // 删除
@DeleteMapping("/deleteConfig/{id}") @DeleteMapping("/deleteConfig/{id}")
@Log(title = "打卡设置", businessType = BusinessType.DELETE)
public R<Integer> remove(@PathVariable Long id) { public R<Integer> remove(@PathVariable Long id) {
return R.ok(dkConfigService.deleteConfig(id)); return R.ok(dkConfigService.deleteConfig(id));
} }


// 修改 // 修改
@PutMapping("/updateConfig") @PutMapping("/updateConfig")
@Log(title = "打卡设置", businessType = BusinessType.UPDATE)
public R<Void> edit(@RequestBody DkCheckInConfigDTO bo) { public R<Void> edit(@RequestBody DkCheckInConfigDTO bo) {
return toAjax(dkConfigService.updateConfig(bo)); return toAjax(dkConfigService.updateConfig(bo));
} }

+ 4
- 0
zs-manager/src/main/java/com/ruoyi/zhushi/controller/DkRecordController.java Parādīt failu

package com.ruoyi.zhushi.controller; package com.ruoyi.zhushi.controller;


import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.zhushi.entity.DkCheckInRecordDTO; import com.ruoyi.zhushi.entity.DkCheckInRecordDTO;
import com.ruoyi.zhushi.service.DkRecordService; import com.ruoyi.zhushi.service.DkRecordService;
* 导出结果列表 * 导出结果列表
*/ */
@PostMapping("/exportNew") @PostMapping("/exportNew")
@Log(title = "考勤记录", businessType = BusinessType.EXPORT)
public void exportNew(DkCheckInRecordDTO bo, HttpServletResponse response) { public void exportNew(DkCheckInRecordDTO bo, HttpServletResponse response) {
dkRecordService.exportNew(bo, response); dkRecordService.exportNew(bo, response);
} }
* 修改打卡记录信息 * 修改打卡记录信息
*/ */
@PutMapping() @PutMapping()
@Log(title = "考勤记录", businessType = BusinessType.UPDATE)
public R<Integer> updateDkRecord(@RequestBody DkCheckInRecordDTO bo) { public R<Integer> updateDkRecord(@RequestBody DkCheckInRecordDTO bo) {
return R.ok(dkRecordService.updateDkRecord(bo)); return R.ok(dkRecordService.updateDkRecord(bo));
} }

+ 3
- 0
zs-manager/src/main/java/com/ruoyi/zhushi/controller/NjBalanceManageController.java Parādīt failu

package com.ruoyi.zhushi.controller; package com.ruoyi.zhushi.controller;


import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.zhushi.entity.*; import com.ruoyi.zhushi.entity.*;
import com.ruoyi.zhushi.service.NjBalanceManageService; import com.ruoyi.zhushi.service.NjBalanceManageService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;


// 手动更新年假数据 // 手动更新年假数据
@PutMapping("/update") @PutMapping("/update")
@Log(title = "年假手动更新", businessType = BusinessType.UPDATE)
public R<Integer> update(@RequestBody NjBalanceManageDTO njBalanceManageDTO){ public R<Integer> update(@RequestBody NjBalanceManageDTO njBalanceManageDTO){
return R.ok(njBalanceManageService.update(njBalanceManageDTO)); return R.ok(njBalanceManageService.update(njBalanceManageDTO));
} }

+ 2
- 0
zs-manager/src/main/java/com/ruoyi/zhushi/controller/NjBalanceManageDetailController.java Parādīt failu



// 年假申请 // 年假申请
@PostMapping("/apply") @PostMapping("/apply")
@Log(title = "年假余额申请", businessType = BusinessType.UPDATE)
public R<Void> insert(@Validated(AddGroup.class) @RequestBody NjBalanceManageDetailDTO njBalanceManageDetailDTO) { public R<Void> insert(@Validated(AddGroup.class) @RequestBody NjBalanceManageDetailDTO njBalanceManageDetailDTO) {
return toAjax(njBalanceManageDetailService.insert(njBalanceManageDetailDTO)); return toAjax(njBalanceManageDetailService.insert(njBalanceManageDetailDTO));
} }
* @param ids 主键串 * @param ids 主键串
*/ */
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
@Log(title = "年假余额申请撤销", businessType = BusinessType.UPDATE)
public R<Void> cancelByIds(@NotEmpty(message = "主键不能为空") public R<Void> cancelByIds(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {
return toAjax(njBalanceManageDetailService.cancelByIds(Arrays.asList(ids))); return toAjax(njBalanceManageDetailService.cancelByIds(Arrays.asList(ids)));

+ 5
- 0
zs-manager/src/main/java/com/ruoyi/zhushi/controller/NjRuleConfigController.java Parādīt failu

package com.ruoyi.zhushi.controller; package com.ruoyi.zhushi.controller;


import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.zhushi.entity.NjRuleConfigDTO; import com.ruoyi.zhushi.entity.NjRuleConfigDTO;
import com.ruoyi.zhushi.service.NjRuleConfigService; import com.ruoyi.zhushi.service.NjRuleConfigService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
* @return * @return
*/ */
@PostMapping("/addRuleConfig") @PostMapping("/addRuleConfig")
@Log(title = "年假规则", businessType = BusinessType.UPDATE)
public R<Boolean> addRule(@RequestBody NjRuleConfigDTO njRuleConfigDTO) { public R<Boolean> addRule(@RequestBody NjRuleConfigDTO njRuleConfigDTO) {
return R.ok(njRuleConfigService.addRule(njRuleConfigDTO)); return R.ok(njRuleConfigService.addRule(njRuleConfigDTO));
} }
* @return * @return
*/ */
@GetMapping("/delRule") @GetMapping("/delRule")
@Log(title = "年假规则", businessType = BusinessType.DELETE)
public R<Integer> delRule(@RequestParam("id") long id) { public R<Integer> delRule(@RequestParam("id") long id) {
return R.ok(njRuleConfigService.delRule(id)); return R.ok(njRuleConfigService.delRule(id));
} }
* @return * @return
*/ */
@DeleteMapping("/delUser/{id}") @DeleteMapping("/delUser/{id}")
@Log(title = "年假规则关联用户", businessType = BusinessType.DELETE)
public R<Void> delUser(@PathVariable Long id) { public R<Void> delUser(@PathVariable Long id) {
return toAjax(njRuleConfigService.delUser(id)); return toAjax(njRuleConfigService.delUser(id));
} }

Notiek ielāde…
Atcelt
Saglabāt