diff --git a/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/flow/handler/WorkflowPermissionHandler.java b/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/flow/handler/WorkflowPermissionHandler.java index 7b60f1d..1043f32 100644 --- a/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/flow/handler/WorkflowPermissionHandler.java +++ b/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/flow/handler/WorkflowPermissionHandler.java @@ -67,15 +67,8 @@ public class WorkflowPermissionHandler implements PermissionHandler { // 用户和部门权限 Stream.of(String.valueOf(loginUser.getEmployeeId()), TaskAssigneeEnum.DEPT.getCode() + loginUser.getEmployeeId() - ), + ) // 诉求办理岗位权限（处理空指针） - Optional.ofNullable(loginUser.getPositionIdList()) - .filter(positionIds -> positionIds != null && !positionIds.isEmpty()) - .map(positionIds -> - Arrays.stream(positionIds.split(",")) - .map(positionId -> TaskAssigneeEnum.POST.getCode() + positionId) - ) - .orElse(Stream.empty()) ) .flatMap(stream -> stream) .collect(Collectors.toList()); diff --git a/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/entity/EmployeeEntity.java b/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/entity/EmployeeEntity.java index b833220..4318e2f 100644 --- a/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/entity/EmployeeEntity.java +++ b/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/entity/EmployeeEntity.java @@ -87,11 +87,6 @@ public class EmployeeEntity { */ private Long positionId; - /** - * 诉求办理职位 ID 列表（多选，逗号分隔存储） - */ - private String positionIdList; - /** * 是否为超级管理员：0 不是，1 是 */ diff --git a/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java b/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java index 42e3b43..87e3996 100644 --- a/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java +++ b/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java @@ -71,9 +71,6 @@ public class EmployeeAddForm { @Schema(description = "职务级别 ID") private Long positionId; - @Schema(description = "诉求办理职位 ID 列表（多选）") - private List positionIdList; - @Schema(description = "角色列表") private List roleIdList; diff --git a/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/vo/EmployeeVO.java b/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/vo/EmployeeVO.java index baccb6c..cdf3f91 100644 --- a/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/vo/EmployeeVO.java +++ b/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/vo/EmployeeVO.java @@ -73,9 +73,6 @@ public class EmployeeVO { @Schema(description = "职务名称") private String positionName; - @Schema(description = "诉求办理职位 ID 列表（多选）") - private String positionIdList; - @Schema(description = "邮箱") private String email; diff --git a/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java b/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java index fdd4cb4..197f244 100644 --- a/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java +++ b/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java @@ -200,11 +200,6 @@ public class EmployeeService { EmployeeEntity entity = SmartBeanUtil.copy(employeeAddForm, EmployeeEntity.class); - // 处理诉求办理职位列表，将 List 转换为逗号分隔的字符串 - if (employeeAddForm.getPositionIdList() != null && !employeeAddForm.getPositionIdList().isEmpty()) { - entity.setPositionIdList(String.join(",", employeeAddForm.getPositionIdList().stream().map(String::valueOf).toArray(String[]::new))); - } - // 设置密码：优先使用配置文件的默认密码，若未配置则使用随机密码 String password = employeeConfig.getDefaultPassword(); if (password == null || password.isEmpty()) { @@ -247,15 +242,6 @@ public class EmployeeService { // 不更新密码 entity.setLoginPwd(null); - // 处理诉求办理职位列表，将 List 转换为逗号分隔的字符串 - if (employeeUpdateForm.getPositionIdList() != null) { - if (employeeUpdateForm.getPositionIdList().isEmpty()) { - entity.setPositionIdList(null); - } else { - entity.setPositionIdList(String.join(",", employeeUpdateForm.getPositionIdList().stream().map(String::valueOf).toArray(String[]::new))); - } - } - // 更新数据 employeeManager.updateEmployee(entity, employeeUpdateForm.getRoleIdList()); diff --git a/smart-flow-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml b/smart-flow-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml index 999ab73..fe131d1 100644 --- a/smart-flow-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml +++ b/smart-flow-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml @@ -14,7 +14,6 @@ t_employee.police_no, t_employee.department_id, t_employee.position_id, - t_employee.position_id_list, t_employee.disabled_flag, t_employee.administrator_flag, t_employee.email, @@ -201,7 +200,6 @@ t_employee.police_no, t_employee.department_id, t_employee.position_id, - t_employee.position_id_list, t_employee.disabled_flag, t_employee.administrator_flag, t_employee.email, @@ -228,7 +226,6 @@ t_employee.police_no, t_employee.department_id, t_employee.position_id, - t_employee.position_id_list, t_employee.disabled_flag, t_employee.administrator_flag, t_employee.email, @@ -254,7 +251,6 @@ t_employee.police_no, t_employee.department_id, t_employee.position_id, - t_employee.position_id_list, t_employee.disabled_flag, t_employee.administrator_flag, t_employee.email, @@ -397,9 +393,6 @@ and re.role_id = #{roleId} and e.employee_id = re.employee_id - - and e.position_id_list like '%${positionId}%' - and (#{deptId} = ',' or instr(#{deptId}, concat(e.department_id, ',')) > 0) @@ -418,7 +411,6 @@ t_employee.police_no, t_employee.department_id, t_employee.position_id, - t_employee.position_id_list, t_employee.disabled_flag, t_employee.administrator_flag, t_employee.email, diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/constant/RightsFlowStatusEnum.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/constant/RightsFlowStatusEnum.java deleted file mode 100644 index 4abcc4a..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/constant/RightsFlowStatusEnum.java +++ /dev/null @@ -1,63 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.constant; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import net.lab1024.sa.base.common.enumeration.BaseEnum; - -/** - * 维权流程状态枚举 - * - * @author SmartFlow - * @date 2026-03-18 - */ -@AllArgsConstructor -@Getter -public enum RightsFlowStatusEnum implements BaseEnum { - - /** - * 0 待提交 - */ - PENDING_SUBMIT(0, "待提交"), - - /** - * 1 待受理 - */ - PENDING_ACCEPT(1, "待受理"), - - /** - * 2 受理中 - */ - ACCEPTING(2, "受理中"), - - /** - * 3 已受理 - */ - ACCEPTED(3, "已受理"), - - /** - * 4 办理中 - */ - PROCESSING(4, "办理中"), - - /** - * 5 已办结 - */ - COMPLETED(5, "已办结"), - - - /** - * 7 已评价 - */ - EVALUATED(6, "已评价"), - - /** - * 9 不受理 - */ - REJECTED(9, "不受理"), - - ; - - private final Integer value; - - private final String desc; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/dto/PoliceEventQueryDTO.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/dto/PoliceEventQueryDTO.java deleted file mode 100644 index 1217577..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/dto/PoliceEventQueryDTO.java +++ /dev/null @@ -1,60 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -/** - * 警情查询 DTO - * - * @author SmartFlow - * @date 2026-03-27 - */ -@Data -@Schema(description = "警情查询参数") -public class PoliceEventQueryDTO { - - @Schema(description = "接警单编号") - private String receiveNo; - - @Schema(description = "案件名称") - private String caseName; - - @Schema(description = "案件类型（administrative:行政，criminal:刑事，other:其他）") - private String caseType; - - @Schema(description = "报案开始时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime reportStartTime; - - @Schema(description = "报案结束时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime reportEndTime; - - @Schema(description = "受理开始时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime acceptStartTime; - - @Schema(description = "受理结束时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime acceptEndTime; - - @Schema(description = "报警开始时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime alarmStartTime; - - @Schema(description = "报警结束时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime alarmEndTime; - - @Schema(description = "接警单位") - private String receiveUnit; - - @Schema(description = "页码") - private Integer pageNum = 1; - - @Schema(description = "每页条数") - private Integer pageSize = 10; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/dto/RightsCaseQueryDTO.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/dto/RightsCaseQueryDTO.java deleted file mode 100644 index 29e3ea4..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/dto/RightsCaseQueryDTO.java +++ /dev/null @@ -1,52 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -/** - * 案件查询 DTO - * - * @author SmartFlow - * @date 2026-03-27 - */ -@Data -@Schema(description = "案件查询参数") -public class RightsCaseQueryDTO { - - @Schema(description = "案件编号") - private String caseNo; - - @Schema(description = "案件名称") - private String caseName; - - @Schema(description = "案件类型（administrative:行政，criminal:刑事，other:其他）") - private String caseType; - - @Schema(description = "案件状态（pending:待受理，accepted:已受理，investigating:调查中，closed:已结案，archived:已归档）") - private String caseStatus; - - @Schema(description = "报案开始时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime reportStartTime; - - @Schema(description = "报案结束时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime reportEndTime; - - @Schema(description = "受理开始时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime acceptStartTime; - - @Schema(description = "受理结束时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime acceptEndTime; - - @Schema(description = "页码") - private Integer pageNum = 1; - - @Schema(description = "每页条数") - private Integer pageSize = 10; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/PoliceEventEntity.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/PoliceEventEntity.java deleted file mode 100644 index 95e22f3..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/PoliceEventEntity.java +++ /dev/null @@ -1,159 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.time.LocalDateTime; - -/** - * 警情事件实体类 - * - * @author SmartFlow - * @date 2026-03-27 - */ -@Data -@TableName("t_police_event") -public class PoliceEventEntity { - - /** - * 警情事件 ID - */ - @TableId(type = IdType.AUTO) - private Long eventId; - - /** - * 序号 - */ - private String serialNumber; - - /** - * 接警单编号 - */ - private String receiveNo; - - /** - * 报警方式（phone:电话报警，visit:来访报警，letter:来信报警，email:邮件报警，online:网络报警，other:其他） - */ - private String alarmMethod; - - /** - * 报警时间 - */ - private LocalDateTime alarmTime; - - /** - * 报警电话 - */ - private String alarmPhone; - - /** - * 案发时间 - */ - private LocalDateTime incidentTime; - - /** - * 案发地点 - */ - private String incidentPlace; - - /** - * 报警内容 - */ - private String alarmContent; - - /** - * 报警类型（emergency:紧急，urgent: urgent，normal:普通） - */ - private String alarmType; - - /** - * 报警人姓名 - */ - private String alarmPersonName; - - /** - * 报警人联系电话 - */ - private String alarmPersonPhone; - - /** - * 接警单位 - */ - private String receiveUnit; - - /** - * 接警人姓名 - */ - private String receivePersonName; - - /** - * 接警人警号 - */ - private String receivePersonPoliceNo; - - /** - * 接警时间 - */ - private LocalDateTime receiveTime; - - /** - * 案件名称 - */ - private String caseName; - - /** - * 案件类型（administrative:行政，criminal:刑事，other:其他） - */ - private String caseType; - - /** - * 报案时间 - */ - private LocalDateTime reportTime; - - /** - * 受理时间 - */ - private LocalDateTime acceptTime; - - /** - * 详情链接 - */ - private String detailUrl; - - /** - * 创建人 ID - */ - private Long createUserId; - - /** - * 创建人姓名 - */ - private String createUserName; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新人 ID - */ - private Long updateUserId; - - /** - * 更新人姓名 - */ - private String updateUserName; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 是否删除（0-未删除 1-已删除） - */ - private Integer deletedFlag; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsAppealEntity.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsAppealEntity.java deleted file mode 100644 index 66fb629..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsAppealEntity.java +++ /dev/null @@ -1,134 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.time.LocalDateTime; - -/** - * 民警维权申诉表实体类 - * - * @author SmartFlow - * @date 2026-03-04 - */ -@Data -@TableName("t_rights_defense_appeal") -public class RightsAppealEntity { - - /** - * 申诉 ID - */ - @TableId(type = IdType.AUTO) - private Long appealId; - - /** - * 原维权申请 ID - */ - private Long rightsId; - - /** - * 原办件 ID - */ - private Long originalCaseId; - - /** - * 申诉人 ID - */ - private Long appellantId; - - /** - * 申诉人姓名 - */ - private String appellantName; - - /** - * 申诉人警号 - */ - private String appellantPoliceNo; - - /** - * 申诉时间 - */ - private LocalDateTime appealTime; - - /** - * 申诉理由 - */ - private String appealReason; - - /** - * 申诉请求 - */ - private String appealRequest; - - /** - * 新证据材料 - */ - private String newEvidence; - - /** - * 申诉状态（待审核、审核通过、审核不通过、办理中、已办结） - */ - private String appealStatus; - - /** - * 处理意见 - */ - private String handleOpinion; - - /** - * 处理结果 - */ - private String handleResult; - - /** - * 处理人 ID - */ - private Long handleUserId; - - /** - * 处理人姓名 - */ - private String handleUserName; - - /** - * 处理时间 - */ - private LocalDateTime handleTime; - - /** - * 创建人 ID - */ - private Long createUserId; - - /** - * 创建人姓名 - */ - private String createUserName; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新人 ID - */ - private Long updateUserId; - - /** - * 更新人姓名 - */ - private String updateUserName; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 是否删除 - */ - private Boolean deletedFlag; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsApplicationEntity.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsApplicationEntity.java deleted file mode 100644 index d95589a..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsApplicationEntity.java +++ /dev/null @@ -1,253 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.time.LocalDateTime; - -/** - * 民警维权申请表实体类 - * - * @author SmartFlow - * @date 2026-03-04 - */ -@Data -@TableName("t_rights_defense_application") -public class RightsApplicationEntity { - - /** - * 维权 ID - */ - @TableId(type = IdType.AUTO) - private Long rightsId; - - /** - * 维权编号 - */ - private String rightsNo; - - /** - * 申请类型（本人申请、非本人申请） - */ - private String applicationType; - - /** - * 申请人 ID - */ - private Long applicantId; - - /** - * 申请人姓名 - */ - private String applicantName; - - /** - * 申请人警号 - */ - private String applicantPoliceNo; - - /** - * 申请机构 - */ - private String applicantOrg; - - /** - * 申请机构 ID - */ - private String applicantOrgId; - - /** - * 被侵权人姓名（冗余） - */ - private String victimName; - - /** - * 事件发生时间 - */ - private LocalDateTime incidentTime; - - /** - * 事件地点 - */ - private String incidentLocation; - - /** - * 执法环节 - */ - private String incidentPhase; - - /** - * 侵害类型 - */ - private String incidentType; - - /** - * 关联案件 - */ - private String relatedCase; - - private String handleDepartments; - - /** - * 关联警情 - */ - private String relatedAlarm; - - /** - * 维权事项 - */ - private String rightsItems; - - /** - * 证据文件 JSON 数组 - */ - private String evidenceFiles; - - /** - * 流程状态（0 待提交、1 待受理、2 已受理、3 办理中、4 已办结、5 待评价、6 已评价、9 不受理） - */ - private String flowStatus; - - /** - * 工作流实例 ID - */ - private Long instanceId; - - /** - * 当前审批节点 - */ - private String currentNode; - - /** - * 提交时间 - */ - private LocalDateTime submitTime; - - /** - * 创建人 ID - */ - private Long createUserId; - - /** - * 创建人姓名 - */ - private String createUserName; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新人 ID - */ - private Long updateUserId; - - /** - * 更新人姓名 - */ - private String updateUserName; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 是否删除 - */ - @TableField("deleted_flag") - private Boolean deletedFlag; - - /** - * 是否报备工单 (0-否 1-是) - */ - @TableField("is_reported") - private Integer isReported; - - /** - * 是否评查 (0-否 1-是) - */ - @TableField("is_reviewed") - private Integer isReviewed; - - @TableField("claims") - private String claims; - - @TableField("application_area") - private String applicationArea; - - /** - * 延期申请状态 (0-无延期，1-延期申请中，2-已延期) - */ - @TableField("delay_apply_status") - private Integer delayApplyStatus; - - /** - * 延期次数 - */ - @TableField("delay_times") - private Integer delayTimes; - - /** - * 总延期天数 - */ - @TableField("total_delay_days") - private Integer totalDelayDays; - - /** - * 预计办结时间 - */ - @TableField("expected_finish_time") - private LocalDateTime expectedFinishTime; - - /** - * 实际办结时间 - */ - @TableField("actual_finish_time") - private LocalDateTime actualFinishTime; - - /** - * 是否超期 - */ - @TableField("is_timeout") - private Boolean isTimeout; - - /** - * 满意度等级 (满意、基本满意、不满意) - */ - @TableField("satisfaction_level") - private String satisfactionLevel; - - /** - * 满意度评分 (1-3 分) - */ - @TableField("satisfaction_score") - private Integer satisfactionScore; - - /** - * 评价内容 - */ - @TableField("evaluation_content") - private String evaluationContent; - - /** - * 评价人 ID - */ - @TableField("evaluator_id") - private Long evaluatorId; - - /** - * 评价人姓名 - */ - @TableField("evaluator_name") - private String evaluatorName; - - /** - * 评价时间 - */ - @TableField("evaluate_time") - private LocalDateTime evaluateTime; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsCaseEntity.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsCaseEntity.java deleted file mode 100644 index 34d9aeb..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsCaseEntity.java +++ /dev/null @@ -1,139 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.time.LocalDateTime; - -/** - * 民警维权办件表实体类 - * - * @author SmartFlow - * @date 2026-03-04 - */ -@Data -@TableName("t_rights_defense_case") -public class RightsCaseEntity { - - /** - * 办件 ID - */ - @TableId(type = IdType.AUTO) - private String caseId; - - /** - * 维权申请 ID - */ - private Long rightsId; - - /** - * 办件类型（督察受理、局领导审核、保障结果反馈等） - */ - private String caseType; - - /** - * 办理人 ID - */ - private Long handlerId; - - /** - * 办理人姓名 - */ - private String handlerName; - - /** - * 办理单位 - */ - private String handlerUnit; - - /** - * 办理意见 - */ - private String handlerOpinion; - - /** - * 办理结果 - */ - private String handlerResult; - - /** - * 反馈时间 - */ - private LocalDateTime feedbackTime; - - /** - * 是否通过（0 否 1 是） - */ - private Boolean isPass; - - /** - * 驳回原因 - */ - private String rejectReason; - - /** - * 是否需要延期 - */ - private Boolean needDelay; - - /** - * 延期原因 - */ - private String delayReason; - - /** - * 延期天数 - */ - private Integer delayDays; - - /** - * 预计办结时间 - */ - private LocalDateTime expectedFinishTime; - - /** - * 实际办结时间 - */ - private LocalDateTime actualFinishTime; - - /** - * 是否超期 - */ - private Boolean isTimeout; - - /** - * 创建人 ID - */ - private Long createUserId; - - /** - * 创建人姓名 - */ - private String createUserName; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新人 ID - */ - private Long updateUserId; - - /** - * 更新人姓名 - */ - private String updateUserName; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 是否删除 - */ - private Boolean deletedFlag; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsCaseInfoEntity.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsCaseInfoEntity.java deleted file mode 100644 index 0351e41..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsCaseInfoEntity.java +++ /dev/null @@ -1,149 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.time.LocalDateTime; - -/** - * 案件信息实体类 - * - * @author SmartFlow - * @date 2026-03-27 - */ -@Data -@TableName("t_rights_case_info") -public class RightsCaseInfoEntity { - - /** - * 案件 ID - */ - @TableId(type = IdType.AUTO) - private String caseId; - - /** - * 序号 - */ - private String serialNumber; - - /** - * 案件编号 - */ - private String caseNo; - - /** - * 案件名称 - */ - private String caseName; - - /** - * 案件类型（administrative:行政，criminal:刑事，other:其他） - */ - private String caseType; - - /** - * 主办单位 - */ - private String organizeUnit; - - /** - * 案件状态（pending:待受理，accepted:已受理，investigating:调查中，closed:已结案，archived:已归档） - */ - private String caseStatus; - - /** - * 报案时间 - */ - private LocalDateTime reportTime; - - /** - * 受理时间 - */ - private LocalDateTime acceptTime; - - /** - * 立案时间 - */ - private LocalDateTime registerTime; - - /** - * 结案时间 - */ - private LocalDateTime closeTime; - - /** - * 归档时间 - */ - private LocalDateTime archiveTime; - - /** - * 主办人姓名 - */ - private String organizerName; - - /** - * 主办人警号 - */ - private String organizerPoliceNo; - - /** - * 主办人电话 - */ - private String organizerPhone; - - /** - * 简要案情 - */ - private String briefDescription; - - /** - * 关联警情 ID - */ - private String relatedEventId; - - /** - * 关联接警单编号 - */ - private String relatedReceiveNo; - - /** - * 详情链接 - */ - private String detailUrl; - - /** - * 创建人 ID - */ - private Long createUserId; - - /** - * 创建人姓名 - */ - private String createUserName; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新人 ID - */ - private Long updateUserId; - - /** - * 更新人姓名 - */ - private String updateUserName; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 是否删除（0-未删除 1-已删除） - */ - private Integer deletedFlag; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsClaimConfigEntity.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsClaimConfigEntity.java deleted file mode 100644 index bea202a..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsClaimConfigEntity.java +++ /dev/null @@ -1,99 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.time.LocalDateTime; - -/** - * 保障诉求配置表实体类 - * - * @author SmartFlow - * @date 2026-03-04 - */ -@Data -@TableName("t_rights_claim_config") -public class RightsClaimConfigEntity { - - /** - * 配置 ID - */ - @TableId(type = IdType.AUTO) - private Long configId; - - /** - * 保障诉求类型 - */ - private String claimType; - - /** - * 诉求编码 - */ - private String claimCode; - - /** - * 关联事件性质 - */ - private String eventType; - - /** - * 办理时限（天） - */ - private Integer timeLimit; - - /** - * 填报要求 - */ - private String fillRequirement; - - /** - * 排序 - */ - private Integer sortOrder; - - /** - * 是否启用 - */ - private Boolean isEnabled; - - /** - * 备注 - */ - private String remark; - - /** - * 创建人 ID - */ - private Long createUserId; - - /** - * 创建人姓名 - */ - private String createUserName; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新人 ID - */ - private Long updateUserId; - - /** - * 更新人姓名 - */ - private String updateUserName; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 是否删除 - */ - private Boolean deletedFlag; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsClaimEntity.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsClaimEntity.java deleted file mode 100644 index 6141491..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsClaimEntity.java +++ /dev/null @@ -1,100 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -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 lombok.Data; - -import java.time.LocalDateTime; -import java.util.List; - -@Data -@TableName("t_rights_defense_claim") -public class RightsClaimEntity { - - @TableId(type = IdType.AUTO) - private Long claimId; - - private Long rightsId; - - private Long configId; - - private String claimType; - - private String reportRequirement; - - private Integer deadline; - - private Long handlerId; - - private String handlerName; - - private LocalDateTime handleTime; - - private String evidenceFiles; - - @TableField(exist = false) - private List evidenceList; - - private String handleDescription; - - /** - * 会商 ID - */ - private Long consultationId; - - /** - * 会商名称 - */ - private String consultationName; - - /** - * 办理类型 (1-直接办理，2-会商办理，3-延期办理) - */ - private Integer handleType; - - /** - * 延期原因 - */ - private String delayReason; - - /** - * 延期天数 - */ - private Integer delayDays; - - /** - * 原截止时间 - */ - private LocalDateTime originalDeadlineDate; - - /** - * 新截止时间 - */ - private LocalDateTime newDeadlineDate; - - /** - * 处理方式类型（多个用逗号分隔） - */ - private String punishmentTypes; - - /** - * 抚恤金额 - */ - private java.math.BigDecimal compensationAmount; - - /** - * 挽回损失金额（元） - */ - private java.math.BigDecimal recoveryLoss; - - /** - * 是否追究领导和责任人责任（0-否 1-是） - */ - private Integer pursueResponsibility; - - private LocalDateTime createTime; - - private Boolean deletedFlag; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsDefenseFileForm.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsDefenseFileForm.java deleted file mode 100644 index 9769a52..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsDefenseFileForm.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Data -public class RightsDefenseFileForm { - - @Schema(description = "文件ID") - private Long fileId; - - @Schema(description = "文件Key") - private String fileKey; - - @Schema(description = "文件名称") - private String fileName; - - @Schema(description = "文件大小") - private Long fileSize; - - @Schema(description = "文件类型") - private String fileType; - - @Schema(description = "附件地址") - private String fileUrl; - - @Schema(description = "附件业务类型（1：佐证材料；2：初查材料；3：办理材料）") - private Integer busType; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsEvaluationEntity.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsEvaluationEntity.java deleted file mode 100644 index 23e9350..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsEvaluationEntity.java +++ /dev/null @@ -1,99 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.time.LocalDateTime; - -/** - * 民警维权评价表实体类 - * - * @author SmartFlow - * @date 2026-03-04 - */ -@Data -@TableName("t_rights_defense_evaluation") -public class RightsEvaluationEntity { - - /** - * 评价 ID - */ - @TableId(type = IdType.AUTO) - private Long evaluationId; - - /** - * 维权申请 ID - */ - private Long rightsId; - - /** - * 办件 ID - */ - private String caseId; - - /** - * 评价人 ID - */ - private Long evaluatorId; - - /** - * 评价人姓名 - */ - private String evaluatorName; - - /** - * 满意度等级（非常满意、满意、基本满意、不满意） - */ - private String satisfactionLevel; - - /** - * 满意度评分（1-5 分） - */ - private Integer satisfactionScore; - - /** - * 评价内容 - */ - private String evaluationContent; - - /** - * 回复内容 - */ - private String replyContent; - - /** - * 回复人 ID - */ - private Long replyUserId; - - /** - * 回复人姓名 - */ - private String replyUserName; - - /** - * 回复时间 - */ - private LocalDateTime replyTime; - - /** - * 评价时间 - */ - private LocalDateTime evaluateTime; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 是否删除 - */ - private Boolean deletedFlag; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsEventClaimRelEntity.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsEventClaimRelEntity.java deleted file mode 100644 index 6784af5..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsEventClaimRelEntity.java +++ /dev/null @@ -1,69 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.time.LocalDateTime; - -/** - * 事件性质与保障诉求关联表实体类 - * - * @author SmartFlow - * @date 2026-03-05 - */ -@Data -@TableName("t_rights_event_claim_rel") -public class RightsEventClaimRelEntity { - - /** - * 关联 ID - */ - @TableId(type = IdType.AUTO) - private Long relId; - - /** - * 事件性质 ID - */ - private Long eventTypeId; - - /** - * 保障诉求配置 ID - */ - private Long configId; - - /** - * 创建人 ID - */ - private Long createUserId; - - /** - * 创建人姓名 - */ - private String createUserName; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新人 ID - */ - private Long updateUserId; - - /** - * 更新人姓名 - */ - private String updateUserName; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 是否删除 - */ - private Boolean deletedFlag; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsEventTypeEntity.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsEventTypeEntity.java deleted file mode 100644 index 29e6e63..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsEventTypeEntity.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.time.LocalDateTime; - -/** - * 事件性质表实体类 - * - * @author SmartFlow - * @date 2026-03-05 - */ -@Data -@TableName("t_rights_event_type") -public class RightsEventTypeEntity { - - /** - * 事件性质 ID - */ - @TableId(type = IdType.AUTO) - private Long eventTypeId; - - /** - * 事件性质名称 - */ - private String eventTypeName; - - /** - * 创建人 ID - */ - private Long createUserId; - - /** - * 创建人姓名 - */ - private String createUserName; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新人 ID - */ - private Long updateUserId; - - /** - * 更新人姓名 - */ - private String updateUserName; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 是否删除 - */ - private Boolean deletedFlag; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsOrganizationMemberEntity.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsOrganizationMemberEntity.java deleted file mode 100644 index 7edd1c6..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsOrganizationMemberEntity.java +++ /dev/null @@ -1,114 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.time.LocalDateTime; - -/** - * 维权组织成员表实体类 - * - * @author SmartFlow - * @date 2026-03-04 - */ -@Data -@TableName("t_rights_organization_member") -public class RightsOrganizationMemberEntity { - - /** - * 成员 ID - */ - @TableId(type = IdType.AUTO) - private Long memberId; - - /** - * 成员类型（维权委成员、维权办成员、会商成员、工作组） - */ - private String memberType; - - /** - * 用户 ID - */ - private Long userId; - - /** - * 用户姓名 - */ - private String userName; - - /** - * 警号 - */ - private String policeNo; - - /** - * 单位名称 - */ - private String unitName; - - /** - * 职务 - */ - private String position; - - /** - * 角色（主任、副主任、委员、联络员等） - */ - private String role; - - /** - * 管辖区域 - */ - private String jurisdictionArea; - - /** - * 是否启用 - */ - private Boolean isEnabled; - - /** - * 排序 - */ - private Integer sortOrder; - - /** - * 备注 - */ - private String remark; - - /** - * 创建人 ID - */ - private Long createUserId; - - /** - * 创建人姓名 - */ - private String createUserName; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新人 ID - */ - private Long updateUserId; - - /** - * 更新人姓名 - */ - private String updateUserName; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 是否删除 - */ - private Boolean deletedFlag; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsRecordEntity.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsRecordEntity.java deleted file mode 100644 index 0ef738a..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsRecordEntity.java +++ /dev/null @@ -1,174 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.time.LocalDateTime; - -/** - * 民警维权报备表实体类 - * - * @author SmartFlow - * @date 2026-03-04 - */ -@Data -@TableName("t_rights_defense_record") -public class RightsRecordEntity { - - /** - * 报备 ID - */ - @TableId(type = IdType.AUTO) - private Long recordId; - - /** - * 报备类型（代为申请、记录备案） - */ - private String recordType; - - /** - * 被侵权人 ID - */ - private Long victimId; - - /** - * 被侵权人姓名 - */ - private String victimName; - - /** - * 被侵权人警号 - */ - private String victimPoliceNo; - - /** - * 被侵权人单位 - */ - private String victimUnit; - - /** - * 事件发生时间 - */ - private LocalDateTime incidentTime; - - /** - * 事件地点 - */ - private String incidentLocation; - - /** - * 执法环节 - */ - private String incidentPhase; - - /** - * 侵害类型 - */ - private String incidentType; - - /** - * 事件描述 - */ - private String incidentDescription; - - /** - * 是否有保障诉求（0 否 1 是） - */ - private Boolean hasClaim; - - /** - * 保障诉求内容 - */ - private String claimContent; - - /** - * 证据文件 - */ - private String evidenceFiles; - - /** - * 报备人 ID - */ - private Long recordUserId; - - /** - * 报备人姓名 - */ - private String recordUserName; - - /** - * 报备人警号 - */ - private String recordUserPoliceNo; - - /** - * 报备单位 - */ - private String recordUnit; - - /** - * 报备时间 - */ - private LocalDateTime recordTime; - - /** - * 处理状态（待处理、处理中、已处理） - */ - private String handleStatus; - - /** - * 处理意见 - */ - private String handleOpinion; - - /** - * 处理人 ID - */ - private Long handleUserId; - - /** - * 处理人姓名 - */ - private String handleUserName; - - /** - * 处理时间 - */ - private LocalDateTime handleTime; - - /** - * 创建人 ID - */ - private Long createUserId; - - /** - * 创建人姓名 - */ - private String createUserName; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新人 ID - */ - private Long updateUserId; - - /** - * 更新人姓名 - */ - private String updateUserName; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 是否删除 - */ - private Boolean deletedFlag; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsRiskWarningEntity.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsRiskWarningEntity.java deleted file mode 100644 index 65c4d79..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsRiskWarningEntity.java +++ /dev/null @@ -1,104 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.time.LocalDateTime; - -/** - * 维权风险预警表实体类 - * - * @author SmartFlow - * @date 2026-03-04 - */ -@Data -@TableName("t_rights_risk_warning") -public class RightsRiskWarningEntity { - - /** - * 预警 ID - */ - @TableId(type = IdType.AUTO) - private Long warningId; - - /** - * 预警类型（办件超期预警、疑似被侵权案件预警） - */ - private String warningType; - - /** - * 预警级别（一般、重要、紧急） - */ - private String warningLevel; - - /** - * 关联维权申请 ID - */ - private Long rightsId; - - /** - * 关联办件 ID - */ - private String caseId; - - /** - * 预警内容 - */ - private String warningContent; - - /** - * 预警时间 - */ - private LocalDateTime warningTime; - - /** - * 处理状态（未处理、已处理、已忽略） - */ - private String handleStatus; - - /** - * 处理人 ID - */ - private Long handleUserId; - - /** - * 处理人姓名 - */ - private String handleUserName; - - /** - * 处理意见 - */ - private String handleOpinion; - - /** - * 处理时间 - */ - private LocalDateTime handleTime; - - /** - * 是否发送短信 - */ - private Boolean sendSmsFlag; - - /** - * 发送时间 - */ - private LocalDateTime sendTime; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 是否删除 - */ - private Boolean deletedFlag; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsVictimEntity.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsVictimEntity.java deleted file mode 100644 index ceb07a3..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/entity/RightsVictimEntity.java +++ /dev/null @@ -1,52 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.time.LocalDateTime; - -@Data -@TableName("t_rights_defense_victim") -public class RightsVictimEntity { - - @TableId(type = IdType.AUTO) - private Long victimId; - - private Long rightsId; - - private Long employeeId; - - private String victimName; - - private String victimType; - - private String victimIdCard; - - private String victimPhone; - - private String victimWorkUnit; - - private String victimPoliceType; - - private String victimPoliceNo; - - private String victimGender; - - private LocalDateTime victimBirthday; - - /** - * 伤害程度 (sacrifice:牺牲, severe:重伤, minor:轻伤, slight:轻微伤, none:无伤害) - */ - private String injuryLevel; - - /** - * 不公正处分处理类型，多个用逗号分隔 (criminal:刑事责任, measure:刑事强制措施, suspension:停职禁闭, party:党纪处分, admin:政纪处分, dismissal:免职降职辞退调离) - */ - private String unjustTreatmentType; - - private LocalDateTime createTime; - - private Boolean deletedFlag; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/vo/PoliceEventVO.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/vo/PoliceEventVO.java deleted file mode 100644 index 1088522..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/vo/PoliceEventVO.java +++ /dev/null @@ -1,80 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - -/** - * 警情信息 VO - * - * @author SmartFlow - * @date 2026-03-27 - */ -@Data -@Schema(description = "警情信息") -public class PoliceEventVO { - - @Schema(description = "警情事件 ID") - private String eventId; - - @Schema(description = "序号") - private String serialNumber; - - @Schema(description = "接警单编号") - private String receiveNo; - - @Schema(description = "报警方式") - private String alarmMethod; - - @Schema(description = "报警时间") - private LocalDateTime alarmTime; - - @Schema(description = "报警电话") - private String alarmPhone; - - @Schema(description = "案发时间") - private LocalDateTime incidentTime; - - @Schema(description = "案发地点") - private String incidentPlace; - - @Schema(description = "报警内容") - private String alarmContent; - - @Schema(description = "报警类型") - private String alarmType; - - @Schema(description = "报警人姓名") - private String alarmPersonName; - - @Schema(description = "报警人联系电话") - private String alarmPersonPhone; - - @Schema(description = "接警单位") - private String receiveUnit; - - @Schema(description = "接警人姓名") - private String receivePersonName; - - @Schema(description = "接警人警号") - private String receivePersonPoliceNo; - - @Schema(description = "接警时间") - private LocalDateTime receiveTime; - - @Schema(description = "案件名称") - private String caseName; - - @Schema(description = "案件类型") - private String caseType; - - @Schema(description = "报案时间") - private LocalDateTime reportTime; - - @Schema(description = "受理时间") - private LocalDateTime acceptTime; - - @Schema(description = "详情链接") - private String detailUrl; -} diff --git a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/vo/RightsCaseVO.java b/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/vo/RightsCaseVO.java deleted file mode 100644 index e590beb..0000000 --- a/smart-flow-api/sa-base/src/main/java/net/lab1024/sa/base/module/business/rights/domain/vo/RightsCaseVO.java +++ /dev/null @@ -1,59 +0,0 @@ -package net.lab1024.sa.base.module.business.rights.domain.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - -/** - * 案件信息 VO - * - * @author SmartFlow - * @date 2026-03-27 - */ -@Data -@Schema(description = "案件信息") -public class RightsCaseVO { - - @Schema(description = "案件 ID") - private String caseId; - - @Schema(description = "序号") - private String serialNumber; - - @Schema(description = "案件编号") - private String caseNo; - - @Schema(description = "案件名称") - private String caseName; - - @Schema(description = "案件类型") - private String caseType; - - @Schema(description = "主办单位") - private String organizeUnit; - - @Schema(description = "案件状态") - private String caseStatus; - - @Schema(description = "报案时间") - private LocalDateTime reportTime; - - @Schema(description = "受理时间") - private LocalDateTime acceptTime; - - @Schema(description = "立案时间") - private LocalDateTime registerTime; - - @Schema(description = "主办人姓名") - private String organizerName; - - @Schema(description = "主办人警号") - private String organizerPoliceNo; - - @Schema(description = "主办人电话") - private String organizerPhone; - - @Schema(description = "详情链接") - private String detailUrl; -} diff --git a/smart-flow-api/sa-base/src/main/resources/dev/sa-base.yaml b/smart-flow-api/sa-base/src/main/resources/dev/sa-base.yaml index f45ad80..d143d6e 100644 --- a/smart-flow-api/sa-base/src/main/resources/dev/sa-base.yaml +++ b/smart-flow-api/sa-base/src/main/resources/dev/sa-base.yaml @@ -1,7 +1,7 @@ spring: # 数据库连接信息 datasource: - url: jdbc:kingbase8://8.162.3.203:54321/kingbase?currentSchema=public,sys_catalog&clientEncoding=utf8&socketTimeout=300000&loginTimeout=3000 + url: jdbc:kingbase8://8.148.25.165:54321/kingbase?currentSchema=public&clientEncoding=utf8&socketTimeout=30000&loginTimeout=30 username: dcms_dev password: sdy@2025#dc$ks driver-class-name: com.kingbase8.Driver diff --git a/smart-flow-api/sa-base/src/main/resources/mapper/rights/PoliceEventMapper.xml b/smart-flow-api/sa-base/src/main/resources/mapper/rights/PoliceEventMapper.xml deleted file mode 100644 index c7c90b9..0000000 --- a/smart-flow-api/sa-base/src/main/resources/mapper/rights/PoliceEventMapper.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - diff --git a/smart-flow-web/src/router/routers.js b/smart-flow-web/src/router/routers.js index 0c03953..ceee421 100644 --- a/smart-flow-web/src/router/routers.js +++ b/smart-flow-web/src/router/routers.js @@ -12,6 +12,7 @@ import { homeRouters } from './system/home'; import { loginRouters } from './system/login'; import { flowRouters } from './flow/flow'; import { oaRouters } from './business/oa'; +import { myxtRouters } from './business/myxt'; import { workBookRouters } from './support/work-book'; import NotFound from '/@/views/system/40X/404.vue'; import NoPrivilege from '/@/views/system/40X/403.vue'; @@ -21,6 +22,7 @@ export const routerArray = [ ...homeRouters, ...flowRouters, ...oaRouters, + ...myxtRouters, ...workBookRouters, { path: '/:pathMatch(.*)*', name: '404', component: NotFound }, { path: '/403', name: '403', component: NoPrivilege } diff --git a/smart-flow-web/src/views/system/employee/components/employee-form-modal/index.vue b/smart-flow-web/src/views/system/employee/components/employee-form-modal/index.vue index fc0f372..c19ad4d 100644 --- a/smart-flow-web/src/views/system/employee/components/employee-form-modal/index.vue +++ b/smart-flow-web/src/views/system/employee/components/employee-form-modal/index.vue @@ -64,9 +64,6 @@ {{ item.roleName }} - - - 启用 @@ -103,7 +100,6 @@ // ----------------------- 显示/隐藏 --------------------- const visible = ref(false); // 是否展示抽屉 - const showPositionSelect = ref(false); // 是否显示诉求办理字段 const isEditMode = ref(false); // 是否为编辑模式 const needConfirmRightsDefense = ref(false); // 是否需要确认维权办理提示 // 隐藏 @@ -237,7 +233,6 @@ }); if (hasRightsDefenseRole) { - showPositionSelect.value = true; // 延迟一下让 DOM 渲染后再验证 await nextTick(); if (!form.positionIdList || form.positionIdList.length === 0) { @@ -255,7 +250,6 @@ } } } else { - showPositionSelect.value = false; form.positionIdList = undefined; } } @@ -284,9 +278,6 @@ positionIdList: [{ required: true, validator: (rule, value) => { - if (showPositionSelect.value && (!value || value.length === 0)) { - return Promise.reject('维权办理人需要选择负责办理的诉求保障'); - } return Promise.resolve(); }, trigger: 'change'