ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationsController.java
@@ -21,7 +21,7 @@ import com.ruoyi.system.dto.AddReimbursementDTO; import com.ruoyi.system.emums.ApprovalStatusEnum; import com.ruoyi.system.emums.ApprovalTypeEnum; import com.ruoyi.system.model.OaApprovalApplicationAdvertisement; import com.ruoyi.system.model.OaApprovalApplicationAd; import com.ruoyi.system.model.OaApprovalApplicationAttendance; import com.ruoyi.system.model.OaApprovalApplicationContact; import com.ruoyi.system.model.OaApprovalApplicationContract; @@ -32,7 +32,7 @@ import com.ruoyi.system.model.OaApprovalApplications; import com.ruoyi.system.model.OaApprovalFlowNode; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.OaApprovalApplicationAdvertisementService; import com.ruoyi.system.service.OaApprovalApplicationAdService; import com.ruoyi.system.service.OaApprovalApplicationAttendanceService; import com.ruoyi.system.service.OaApprovalApplicationContactService; import com.ruoyi.system.service.OaApprovalApplicationContractService; @@ -80,7 +80,7 @@ @Resource private OaApprovalApplicationsService approvalApplicationsService; @Resource private OaApprovalApplicationAdvertisementService approvalApplicationAdvertisementService; private OaApprovalApplicationAdService approvalApplicationAdvertisementService; @Resource private OaApprovalApplicationContactService approvalApplicationContactService; @Resource @@ -601,15 +601,15 @@ .one(); oaApprovalApplications.setCurrentFlowNodeId(approvalFlowNode.getId()); approvalApplicationsService.save(oaApprovalApplications); OaApprovalApplicationAdvertisement oaApprovalApplicationAdvertisement = new OaApprovalApplicationAdvertisement(); oaApprovalApplicationAdvertisement.setApprovalApplicationId(oaApprovalApplications.getId()); oaApprovalApplicationAdvertisement.setTitle(dto.getTitle()); oaApprovalApplicationAdvertisement.setContent(dto.getContent()); oaApprovalApplicationAdvertisement.setNumber(dto.getNumber()); oaApprovalApplicationAdvertisement.setTotalAmount(dto.getTotalAmount()); oaApprovalApplicationAdvertisement.setSpec(dto.getSpec()); oaApprovalApplicationAdvertisement.setStatus(false); approvalApplicationAdvertisementService.save(oaApprovalApplicationAdvertisement); OaApprovalApplicationAd oaApprovalApplicationAd = new OaApprovalApplicationAd(); oaApprovalApplicationAd.setApprovalApplicationId(oaApprovalApplications.getId()); oaApprovalApplicationAd.setTitle(dto.getTitle()); oaApprovalApplicationAd.setContent(dto.getContent()); oaApprovalApplicationAd.setNumber(dto.getNumber()); oaApprovalApplicationAd.setTotalAmount(dto.getTotalAmount()); oaApprovalApplicationAd.setSpec(dto.getSpec()); oaApprovalApplicationAd.setStatus(false); approvalApplicationAdvertisementService.save(oaApprovalApplicationAd); // 根据节点类型 生成代办 oaApprovalTodoService.createApprovalTodos(oaApprovalApplications.getId(), code, approvalFlowNode, Integer.valueOf(sysUser.getDeptId())); ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowAuditController.java
@@ -12,7 +12,6 @@ import com.ruoyi.system.dto.AuditDTO; import com.ruoyi.system.emums.ApprovalTypeEnum; import com.ruoyi.system.model.*; import com.ruoyi.system.query.ApprovalDetailQuery; import com.ruoyi.system.query.ApprovalTodoListQuery; import com.ruoyi.system.service.*; @@ -23,35 +22,12 @@ import com.ruoyi.system.service.OaApprovalService; import com.ruoyi.system.service.OaApprovalTodoService; import com.ruoyi.system.service.TDeptService; import com.ruoyi.system.vo.AdvertisementDetailVO; import com.ruoyi.system.vo.ApprovalFlowNodeListVO; import com.ruoyi.system.vo.ApprovalTodoVO; import com.ruoyi.system.vo.BackDetailVO; import com.ruoyi.system.vo.BorrowDetailVO; import com.ruoyi.system.vo.BusinessTripDetailVO; import com.ruoyi.system.vo.ChangeDetailVO; import com.ruoyi.system.vo.ContactDetailVO; import com.ruoyi.system.vo.ContractDetailVO; import com.ruoyi.system.vo.DisposeDetailVO; import com.ruoyi.system.vo.GrabDetailVO; import com.ruoyi.system.vo.GrabListVO; import com.ruoyi.system.vo.LeaveDestroyDetailVO; import com.ruoyi.system.vo.LeaveDetailVO; import com.ruoyi.system.vo.MoneyDetailVO; import com.ruoyi.system.vo.OutDetailVO; import com.ruoyi.system.vo.PaymentDetailVO; import com.ruoyi.system.vo.PurchaseDetailVO; import com.ruoyi.system.vo.PurchaseListVO; import com.ruoyi.system.vo.ReimbursementDetailVO; import com.ruoyi.system.vo.StorageDetailVO; import com.ruoyi.system.vo.StorageListVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -97,7 +73,7 @@ @Resource private OaApprovalApplicationsService approvalApplicationsService; @Resource private OaApprovalApplicationAdvertisementService approvalApplicationAdvertisementService; private OaApprovalApplicationAdService approvalApplicationAdvertisementService; @Resource private OaApprovalApplicationContactService approvalApplicationContactService; @Resource @@ -182,9 +158,9 @@ Map<Integer, List<OaApprovalApplicationAssetItem>> approvalApplicationAssetItemMap = approvalApplicationAssetItemService.lambdaQuery() .in(OaApprovalApplicationAssetItem::getApprovalApplicationId, applicationIds).list() .stream().collect(Collectors.groupingBy(OaApprovalApplicationAssetItem::getApprovalApplicationId)); Map<Integer, OaApprovalApplicationAdvertisement> approvalApplicationAdvertisementMap = approvalApplicationAdvertisementService.lambdaQuery() .in(OaApprovalApplicationAdvertisement::getApprovalApplicationId, applicationIds).list() .stream().collect(Collectors.toMap(OaApprovalApplicationAdvertisement::getApprovalApplicationId, e -> e)); Map<Integer, OaApprovalApplicationAd> approvalApplicationAdMap = approvalApplicationAdvertisementService.lambdaQuery() .in(OaApprovalApplicationAd::getApprovalApplicationId, applicationIds).list() .stream().collect(Collectors.toMap(OaApprovalApplicationAd::getApprovalApplicationId, e -> e)); Map<Integer, OaApprovalApplicationAttendance> applicationAttendanceMap = approvalApplicationAttendanceService.lambdaQuery() .in(OaApprovalApplicationAttendance::getApprovalApplicationId, applicationIds).list() .stream().collect(Collectors.toMap(OaApprovalApplicationAttendance::getApprovalApplicationId, e -> e)); @@ -327,11 +303,11 @@ } break; case 17: OaApprovalApplicationAdvertisement oaApprovalApplicationAdvertisement = approvalApplicationAdvertisementMap.get(approvalApplication.getId()); if (oaApprovalApplicationAdvertisement!=null){ approvalTodoVO.setTitle(oaApprovalApplicationAdvertisement.getTitle()); approvalTodoVO.setContent(oaApprovalApplicationAdvertisement.getContent()); approvalTodoVO.setAmount(oaApprovalApplicationAdvertisement.getTotalAmount()); OaApprovalApplicationAd oaApprovalApplicationAd = approvalApplicationAdMap.get(approvalApplication.getId()); if (oaApprovalApplicationAd !=null){ approvalTodoVO.setTitle(oaApprovalApplicationAd.getTitle()); approvalTodoVO.setContent(oaApprovalApplicationAd.getContent()); approvalTodoVO.setAmount(oaApprovalApplicationAd.getTotalAmount()); } break; } @@ -383,9 +359,9 @@ Map<Integer, List<OaApprovalApplicationAssetItem>> approvalApplicationAssetItemMap = approvalApplicationAssetItemService.lambdaQuery() .in(OaApprovalApplicationAssetItem::getApprovalApplicationId, applicationIds).list() .stream().collect(Collectors.groupingBy(OaApprovalApplicationAssetItem::getApprovalApplicationId)); Map<Integer, OaApprovalApplicationAdvertisement> approvalApplicationAdvertisementMap = approvalApplicationAdvertisementService.lambdaQuery() .in(OaApprovalApplicationAdvertisement::getApprovalApplicationId, applicationIds).list() .stream().collect(Collectors.toMap(OaApprovalApplicationAdvertisement::getApprovalApplicationId, e -> e)); Map<Integer, OaApprovalApplicationAd> approvalApplicationAdMap = approvalApplicationAdvertisementService.lambdaQuery() .in(OaApprovalApplicationAd::getApprovalApplicationId, applicationIds).list() .stream().collect(Collectors.toMap(OaApprovalApplicationAd::getApprovalApplicationId, e -> e)); Map<Integer, OaApprovalApplicationAttendance> applicationAttendanceMap = approvalApplicationAttendanceService.lambdaQuery() .in(OaApprovalApplicationAttendance::getApprovalApplicationId, applicationIds).list() .stream().collect(Collectors.toMap(OaApprovalApplicationAttendance::getApprovalApplicationId, e -> e)); @@ -528,11 +504,11 @@ } break; case 17: OaApprovalApplicationAdvertisement oaApprovalApplicationAdvertisement = approvalApplicationAdvertisementMap.get(approvalApplication.getId()); if (oaApprovalApplicationAdvertisement!=null){ approvalTodoVO.setTitle(oaApprovalApplicationAdvertisement.getTitle()); approvalTodoVO.setContent(oaApprovalApplicationAdvertisement.getContent()); approvalTodoVO.setAmount(oaApprovalApplicationAdvertisement.getTotalAmount()); OaApprovalApplicationAd oaApprovalApplicationAd = approvalApplicationAdMap.get(approvalApplication.getId()); if (oaApprovalApplicationAd !=null){ approvalTodoVO.setTitle(oaApprovalApplicationAd.getTitle()); approvalTodoVO.setContent(oaApprovalApplicationAd.getContent()); approvalTodoVO.setAmount(oaApprovalApplicationAd.getTotalAmount()); } break; } ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java
@@ -56,7 +56,7 @@ @Resource private OaApprovalApplicationsService approvalApplicationsService; @Resource private OaApprovalApplicationAdvertisementService approvalApplicationAdvertisementService; private OaApprovalApplicationAdService approvalApplicationAdvertisementService; @Resource private OaApprovalApplicationContactService approvalApplicationContactService; @Resource @@ -138,9 +138,9 @@ Map<Integer, List<OaApprovalApplicationAssetItem>> approvalApplicationAssetItemMap = approvalApplicationAssetItemService.lambdaQuery() .in(OaApprovalApplicationAssetItem::getApprovalApplicationId, applicationIds).list() .stream().collect(Collectors.groupingBy(OaApprovalApplicationAssetItem::getApprovalApplicationId)); Map<Integer, OaApprovalApplicationAdvertisement> approvalApplicationAdvertisementMap = approvalApplicationAdvertisementService.lambdaQuery() .in(OaApprovalApplicationAdvertisement::getApprovalApplicationId, applicationIds).list() .stream().collect(Collectors.toMap(OaApprovalApplicationAdvertisement::getApprovalApplicationId, e -> e)); Map<Integer, OaApprovalApplicationAd> approvalApplicationAdvertisementMap = approvalApplicationAdvertisementService.lambdaQuery() .in(OaApprovalApplicationAd::getApprovalApplicationId, applicationIds).list() .stream().collect(Collectors.toMap(OaApprovalApplicationAd::getApprovalApplicationId, e -> e)); Map<Integer, OaApprovalApplicationAttendance> applicationAttendanceMap = approvalApplicationAttendanceService.lambdaQuery() .in(OaApprovalApplicationAttendance::getApprovalApplicationId, applicationIds).list() .stream().collect(Collectors.toMap(OaApprovalApplicationAttendance::getApprovalApplicationId, e -> e)); @@ -282,11 +282,11 @@ } break; case 17: OaApprovalApplicationAdvertisement oaApprovalApplicationAdvertisement = approvalApplicationAdvertisementMap.get(approvalApplication.getId()); if (oaApprovalApplicationAdvertisement!=null){ approvalTodoVO.setTitle(oaApprovalApplicationAdvertisement.getTitle()); approvalTodoVO.setContent(oaApprovalApplicationAdvertisement.getContent()); approvalTodoVO.setAmount(oaApprovalApplicationAdvertisement.getTotalAmount()); OaApprovalApplicationAd oaApprovalApplicationAd = approvalApplicationAdvertisementMap.get(approvalApplication.getId()); if (oaApprovalApplicationAd !=null){ approvalTodoVO.setTitle(oaApprovalApplicationAd.getTitle()); approvalTodoVO.setContent(oaApprovalApplicationAd.getContent()); approvalTodoVO.setAmount(oaApprovalApplicationAd.getTotalAmount()); } break; } @@ -1027,8 +1027,8 @@ @GetMapping(value = "/detailAdvertisement") public R<AdvertisementDetailVO> detailAdvertisement(@ApiParam("申请单d")Integer id) { OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id); OaApprovalApplicationAdvertisement applicationAdvertisement = approvalApplicationAdvertisementService.lambdaQuery() .eq(OaApprovalApplicationAdvertisement::getApprovalApplicationId, approvalApplications.getId()) OaApprovalApplicationAd applicationAdvertisement = approvalApplicationAdvertisementService.lambdaQuery() .eq(OaApprovalApplicationAd::getApprovalApplicationId, approvalApplications.getId()) .last("limit 1").one(); List<OaApprovalFlowAudit> approvalFlowAudits = approvalFlowAuditService.lambdaQuery().eq(OaApprovalFlowAudit::getApprovalApplicationId, approvalApplications.getId()) ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetAdMapper.java
File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetAdvertisementMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.system.mapper; import com.ruoyi.system.model.AssetAdvertisement; import com.ruoyi.system.model.AssetAd; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -11,6 +11,6 @@ * @author WuGuanFengYue * @since 2025-09-15 */ public interface AssetAdvertisementMapper extends BaseMapper<AssetAdvertisement> { public interface AssetAdMapper extends BaseMapper<AssetAd> { } ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetAdMaterialPriceMapper.java
New file @@ -0,0 +1,16 @@ package com.ruoyi.system.mapper; import com.ruoyi.system.model.AssetAdMaterialPrice; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * <p> * 广告物料单价参考表 Mapper 接口 * </p> * * @author WuGuanFengYue * @since 2025-09-15 */ public interface AssetAdMaterialPriceMapper extends BaseMapper<AssetAdMaterialPrice> { } ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetAdRentalRecordMapper.java
New file @@ -0,0 +1,16 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.model.AssetAdRentalRecord; /** * <p> * 广告无形资产出租记录表 Mapper 接口 * </p> * * @author WuGuanFengYue * @since 2025-09-15 */ public interface AssetAdRentalRecordMapper extends BaseMapper<AssetAdRentalRecord> { } ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetAdvertisementMaterialPriceMapper.java
File was deleted ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetAdvertisementRentalRecordMapper.java
File was deleted ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalApplicationAdMapper.java
New file @@ -0,0 +1,16 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.model.OaApprovalApplicationAd; /** * <p> * 审批申请记录广告制作申请明细表 Mapper 接口 * </p> * * @author WuGuanFengYue * @since 2025-09-15 */ public interface OaApprovalApplicationAdMapper extends BaseMapper<OaApprovalApplicationAd> { } ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalApplicationAdvertisementMapper.java
File was deleted ruoyi-system/src/main/java/com/ruoyi/system/model/AssetAd.java
File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/model/AssetAdvertisement.java @@ -23,9 +23,9 @@ */ @Data @EqualsAndHashCode(callSuper = false) @TableName("asset_advertisement") @ApiModel(value="AssetAdvertisement对象", description="广告无形资产表") public class AssetAdvertisement implements Serializable { @TableName("asset_ad") @ApiModel(value="AssetAd对象", description="广告无形资产表") public class AssetAd implements Serializable { private static final long serialVersionUID = 1L;
File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/model/AssetAdvertisementMaterialPrice.java @@ -24,9 +24,9 @@ */ @Data @EqualsAndHashCode(callSuper = false) @TableName("asset_advertisement_material_price") @ApiModel(value="AssetAdvertisementMaterialPrice对象", description="广告物料单价参考表") public class AssetAdvertisementMaterialPrice implements Serializable { @TableName("asset_ad_material_price") @ApiModel(value="AssetAdMaterialPrice对象", description="广告物料单价参考表") public class AssetAdMaterialPrice implements Serializable { private static final long serialVersionUID = 1L;
File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/model/AssetAdvertisementRentalRecord.java @@ -25,9 +25,9 @@ */ @Data @EqualsAndHashCode(callSuper = false) @TableName("asset_advertisement_rental_record") @ApiModel(value="AssetAdvertisementRentalRecord对象", description="广告无形资产出租记录表") public class AssetAdvertisementRentalRecord implements Serializable { @TableName("asset_ad_rental_record") @ApiModel(value="AssetAdRentalRecord对象", description="广告无形资产出租记录表") public class AssetAdRentalRecord implements Serializable { private static final long serialVersionUID = 1L;
File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationAdvertisement.java @@ -23,9 +23,9 @@ */ @Data @EqualsAndHashCode(callSuper = false) @TableName("oa_approval_application_advertisement") @TableName("oa_approval_application_ad") @ApiModel(value="OaApprovalApplicationAdvertisement对象", description="审批申请记录广告制作申请明细表") public class OaApprovalApplicationAdvertisement implements Serializable { public class OaApprovalApplicationAd implements Serializable { private static final long serialVersionUID = 1L;
New file @@ -0,0 +1,16 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.model.AssetAdMaterialPrice; /** * <p> * 广告物料单价参考表 服务类 * </p> * * @author WuGuanFengYue * @since 2025-09-15 */ public interface AssetAdMaterialPriceService extends IService<AssetAdMaterialPrice> { } ruoyi-system/src/main/java/com/ruoyi/system/service/AssetAdRentalRecordService.java
New file @@ -0,0 +1,16 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.model.AssetAdRentalRecord; /** * <p> * 广告无形资产出租记录表 服务类 * </p> * * @author WuGuanFengYue * @since 2025-09-15 */ public interface AssetAdRentalRecordService extends IService<AssetAdRentalRecord> { } ruoyi-system/src/main/java/com/ruoyi/system/service/AssetAdService.java
File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/service/AssetAdvertisementService.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.model.AssetAdvertisement; import com.ruoyi.system.model.AssetAd; /** * <p> @@ -11,6 +11,6 @@ * @author WuGuanFengYue * @since 2025-09-15 */ public interface AssetAdvertisementService extends IService<AssetAdvertisement> { public interface AssetAdService extends IService<AssetAd> { } ruoyi-system/src/main/java/com/ruoyi/system/service/AssetAdvertisementMaterialPriceService.java
File was deleted ruoyi-system/src/main/java/com/ruoyi/system/service/AssetAdvertisementRentalRecordService.java
File was deleted ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAdService.java
New file @@ -0,0 +1,16 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.model.OaApprovalApplicationAd; /** * <p> * 审批申请记录广告制作申请明细表 服务类 * </p> * * @author WuGuanFengYue * @since 2025-09-15 */ public interface OaApprovalApplicationAdService extends IService<OaApprovalApplicationAd> { } ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAdvertisementService.java
File was deleted ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetAdMaterialPriceServiceImpl.java
New file @@ -0,0 +1,20 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.mapper.AssetAdMaterialPriceMapper; import com.ruoyi.system.model.AssetAdMaterialPrice; import com.ruoyi.system.service.AssetAdMaterialPriceService; import org.springframework.stereotype.Service; /** * <p> * 广告物料单价参考表 服务实现类 * </p> * * @author WuGuanFengYue * @since 2025-09-15 */ @Service public class AssetAdMaterialPriceServiceImpl extends ServiceImpl<AssetAdMaterialPriceMapper, AssetAdMaterialPrice> implements AssetAdMaterialPriceService { } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetAdRentalRecordServiceImpl.java
New file @@ -0,0 +1,20 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.mapper.AssetAdRentalRecordMapper; import com.ruoyi.system.model.AssetAdRentalRecord; import com.ruoyi.system.service.AssetAdRentalRecordService; import org.springframework.stereotype.Service; /** * <p> * 广告无形资产出租记录表 服务实现类 * </p> * * @author WuGuanFengYue * @since 2025-09-15 */ @Service public class AssetAdRentalRecordServiceImpl extends ServiceImpl<AssetAdRentalRecordMapper, AssetAdRentalRecord> implements AssetAdRentalRecordService { } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetAdServiceImpl.java
New file @@ -0,0 +1,20 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.mapper.AssetAdMapper; import com.ruoyi.system.model.AssetAd; import com.ruoyi.system.service.AssetAdService; import org.springframework.stereotype.Service; /** * <p> * 广告无形资产表 服务实现类 * </p> * * @author WuGuanFengYue * @since 2025-09-15 */ @Service public class AssetAdServiceImpl extends ServiceImpl<AssetAdMapper, AssetAd> implements AssetAdService { } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetAdvertisementMaterialPriceServiceImpl.java
File was deleted ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetAdvertisementRentalRecordServiceImpl.java
File was deleted ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetAdvertisementServiceImpl.java
File was deleted ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAdServiceImpl.java
New file @@ -0,0 +1,20 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.mapper.OaApprovalApplicationAdMapper; import com.ruoyi.system.model.OaApprovalApplicationAd; import com.ruoyi.system.service.OaApprovalApplicationAdService; import org.springframework.stereotype.Service; /** * <p> * 审批申请记录广告制作申请明细表 服务实现类 * </p> * * @author WuGuanFengYue * @since 2025-09-15 */ @Service public class OaApprovalApplicationAdServiceImpl extends ServiceImpl<OaApprovalApplicationAdMapper, OaApprovalApplicationAd> implements OaApprovalApplicationAdService { } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAdvertisementServiceImpl.java
File was deleted ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml
File was renamed from ruoyi-system/src/main/resources/mapper/system/AssetAdvertisementMapper.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.AssetAdvertisementMapper"> <mapper namespace="com.ruoyi.system.mapper.AssetAdMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.system.model.AssetAdvertisement"> <resultMap id="BaseResultMap" type="com.ruoyi.system.model.AssetAd"> <id column="id" property="id" /> <result column="asset_name" property="assetName" /> <result column="asset_code" property="assetCode" /> ruoyi-system/src/main/resources/mapper/system/AssetAdMaterialPriceMapper.xml
File was renamed from ruoyi-system/src/main/resources/mapper/system/AssetAdvertisementMaterialPriceMapper.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.AssetAdvertisementMaterialPriceMapper"> <mapper namespace="com.ruoyi.system.mapper.AssetAdMaterialPriceMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.system.model.AssetAdvertisementMaterialPrice"> <resultMap id="BaseResultMap" type="com.ruoyi.system.model.AssetAdMaterialPrice"> <id column="id" property="id" /> <result column="material_name" property="materialName" /> <result column="unit_price" property="unitPrice" /> ruoyi-system/src/main/resources/mapper/system/AssetAdRentalRecordMapper.xml
File was renamed from ruoyi-system/src/main/resources/mapper/system/AssetAdvertisementRentalRecordMapper.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.AssetAdvertisementRentalRecordMapper"> <mapper namespace="com.ruoyi.system.mapper.AssetAdRentalRecordMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.system.model.AssetAdvertisementRentalRecord"> <resultMap id="BaseResultMap" type="com.ruoyi.system.model.AssetAdRentalRecord"> <id column="id" property="id" /> <result column="asset_advertisement_id" property="assetAdvertisementId" /> <result column="start_date" property="startDate" /> ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAdMapper.xml
File was renamed from ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAdvertisementMapper.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.OaApprovalApplicationAdvertisementMapper"> <mapper namespace="com.ruoyi.system.mapper.OaApprovalApplicationAdMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.system.model.OaApprovalApplicationAdvertisement"> <resultMap id="BaseResultMap" type="com.ruoyi.system.model.OaApprovalApplicationAd"> <id column="id" property="id" /> <result column="approval_application_id" property="approvalApplicationId" /> <result column="title" property="title" />
