isoftstone/lc_backend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

外协人员批量审批

Browse Source
This commit is contained in:
李奋勇
2025-12-11 14:49:20 +08:00
parent 0b48e4d785
commit 470e14e7a2
28 changed files with 2304 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/config/framework/portal/core/dto/ReceiveCCRequestDTO.java
View File

@@ -3,6 +3,7 @@ package com.jeelowcode.service.bpm.config.framework.portal.core.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
@@ -12,6 +13,7 @@ import static com.jeelowcode.tool.framework.common.util.date.DateUtils.TIME_ZONE
/**
* 描述：接收待阅流程请求参数
*/
@Accessors(chain = true)
@Data
public class ReceiveCCRequestDTO {

2
jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/controller/vo/instance/BpmProcessInstanceCopyCreateReqVO.java
View File

@@ -6,10 +6,12 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Collection;
@Schema(description = "管理后台 - 流程实例抄送的创建 Request VO")
@Accessors(chain = true)
@Data
public class BpmProcessInstanceCopyCreateReqVO {

2
jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/entity/BpmProcessInstanceCopyDO.java
View File

@@ -4,6 +4,7 @@ import com.jeelowcode.tool.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
import lombok.experimental.Accessors;
/**
* 流程抄送 DO
@@ -12,6 +13,7 @@ import lombok.*;
* @since 2024-01-22
*/
@TableName(value = "bpm_process_instance_copy", autoResultMap = true)
@Accessors(chain = true)
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)

46
jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/service/impl/BillApproveStatusService.java
View File

@@ -1,5 +1,6 @@
package com.jeelowcode.service.bpm.service.impl;
import cn.hutool.json.JSONObject;
import com.jeelowcode.core.framework.entity.FormEntity;
import com.jeelowcode.core.framework.enums.ApproveStatusEnum;
import com.jeelowcode.core.framework.mapper.FormMapper;
@@ -9,13 +10,9 @@ import com.jeelowcode.service.bpm.controller.vo.instance.BpmProcessInstanceRespV
import com.jeelowcode.service.bpm.service.IBpmProcessInstanceService;
import com.jeelowcode.tool.framework.datapermission.core.annotation.DataPermission;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.impl.persistence.entity.ExecutionEntityImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
@Service
@Slf4j
@@ -27,8 +24,6 @@ public class BillApproveStatusService {
public void afterSubmit(String processInstanceId){
Map<String,Object> map = new HashMap<>();
//流程实例id
BpmProcessInstanceRespVO vo = SpringUtils.getBean(IBpmProcessInstanceService.class).getProcessInstanceVO(processInstanceId);
//获取到的自定义表单数据id
@@ -37,17 +32,16 @@ public class BillApproveStatusService {
Long formId = vo.getProcessDefinition().getFormId();
FormEntity formEntity = SpringUtils.getBean(FormMapper.class).getByWebId(formId);
Map<String,Object> json = new HashMap<>();
// 使用 editJsonData 方法，这样会触发增强机制
JSONObject json = new JSONObject();
json.put("id", id);
json.put(ApproveStatusEnum.codeField, ApproveStatusEnum.APPROVING.getCode());
json.put(ApproveStatusEnum.nameField, ApproveStatusEnum.APPROVING.getDesc());
json.put("ProcessInstanceId", processInstanceId);
dbformDataService.update(formEntity.getTableName(),id,json);
json.put("processInstanceId", processInstanceId);
dbformDataService.editJsonData(formEntity.getId(), json);
}
public void afterApproved(String processInstanceId){
Map<String,Object> map = new HashMap<>();
//流程实例id
BpmProcessInstanceRespVO vo = SpringUtils.getBean(IBpmProcessInstanceService.class).getProcessInstanceVO(processInstanceId);
//获取到的自定义表单数据id
@@ -55,17 +49,15 @@ public class BillApproveStatusService {
//数据表id
Long formId = vo.getProcessDefinition().getFormId();
FormEntity formEntity = SpringUtils.getBean(FormMapper.class).getByWebId(formId);
Map<String,Object> json = new HashMap<>();
// 使用 editJsonData 方法，这样会触发增强机制
JSONObject json = new JSONObject();
json.put("id", id);
json.put(ApproveStatusEnum.codeField, ApproveStatusEnum.APPROVED.getCode());
json.put(ApproveStatusEnum.nameField, ApproveStatusEnum.APPROVED.getDesc());
dbformDataService.update(formEntity.getTableName(),id,json);
dbformDataService.editJsonData(formEntity.getId(), json);
}
public void afterRejected(String processInstanceId){
Map<String,Object> map = new HashMap<>();
//流程实例id
BpmProcessInstanceRespVO vo = SpringUtils.getBean(IBpmProcessInstanceService.class).getProcessInstanceVO(processInstanceId);
//获取到的自定义表单数据id
@@ -73,18 +65,16 @@ public class BillApproveStatusService {
//数据表id
Long formId = vo.getProcessDefinition().getFormId();
FormEntity formEntity = SpringUtils.getBean(FormMapper.class).getByWebId(formId);
Map<String,Object> json = new HashMap<>();
// 使用 editJsonData 方法，这样会触发增强机制
JSONObject json = new JSONObject();
json.put("id", id);
json.put(ApproveStatusEnum.codeField, ApproveStatusEnum.REJECTED.getCode());
json.put(ApproveStatusEnum.nameField, ApproveStatusEnum.REJECTED.getDesc());
dbformDataService.update(formEntity.getTableName(),id,json);
dbformDataService.editJsonData(formEntity.getId(), json);
}
public void afterCancel(String processInstanceId){
Map<String,Object> map = new HashMap<>();
//流程实例id
BpmProcessInstanceRespVO vo = SpringUtils.getBean(IBpmProcessInstanceService.class).getProcessInstanceVO(processInstanceId);
//获取到的自定义表单数据id
@@ -92,11 +82,11 @@ public class BillApproveStatusService {
//数据表id
Long formId = vo.getProcessDefinition().getFormId();
FormEntity formEntity = SpringUtils.getBean(FormMapper.class).getByWebId(formId);
Map<String,Object> json = new HashMap<>();
// 使用 editJsonData 方法，这样会触发增强机制
JSONObject json = new JSONObject();
json.put("id", id);
json.put(ApproveStatusEnum.codeField, ApproveStatusEnum.UNAPPROVED.getCode());
json.put(ApproveStatusEnum.nameField, ApproveStatusEnum.UNAPPROVED.getDesc());
dbformDataService.update(formEntity.getTableName(),id,json);
dbformDataService.editJsonData(formEntity.getId(), json);
}
}

1
jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/service/impl/BpmProcessInstanceCopyServiceImpl.java
View File

@@ -24,7 +24,6 @@ import com.jeelowcode.service.bpm.service.IBpmProcessInstanceCopyService;
import com.jeelowcode.service.bpm.service.IBpmProcessInstanceService;
import com.jeelowcode.service.bpm.service.IBpmTaskService;
import com.jeelowcode.service.bpm.dto.BpmDelegateExecutionDTO;
import com.jeelowcode.tool.framework.common.util.object.ObjectUtils;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.delegate.DelegateExecution;

2
jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/controller/vo/permission/role/RoleSaveReqVO.java
View File

@@ -2,12 +2,14 @@ package com.jeelowcode.service.system.controller.vo.permission.role;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
@Schema(description = "管理后台 - 角色创建 Request VO")
@Accessors(chain = true)
@Data
public class RoleSaveReqVO {

2
jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/entity/AdminUserDO.java
View File

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
import lombok.experimental.Accessors;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import java.time.LocalDateTime;
@@ -18,6 +19,7 @@ import java.time.LocalDateTime;
*/
@TableName(value = "system_users", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users
@KeySequence("system_user_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Accessors(chain = true)
@Data
@EqualsAndHashCode(callSuper = true)
@Builder

2
jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/entity/ErrorCodeDO.java
View File

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import lombok.experimental.Accessors;
/**
* 错误码表
@@ -16,6 +17,7 @@ import lombok.ToString;
*/
@TableName(value = "system_error_code")
@KeySequence("system_error_code_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Accessors(chain = true)
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)

2
jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/entity/RoleDO.java
View File

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Set;
@@ -21,6 +22,7 @@ import java.util.Set;
*/
@TableName(value = "system_role", autoResultMap = true)
@KeySequence("system_role_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Accessors(chain = true)
@Data
@EqualsAndHashCode(callSuper = true)
public class RoleDO extends TenantBaseDO {

2
jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/entity/TenantDO.java
View File

@@ -5,6 +5,7 @@ import com.jeelowcode.tool.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
*/
@TableName(value = "system_tenant", autoResultMap = true)
@KeySequence("system_tenant_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Accessors(chain = true)
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)

2
jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/entity/UserDeptDO.java
View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* 用户和部门关联
@@ -14,6 +15,7 @@ import lombok.EqualsAndHashCode;
*/
@TableName("system_user_dept")
@KeySequence("system_user_dept_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Accessors(chain = true)
@Data
@EqualsAndHashCode(callSuper = true)
public class UserDeptDO extends BaseDO {

2
jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/entity/UserDutyDO.java
View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* 用户和岗位关联
@@ -14,6 +15,7 @@ import lombok.EqualsAndHashCode;
*/
@TableName("system_user_duty")
@KeySequence("system_user_duty_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Accessors(chain = true)
@Data
@EqualsAndHashCode(callSuper = true)
public class UserDutyDO extends BaseDO {

2
jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/entity/UserPositionDO.java
View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* 用户和职位关联
@@ -14,6 +15,7 @@ import lombok.EqualsAndHashCode;
*/
@TableName("system_user_position")
@KeySequence("system_user_position_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Accessors(chain = true)
@Data
@EqualsAndHashCode(callSuper = true)
public class UserPositionDO extends BaseDO {

2
jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/entity/UserPostDO.java
View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* 用户和岗位关联
@@ -14,6 +15,7 @@ import lombok.EqualsAndHashCode;
*/
@TableName("system_user_post")
@KeySequence("system_user_post_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Accessors(chain = true)
@Data
@EqualsAndHashCode(callSuper = true)
public class UserPostDO extends BaseDO {

2
jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/entity/UserRankDO.java
View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* 用户和职级关联
@@ -14,6 +15,7 @@ import lombok.EqualsAndHashCode;
*/
@TableName("system_user_rank")
@KeySequence("system_user_rank_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Accessors(chain = true)
@Data
@EqualsAndHashCode(callSuper = true)
public class UserRankDO extends BaseDO {

2
jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/entity/UserRoleDO.java
View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* 用户和角色关联
@@ -14,6 +15,7 @@ import lombok.EqualsAndHashCode;
*/
@TableName("system_user_role")
@KeySequence("system_user_role_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Accessors(chain = true)
@Data
@EqualsAndHashCode(callSuper = true)
public class UserRoleDO extends BaseDO {