diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleItemController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleTypeController.java
similarity index 58%
rename from emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleItemController.java
rename to emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleTypeController.java
index 18aab0a81..62a839cf0 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleItemController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleTypeController.java
@@ -1,9 +1,9 @@
/**
* @Project: emis
- * @Title: EmisSettleItemController.java
+ * @Title: EmisSettleTypeController.java
* @author linfso
- * @date 2024-06-15 07:15:25
+ * @date 2024-06-15 07:58:16
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description:
结算类型维护 控制器
@@ -32,31 +32,31 @@ import com.xdadan.erp.common.enums.BusinessType;
import com.xdadan.erp.common.utils.StringUtils;
import com.xdadan.erp.common.utils.poi.ExcelUtil;
-import com.xdadan.erp.emis.domain.EmisSettleItem;
-import com.xdadan.erp.emis.service.IEmisSettleItemService;
+import com.xdadan.erp.emis.domain.EmisSettleType;
+import com.xdadan.erp.emis.service.IEmisSettleTypeService;
/**
* 结算类型维护Controller
*
* @author linfso
- * @date 2024-06-15 07:15:25
+ * @date 2024-06-15 07:58:16
*/
@RestController
-@RequestMapping("/emis/emisSettleItem")
-public class EmisSettleItemController extends BaseController
+@RequestMapping("/emis/emisSettleType")
+public class EmisSettleTypeController extends BaseController
{
@Autowired
- private IEmisSettleItemService emisSettleItemService;
+ private IEmisSettleTypeService emisSettleTypeService;
/**
* 查询结算类型维护列表
*/
- @PreAuthorize("@ss.hasPermi('emis:emisSettleItem:list')")
+ @PreAuthorize("@ss.hasPermi('emis:emisSettleType:list')")
@GetMapping("/list")
- public TableDataInfo list(EmisSettleItem emisSettleItem)
+ public TableDataInfo list(EmisSettleType emisSettleType)
{
startPage();
- List list = emisSettleItemService.selectEmisSettleItemList(emisSettleItem);
+ List list = emisSettleTypeService.selectEmisSettleTypeList(emisSettleType);
return getDataTable(list);
}
@@ -64,14 +64,14 @@ public class EmisSettleItemController extends BaseController
/**
* 检查是否重复
*
- * @param emisSettleItem
+ * @param emisSettleType
* @return 数量
*/
- @PreAuthorize("@ss.hasPermi('emis:emisSettleItem:list')")
+ @PreAuthorize("@ss.hasPermi('emis:emisSettleType:list')")
@GetMapping("/checkUnique")
- public AjaxResult checkUnique(EmisSettleItem emisSettleItem)
+ public AjaxResult checkUnique(EmisSettleType emisSettleType)
{
- int cnt=emisSettleItemService.checkUnique(emisSettleItem);
+ int cnt=emisSettleTypeService.checkUnique(emisSettleType);
return AjaxResult.success("检查成功",cnt);
}
@@ -79,56 +79,56 @@ public class EmisSettleItemController extends BaseController
/**
* 导出结算类型维护列表
*/
- @PreAuthorize("@ss.hasPermi('emis:emisSettleItem:export')")
+ @PreAuthorize("@ss.hasPermi('emis:emisSettleType:export')")
@Log(title = "结算类型维护", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, EmisSettleItem emisSettleItem)
+ public void export(HttpServletResponse response, EmisSettleType emisSettleType)
{
- List list = emisSettleItemService.selectEmisSettleItemList(emisSettleItem);
- ExcelUtil util = new ExcelUtil(EmisSettleItem.class);
+ List list = emisSettleTypeService.selectEmisSettleTypeList(emisSettleType);
+ ExcelUtil util = new ExcelUtil(EmisSettleType.class);
util.exportExcel(response, list, "结算类型维护数据");
}
/**
* 获取结算类型维护详细信息
*/
- @PreAuthorize("@ss.hasPermi('emis:emisSettleItem:query')")
+ @PreAuthorize("@ss.hasPermi('emis:emisSettleType:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
- return AjaxResult.success(emisSettleItemService.selectEmisSettleItemById(id));
+ return AjaxResult.success(emisSettleTypeService.selectEmisSettleTypeById(id));
}
/**
* 新增结算类型维护
*/
- @PreAuthorize("@ss.hasPermi('emis:emisSettleItem:add')")
+ @PreAuthorize("@ss.hasPermi('emis:emisSettleType:add')")
@Log(title = "结算类型维护", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody EmisSettleItem emisSettleItem)
+ public AjaxResult add(@RequestBody EmisSettleType emisSettleType)
{
- return toAjax(emisSettleItemService.insertEmisSettleItem(emisSettleItem));
+ return toAjax(emisSettleTypeService.insertEmisSettleType(emisSettleType));
}
/**
* 修改结算类型维护
*/
- @PreAuthorize("@ss.hasPermi('emis:emisSettleItem:edit')")
+ @PreAuthorize("@ss.hasPermi('emis:emisSettleType:edit')")
@Log(title = "结算类型维护", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody EmisSettleItem emisSettleItem)
+ public AjaxResult edit(@RequestBody EmisSettleType emisSettleType)
{
- return toAjax(emisSettleItemService.updateEmisSettleItem(emisSettleItem));
+ return toAjax(emisSettleTypeService.updateEmisSettleType(emisSettleType));
}
/**
* 删除结算类型维护
*/
- @PreAuthorize("@ss.hasPermi('emis:emisSettleItem:remove')")
+ @PreAuthorize("@ss.hasPermi('emis:emisSettleType:remove')")
@Log(title = "结算类型维护", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(emisSettleItemService.deleteEmisSettleItemByIds(ids));
+ return toAjax(emisSettleTypeService.deleteEmisSettleTypeByIds(ids));
}
}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleItem.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleType.java
similarity index 87%
rename from emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleItem.java
rename to emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleType.java
index 016414c4e..fc80ce29c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleItem.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleType.java
@@ -1,8 +1,8 @@
/**
* @Project: emis
- * @Title: EmisSettleItem.java
+ * @Title: EmisSettleType.java
* @author linfso
- * @date 2024-06-15 07:15:24
+ * @date 2024-06-15 07:58:16
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: 结算类型维护 实体类
@@ -23,22 +23,22 @@ import lombok.Data;
/**
- * @ClassName EmisSettleItem
+ * @ClassName EmisSettleType
* @Description 结算类型维护
* @author linfso
- * @date 2024-06-15 07:15:24
+ * @date 2024-06-15 07:58:16
*/
@Data
-public class EmisSettleItem extends BaseEntity
+public class EmisSettleType extends BaseEntity
{
private static final long serialVersionUID = 1L;
/* 序号 */
private Long id;
/* 结算项类型 */
- private String itemType;
+ private String settleType;
/* 结算项名称 */
- private String itemName;
+ private String settleName;
/* 统计名称 */
private String statName;
/* 加-1 减0 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleItemMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleTypeMapper.java
similarity index 55%
rename from emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleItemMapper.java
rename to emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleTypeMapper.java
index 55ce53abc..e6cc8260e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleItemMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleTypeMapper.java
@@ -1,8 +1,8 @@
/**
* @Project: emis
- * @Title: EmisSettleItemMapper.java
+ * @Title: EmisSettleTypeMapper.java
* @author linfso
- * @date 2024-06-15 07:15:24
+ * @date 2024-06-15 07:58:16
* @Copyright: ShangHai Doitinfo 2022 All rights reserved.
* @version v1.0
* @Description: 结算类型维护 Mapper 接口
@@ -12,55 +12,55 @@ package com.xdadan.erp.emis.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xdadan.erp.emis.domain.EmisSettleItem;
+import com.xdadan.erp.emis.domain.EmisSettleType;
/**
- * @ClassName EmisSettleItemMapper
+ * @ClassName EmisSettleTypeMapper
* @Description 结算类型维护 Mapper 接口
* @author linfso
- * @date 2024-06-15 07:15:24
+ * @date 2024-06-15 07:58:16
*/
-public interface EmisSettleItemMapper extends BaseMapper
+public interface EmisSettleTypeMapper extends BaseMapper
{
/**
* 主键查询
* @param id
* @return
*/
- public EmisSettleItem selectEmisSettleItemById(Long id);
+ public EmisSettleType selectEmisSettleTypeById(Long id);
/**
* 查询列表
*
- * @param emisSettleItem
+ * @param emisSettleType
* @return 集合
*/
- public List selectEmisSettleItemList(EmisSettleItem emisSettleItem);
+ public List selectEmisSettleTypeList(EmisSettleType emisSettleType);
/**
* 检查是否重复
*
- * @param emisSettleItem
+ * @param emisSettleType
* @return 数量
*/
- public int checkUnique(EmisSettleItem emisSettleItem);
+ public int checkUnique(EmisSettleType emisSettleType);
/**
* 新增
*
- * @param emisSettleItem
+ * @param emisSettleType
* @return
*/
- public int insertEmisSettleItem(EmisSettleItem emisSettleItem);
+ public int insertEmisSettleType(EmisSettleType emisSettleType);
/**
* 修改
*
- * @param emisSettleItem
+ * @param emisSettleType
* @return
*/
- public int updateEmisSettleItem(EmisSettleItem emisSettleItem);
+ public int updateEmisSettleType(EmisSettleType emisSettleType);
/**
* 删除
@@ -68,7 +68,7 @@ public interface EmisSettleItemMapper extends BaseMapper
* @param id 主键
* @return 结果
*/
- public int deleteEmisSettleItemById(Long id);
+ public int deleteEmisSettleTypeById(Long id);
/**
* 批量删除
@@ -76,5 +76,5 @@ public interface EmisSettleItemMapper extends BaseMapper
* @param ids 需要删除的数据主键集合
* @return 结果
*/
- public int deleteEmisSettleItemByIds(Long[] ids);
+ public int deleteEmisSettleTypeByIds(Long[] ids);
}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleItemService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleTypeService.java
similarity index 53%
rename from emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleItemService.java
rename to emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleTypeService.java
index 53d123806..22d0509d4 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleItemService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleTypeService.java
@@ -1,8 +1,8 @@
/**
* @Project: emis
- * @Title: EmisSettleItemService.java
+ * @Title: EmisSettleTypeService.java
* @author linfso
- * @date 2024-06-15 07:15:24
+ * @date 2024-06-15 07:58:16
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: 结算类型维护 服务类接口
@@ -10,55 +10,55 @@
package com.xdadan.erp.emis.service;
import java.util.List;
-import com.xdadan.erp.emis.domain.EmisSettleItem;
+import com.xdadan.erp.emis.domain.EmisSettleType;
/**
- * @ClassName EmisSettleItemService
+ * @ClassName EmisSettleTypeService
* @Description 结算类型维护
* @author linfso
- * @date 2024-06-15 07:15:24
+ * @date 2024-06-15 07:58:16
*/
-public interface IEmisSettleItemService
+public interface IEmisSettleTypeService
{
/**
* 主键查询
* @param id
* @return
*/
- public EmisSettleItem selectEmisSettleItemById(Long id);
+ public EmisSettleType selectEmisSettleTypeById(Long id);
/**
* 查询结算类型维护列表
*
- * @param emisSettleItem 结算类型维护
+ * @param emisSettleType 结算类型维护
* @return 结算类型维护集合
*/
- public List selectEmisSettleItemList(EmisSettleItem emisSettleItem);
+ public List selectEmisSettleTypeList(EmisSettleType emisSettleType);
/**
* 检查是否重复
*
- * @param emisSettleItem
+ * @param emisSettleType
* @return 数量
*/
- public int checkUnique(EmisSettleItem emisSettleItem);
+ public int checkUnique(EmisSettleType emisSettleType);
/**
* 新增结算类型维护
*
- * @param emisSettleItem 结算类型维护
+ * @param emisSettleType 结算类型维护
* @return 结果
*/
- public int insertEmisSettleItem(EmisSettleItem emisSettleItem);
+ public int insertEmisSettleType(EmisSettleType emisSettleType);
/**
* 修改结算类型维护
*
- * @param emisSettleItem 结算类型维护
+ * @param emisSettleType 结算类型维护
* @return 结果
*/
- public int updateEmisSettleItem(EmisSettleItem emisSettleItem);
+ public int updateEmisSettleType(EmisSettleType emisSettleType);
/**
* 批量删除结算类型维护
@@ -66,7 +66,7 @@ public interface IEmisSettleItemService
* @param ids 需要删除的结算类型维护主键集合
* @return 结果
*/
- public int deleteEmisSettleItemByIds(Long[] ids);
+ public int deleteEmisSettleTypeByIds(Long[] ids);
/**
* 删除结算类型维护信息
@@ -74,5 +74,5 @@ public interface IEmisSettleItemService
* @param id 结算类型维护主键
* @return 结果
*/
- public int deleteEmisSettleItemById(Long id);
+ public int deleteEmisSettleTypeById(Long id);
}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleItemServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleItemServiceImpl.java
deleted file mode 100644
index 65b1e6726..000000000
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleItemServiceImpl.java
+++ /dev/null
@@ -1,117 +0,0 @@
- /**
- * @Project: emis
- * @Title: EmisSettleItemServiceImpl.java
- * @author linfso
- * @date 2024-06-15 07:15:25
- * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0
- * @Description: 结算类型维护 实体类
- */
-
-package com.xdadan.erp.emis.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisSettleItem;
-import com.xdadan.erp.emis.mapper.EmisSettleItemMapper;
-import com.xdadan.erp.emis.service.IEmisSettleItemService;
-
-/**
- * 结算类型维护Service业务层处理
- *
- * @author linfso
- * @date 2024-06-15 07:15:25
- */
-@Service
-public class EmisSettleItemServiceImpl implements IEmisSettleItemService
-{
- @Autowired
- private EmisSettleItemMapper emisSettleItemMapper;
-
- /**
- * 查询结算类型维护
- *
- * @param id 结算类型维护主键
- * @return 结算类型维护
- */
- @Override
- public EmisSettleItem selectEmisSettleItemById(Long id)
- {
- return emisSettleItemMapper.selectEmisSettleItemById(id);
- }
-
-
- /**
- * 查询结算类型维护列表
- *
- * @param emisSettleItem 结算类型维护
- * @return 结算类型维护
- */
- @Override
- public List selectEmisSettleItemList(EmisSettleItem emisSettleItem)
- {
- return emisSettleItemMapper.selectEmisSettleItemList(emisSettleItem);
- }
-
- /**
- * 检查是否重复
- *
- * @param emisSettleItem
- * @return 数量
- */
- @Override
- public int checkUnique(EmisSettleItem emisSettleItem)
- {
- return emisSettleItemMapper.checkUnique(emisSettleItem);
- }
-
- /**
- * 新增结算类型维护
- *
- * @param emisSettleItem 结算类型维护
- * @return 结果
- */
- @Override
- public int insertEmisSettleItem(EmisSettleItem emisSettleItem)
- {
- return emisSettleItemMapper.insertEmisSettleItem(emisSettleItem);
- }
-
- /**
- * 修改结算类型维护
- *
- * @param emisSettleItem 结算类型维护
- * @return 结果
- */
- @Override
- public int updateEmisSettleItem(EmisSettleItem emisSettleItem)
- {
- return emisSettleItemMapper.updateEmisSettleItem(emisSettleItem);
- }
-
- /**
- * 批量删除结算类型维护
- *
- * @param ids 需要删除的结算类型维护主键
- * @return 结果
- */
- @Override
- public int deleteEmisSettleItemByIds(Long[] ids)
- {
- return emisSettleItemMapper.deleteEmisSettleItemByIds(ids);
- }
-
- /**
- * 删除结算类型维护信息
- *
- * @param id 结算类型维护主键
- * @return 结果
- */
- @Override
- public int deleteEmisSettleItemById(Long id)
- {
- return emisSettleItemMapper.deleteEmisSettleItemById(id);
- }
-
-}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleTypeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleTypeServiceImpl.java
new file mode 100644
index 000000000..070369e51
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleTypeServiceImpl.java
@@ -0,0 +1,117 @@
+ /**
+ * @Project: emis
+ * @Title: EmisSettleTypeServiceImpl.java
+ * @author linfso
+ * @date 2024-06-15 07:58:16
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0
+ * @Description: 结算类型维护 实体类
+ */
+
+package com.xdadan.erp.emis.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.xdadan.erp.emis.domain.EmisSettleType;
+import com.xdadan.erp.emis.mapper.EmisSettleTypeMapper;
+import com.xdadan.erp.emis.service.IEmisSettleTypeService;
+
+/**
+ * 结算类型维护Service业务层处理
+ *
+ * @author linfso
+ * @date 2024-06-15 07:58:16
+ */
+@Service
+public class EmisSettleTypeServiceImpl implements IEmisSettleTypeService
+{
+ @Autowired
+ private EmisSettleTypeMapper emisSettleTypeMapper;
+
+ /**
+ * 查询结算类型维护
+ *
+ * @param id 结算类型维护主键
+ * @return 结算类型维护
+ */
+ @Override
+ public EmisSettleType selectEmisSettleTypeById(Long id)
+ {
+ return emisSettleTypeMapper.selectEmisSettleTypeById(id);
+ }
+
+
+ /**
+ * 查询结算类型维护列表
+ *
+ * @param emisSettleType 结算类型维护
+ * @return 结算类型维护
+ */
+ @Override
+ public List selectEmisSettleTypeList(EmisSettleType emisSettleType)
+ {
+ return emisSettleTypeMapper.selectEmisSettleTypeList(emisSettleType);
+ }
+
+ /**
+ * 检查是否重复
+ *
+ * @param emisSettleType
+ * @return 数量
+ */
+ @Override
+ public int checkUnique(EmisSettleType emisSettleType)
+ {
+ return emisSettleTypeMapper.checkUnique(emisSettleType);
+ }
+
+ /**
+ * 新增结算类型维护
+ *
+ * @param emisSettleType 结算类型维护
+ * @return 结果
+ */
+ @Override
+ public int insertEmisSettleType(EmisSettleType emisSettleType)
+ {
+ return emisSettleTypeMapper.insertEmisSettleType(emisSettleType);
+ }
+
+ /**
+ * 修改结算类型维护
+ *
+ * @param emisSettleType 结算类型维护
+ * @return 结果
+ */
+ @Override
+ public int updateEmisSettleType(EmisSettleType emisSettleType)
+ {
+ return emisSettleTypeMapper.updateEmisSettleType(emisSettleType);
+ }
+
+ /**
+ * 批量删除结算类型维护
+ *
+ * @param ids 需要删除的结算类型维护主键
+ * @return 结果
+ */
+ @Override
+ public int deleteEmisSettleTypeByIds(Long[] ids)
+ {
+ return emisSettleTypeMapper.deleteEmisSettleTypeByIds(ids);
+ }
+
+ /**
+ * 删除结算类型维护信息
+ *
+ * @param id 结算类型维护主键
+ * @return 结果
+ */
+ @Override
+ public int deleteEmisSettleTypeById(Long id)
+ {
+ return emisSettleTypeMapper.deleteEmisSettleTypeById(id);
+ }
+
+}
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleItemMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleTypeMapper.xml
similarity index 79%
rename from emis-biz/src/main/resources/mapper/EmisSettleItemMapper.xml
rename to emis-biz/src/main/resources/mapper/EmisSettleTypeMapper.xml
index 301b61370..262f7c5ac 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleItemMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleTypeMapper.xml
@@ -2,12 +2,12 @@
-
+
-
+
-
-
+
+
@@ -23,20 +23,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
- select id, item_type, item_name, stat_name, bl_inc, bl_input, bl_valid, bl_invoice, apply_grouping, parter_fee_type_code, parter_item_type_code, parter_income_type_code, rec_pay_type, invoice_type, bl_ebs_yt, bl_reward, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_settle_item
+
+ select id, settle_type, settle_name, stat_name, bl_inc, bl_input, bl_valid, bl_invoice, apply_grouping, parter_fee_type_code, parter_item_type_code, parter_income_type_code, rec_pay_type, invoice_type, bl_ebs_yt, bl_reward, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_settle_type
-