Commit e6cfd6fd authored by fangxinjiang's avatar fangxinjiang

项目规则配置-fxj

parent 9c715fd7
......@@ -29,7 +29,6 @@ import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
* 字典项
......@@ -130,13 +129,13 @@ public class SysAutoDictItem extends BaseEntity {
@Schema(description = "客户端标识")
private String clientId;
/**
* 是否禁用: 0 启用 1
* 是否禁用: 0 启用 1
*/
@ExcelAttribute(name = "是否禁用: 0 启用 1 急用", isNotEmpty = true, errorInfo = "是否禁用: 0 启用 1 急用不能为空", maxLength = 1)
@NotBlank(message = "是否禁用: 0 启用 1 用不能为空")
@Length(max = 1, message = "是否禁用: 0 启用 1 用不能超过1个字符")
@ExcelProperty("是否禁用: 0 启用 1 用")
@Schema(description = "是否禁用: 0 启用 1 用")
@ExcelAttribute(name = "是否禁用: 0 启用 1 禁用", isNotEmpty = true, errorInfo = "是否禁用: 0 启用 1 禁用不能为空", maxLength = 1)
@NotBlank(message = "是否禁用: 0 启用 1 用不能为空")
@Length(max = 1, message = "是否禁用: 0 启用 1 用不能超过1个字符")
@ExcelProperty("是否禁用: 0 启用 1 用")
@Schema(description = "是否禁用: 0 启用 1 用")
private String disable;
/**
* 项目编码,标识此字典项为那个项目所有
......
......@@ -53,20 +53,20 @@ public class TAutoEmpRuleInfo extends BaseEntity {
/**
* 是否启用自动化:0是 1否
*/
@ExcelAttribute(name = "是否启用自动化:0是 1否", isNotEmpty = true, errorInfo = "是否启用自动化:0是 1否不能为空", maxLength = 1)
@ExcelAttribute(name = "是否启用自动化:0是 1否", isNotEmpty = true, errorInfo = "是否启用自动化不能为空", maxLength = 1)
@NotBlank(message = "是否启用自动化:0是 1否不能为空")
@Length(max = 1, message = "是否启用自动化:0是 1否不能超过1个字符")
@ExcelProperty("是否启用自动化:0是 1否")
@Schema(description = "是否启用自动化:0是 1否")
private String autoFlag;
/**
* 收集方:0自动1 手动
* 收集方:0自动1 手动
*/
@ExcelAttribute(name = "收集方案:0自动1 手动", isNotEmpty = true, errorInfo = "收集方案:0自动1 手动不能为空", maxLength = 1)
@NotBlank(message = "收集方:0自动1 手动不能为空")
@Length(max = 1, message = "收集方:0自动1 手动不能超过1个字符")
@ExcelProperty("收集方:0自动1 手动")
@Schema(description = "收集方:0自动1 手动")
@ExcelAttribute(name = "收集方式:0自动1 手动", isNotEmpty = true, errorInfo = "收集方式不能为空", maxLength = 1)
@NotBlank(message = "收集方:0自动1 手动不能为空")
@Length(max = 1, message = "收集方:0自动1 手动不能超过1个字符")
@ExcelProperty("收集方:0自动1 手动")
@Schema(description = "收集方:0自动1 手动")
private String collectType;
/**
* 推送时间
......@@ -119,7 +119,7 @@ public class TAutoEmpRuleInfo extends BaseEntity {
/**
* 业务细分(同合的业务细分)
*/
@ExcelAttribute(name = "业务细分(同合的业务细分)", isNotEmpty = true, errorInfo = "业务细分(同合的业务细分)不能为空", maxLength = 32)
@ExcelAttribute(name = "业务细分(同合的业务细分)", isNotEmpty = true, errorInfo = "业务细分不能为空", maxLength = 32)
@NotBlank(message = "业务细分(同合的业务细分)不能为空")
@Length(max = 32, message = "业务细分(同合的业务细分)不能超过32个字符")
@ExcelProperty("业务细分(同合的业务细分)")
......@@ -137,7 +137,7 @@ public class TAutoEmpRuleInfo extends BaseEntity {
/**
* 项目编码
*/
@ExcelAttribute(name = "项目编码", isNotEmpty = true, errorInfo = "项目编码不能为空", maxLength = 50)
@ExcelAttribute(name = "项目编码")
@NotBlank(message = "项目编码不能为空")
@Length(max = 50, message = "项目编码不能超过50个字符")
@ExcelProperty("项目编码")
......@@ -146,8 +146,7 @@ public class TAutoEmpRuleInfo extends BaseEntity {
/**
* 项目ID
*/
@ExcelAttribute(name = "项目ID", isNotEmpty = true, errorInfo = "项目ID不能为空", maxLength = 32)
@NotBlank(message = "项目ID不能为空")
@ExcelAttribute(name = "项目ID")
@Length(max = 32, message = "项目ID不能超过32个字符")
@ExcelProperty("项目ID")
@Schema(description = "项目ID")
......@@ -155,8 +154,7 @@ public class TAutoEmpRuleInfo extends BaseEntity {
/**
* 项目配置主表ID
*/
@ExcelAttribute(name = "项目配置主表ID", isNotEmpty = true, errorInfo = "项目配置主表ID不能为空", maxLength = 32)
@NotBlank(message = "项目配置主表ID不能为空")
@ExcelAttribute(name = "项目配置主表ID")
@Length(max = 32, message = "项目配置主表ID不能超过32个字符")
@ExcelProperty("项目配置主表ID")
@Schema(description = "项目配置主表ID")
......
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.SysAutoDictItem;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoEmpRuleInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoMainRel;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoRuleLog;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 项目配置表主表--详情
*
* @author fxj
* @date 2025-03-13 15:15:26
*/
@Data
public class TAutoMainRelAddVo implements Serializable {
//项目配置主表
private TAutoMainRel autoMainRel;
//档案管理规则配置表
private TAutoEmpRuleInfo autoEmpRuleInfo;
//岗位信息表
private List<SysAutoDictItem> autoDictItems;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.yifu.cloud.plus.v1.yifu.archives.entity.SysAutoDictItem;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoEmpRuleInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoMainRel;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoRuleLog;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 项目配置表主表--详情
*
* @author fxj
* @date 2025-03-13 15:15:26
*/
@Data
public class TAutoMainRelDetailVo implements Serializable {
//项目配置主表
private TAutoMainRel autoMainRel;
//档案管理规则配置表
private TAutoEmpRuleInfo autoEmpRuleInfo;
//项目配置日志表
private List<TAutoRuleLog> autoRuleLogs;
//岗位信息表
private List<SysAutoDictItem> autoDictItems;
//项目信息表
private TSettleDomainSelectVo settleDomainVo;
}
......@@ -21,8 +21,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoMainRel;
import com.yifu.cloud.plus.v1.yifu.archives.service.TAutoMainRelService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoMainRelAddVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoMainRelDetailVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoMainRelExportVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoMainRelSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
......@@ -84,41 +87,50 @@ public class TAutoMainRelController {
}
/**
* 通过id查询项目配置表主表
* 通过id查询项目配置表主表及相关信息
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询:hasPermission('demo_tautomainrel_get')")
@Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('demo_tautomainrel_get')" )
public R<TAutoMainRel> getById(@PathVariable("id" ) String id) {
return R.ok(tAutoMainRelService.getById(id));
public R<TAutoMainRelDetailVo> getById(@PathVariable("id" ) String id) {
return tAutoMainRelService.getByIdAsso(id);
}
/**
* 通过id查询项目配置表主表及相关信息
* @param deptId deptNo
* @return R
*/
@Operation(summary = "通过项目信息查询项目配置", description = "通过项目信息查询项目配置")
@GetMapping("/getProjectRule" )
public R<TAutoMainRelDetailVo> getProjectRule(@RequestParam(required = false) String deptId,
@RequestParam(required = false) String deptNo) {
return tAutoMainRelService.getProjectRule(deptId,deptNo);
}
/**
* 新增项目配置表主表
* @param tAutoMainRel 项目配置表主表
* @param entity 项目配置表主表
* @return R
*/
@Operation(summary = "新增项目配置表主表", description = "新增项目配置表主表:hasPermission('demo_tautomainrel_add')")
@SysLog("新增项目配置表主表" )
@PostMapping
@PreAuthorize("@pms.hasPermission('demo_tautomainrel_add')" )
public R<Boolean> save(@RequestBody TAutoMainRel tAutoMainRel) {
return R.ok(tAutoMainRelService.save(tAutoMainRel));
@Operation(summary = "新增项目配置表", description = "新增项目配置表")
@SysLog("新增项目配置表" )
@PostMapping("/save")
public R<Boolean> save(@RequestBody TAutoMainRelAddVo entity) {
return tAutoMainRelService.saveAsso(entity);
}
/**
* 修改项目配置表主表
* @param tAutoMainRel 项目配置表主表
* @param entity 项目配置表修改
* @return R
*/
@Operation(summary = "修改项目配置表主表", description = "修改项目配置表主表:hasPermission('demo_tautomainrel_edit')")
@SysLog("修改项目配置表主表" )
@PutMapping
@PreAuthorize("@pms.hasPermission('demo_tautomainrel_edit')" )
public R<Boolean> updateById(@RequestBody TAutoMainRel tAutoMainRel) {
return R.ok(tAutoMainRelService.updateById(tAutoMainRel));
@Operation(summary = "修改项目配置表主表", description = "修改项目配置表")
@SysLog("修改项目配置表" )
@PutMapping("/updateById")
public R<Boolean> updateById(@RequestBody TAutoMainRelAddVo entity) {
return tAutoMainRelService.updateAsso(entity);
}
/**
......
......@@ -63,93 +63,5 @@ public class TAutoRuleLogController {
public R<IPage<TAutoRuleLog>> getTAutoRuleLogPage(Page<TAutoRuleLog> page, TAutoRuleLogSearchVo tAutoRuleLog) {
return new R<>(tAutoRuleLogService.getTAutoRuleLogPage(page,tAutoRuleLog));
}
/**
* 不分页查询
* @param tAutoRuleLog 规则变更日志表
* @return
*/
@Operation(summary = "不分页查询", description = "不分页查询")
@PostMapping("/noPage" )
//@PreAuthorize("@pms.hasPermission('demo_tautorulelog_get')" )
public R<List<TAutoRuleLog>> getTAutoRuleLogNoPage(@RequestBody TAutoRuleLogSearchVo tAutoRuleLog) {
return R.ok(tAutoRuleLogService.noPageDiy(tAutoRuleLog));
}
/**
* 通过id查询规则变更日志表
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询:hasPermission('demo_tautorulelog_get')")
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('demo_tautorulelog_get')" )
public R<TAutoRuleLog> getById(@PathVariable("id" ) String id) {
return R.ok(tAutoRuleLogService.getById(id));
}
/**
* 新增规则变更日志表
* @param tAutoRuleLog 规则变更日志表
* @return R
*/
@Operation(summary = "新增规则变更日志表", description = "新增规则变更日志表:hasPermission('demo_tautorulelog_add')")
@SysLog("新增规则变更日志表" )
@PostMapping
@PreAuthorize("@pms.hasPermission('demo_tautorulelog_add')" )
public R<Boolean> save(@RequestBody TAutoRuleLog tAutoRuleLog) {
return R.ok(tAutoRuleLogService.save(tAutoRuleLog));
}
/**
* 修改规则变更日志表
* @param tAutoRuleLog 规则变更日志表
* @return R
*/
@Operation(summary = "修改规则变更日志表", description = "修改规则变更日志表:hasPermission('demo_tautorulelog_edit')")
@SysLog("修改规则变更日志表" )
@PutMapping
@PreAuthorize("@pms.hasPermission('demo_tautorulelog_edit')" )
public R<Boolean> updateById(@RequestBody TAutoRuleLog tAutoRuleLog) {
return R.ok(tAutoRuleLogService.updateById(tAutoRuleLog));
}
/**
* 通过id删除规则变更日志表
* @param id id
* @return R
*/
@Operation(summary = "通过id删除规则变更日志表", description = "通过id删除规则变更日志表:hasPermission('demo_tautorulelog_del')")
@SysLog("通过id删除规则变更日志表" )
@DeleteMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('demo_tautorulelog_del')" )
public R<Boolean> removeById(@PathVariable String id) {
return R.ok(tAutoRuleLogService.removeById(id));
}
/**
* 规则变更日志表 批量导入
*
* @author fxj
* @date 2025-03-13 15:15:26
**/
@SneakyThrows
@Operation(description = "批量新增规则变更日志表 hasPermission('demo_tautorulelog-batch-import')")
@SysLog("批量新增规则变更日志表")
@PostMapping("/importListAdd")
@PreAuthorize("@pms.hasPermission('demo_tautorulelog-batch-import')")
public R<List<ErrorMessage>> importListAdd(@RequestBody MultipartFile file){
return tAutoRuleLogService.importDiy(file.getInputStream());
}
/**
* 规则变更日志表 批量导出
* @author fxj
* @date 2025-03-13 15:15:26
**/
@Operation(description = "导出规则变更日志表 hasPermission('demo_tautorulelog-export')")
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('demo_tautorulelog-export')")
public void export(HttpServletResponse response, @RequestBody TAutoRuleLogSearchVo searchVo) {
tAutoRuleLogService.listExport(response,searchVo);
}
}
......@@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoMainRel;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoMainRelAddVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoMainRelDetailVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoMainRelExportVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoMainRelSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
......@@ -49,4 +51,12 @@ public interface TAutoMainRelService extends IService<TAutoMainRel> {
void listExport(HttpServletResponse response, TAutoMainRelSearchVo searchVo);
List<TAutoMainRelExportVo> noPageDiy(TAutoMainRelSearchVo searchVo);
R<TAutoMainRelDetailVo> getByIdAsso(String id);
R<Boolean> saveAsso(TAutoMainRelAddVo entity);
R<Boolean> updateAsso(TAutoMainRelAddVo entity);
R<TAutoMainRelDetailVo> getProjectRule(String deptId, String deptNo);
}
......@@ -22,12 +22,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoRuleLog;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoRuleLogSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.util.List;
/**
* 规则变更日志表
......@@ -36,16 +30,8 @@ import java.util.List;
* @date 2025-03-13 15:15:26
*/
public interface TAutoRuleLogService extends IService<TAutoRuleLog> {
/**
* 规则变更日志表简单分页查询
* @param tAutoRuleLog 规则变更日志表
* @return
*/
IPage<TAutoRuleLog> getTAutoRuleLogPage(Page<TAutoRuleLog> page, TAutoRuleLogSearchVo tAutoRuleLog);
R<List<ErrorMessage>> importDiy(InputStream inputStream);
void listExport(HttpServletResponse response, TAutoRuleLogSearchVo searchVo);
IPage<TAutoRuleLog> getTAutoRuleLogPage(Page<TAutoRuleLog> page, TAutoRuleLogSearchVo tAutoRuleLog);
List<TAutoRuleLog> noPageDiy(TAutoRuleLogSearchVo searchVo);
<T> TAutoRuleLog saveModificationRecord(Integer type, String mainId, T oldInfo, T newInfo);
}
......@@ -347,6 +347,8 @@ public interface CommonConstants {
String PLEASE_LOG_IN = "请登录!";
String INIT_DATA_GET_FAIL = "初试化数据失败,请检查传参!";
String SEX_MAN = "1";
String SEX_WONMAN = "2";
String SALARY_ISFLAG = "已结算";
......@@ -660,4 +662,5 @@ public interface CommonConstants {
public static final String DELETE_FLAG = "1";
//单条数据检索SQL
public static final String SQL_LIMIT_ONE = " limit 1 ";
String POST_TYPE = "post_type";
}
......@@ -52,4 +52,6 @@ public interface ServiceNameConstants {
String CLIENT_ID_HR_B = "hrCustomer";
String SERVICE_NAME_MVP = "mvp";
String SERVICE_CLIENT_ID_MVP = "yifu-mvp";
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment