费控核算方式改名

hx-account/src/main/java/com/fjhx/account/controller/calculate/CalculateItemController.java → hx-account/src/main/java/com/fjhx/account/controller/calculate/CostCalculateItemController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/calculateItem")
-public class CalculateItemController {
+public class CostCalculateItemController {
 
 
 }

hx-account/src/main/java/com/fjhx/account/entity/calculate/dto/CalculateItemDto.java → hx-account/src/main/java/com/fjhx/account/entity/calculate/dto/CostCalculateItemDto.java

@@ -1,6 +1,6 @@
 package com.fjhx.account.entity.calculate.dto;
 
-import com.fjhx.account.entity.calculate.po.CalculateItem;
+import com.fjhx.account.entity.calculate.po.CostCalculateItem;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,6 +12,6 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class CalculateItemDto extends CalculateItem {
+public class CostCalculateItemDto extends CostCalculateItem {
 
 }

hx-account/src/main/java/com/fjhx/account/entity/calculate/dto/CalculateItemSelectDto.java → hx-account/src/main/java/com/fjhx/account/entity/calculate/dto/CostCalculateItemSelectDto.java

@@ -12,6 +12,6 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class CalculateItemSelectDto extends BaseSelectDto {
+public class CostCalculateItemSelectDto extends BaseSelectDto {
 
 }

hx-account/src/main/java/com/fjhx/account/entity/calculate/po/CalculateItem.java → hx-account/src/main/java/com/fjhx/account/entity/calculate/po/CostCalculateItem.java

@@ -16,7 +16,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("calculate_item")
-public class CalculateItem extends BasePo {
+public class CostCalculateItem extends BasePo {
 
     /**
      * 费控明细id

hx-account/src/main/java/com/fjhx/account/entity/calculate/vo/CalculateItemVo.java → hx-account/src/main/java/com/fjhx/account/entity/calculate/vo/CostCalculateItemVo.java

@@ -1,6 +1,6 @@
 package com.fjhx.account.entity.calculate.vo;
 
-import com.fjhx.account.entity.calculate.po.CalculateItem;
+import com.fjhx.account.entity.calculate.po.CostCalculateItem;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,7 +12,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class CalculateItemVo extends CalculateItem {
+public class CostCalculateItemVo extends CostCalculateItem {
 
     /**
      * 客户名称

hx-account/src/main/java/com/fjhx/account/mapper/calculate/CalculateItemMapper.java → hx-account/src/main/java/com/fjhx/account/mapper/calculate/CostCalculateItemMapper.java

@@ -1,8 +1,8 @@
 package com.fjhx.account.mapper.calculate;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.account.entity.calculate.po.CalculateItem;
-import com.fjhx.account.entity.calculate.vo.CalculateItemVo;
+import com.fjhx.account.entity.calculate.po.CostCalculateItem;
+import com.fjhx.account.entity.calculate.vo.CostCalculateItemVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,8 +17,8 @@ import java.util.List;
  * @author
  * @since 2024-03-25
  */
-public interface CalculateItemMapper extends BaseMapper<CalculateItem> {
+public interface CostCalculateItemMapper extends BaseMapper<CostCalculateItem> {
 
-    List<CalculateItemVo> getList(@Param("ew") IWrapper<Object> wrapper);
+    List<CostCalculateItemVo> getList(@Param("ew") IWrapper<Object> wrapper);
 
 }

hx-account/src/main/java/com/fjhx/account/service/calculate/CalculateItemService.java → hx-account/src/main/java/com/fjhx/account/service/calculate/CostCalculateItemService.java

@@ -1,7 +1,7 @@
 package com.fjhx.account.service.calculate;
 
-import com.fjhx.account.entity.calculate.po.CalculateItem;
-import com.fjhx.account.entity.calculate.vo.CalculateItemVo;
+import com.fjhx.account.entity.calculate.po.CostCalculateItem;
+import com.fjhx.account.entity.calculate.vo.CostCalculateItemVo;
 import com.ruoyi.common.core.service.BaseService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
@@ -17,8 +17,8 @@ import java.util.List;
  * @author
  * @since 2024-03-25
  */
-public interface CalculateItemService extends BaseService<CalculateItem> {
+public interface CostCalculateItemService extends BaseService<CostCalculateItem> {
 
-    List<CalculateItemVo> getList(@Param("ew") IWrapper<Object> wrapper);
+    List<CostCalculateItemVo> getList(@Param("ew") IWrapper<Object> wrapper);
 
 }

hx-account/src/main/java/com/fjhx/account/service/calculate/impl/CalculateItemServiceImpl.java

@@ -1,29 +0,0 @@
-package com.fjhx.account.service.calculate.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.account.entity.calculate.po.CalculateItem;
-import com.fjhx.account.entity.calculate.vo.CalculateItemVo;
-import com.fjhx.account.mapper.calculate.CalculateItemMapper;
-import com.fjhx.account.service.calculate.CalculateItemService;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-/**
- * <p>
- * 核算项目 服务实现类
- * </p>
- *
- * @author
- * @since 2024-03-25
- */
-@Service
-public class CalculateItemServiceImpl extends ServiceImpl<CalculateItemMapper, CalculateItem> implements CalculateItemService {
-
-    @Override
-    public List<CalculateItemVo> getList(IWrapper<Object> wrapper) {
-        return baseMapper.getList(wrapper);
-    }
-}

hx-account/src/main/java/com/fjhx/account/service/calculate/impl/CostCalculateItemServiceImpl.java

@@ -0,0 +1,29 @@
+package com.fjhx.account.service.calculate.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.account.entity.calculate.po.CostCalculateItem;
+import com.fjhx.account.entity.calculate.vo.CostCalculateItemVo;
+import com.fjhx.account.mapper.calculate.CostCalculateItemMapper;
+import com.fjhx.account.service.calculate.CostCalculateItemService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 核算项目 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-25
+ */
+@Service
+public class CostCalculateItemServiceImpl extends ServiceImpl<CostCalculateItemMapper, CostCalculateItem> implements CostCalculateItemService {
+
+    @Override
+    public List<CostCalculateItemVo> getList(IWrapper<Object> wrapper) {
+        return baseMapper.getList(wrapper);
+    }
+}

hx-account/src/main/resources/mapper/calculate/CalculateItemMapper.xml → hx-account/src/main/resources/mapper/calculate/CostCalculateItemMapper.xml

@@ -1,8 +1,8 @@
 <?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.fjhx.account.mapper.calculate.CalculateItemMapper">
-    <select id="getList" resultType="com.fjhx.account.entity.calculate.vo.CalculateItemVo">
+<mapper namespace="com.fjhx.account.mapper.calculate.CostCalculateItemMapper">
+    <select id="getList" resultType="com.fjhx.account.entity.calculate.vo.CostCalculateItemVo">
         SELECT *
-        FROM calculate_item ${ew.customSqlSegment}
+        FROM cost_calculate_item ${ew.customSqlSegment}
     </select>
 </mapper>