From 215c9da7fa3c39661a801e2a9cd560cbe014d23a Mon Sep 17 00:00:00 2001 From: Lx <935448346@qq.com> Date: Fri, 11 Apr 2025 18:05:56 +0800 Subject: [PATCH] 0411 --- .../controller/CompanySmallProgramAPI.java | 25 ++++ .../yudao/module/company/entity/Company.java | 124 ++++++++++++------ .../impl/ExamBatchItemServiceImpl.java | 13 +- .../jx/mapper/DriveSchoolInfoMapper.java | 5 + .../app/SmallProgramJxOrderController.java | 23 ++++ .../jx/service/IDriveSchoolInfoService.java | 5 + .../impl/DriveSchoolInfoServiceImpl.java | 6 + .../mapper/jx/DriveSchoolInfoMapper.xml | 8 ++ 8 files changed, 168 insertions(+), 41 deletions(-) diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/app/company/controller/CompanySmallProgramAPI.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/app/company/controller/CompanySmallProgramAPI.java index ace5ead8..c2a3270d 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/app/company/controller/CompanySmallProgramAPI.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/app/company/controller/CompanySmallProgramAPI.java @@ -1,9 +1,12 @@ package cn.iocoder.yudao.module.app.company.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import cn.iocoder.yudao.module.company.entity.Company; import cn.iocoder.yudao.module.company.service.CompanyService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -16,6 +19,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.annotation.security.PermitAll; +import java.util.List; + import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; /** @@ -68,4 +73,24 @@ public class CompanySmallProgramAPI { public CommonResult getCompanyServerNoTenantIdById(@RequestParam("id") String id){ return success(companyService.getCompanyServerById(id)); } + + /** + * 查某租户下某个业务系统的企业信息 + * @author vinjor-M + * @date 15:08 2024/11/15 + * @param tenantId 租户ID + * @param systemCode 系统标识 + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + **/ + @GetMapping("/getCompanyByTenantId") + @Operation(summary = "查某租户下某个业务系统的企业信息") + @TenantIgnore + public CommonResult getCompanyByTenantId(String tenantId,String systemCode){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(TenantBaseDO::getTenantId,tenantId) + .like(Company::getServiceCodes,systemCode) + .orderByDesc(BaseDO::getCreateTime); + List list = this.companyService.list(queryWrapper); + return success(list.isEmpty()?null:list.get(0)); + } } diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/entity/Company.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/entity/Company.java index acbd50cc..cab54a1d 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/entity/Company.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/entity/Company.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.company.entity; +import cn.iocoder.yudao.annotation.Excel; import cn.iocoder.yudao.converter.DateFormatConverter; import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; @@ -14,8 +15,9 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; - /** +/** * 企业信息表（每个租户的下属企业信息）; + * * @author : http://www.chiner.pro * @date : 2024-7-31 */ @@ -24,53 +26,101 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @ExcelIgnoreUnannotated public class Company extends TenantBaseDO { - /** 主键标识 */ + /** + * 主键标识 + */ @TableId(type = IdType.ASSIGN_ID) - private String id ; - /** 企业名称 */ + private String id; + /** + * 企业名称 + */ @ExcelProperty("企业名称") - private String corpName ; - /** 企业简称 */ + private String corpName; + /** + * 企业简称 + */ @ExcelProperty("企业简称") - private String simpleName ; - /** 统一社会信用代码 */ + private String simpleName; + /** + * 统一社会信用代码 + */ @ExcelProperty("统一社会信用代码") - private String orgCard ; - /** 注册资本（单位：万元） */ + private String orgCard; + /** + * 注册资本（单位：万元） + */ @ExcelProperty("注册资本（单位：万元）") - private Integer registFund ; - /** 注册日期 */ - @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ExcelProperty(value = "注册日期",converter = DateFormatConverter.class) - private Date registDate ; - /** 详细地址 */ + private Integer registFund; + /** + * 注册日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ExcelProperty(value = "注册日期", converter = DateFormatConverter.class) + private Date registDate; + /** + * 详细地址 + */ @ExcelProperty("详细地址") - private String address ; - /** 法人姓名 */ + private String address; + /** + * 法人姓名 + */ @ExcelProperty("法人姓名") - private String legalName ; - /** 法人身份证号 */ + private String legalName; + /** + * 法人身份证号 + */ @ExcelProperty("法人身份证号") - private String legalCard ; - /** 联系人 */ + private String legalCard; + /** + * 联系人 + */ @ExcelProperty("联系人") - private String contactName ; - /** 联系方式 */ + private String contactName; + /** + * 联系方式 + */ @ExcelProperty("联系方式") - private String mobilePhone ; - /** 企业简介 */ + private String mobilePhone; + /** + * 企业简介 + */ @ExcelProperty("企业简介") - private String corpContent ; - /** 经营范围 */ + private String corpContent; + /** + * 经营范围 + */ @ExcelProperty("经营范围") - private String business ; - /** 管理员登录账号 */ - private String loginAccount ; - /** 关联的服务编号（多个以英文逗号隔开）(实际就是这个企业的用户登录后有哪些系统权限) */ - private String serviceCodes ; - /** 开户行 */ + private String business; + /** + * 管理员登录账号 + */ + private String loginAccount; + /** + * 关联的服务编号（多个以英文逗号隔开）(实际就是这个企业的用户登录后有哪些系统权限) + */ + private String serviceCodes; + /** + * 开户行 + */ private String bankAccount; - /** 收款账号 */ + /** + * 收款账号 + */ private String account; -} \ No newline at end of file + /** + * 图片 + */ + private String photo; + + /** + * 营业开始时间 + */ + private String businessStartTime; + + /** + * 营业结束时间 + */ + private String businessEndTime; +} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/service/impl/ExamBatchItemServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/service/impl/ExamBatchItemServiceImpl.java index a0990f9a..74334a53 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/service/impl/ExamBatchItemServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/service/impl/ExamBatchItemServiceImpl.java @@ -270,7 +270,9 @@ public class ExamBatchItemServiceImpl extends ServiceImpl list = processService.list(queryWrapper); if (list.isEmpty()) { //插入 @@ -290,14 +292,17 @@ public class ExamBatchItemServiceImpl extends ServiceImpl findSelfSchoolData(); /*String selectDriveSchoolInfoAppletById(Long id);*/ + + /** + * 小程序根据租户id获取驾校详细信息 + */ + DriveSchoolInfoVO getSchoolDetailsByTenantId(Long tenantId, String schoolName); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolInfoServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolInfoServiceImpl.java index 312a7254..d0bbdccb 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolInfoServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolInfoServiceImpl.java @@ -18,6 +18,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper; import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleMapper; import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.ObjectUtils; @@ -288,6 +289,11 @@ public class DriveSchoolInfoServiceImpl implements IDriveSchoolInfoService return payVoList; } + @Override + public DriveSchoolInfoVO getSchoolDetailsByTenantId(Long tenantId,String schoolName) { + return driveSchoolInfoMapper.getSchoolDetailsByTenantId(tenantId, schoolName); + } + /** * 计算两个经纬度之间的距离 diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml index ffd0075b..e3fcaa0e 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolInfoMapper.xml @@ -163,5 +163,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +