审核规则
This commit is contained in:
parent
6a7663dce6
commit
cde6b6b40f
|
|
@ -0,0 +1,79 @@
|
|||
package com.chushang.inspection.work.po;
|
||||
|
||||
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 com.chushang.common.mybatis.base.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/27 18:13
|
||||
*/
|
||||
|
||||
/**
|
||||
* 工单审核表
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper=true)
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "wrk_audit_rule")
|
||||
public class WrkAuditRule extends BaseEntity {
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@TableId(value = "id", type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@TableField(value = "status")
|
||||
private Integer status;
|
||||
|
||||
|
||||
/**
|
||||
* 审核人
|
||||
*/
|
||||
@TableField(value = "user_id")
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 规则名称
|
||||
*/
|
||||
@TableField(value = "name")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 规则时间
|
||||
*/
|
||||
@TableField(value = "rule_time")
|
||||
private LocalDateTime ruleTime;
|
||||
|
||||
|
||||
/**
|
||||
* 审核描述
|
||||
*/
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 规则内容
|
||||
*/
|
||||
@TableField(value = "content")
|
||||
private String content;
|
||||
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField(value = "dept_id")
|
||||
private Long deptId;
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
package com.chushang.inspection.work.query;
|
||||
|
||||
import cn.hutool.core.date.DatePattern;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.chushang.common.mybatis.annotation.Condition;
|
||||
import com.chushang.common.mybatis.page.CommonParam;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.*;
|
||||
|
||||
import javax.validation.constraints.Null;
|
||||
import javax.validation.constraints.Size;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WrkAuditRuleQuery extends CommonParam {
|
||||
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@Condition(name = "status", type = Condition.ConditionType.eq)
|
||||
private Integer status;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 规则名称
|
||||
*/
|
||||
@Condition(name = "name", type = Condition.ConditionType.like)
|
||||
private String name;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,68 @@
|
|||
package com.chushang.inspection.work.vo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.chushang.common.mybatis.page.CommonParam;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class WrkAuditRuleDTO {
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@TableId(value = "id", type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@TableField(value = "status")
|
||||
private Integer status;
|
||||
|
||||
|
||||
/**
|
||||
* 审核人
|
||||
*/
|
||||
@TableField(value = "user_id")
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 规则名称
|
||||
*/
|
||||
@TableField(value = "name")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 规则时间
|
||||
*/
|
||||
@TableField(value = "rule_time")
|
||||
private LocalDateTime ruleTime;
|
||||
|
||||
|
||||
/**
|
||||
* 审核描述
|
||||
*/
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 规则内容
|
||||
*/
|
||||
@TableField(value = "content")
|
||||
private String content;
|
||||
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField(value = "dept_id")
|
||||
private Long deptId;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
package com.chushang.inspection.work.controller;
|
||||
|
||||
import com.chushang.common.core.web.AjaxResult;
|
||||
import com.chushang.common.log.annotation.SysLog;
|
||||
import com.chushang.common.log.enums.BusinessType;
|
||||
import com.chushang.inspection.project.dto.AuditDTO;
|
||||
import com.chushang.inspection.work.query.WrkAuditRuleQuery;
|
||||
import com.chushang.inspection.work.service.WrkAuditRuleService;
|
||||
import com.chushang.inspection.work.service.WrkInfoService;
|
||||
import com.chushang.inspection.work.vo.WrkAuditRuleDTO;
|
||||
import com.chushang.security.annotation.RequiresPermissions;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* 工单审核表(wrk_info_audit)表控制层
|
||||
* 工单审核相关接口
|
||||
* @author xxxxx
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/wrk/rule")
|
||||
public class WrkAuditRuleController {
|
||||
|
||||
@Resource
|
||||
private WrkAuditRuleService wrkAuditRuleService;
|
||||
|
||||
|
||||
/**
|
||||
* 工单审核
|
||||
*/
|
||||
@PostMapping ("/pages")
|
||||
@RequiresPermissions("wrk:aduit:page")
|
||||
@SysLog(value = "工单审核", businessType = BusinessType.AUDIT)
|
||||
public AjaxResult page(@Validated @RequestBody WrkAuditRuleQuery query) {
|
||||
return AjaxResult.success(wrkAuditRuleService.queryRulePage(query));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 新增和修改
|
||||
*/
|
||||
@PostMapping ("/saveOrUpdate")
|
||||
@RequiresPermissions("wrk:aduit:audit")
|
||||
@SysLog(value = "工单审核", businessType = BusinessType.AUDIT)
|
||||
public AjaxResult saveOrUpdate(@Validated @RequestBody WrkAuditRuleDTO dto) {
|
||||
return AjaxResult.success(wrkAuditRuleService.saveOrUpdate(dto));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 删除字典类型
|
||||
*/
|
||||
@RequiresPermissions("wrk:aduit:remove")
|
||||
@SysLog(value = "字典类型", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("del/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids)
|
||||
{
|
||||
wrkAuditRuleService.removeBatchByIds(Arrays.asList(ids));
|
||||
return AjaxResult.success();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
package com.chushang.inspection.work.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.chushang.datascope.annotation.DataScope;
|
||||
import com.chushang.inspection.work.po.WrkAuditRule;
|
||||
import com.chushang.inspection.work.po.WrkInfo;
|
||||
import com.chushang.inspection.work.query.ReviewedQuery;
|
||||
import com.chushang.inspection.work.query.WrkAppQuery;
|
||||
import com.chushang.inspection.work.query.WrkInfoQuery;
|
||||
import com.chushang.inspection.work.vo.WrkInfoDetailsVO;
|
||||
import com.chushang.inspection.work.vo.WrkInfoExportVO;
|
||||
import com.chushang.inspection.work.vo.WrkListAppVO;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @auther: chujinwang
|
||||
* @date: 2024/6/26 17:13
|
||||
*/
|
||||
public interface WrkAuditRuleMapper extends BaseMapper<WrkAuditRule> {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
package com.chushang.inspection.work.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.chushang.common.mybatis.utils.PageResult;
|
||||
import com.chushang.inspection.work.po.WrkAuditRule;
|
||||
import com.chushang.inspection.work.query.WrkAuditRuleQuery;
|
||||
import com.chushang.inspection.work.vo.WrkAuditRuleDTO;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/26 17:13
|
||||
*/
|
||||
public interface WrkAuditRuleService extends IService<WrkAuditRule> {
|
||||
|
||||
|
||||
PageResult queryRulePage(WrkAuditRuleQuery query);
|
||||
|
||||
|
||||
int saveOrUpdate(WrkAuditRuleDTO dto);
|
||||
|
||||
int update(WrkAuditRuleDTO dto);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,118 @@
|
|||
package com.chushang.inspection.work.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.collection.ListUtil;
|
||||
import cn.hutool.core.lang.Assert;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.http.HttpUtil;
|
||||
import cn.hutool.json.JSONArray;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.chushang.common.core.constant.SecurityConstants;
|
||||
import com.chushang.common.core.exception.ResultException;
|
||||
import com.chushang.common.core.exception.utils.AssertUtil;
|
||||
import com.chushang.common.core.util.DateUtils;
|
||||
import com.chushang.common.core.util.IPUtils;
|
||||
import com.chushang.common.core.util.SpringUtils;
|
||||
import com.chushang.common.core.web.Result;
|
||||
import com.chushang.common.dict.utils.DictUtils;
|
||||
import com.chushang.common.excel.utils.ExcelUtils;
|
||||
import com.chushang.common.mybatis.enums.Operator;
|
||||
import com.chushang.common.mybatis.page.CommonParam;
|
||||
import com.chushang.common.mybatis.utils.PageResult;
|
||||
import com.chushang.common.mybatis.utils.WrapperUtils;
|
||||
import com.chushang.inspection.ins.GeneratedInsFactory;
|
||||
import com.chushang.inspection.project.dto.AuditDTO;
|
||||
import com.chushang.inspection.project.po.InspectionData;
|
||||
import com.chushang.inspection.project.po.WrkProject;
|
||||
import com.chushang.inspection.project.service.InspectionDataService;
|
||||
import com.chushang.inspection.project.service.PollingTaskService;
|
||||
import com.chushang.inspection.terminal.po.FiveStore;
|
||||
import com.chushang.inspection.terminal.po.Store;
|
||||
import com.chushang.inspection.terminal.po.Terminal;
|
||||
import com.chushang.inspection.terminal.po.TerminalIns;
|
||||
import com.chushang.inspection.terminal.service.FiveStoreService;
|
||||
import com.chushang.inspection.terminal.service.StoreService;
|
||||
import com.chushang.inspection.terminal.service.TerminalInsService;
|
||||
import com.chushang.inspection.terminal.service.TerminalService;
|
||||
import com.chushang.inspection.terminal.vo.FiveStoreVO;
|
||||
import com.chushang.inspection.utils.PoolUtils;
|
||||
import com.chushang.inspection.utils.StreamUtils;
|
||||
import com.chushang.inspection.utils.TaskConfigUtils;
|
||||
import com.chushang.inspection.work.dto.DispatchDTO;
|
||||
import com.chushang.inspection.work.dto.WrkInfoDTO;
|
||||
import com.chushang.inspection.work.enums.WorkTypeOperation;
|
||||
import com.chushang.inspection.work.mapper.WrkAuditRuleMapper;
|
||||
import com.chushang.inspection.work.mapper.WrkInfoMapper;
|
||||
import com.chushang.inspection.work.po.*;
|
||||
import com.chushang.inspection.work.query.*;
|
||||
import com.chushang.inspection.work.service.*;
|
||||
import com.chushang.inspection.work.vo.*;
|
||||
import com.chushang.security.entity.po.SysUser;
|
||||
import com.chushang.security.utils.SecurityUtils;
|
||||
import com.chushang.system.feign.RemoteUserService;
|
||||
import com.chushang.task.entity.dto.CreateTaskDTO;
|
||||
import com.chushang.task.enums.ServiceEnum;
|
||||
import com.chushang.task.enums.TaskTypeEnum;
|
||||
import com.chushang.task.feign.RemoteTaskService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @auther: zhao
|
||||
* @date: 2024/6/26 17:13
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class WrkAuditRuleServiceImpl extends ServiceImpl<WrkAuditRuleMapper, WrkAuditRule> implements WrkAuditRuleService {
|
||||
|
||||
@Override
|
||||
public PageResult queryRulePage(WrkAuditRuleQuery query) {
|
||||
CommonParam commonParam = CommonParam.buildPageRequest();
|
||||
LambdaQueryWrapper<WrkAuditRule> queryWrapper = WrapperUtils.builder(query, commonParam);
|
||||
IPage<WrkAuditRule> page = this.page(
|
||||
new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()),
|
||||
queryWrapper
|
||||
);
|
||||
return new PageResult(page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int saveOrUpdate(WrkAuditRuleDTO dto) {
|
||||
if (ObjectUtil.isNotNull(dto.getId())) {
|
||||
WrkAuditRule wrkAuditRule = this.getById(dto.getId());
|
||||
Assert.notNull(wrkAuditRule, "修改失败，数据不存在");
|
||||
BeanUtil.copyProperties(dto, wrkAuditRule);
|
||||
return this.updateById(wrkAuditRule) ? 1 : 0;
|
||||
} else {
|
||||
WrkAuditRule wrkAuditRule = new WrkAuditRule();
|
||||
BeanUtil.copyProperties(dto, wrkAuditRule);
|
||||
wrkAuditRule.setId(IdUtil.getSnowflakeNextId());
|
||||
return this.save(wrkAuditRule) ? 1 : 0;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int update(WrkAuditRuleDTO dto) {
|
||||
|
||||
return this.removeById(dto.getId()) ? 1 : 0;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue