diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java new file mode 100644 index 0000000..090db49 --- /dev/null +++ b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java @@ -0,0 +1,61 @@ +package com.ruoyi.business.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.database.domain.ApprovalProcess; +import com.ruoyi.database.service.ApprovalProcessService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Description ApprovalProcessController + * @Author lijingtong + * @Date 2025-06-07 + */ +@Api(tags = "审批单") +@RestController +@RequestMapping("/ApprovalProcess") +@RequiredArgsConstructor +public class ApprovalProcessController extends BaseController { + + private final ApprovalProcessService approvalsProcessService; + + + @PostMapping("/list") + @ApiOperation("查询列表") + public TableDataInfo list(ApprovalProcess approvalProcess) { + startPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(approvalProcess); + List list = approvalsProcessService.list(queryWrapper); + return getDataTable(list); + } + + @ApiOperation("根据编号查") + @PostMapping("/getById") + public TableDataInfo getById(Long id) { + List list = approvalsProcessService.lambdaQuery() + .eq(ApprovalProcess::getApprovalNo, id) + .list(); + return getDataTable(list); + } + + @ApiOperation("根据id查询详情") + @PostMapping("/getDetailById") + public AjaxResult getDetailById(Long id) { + ApprovalProcess approvalProcess = approvalsProcessService.getById(id); + approvalProcess.setReadStatus(1); + boolean result = approvalsProcessService.updateById(approvalProcess); + return AjaxResult.success(approvalProcess); + } + + + +} diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java b/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java index a058551..d49cf33 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java @@ -8,9 +8,11 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.database.domain.ApprovalProcess; import com.ruoyi.database.domain.PoliceLeaveApproval; import com.ruoyi.database.domain.dto.ApprovaltDto; import com.ruoyi.database.domain.gwglLog; +import com.ruoyi.database.service.ApprovalProcessService; import com.ruoyi.database.service.PoliceLeaveApprovalService; import com.ruoyi.database.service.gwglLogService; import com.ruoyi.system.service.ISysDeptService; @@ -42,6 +44,7 @@ public class PoliceLeaveApprovalController extends BaseController { private final ISysDeptService deptService; private final ISysUserService userService; private final gwglLogService gwglLogService; + private final ApprovalProcessService approvalsProcessService; @RequestMapping("/list") @ApiOperation("查询") @@ -103,7 +106,7 @@ public class PoliceLeaveApprovalController extends BaseController { List leader = sysDepts.stream().map(SysDept::getLeader).collect(Collectors.toList()); // 局党委和分管局成员 List leaderLeader = sysDepts.stream().map(SysDept::getLeaderLeader).distinct().collect(Collectors.toList()); - + String s = OrderNumberGenerator(); SysUser user = getLoginUser().getUser(); if (policeLeaveApproval.getId() == null) { policeLeaveApproval.setName(user.getNickName()); @@ -114,7 +117,23 @@ public class PoliceLeaveApprovalController extends BaseController { policeLeaveApproval.setCreateBy(user.getNickName()); policeLeaveApproval.setUserId(user.getUserId()); policeLeaveApproval.setDeptId(user.getDeptId()); - policeLeaveApproval.setApplyNo(OrderNumberGenerator()); + policeLeaveApproval.setApplyNo(s); + + + ApprovalProcess approvalProcess = new ApprovalProcess(); + approvalProcess.setApprovalNo(s); + approvalProcess.setProcessTitle("民警请（休）假审批表"); + approvalProcess.setSubmitterName(user.getNickName()); + approvalProcess.setSubmitterId(user.getUserId()); + approvalProcess.setSubmitTime(new Date().getTime()); + approvalProcess.setMatterType(1); + approvalProcess.setApprovalStatus(0); + approvalProcess.setReadStatus(0); + approvalProcess.setStartTime(policeLeaveApproval.getStartDate()); + approvalProcess.setEndTime(policeLeaveApproval.getEndDate()); + approvalProcess.setCreateTime(new Date().getTime()); + approvalsProcessService.save(approvalProcess); + if (leader.contains(user.getNickName())) { // 单位领导 policeLeaveApproval.setUserType(1); diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java b/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java new file mode 100644 index 0000000..6ab43ca --- /dev/null +++ b/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java @@ -0,0 +1,100 @@ +package com.ruoyi.database.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description ApprovalProcess + * @Author lijingtong + * @Date 2025-06-07 + */ +@Data +@TableName("approval_process") +@ApiModel("审批单") +public class ApprovalProcess { + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty("主键ID") + private Long id; + + @ApiModelProperty("审批编号") + private String approvalNo; + + @ApiModelProperty("流程标题") + private String processTitle; + + @ApiModelProperty("提交人姓名") + private String submitterName; + + @ApiModelProperty("提交人ID") + private Long submitterId; + + @ApiModelProperty("提交时间") + private Long submitTime; + + @ApiModelProperty("事项类型 0-喝酒 1-请假 2-出差") + private Integer matterType; + + @ApiModelProperty("审批状态：0-待提交 1-部门审批中 2-政治处审批中 3-局领导审批中 4-已通过 5-已拒绝") + private Integer approvalStatus; + + @ApiModelProperty("到达日期") + private Long arrivalDate; + + @ApiModelProperty("处理日期") + private Long handleDate; + + @ApiModelProperty("阅读状态：0-未读 1-已读") + private Integer readStatus; + + @ApiModelProperty("开始时间") + private Long startTime; + + @ApiModelProperty("结束时间") + private Long endTime; + + @ApiModelProperty("出差目的地") + private String businessTripDestination; + + @ApiModelProperty("起止日期") + private String startEndDate; + + @ApiModelProperty("饮酒时间") + private Long drinkingTime; + + @ApiModelProperty("饮酒地点") + private String drinkingPlace; + + @ApiModelProperty("创建时间") + private Long createTime; + + @ApiModelProperty("创建人") + private String createBy; + + @ApiModelProperty("修改时间") + private Long updateTime; + + @ApiModelProperty("修改人") + private String updateBy; + + // 非数据库字段 - 用于前端展示的日期格式化字符串 + @TableField(exist = false) + @ApiModelProperty("提交时间（格式化字符串）") + private String submitTimeStr; + + @TableField(exist = false) + @ApiModelProperty("开始时间（格式化字符串）") + private String startTimeStr; + + @TableField(exist = false) + @ApiModelProperty("结束时间（格式化字符串）") + private String endTimeStr; + + @TableField(exist = false) + @ApiModelProperty("饮酒时间（格式化字符串）") + private String drinkingTimeStr; +} diff --git a/gather-app/src/main/java/com/ruoyi/database/mapper/ApprovalProcessMapper.java b/gather-app/src/main/java/com/ruoyi/database/mapper/ApprovalProcessMapper.java new file mode 100644 index 0000000..036bc6b --- /dev/null +++ b/gather-app/src/main/java/com/ruoyi/database/mapper/ApprovalProcessMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.database.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.database.domain.ApprovalProcess; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Description ApprovalProcessMapper + * @Author lijingtong + * @Date 2025-06-07 + */ +@Mapper +public interface ApprovalProcessMapper extends BaseMapper { +} diff --git a/gather-app/src/main/java/com/ruoyi/database/service/ApprovalProcessService.java b/gather-app/src/main/java/com/ruoyi/database/service/ApprovalProcessService.java new file mode 100644 index 0000000..bcd7af1 --- /dev/null +++ b/gather-app/src/main/java/com/ruoyi/database/service/ApprovalProcessService.java @@ -0,0 +1,12 @@ +package com.ruoyi.database.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.database.domain.ApprovalProcess; + +/** + * @Description ApprovalProcessService + * @Author lijingtong + * @Date 2025-06-07 + */ +public interface ApprovalProcessService extends IService { +} diff --git a/gather-app/src/main/java/com/ruoyi/database/service/impl/ApprovalProcessServiceImpl.java b/gather-app/src/main/java/com/ruoyi/database/service/impl/ApprovalProcessServiceImpl.java new file mode 100644 index 0000000..b845dd4 --- /dev/null +++ b/gather-app/src/main/java/com/ruoyi/database/service/impl/ApprovalProcessServiceImpl.java @@ -0,0 +1,16 @@ +package com.ruoyi.database.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.database.domain.ApprovalProcess; +import com.ruoyi.database.mapper.ApprovalProcessMapper; +import com.ruoyi.database.service.ApprovalProcessService; +import org.springframework.stereotype.Service; + +/** + * @Description ApprovalProcessServiceImpl + * @Author lijingtong + * @Date 2025-06-07 + */ +@Service +public class ApprovalProcessServiceImpl extends ServiceImpl implements ApprovalProcessService { +}