1. 修复代码生成器错误的 mysql 路径
2. 新增部门代码,部门简称字段
This commit is contained in:
@@ -12,12 +12,14 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
||||
import cn.iocoder.yudao.module.infra.api.businessfile.BusinessFileApi;
|
||||
import cn.iocoder.yudao.module.infra.api.businessfile.dto.BusinessFilePageReqDTO;
|
||||
import cn.iocoder.yudao.module.infra.api.businessfile.dto.BusinessFileWithUrlRespDTO;
|
||||
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
|
||||
import cn.iocoder.yudao.module.system.api.dept.dto.CompanyDeptInfoRespDTO;
|
||||
import cn.iocoder.yudao.module.template.controller.admin.contract.vo.DemoContractPageReqVO;
|
||||
import cn.iocoder.yudao.module.template.controller.admin.contract.vo.DemoContractRespVO;
|
||||
import cn.iocoder.yudao.module.template.controller.admin.contract.vo.DemoContractSaveReqVO;
|
||||
import cn.iocoder.yudao.module.template.dal.dataobject.contract.DemoContractDO;
|
||||
import cn.iocoder.yudao.module.template.service.contract.DemoContractService;
|
||||
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -30,9 +32,11 @@ import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
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
|
||||
@@ -54,6 +58,9 @@ public class DemoContractController extends AbstractFileUploadController impleme
|
||||
@Resource
|
||||
private BusinessFileApi businessFileApi;
|
||||
|
||||
@Resource
|
||||
private DeptApi deptApi;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建合同")
|
||||
@PreAuthorize("@ss.hasPermission('template:demo-contract:create')")
|
||||
@@ -101,8 +108,9 @@ public class DemoContractController extends AbstractFileUploadController impleme
|
||||
@PreAuthorize("@ss.hasPermission('template:demo-contract:query')")
|
||||
public CommonResult<PageResult<DemoContractRespVO>> getDemoContractPage(@Valid DemoContractPageReqVO pageReqVO) {
|
||||
BusinessFilePageReqDTO pageReqDTO = new BusinessFilePageReqDTO();
|
||||
pageReqDTO.setBusinessCode("22323");
|
||||
CommonResult<PageResult<BusinessFileWithUrlRespDTO>> businessFilePageWithUrl = businessFileApi.getBusinessFilePageWithUrl(pageReqDTO);
|
||||
CommonResult<Set<CompanyDeptInfoRespDTO>> companyDeptInfoListByUserId = deptApi.getCompanyDeptInfoListByUserId(getLoginUserId());
|
||||
Long id = IdWorker.getId();
|
||||
System.out.println("Generated ID: " + id);
|
||||
PageResult<DemoContractDO> pageResult = demoContractService.getDemoContractPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, DemoContractRespVO.class));
|
||||
}
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
package cn.iocoder.yudao.module.template.framework.rpc.config;
|
||||
|
||||
import cn.iocoder.yudao.module.infra.api.config.ConfigApi;
|
||||
import cn.iocoder.yudao.module.infra.api.file.FileApi;
|
||||
import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi;
|
||||
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
|
||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
@Configuration(value = "templateRpcConfiguration", proxyBeanMethods = false)
|
||||
@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, ConfigApi.class, DeptApi.class})
|
||||
public class RpcConfiguration {
|
||||
}
|
||||
Reference in New Issue
Block a user