From 1a0cc2ff19aaf2e85e58740704657ca51eafdd69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 28 Feb 2026 19:30:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(quotation):=20=E6=B7=BB=E5=8A=A0=E7=9B=B4?= =?UTF-8?q?=E9=94=80=E7=B3=BB=E6=95=B0=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90=E5=88=97=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增直销系数配置控制器RatioDirectController及相应实体类 - 添加报价直销系数及相关子项的数据模型和数据库映射 - 实现直销系数动态表头获取功能 - 优化权限角色列映射查询SQL，增加表名关联查询 - 修复权限列映射服务中的数据转换逻辑 - 更新代码生成器测试配置，修正生成表名 - 添加lombok链式调用支持到权限角色列映射DTO --- .../pojo/dto/PermissionRoleColumnMapDTO.java | 2 + .../pojo/dto/RatioDirectEffectiveDTO.java | 34 +++++ .../admin/RatioAgentController.java | 2 +- .../admin/RatioDirectController.java | 119 ++++++++++++++++++ .../entity/QuotationModelRatioDirect.java | 57 +++++++++ .../entity/QuotationModelRatioDirectItem.java | 57 +++++++++ .../QuotationModelRatioDirectItemMapper.java | 16 +++ .../QuotationModelRatioDirectMapper.java | 20 +++ ...IQuotationModelRatioDirectItemService.java | 16 +++ .../IQuotationModelRatioDirectService.java | 20 +++ ...minPermissionRoleColumnMapServiceImpl.java | 30 ++++- ...tationModelRatioDirectItemServiceImpl.java | 20 +++ .../QuotationModelRatioDirectServiceImpl.java | 27 ++++ .../AdminPermissionRoleColumnMapMapper.xml | 10 +- .../QuotationModelRatioDirectItemMapper.xml | 5 + .../QuotationModelRatioDirectMapper.xml | 11 ++ .../repository/CodeGeneratorTest.java | 2 +- 17 files changed, 441 insertions(+), 7 deletions(-) create mode 100644 nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/dto/RatioDirectEffectiveDTO.java create mode 100644 nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioDirectController.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelRatioDirect.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelRatioDirectItem.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelRatioDirectItemMapper.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelRatioDirectMapper.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelRatioDirectItemService.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelRatioDirectService.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelRatioDirectItemServiceImpl.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelRatioDirectServiceImpl.java create mode 100644 nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelRatioDirectItemMapper.xml create mode 100644 nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelRatioDirectMapper.xml diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/dto/PermissionRoleColumnMapDTO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/dto/PermissionRoleColumnMapDTO.java index 3ed065f8..97e0da33 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/dto/PermissionRoleColumnMapDTO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/dto/PermissionRoleColumnMapDTO.java @@ -1,8 +1,10 @@ package com.nflg.mobilebroken.common.pojo.dto; import lombok.Data; +import lombok.experimental.Accessors; @Data +@Accessors(chain = true) public class PermissionRoleColumnMapDTO { private Long id; diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/dto/RatioDirectEffectiveDTO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/dto/RatioDirectEffectiveDTO.java new file mode 100644 index 00000000..3926cf69 --- /dev/null +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/dto/RatioDirectEffectiveDTO.java @@ -0,0 +1,34 @@ +package com.nflg.mobilebroken.common.pojo.dto; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class RatioDirectEffectiveDTO { + + /** + * 机型id + */ + private Integer modelId; + + /** + * 用户id + */ + private Integer userId; + + /** + * 标配系数 + */ + private BigDecimal standardRatio; + + /** + * 选配系数 + */ + private BigDecimal optionalRatio; + + /** + * 上级用户id + */ + private Integer parentUserId; +} diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioAgentController.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioAgentController.java index 5259d2af..7108a21c 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioAgentController.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioAgentController.java @@ -29,7 +29,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * 代理商配置系数 + * 代理商系数配置 */ @RestController @RequestMapping("/ratio/agent") diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioDirectController.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioDirectController.java new file mode 100644 index 00000000..09ba9b77 --- /dev/null +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/RatioDirectController.java @@ -0,0 +1,119 @@ +package com.nflg.mobilebroken.quotation.controller.admin; + +import cn.hutool.core.collection.CollectionUtil; +import com.nflg.mobilebroken.common.constant.Constant; +import com.nflg.mobilebroken.common.pojo.ApiResult; +import com.nflg.mobilebroken.common.pojo.dto.RatioDirectEffectiveDTO; +import com.nflg.mobilebroken.common.pojo.vo.DynamicHeaderVO; +import com.nflg.mobilebroken.common.pojo.vo.ModelPriceVO; +import com.nflg.mobilebroken.quotation.controller.ControllerBase; +import com.nflg.mobilebroken.repository.entity.AdminUser; +import com.nflg.mobilebroken.repository.entity.DictionaryItem; +import com.nflg.mobilebroken.repository.entity.TBaseDepartment; +import com.nflg.mobilebroken.repository.service.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.constraints.NotEmpty; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * 直销系数配置 + */ +@RestController +@RequestMapping("/ratio/direct") +public class RatioDirectController extends ControllerBase { + + @Resource + private IDictionaryItemService dictionaryItemService; + + @Resource + private IQuotationModelPriceService priceService; + + @Resource + private IAdminUserService adminUserService; + + @Resource + private ITBaseDepartmentService departmentService; + + @Resource + private IQuotationModelRatioDirectService ratioDirectService; + + /** + * 获取动态表头 + * @param userIds 用户id列表 + */ + @GetMapping("/header") + public ApiResult> getHeaders(@RequestBody @NotEmpty List userIds) { + List users = adminUserService.lambdaQuery().in(AdminUser::getId, userIds).list(); + if (CollectionUtil.isEmpty(users)) { + return ApiResult.success(Collections.emptyList()); + } + List categories = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_DIRECT_SALES_CATEGORY); + List departments = departmentService.list(); + List ratioDirects=ratioDirectService.getEffectives(); + List prices = priceService.getAllModelPrice(); + return ApiResult.success(users.stream() + .map(user -> new DynamicHeaderVO() + .setProp(user.getId().toString()) + .setLabel(user.getUserName() + getDepartmentName( + departments.stream() + .filter(d -> d.getId().equals(user.getDepartmentId())) + .findFirst() + .orElse(null) + ) + ) + .setChildren( + new ArrayList<>() { + { + add(new DynamicHeaderVO() + .setProp(user.getId() + "standardPrice") + .setLabel("标配价" + getCategoryName( + categories.stream() + .filter(c -> c.getId().equals(user.getCategoryId())) + .findFirst() + .orElse(null) + ) + ) + ); + + } + } + ) + ) + .collect(Collectors.toList()) + ); + } + + private BigDecimal getUserStandardPrice(Integer userId,List ratioDirects,List prices){ + RatioDirectEffectiveDTO ratioDirect = ratioDirects.stream() + .filter(r -> r.getUserId().equals(userId)) + .findFirst() + .orElse(null); + if (Objects.isNull(ratioDirect)){ + return BigDecimal.ZERO; + } + } + + private String getDepartmentName(TBaseDepartment department) { + if (department == null) { + return ""; + } + return "(" + department.getDeptName() + ")"; + } + + private String getCategoryName(DictionaryItem category) { + if (category == null) { + return ""; + } + return "(" + category.getName() + ")"; + } +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelRatioDirect.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelRatioDirect.java new file mode 100644 index 00000000..01a3e8af --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelRatioDirect.java @@ -0,0 +1,57 @@ +package com.nflg.mobilebroken.repository.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +/** + *

+ * 报价-直销系数 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("quotation_model_ratio_direct") +public class QuotationModelRatioDirect implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 年份 + */ + private String year; + + /** + * 版本号 + */ + private String version; + + /** + * 状态，0：草稿；1：已发布；2：已废弃 + */ + private Integer status; + + /** + * 新增人id + */ + private Integer createById; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private LocalDateTime createTime; +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelRatioDirectItem.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelRatioDirectItem.java new file mode 100644 index 00000000..eb1c0347 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelRatioDirectItem.java @@ -0,0 +1,57 @@ +package com.nflg.mobilebroken.repository.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.math.BigDecimal; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +/** + *

+ * 报价-直销系数-子项 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("quotation_model_ratio_direct_item") +public class QuotationModelRatioDirectItem implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 系数id + */ + private Long ratioId; + + /** + * 机型id + */ + private Integer modelId; + + /** + * 用户id + */ + private Integer userId; + + /** + * 标配系数 + */ + private BigDecimal standardRatio; + + /** + * 选配系数 + */ + private BigDecimal optionalRatio; + + /** + * 是否有效 + */ + private Boolean enable; +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelRatioDirectItemMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelRatioDirectItemMapper.java new file mode 100644 index 00000000..c22f425c --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelRatioDirectItemMapper.java @@ -0,0 +1,16 @@ +package com.nflg.mobilebroken.repository.mapper; + +import com.nflg.mobilebroken.repository.entity.QuotationModelRatioDirectItem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 报价-直销系数-子项 Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +public interface QuotationModelRatioDirectItemMapper extends BaseMapper { + +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelRatioDirectMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelRatioDirectMapper.java new file mode 100644 index 00000000..11472617 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelRatioDirectMapper.java @@ -0,0 +1,20 @@ +package com.nflg.mobilebroken.repository.mapper; + +import com.nflg.mobilebroken.common.pojo.dto.RatioDirectEffectiveDTO; +import com.nflg.mobilebroken.repository.entity.QuotationModelRatioDirect; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 报价-直销系数 Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +public interface QuotationModelRatioDirectMapper extends BaseMapper { + + List getEffectives(); +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelRatioDirectItemService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelRatioDirectItemService.java new file mode 100644 index 00000000..26932cd8 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelRatioDirectItemService.java @@ -0,0 +1,16 @@ +package com.nflg.mobilebroken.repository.service; + +import com.nflg.mobilebroken.repository.entity.QuotationModelRatioDirectItem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 报价-直销系数-子项 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +public interface IQuotationModelRatioDirectItemService extends IService { + +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelRatioDirectService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelRatioDirectService.java new file mode 100644 index 00000000..5b6aa918 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelRatioDirectService.java @@ -0,0 +1,20 @@ +package com.nflg.mobilebroken.repository.service; + +import com.nflg.mobilebroken.common.pojo.dto.RatioDirectEffectiveDTO; +import com.nflg.mobilebroken.repository.entity.QuotationModelRatioDirect; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 报价-直销系数 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +public interface IQuotationModelRatioDirectService extends IService { + + List getEffectives(); +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminPermissionRoleColumnMapServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminPermissionRoleColumnMapServiceImpl.java index 7116faa9..5db98a0d 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminPermissionRoleColumnMapServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminPermissionRoleColumnMapServiceImpl.java @@ -7,11 +7,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.mobilebroken.common.pojo.dto.PermissionRoleColumnMapDTO; import com.nflg.mobilebroken.common.pojo.vo.PermissionRoleColumnMapItemVO; import com.nflg.mobilebroken.common.pojo.vo.PermissionRoleColumnMapVO; +import com.nflg.mobilebroken.repository.entity.AdminPermissionColumn; import com.nflg.mobilebroken.repository.entity.AdminPermissionRoleColumnMap; import com.nflg.mobilebroken.repository.mapper.AdminPermissionRoleColumnMapMapper; +import com.nflg.mobilebroken.repository.service.IAdminPermissionColumnService; import com.nflg.mobilebroken.repository.service.IAdminPermissionRoleColumnMapService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; @@ -27,6 +31,9 @@ import java.util.stream.Collectors; @Service public class AdminPermissionRoleColumnMapServiceImpl extends ServiceImpl implements IAdminPermissionRoleColumnMapService { + @Resource + private IAdminPermissionColumnService permissionColumnService; + @Override public List getList(Long id) { List all = baseMapper.getColumns(); @@ -34,6 +41,27 @@ public class AdminPermissionRoleColumnMapServiceImpl extends ServiceImpl columns = permissionColumnService.list(); +// List tmps = new ArrayList<>(); +// datas.forEach(data -> { +// List cols = StrUtil.split(data.getColName(), ","); +// cols.forEach(col -> { +// tmps.add( +// new PermissionRoleColumnMapDTO() +// .setId(data.getId()) +// .setTableId(data.getTableId()) +// .setTableName(data.getTableName()) +// .setColName(col) +// .setColDesc( +// columns.stream() +// .filter(c -> Objects.equals(c.getTableId(), data.getTableId()) && Objects.equals(c.getColName(), col)) +// .findFirst() +// .map(AdminPermissionColumn::getColDesc) +// .orElse("") +// ) +// ); +// }); +// }); datas.forEach(data -> { List vos = all.stream() .filter(d -> Objects.equals(d.getTableId(), data.getTableId())) @@ -48,7 +76,7 @@ public class AdminPermissionRoleColumnMapServiceImpl extends ServiceImpl convert(List datas) { diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelRatioDirectItemServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelRatioDirectItemServiceImpl.java new file mode 100644 index 00000000..08d138a8 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelRatioDirectItemServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.mobilebroken.repository.service.impl; + +import com.nflg.mobilebroken.repository.entity.QuotationModelRatioDirectItem; +import com.nflg.mobilebroken.repository.mapper.QuotationModelRatioDirectItemMapper; +import com.nflg.mobilebroken.repository.service.IQuotationModelRatioDirectItemService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 报价-直销系数-子项 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +@Service +public class QuotationModelRatioDirectItemServiceImpl extends ServiceImpl implements IQuotationModelRatioDirectItemService { + +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelRatioDirectServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelRatioDirectServiceImpl.java new file mode 100644 index 00000000..ac0595f0 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelRatioDirectServiceImpl.java @@ -0,0 +1,27 @@ +package com.nflg.mobilebroken.repository.service.impl; + +import com.nflg.mobilebroken.common.pojo.dto.RatioDirectEffectiveDTO; +import com.nflg.mobilebroken.repository.entity.QuotationModelRatioDirect; +import com.nflg.mobilebroken.repository.mapper.QuotationModelRatioDirectMapper; +import com.nflg.mobilebroken.repository.service.IQuotationModelRatioDirectService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 报价-直销系数 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +@Service +public class QuotationModelRatioDirectServiceImpl extends ServiceImpl implements IQuotationModelRatioDirectService { + + @Override + public List getEffectives() { + return baseMapper.getEffectives(); + } +} diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminPermissionRoleColumnMapMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminPermissionRoleColumnMapMapper.xml index d0d3a3f9..772e7d59 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminPermissionRoleColumnMapMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminPermissionRoleColumnMapMapper.xml @@ -3,13 +3,15 @@ diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelRatioDirectItemMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelRatioDirectItemMapper.xml new file mode 100644 index 00000000..bba165ce --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelRatioDirectItemMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelRatioDirectMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelRatioDirectMapper.xml new file mode 100644 index 00000000..59e416f5 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelRatioDirectMapper.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGeneratorTest.java b/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGeneratorTest.java index 6b3b7536..38fad5fc 100644 --- a/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGeneratorTest.java +++ b/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGeneratorTest.java @@ -33,7 +33,7 @@ public class CodeGeneratorTest { , Paths.get(System.getProperty("user.dir")) + "/src/main/resources/mapper")) ) .strategyConfig(builder -> { - builder.addInclude("quotation_model_ratio_agent_item") //只生成指定表 + builder.addInclude("quotation_model_ratio_direct_item") //只生成指定表 .entityBuilder() .enableLombok() .enableChainModel()