hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-02-01 19:24:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[feat] 新增外包合同关联功能

Browse Source
This commit is contained in:
wyw 2024-07-30 12:36:12 +08:00
parent a224d73203
commit 8ebbf12016
8 changed files with 53 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/ContractController.java
View File

@ -23,6 +23,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "管理后台 - 合同管理")
@RestController
@ -37,14 +38,14 @@ public class ContractController {
@Operation(summary = "创建合同")
@PreAuthorize("@ss.hasPermission('cms:contract:create')")
public CommonResult<Long> createContract(@Valid @RequestBody ContractSaveReqVO createReqVO) {
return success(contractService.createContract(createReqVO));
return success(contractService.createContract(getLoginUserId(),createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新合同")
@PreAuthorize("@ss.hasPermission('cms:contract:update')")
public CommonResult<Boolean> updateContract(@Valid @RequestBody ContractSaveReqVO updateReqVO) {
contractService.updateContract(updateReqVO);
contractService.updateContract(getLoginUserId(),updateReqVO);
return success(true);
}

6
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/ContractOutsController.java
View File

@ -26,6 +26,7 @@ import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "管理后台 - 外包合同关联")
@RestController
@ -40,14 +41,14 @@ public class ContractOutsController {
@Operation(summary = "创建外包合同关联")
@PreAuthorize("@ss.hasPermission('cms:contract-outs:create')")
public CommonResult<Long> createContractOuts(@Valid @RequestBody ContractOutsSaveReqVO createReqVO) {
return success(contractOutsService.createContractOuts(createReqVO));
return success(contractOutsService.createContractOuts(getLoginUserId(),createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新外包合同关联")
@PreAuthorize("@ss.hasPermission('cms:contract-outs:update')")
public CommonResult<Boolean> updateContractOuts(@Valid @RequestBody ContractOutsSaveReqVO updateReqVO) {
contractOutsService.updateContractOuts(updateReqVO);
contractOutsService.updateContractOuts(getLoginUserId(),updateReqVO);
return success(true);
}
@ -69,6 +70,7 @@ public class ContractOutsController {
return success(BeanUtils.toBean(contractOuts, ContractOutsRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得外包合同关联分页")
@PreAuthorize("@ss.hasPermission('cms:contract-outs:query')")

20
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/vo/ContractOutsPageReqVO.java
View File

@ -23,25 +23,5 @@ public class ContractOutsPageReqVO extends PageParam {
@Schema(description = "外包合同id", example = "9277")
private Long outsContractId;
@Schema(description = "创建人")
private String creator;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "更新人")
private String updater;
@Schema(description = "更新时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] updateTime;
@Schema(description = "是否删除")
private Boolean delete;
@Schema(description = "租户id", example = "15943")
private Long tenantId;
}

28
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/vo/ContractOutsRespVO.java
View File

@ -5,17 +5,11 @@ import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 外包合同关联 Response VO")
@Data
@ExcelIgnoreUnannotated
public class ContractOutsRespVO {
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "7688")
@ExcelProperty("主键")
private Long id;
@Schema(description = "合同id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16187")
@ExcelProperty("合同id")
private Long contractId;
@ -24,28 +18,6 @@ public class ContractOutsRespVO {
@ExcelProperty("外包合同id")
private Long outsContractId;
@Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建人")
private String creator;
@Schema(description = "创建时间")
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "更新人", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("更新人")
private String updater;
@Schema(description = "更新时间")
@ExcelProperty("更新时间")
private LocalDateTime updateTime;
@Schema(description = "是否删除", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否删除")
private Boolean delete;
@Schema(description = "租户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "15943")
@ExcelProperty("租户id")
private Long tenantId;
}

24
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contractouts/vo/ContractOutsSaveReqVO.java
View File

@ -22,28 +22,4 @@ public class ContractOutsSaveReqVO {
@NotNull(message = "外包合同id不能为空")
private Long outsContractId;
@Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "创建人不能为空")
private String creator;
@Schema(description = "创建时间")
private LocalDateTime createTime;
@Schema(description = "更新人", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "更新人不能为空")
private String updater;
@Schema(description = "更新时间")
private LocalDateTime updateTime;
@Schema(description = "是否删除", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "是否删除不能为空")
private Boolean delete;
@Schema(description = "租户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "15943")
@NotNull(message = "租户id不能为空")
private Long tenantId;
}

2
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contractouts/ContractOutsDO.java
View File

@ -47,7 +47,7 @@ public class ContractOutsDO extends BaseDO {
/**
* 是否删除
*/
private Boolean delete;
private Boolean deleted;
/**
* 租户id

4
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractouts/ContractOutsService.java
View File

@ -19,14 +19,14 @@ public interface ContractOutsService {
* @param createReqVO 创建信息
* @return 编号
*/
Long createContractOuts(@Valid ContractOutsSaveReqVO createReqVO);
Long createContractOuts(Long loginUserId ,@Valid ContractOutsSaveReqVO createReqVO);
/**
* 更新外包合同关联
*
* @param updateReqVO 更新信息
*/
void updateContractOuts(@Valid ContractOutsSaveReqVO updateReqVO);
void updateContractOuts(Long loginUserId,@Valid ContractOutsSaveReqVO updateReqVO);
/**
* 删除外包合同关联

49
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractouts/ContractOutsServiceImpl.java
View File

@ -6,13 +6,16 @@ import cn.iocoder.yudao.module.cms.controller.admin.contractouts.vo.ContractOuts
import cn.iocoder.yudao.module.cms.controller.admin.contractouts.vo.ContractOutsSaveReqVO;
import cn.iocoder.yudao.module.cms.dal.dataobject.contractouts.ContractOutsDO;
import cn.iocoder.yudao.module.cms.dal.mysql.contractouts.ContractOutsMapper;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.CONTRACT_NOT_EXISTS;
import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.CONTRACT_OUTS_NOT_EXISTS;
import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.USER_NOT_EXISTS;
/**
* 外包合同关联 Service 实现类
@ -26,8 +29,11 @@ public class ContractOutsServiceImpl implements ContractOutsService {
@Resource
private ContractOutsMapper contractOutsMapper;
@Resource
private AdminUserApi adminUserApi;
@Override
public Long createContractOuts(ContractOutsSaveReqVO createReqVO) {
public Long createContractOuts(Long loginUserId, ContractOutsSaveReqVO createReqVO) {
ContractOutsDO outsDO = BeanUtils.toBean(createReqVO, ContractOutsDO.class);
Long contractId = createReqVO.getContractId();
Long outsContractId = createReqVO.getOutsContractId();
@ -38,17 +44,48 @@ public class ContractOutsServiceImpl implements ContractOutsService {
throw exception(CONTRACT_OUTS_NOT_EXISTS);
}
contractOutsMapper.insert(outsDO);
String userName = adminUserApi.getUser(loginUserId).getNickname();
//用户不存在
if (userName == null || userName.isEmpty()) {
throw exception(USER_NOT_EXISTS);
}
//如果这条记录不存在，则创建者就是登陆者，如果存在，只更新更新者，创建者不再改变
QueryWrapper<ContractOutsDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("contract_id", contractId);
queryWrapper.eq("outs_contract_id", outsContractId);
Long count = contractOutsMapper.selectCount(queryWrapper);
if (count >= 1) {
throw exception(CONTRACT_OUTS_ALREADY_EXISTS);
}
ContractOutsDO contractOutsDO = contractOutsMapper.selectOne(queryWrapper);
if (contractOutsDO == null) {
outsDO.setCreator(userName);
outsDO.setUpdater(userName);
}
// 返回
return createReqVO.getId();
return (long) contractOutsMapper.insert(outsDO);
}
@Override
public void updateContractOuts(ContractOutsSaveReqVO updateReqVO) {
public void updateContractOuts(Long loginUserId,ContractOutsSaveReqVO updateReqVO) {
// 校验存在
validateContractOutsExists(updateReqVO.getId());
if (loginUserId == null){
throw exception(USER_NOT_EXISTS);
}
// 更新
ContractOutsDO updateObj = BeanUtils.toBean(updateReqVO, ContractOutsDO.class);
//校验
ContractOutsDO contractOutsDO = contractOutsMapper.selectById(updateObj.getId());
if (contractOutsDO == null) {
throw exception(CONTRACT_OUTS_NOT_EXISTS);
}
String userName = adminUserApi.getUser(loginUserId).getNickname();
updateObj.setUpdater(userName);
contractOutsMapper.updateById(updateObj);
}