Browse Source

滚动计划审核

dev
xiaoyu 1 month ago
parent
commit
c947ca74c0
  1. 17
      ruoyi-system/src/main/java/com/ruoyi/system/domain/RollingPlan.java
  2. 8
      ruoyi-system/src/main/java/com/ruoyi/system/service/IRollingPlanService.java
  3. 13
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RollingPlanServiceImpl.java
  4. 22
      sql/gss/滚动计划.sql

17
ruoyi-system/src/main/java/com/ruoyi/system/domain/RollingPlan.java

@ -154,5 +154,22 @@ public class RollingPlan extends BaseEntity @@ -154,5 +154,22 @@ public class RollingPlan extends BaseEntity
@Excel(name = "锁定周次")
private String lockWeek;
/** 审核状态(0待审核 1已审核 2已驳回) */
@Excel(name = "审核状态", readConverterExp = "0=待审核,1=已审核,2=已驳回")
private String auditStatus;
/** 审核人 */
@Excel(name = "审核人")
private String auditBy;
/** 审核时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date auditTime;
/** 审核备注 */
@Excel(name = "审核备注")
private String auditRemark;
// getter/setter 方法略
}

8
ruoyi-system/src/main/java/com/ruoyi/system/service/IRollingPlanService.java

@ -42,6 +42,14 @@ public interface IRollingPlanService @@ -42,6 +42,14 @@ public interface IRollingPlanService
*/
public int updateRollingPlan(RollingPlan rollingPlan);
/**
* 审核滚动计划
*
* @param rollingPlan 滚动计划信息
* @return 结果
*/
public int auditRollingPlan(RollingPlan rollingPlan);
/**
* 批量删除滚动计划
*

13
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RollingPlanServiceImpl.java

@ -92,4 +92,17 @@ public class RollingPlanServiceImpl implements IRollingPlanService @@ -92,4 +92,17 @@ public class RollingPlanServiceImpl implements IRollingPlanService
{
return rollingPlanMapper.deleteRollingPlanByPlanId(planId);
}
/**
* 审核滚动计划
*
* @param rollingPlan 滚动计划信息
* @return 结果
*/
@Override
public int auditRollingPlan(RollingPlan rollingPlan)
{
rollingPlan.setAuditTime(DateUtils.getNowDate());
return rollingPlanMapper.updateRollingPlan(rollingPlan);
}
}

22
sql/gss/滚动计划.sql

@ -75,4 +75,24 @@ values('滚动计划导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'sys @@ -75,4 +75,24 @@ values('滚动计划导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'sys
-- 修改菜单权限标识
UPDATE sys_menu
SET perms = REPLACE(perms, 'system:rollingPlan:', 'system:rolling-plan:')
WHERE perms LIKE 'system:rollingPlan:%';
WHERE perms LIKE 'system:rollingPlan:%';
-------------------------------------------------------------------------
-- 添加审核相关字段
ALTER TABLE `rolling_plan`
ADD COLUMN `audit_status` char(1) DEFAULT '0' COMMENT '审核状态(0待审核 1已审核 2已驳回)' AFTER `status`,
ADD COLUMN `audit_by` varchar(64) DEFAULT '' COMMENT '审核人' AFTER `audit_status`,
ADD COLUMN `audit_time` datetime DEFAULT NULL COMMENT '审核时间' AFTER `audit_by`,
ADD COLUMN `audit_remark` varchar(500) DEFAULT NULL COMMENT '审核备注' AFTER `audit_time`;
-- 添加审核菜单权限
INSERT INTO sys_menu(menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
VALUES ('滚动计划审核', '3', '1', 'rollingPlanAudit', 'system/rollingPlan/audit', 1, 0, 'C', '0', '0', 'system:rollingPlan:audit', 'audit', 'admin', sysdate(), '', null, '');
-- 按钮父菜单ID
SELECT @parentId := LAST_INSERT_ID();
-- 审核按钮权限
INSERT INTO sys_menu(menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
VALUES ('滚动计划审核操作', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'system:rollingPlan:audit:operation', '#', 'admin', sysdate(), '', null, '');
Loading…
Cancel
Save