表名修改

xiangpei

2024-04-23 d1b39618205b7e4030e522bcdfc93a3719582b2f

表名修改

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractPublish.java

File was deleted

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultTemplate.java

File was deleted

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultTemplateRule.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/controller/CalculateMoneyRuleController.java

New file
@@ -0,0 +1,96 @@
package com.ycl.platform.controller;

import annotation.Log;
import com.ycl.platform.domain.entity.CalculateMoneyRule;
import com.ycl.platform.service.ICalculateMoneyRuleService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * 核算规则(钱)Controller
 *
 * @author ruoyi
 * @date 2024-04-03
 */
@RestController
@RequestMapping("/calculate/money/rule")
public class CalculateMoneyRuleController extends BaseController
{
    @Autowired
    private ICalculateMoneyRuleService calculateRuleService;

    /**
     * 查询核算规则列表
     */
   @PreAuthorize("@ss.hasPermi('calculate:rule:list')")
    @GetMapping("/list")
    public AjaxResult list(CalculateMoneyRule calculateMoneyRule)
    {
        List<CalculateMoneyRule> list = calculateRuleService.selectCalculateRuleList(calculateMoneyRule);
        return success(list);
    }

    /**
     * 导出核算规则列表
     */
    @PreAuthorize("@ss.hasPermi('calculate:rule:export')")
    @Log(title = "核算规则", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, CalculateMoneyRule calculateMoneyRule)
    {
        List<CalculateMoneyRule> list = calculateRuleService.selectCalculateRuleList(calculateMoneyRule);
        ExcelUtil<CalculateMoneyRule> util = new ExcelUtil<CalculateMoneyRule>(CalculateMoneyRule.class);
        util.exportExcel(response, list, "核算规则数据");
    }

    /**
     * 获取核算规则详细信息
     */
   @PreAuthorize("@ss.hasPermi('calculate:rule:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(calculateRuleService.selectCalculateRuleById(id));
    }

    /**
     * 新增核算规则
     */
    @PreAuthorize("@ss.hasPermi('calculate:rule:add')")
    @Log(title = "核算规则", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody CalculateMoneyRule calculateMoneyRule)
    {
        return toAjax(calculateRuleService.insertCalculateRule(calculateMoneyRule));
    }

    /**
     * 修改核算规则
     */
    @PreAuthorize("@ss.hasPermi('calculate:rule:edit')")
    @Log(title = "核算规则", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody CalculateMoneyRule calculateMoneyRule)
    {
        return toAjax(calculateRuleService.updateCalculateRule(calculateMoneyRule));
    }

    /**
     * 删除核算规则
     */
    @PreAuthorize("@ss.hasPermi('calculate:rule:remove')")
    @Log(title = "核算规则", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(calculateRuleService.deleteCalculateRuleByIds(ids));
    }
}

 ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java

@@ -1,7 +1,7 @@
package com.ycl.platform.controller;

import annotation.Log;
import com.ycl.platform.domain.entity.CalculateMoneyRule;
import com.ycl.platform.domain.entity.CalculateRule;
import com.ycl.platform.service.ICalculateRuleService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
@@ -15,82 +15,82 @@
import java.util.List;

/**
 * 核算规则Controller
 * 核算规则(分)Controller
 *
 * @author ruoyi
 * @date 2024-04-03
 * @date 2024-04-01
 */
@RestController
@RequestMapping("/calculate/rule")
public class CalculateRuleController extends BaseController
{
    @Autowired
    private ICalculateRuleService calculateRuleService;
    private ICalculateRuleService defaultRuleService;

    /**
     * 查询核算规则列表
     * 查询违约规则列表
     */
   @PreAuthorize("@ss.hasPermi('calculate:rule:list')")
    @PreAuthorize("@ss.hasPermi('system:rule:list')")
    @GetMapping("/list")
    public AjaxResult list(CalculateMoneyRule calculateMoneyRule)
    public AjaxResult list(CalculateRule calculateRule)
    {
        List<CalculateMoneyRule> list = calculateRuleService.selectCalculateRuleList(calculateMoneyRule);
        List<CalculateRule> list = defaultRuleService.selectDefaultRuleList(calculateRule);
        return success(list);
    }

    /**
     * 导出核算规则列表
     * 导出违约规则列表
     */
    @PreAuthorize("@ss.hasPermi('calculate:rule:export')")
    @Log(title = "核算规则", businessType = BusinessType.EXPORT)
    @PreAuthorize("@ss.hasPermi('system:rule:export')")
    @Log(title = "违约规则", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, CalculateMoneyRule calculateMoneyRule)
    public void export(HttpServletResponse response, CalculateRule calculateRule)
    {
        List<CalculateMoneyRule> list = calculateRuleService.selectCalculateRuleList(calculateMoneyRule);
        ExcelUtil<CalculateMoneyRule> util = new ExcelUtil<CalculateMoneyRule>(CalculateMoneyRule.class);
        util.exportExcel(response, list, "核算规则数据");
        List<CalculateRule> list = defaultRuleService.selectDefaultRuleList(calculateRule);
        ExcelUtil<CalculateRule> util = new ExcelUtil<CalculateRule>(CalculateRule.class);
        util.exportExcel(response, list, "违约规则数据");
    }

    /**
     * 获取核算规则详细信息
     * 获取违约规则详细信息
     */
   @PreAuthorize("@ss.hasPermi('calculate:rule:query')")
    @PreAuthorize("@ss.hasPermi('system:rule:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(calculateRuleService.selectCalculateRuleById(id));
        return success(defaultRuleService.selectDefaultRuleById(id));
    }

    /**
     * 新增核算规则
     * 新增违约规则
     */
    @PreAuthorize("@ss.hasPermi('calculate:rule:add')")
    @Log(title = "核算规则", businessType = BusinessType.INSERT)
    @PreAuthorize("@ss.hasPermi('system:rule:add')")
    @Log(title = "违约规则", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody CalculateMoneyRule calculateMoneyRule)
    public AjaxResult add(@RequestBody CalculateRule calculateRule)
    {
        return toAjax(calculateRuleService.insertCalculateRule(calculateMoneyRule));
        return toAjax(defaultRuleService.insertDefaultRule(calculateRule));
    }

    /**
     * 修改核算规则
     * 修改违约规则
     */
    @PreAuthorize("@ss.hasPermi('calculate:rule:edit')")
    @Log(title = "核算规则", businessType = BusinessType.UPDATE)
    @PreAuthorize("@ss.hasPermi('system:rule:edit')")
    @Log(title = "违约规则", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody CalculateMoneyRule calculateMoneyRule)
    public AjaxResult edit(@RequestBody CalculateRule calculateRule)
    {
        return toAjax(calculateRuleService.updateCalculateRule(calculateMoneyRule));
        return toAjax(defaultRuleService.updateDefaultRule(calculateRule));
    }

    /**
     * 删除核算规则
     * 删除违约规则
     */
    @PreAuthorize("@ss.hasPermi('calculate:rule:remove')")
    @Log(title = "核算规则", businessType = BusinessType.DELETE)
    @PreAuthorize("@ss.hasPermi('system:rule:remove')")
    @Log(title = "违约规则", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(calculateRuleService.deleteCalculateRuleByIds(ids));
        return toAjax(defaultRuleService.deleteDefaultRuleByIds(ids));
    }
}

 ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java

File was renamed from ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java
@@ -2,7 +2,7 @@

import annotation.Log;
import com.ycl.platform.domain.entity.ContractResult;
import com.ycl.platform.service.IDefaultResultService;
import com.ycl.platform.service.IContractResultService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
@@ -22,11 +22,11 @@
 * @date 2024-04-01
 */
@RestController
@RequestMapping("/default/result")
public class DefaultResultController extends BaseController
@RequestMapping("/contract/result")
public class ContractResultController extends BaseController
{
    @Autowired
    private IDefaultResultService defaultResultService;
    private IContractResultService defaultResultService;

    /**
     * 查询合同考核结果列表

 ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java

File was renamed from ycl-server/src/main/java/com/ycl/platform/controller/DefaultScoreController.java
@@ -2,7 +2,7 @@

import annotation.Log;
import com.ycl.platform.domain.entity.ContractScore;
import com.ycl.platform.service.IDefaultScoreService;
import com.ycl.platform.service.IContractScoreService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
@@ -22,11 +22,11 @@
 * @date 2024-04-01
 */
@RestController
@RequestMapping("/default/score")
public class DefaultScoreController extends BaseController
@RequestMapping("/contract/score")
public class ContractScoreController extends BaseController
{
    @Autowired
    private IDefaultScoreService defaultScoreService;
    private IContractScoreService defaultScoreService;

    /**
     * 查询合同打分列表

 ycl-server/src/main/java/com/ycl/platform/controller/DefaultPublishController.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/controller/DefaultTemplateController.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/mapper/CalculateMoneyRuleMapper.java

New file
@@ -0,0 +1,63 @@
package com.ycl.platform.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.entity.CalculateMoneyRule;

import java.util.List;

/**
 * 核算规则Mapper接口
 *
 * @author ruoyi
 * @date 2024-04-03
 */
public interface CalculateMoneyRuleMapper extends BaseMapper<CalculateMoneyRule>
{
    /**
     * 查询核算规则
     *
     * @param id 核算规则主键
     * @return 核算规则
     */
    public CalculateMoneyRule selectCalculateRuleById(Long id);

    /**
     * 查询核算规则列表
     *
     * @param calculateMoneyRule 核算规则
     * @return 核算规则集合
     */
    public List<CalculateMoneyRule> selectCalculateRuleList(CalculateMoneyRule calculateMoneyRule);

    /**
     * 新增核算规则
     *
     * @param calculateMoneyRule 核算规则
     * @return 结果
     */
    public int insertCalculateRule(CalculateMoneyRule calculateMoneyRule);

    /**
     * 修改核算规则
     *
     * @param calculateMoneyRule 核算规则
     * @return 结果
     */
    public int updateCalculateRule(CalculateMoneyRule calculateMoneyRule);

    /**
     * 删除核算规则
     *
     * @param id 核算规则主键
     * @return 结果
     */
    public int deleteCalculateRuleById(Long id);

    /**
     * 批量删除核算规则
     *
     * @param ids 需要删除的数据主键集合
     * @return 结果
     */
    public int deleteCalculateRuleByIds(Long[] ids);
}

 ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java

@@ -1,63 +1,63 @@
package com.ycl.platform.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.entity.CalculateMoneyRule;
import com.ycl.platform.domain.entity.CalculateRule;

import java.util.List;

/**
 * 核算规则Mapper接口
 * 违约规则Mapper接口
 *
 * @author ruoyi
 * @date 2024-04-03
 * @date 2024-04-01
 */
public interface CalculateRuleMapper extends BaseMapper<CalculateMoneyRule>
public interface CalculateRuleMapper extends BaseMapper<CalculateRule>
{
    /**
     * 查询核算规则
     * 查询违约规则
     *
     * @param id 核算规则主键
     * @return 核算规则
     * @param id 违约规则主键
     * @return 违约规则
     */
    public CalculateMoneyRule selectCalculateRuleById(Long id);
    public CalculateRule selectDefaultRuleById(Long id);

    /**
     * 查询核算规则列表
     * 查询违约规则列表
     *
     * @param calculateMoneyRule 核算规则
     * @return 核算规则集合
     * @param calculateRule 违约规则
     * @return 违约规则集合
     */
    public List<CalculateMoneyRule> selectCalculateRuleList(CalculateMoneyRule calculateMoneyRule);
    public List<CalculateRule> selectDefaultRuleList(CalculateRule calculateRule);

    /**
     * 新增核算规则
     * 新增违约规则
     *
     * @param calculateMoneyRule 核算规则
     * @param calculateRule 违约规则
     * @return 结果
     */
    public int insertCalculateRule(CalculateMoneyRule calculateMoneyRule);
    public int insertDefaultRule(CalculateRule calculateRule);

    /**
     * 修改核算规则
     * 修改违约规则
     *
     * @param calculateMoneyRule 核算规则
     * @param calculateRule 违约规则
     * @return 结果
     */
    public int updateCalculateRule(CalculateMoneyRule calculateMoneyRule);
    public int updateDefaultRule(CalculateRule calculateRule);

    /**
     * 删除核算规则
     * 删除违约规则
     *
     * @param id 核算规则主键
     * @param id 违约规则主键
     * @return 结果
     */
    public int deleteCalculateRuleById(Long id);
    public int deleteDefaultRuleById(Long id);

    /**
     * 批量删除核算规则
     * 批量删除违约规则
     *
     * @param ids 需要删除的数据主键集合
     * @return 结果
     */
    public int deleteCalculateRuleByIds(Long[] ids);
    public int deleteDefaultRuleByIds(Long[] ids);
}

 ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java

File was renamed from ycl-server/src/main/java/com/ycl/platform/mapper/DefaultResultMapper.java
@@ -11,7 +11,7 @@
 * @author ruoyi
 * @date 2024-04-01
 */
public interface DefaultResultMapper extends BaseMapper<ContractResult>
public interface ContractResultMapper extends BaseMapper<ContractResult>
{
    /**
     * 查询合同考核结果

 ycl-server/src/main/java/com/ycl/platform/mapper/ContractScoreMapper.java

File was renamed from ycl-server/src/main/java/com/ycl/platform/mapper/DefaultScoreMapper.java
@@ -11,7 +11,7 @@
 * @author ruoyi
 * @date 2024-04-01
 */
public interface DefaultScoreMapper extends BaseMapper<ContractScore>
public interface ContractScoreMapper extends BaseMapper<ContractScore>
{
    /**
     * 查询合同打分

 ycl-server/src/main/java/com/ycl/platform/mapper/DefaultPublishMapper.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/mapper/DefaultTemplateMapper.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/mapper/DefaultTemplateRuleMapper.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/ICalculateMoneyRuleService.java

New file
@@ -0,0 +1,62 @@
package com.ycl.platform.service;

import com.ycl.platform.domain.entity.CalculateMoneyRule;

import java.util.List;

/**
 * 核算规则Service接口
 *
 * @author ruoyi
 * @date 2024-04-03
 */
public interface ICalculateMoneyRuleService
{
    /**
     * 查询核算规则
     *
     * @param id 核算规则主键
     * @return 核算规则
     */
    public CalculateMoneyRule selectCalculateRuleById(Long id);

    /**
     * 查询核算规则列表
     *
     * @param calculateMoneyRule 核算规则
     * @return 核算规则集合
     */
    public List<CalculateMoneyRule> selectCalculateRuleList(CalculateMoneyRule calculateMoneyRule);

    /**
     * 新增核算规则
     *
     * @param calculateMoneyRule 核算规则
     * @return 结果
     */
    public int insertCalculateRule(CalculateMoneyRule calculateMoneyRule);

    /**
     * 修改核算规则
     *
     * @param calculateMoneyRule 核算规则
     * @return 结果
     */
    public int updateCalculateRule(CalculateMoneyRule calculateMoneyRule);

    /**
     * 批量删除核算规则
     *
     * @param ids 需要删除的核算规则主键集合
     * @return 结果
     */
    public int deleteCalculateRuleByIds(Long[] ids);

    /**
     * 删除核算规则信息
     *
     * @param id 核算规则主键
     * @return 结果
     */
    public int deleteCalculateRuleById(Long id);
}

 ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java

@@ -1,62 +1,62 @@
package com.ycl.platform.service;

import com.ycl.platform.domain.entity.CalculateMoneyRule;
import com.ycl.platform.domain.entity.CalculateRule;

import java.util.List;

/**
 * 核算规则Service接口
 * 违约规则Service接口
 *
 * @author ruoyi
 * @date 2024-04-03
 * @date 2024-04-01
 */
public interface ICalculateRuleService
{
    /**
     * 查询核算规则
     * 查询违约规则
     *
     * @param id 核算规则主键
     * @return 核算规则
     * @param id 违约规则主键
     * @return 违约规则
     */
    public CalculateMoneyRule selectCalculateRuleById(Long id);
    public CalculateRule selectDefaultRuleById(Long id);

    /**
     * 查询核算规则列表
     * 查询违约规则列表
     *
     * @param calculateMoneyRule 核算规则
     * @return 核算规则集合
     * @param calculateRule 违约规则
     * @return 违约规则集合
     */
    public List<CalculateMoneyRule> selectCalculateRuleList(CalculateMoneyRule calculateMoneyRule);
    public List<CalculateRule> selectDefaultRuleList(CalculateRule calculateRule);

    /**
     * 新增核算规则
     * 新增违约规则
     *
     * @param calculateMoneyRule 核算规则
     * @param calculateRule 违约规则
     * @return 结果
     */
    public int insertCalculateRule(CalculateMoneyRule calculateMoneyRule);
    public int insertDefaultRule(CalculateRule calculateRule);

    /**
     * 修改核算规则
     * 修改违约规则
     *
     * @param calculateMoneyRule 核算规则
     * @param calculateRule 违约规则
     * @return 结果
     */
    public int updateCalculateRule(CalculateMoneyRule calculateMoneyRule);
    public int updateDefaultRule(CalculateRule calculateRule);

    /**
     * 批量删除核算规则
     * 批量删除违约规则
     *
     * @param ids 需要删除的核算规则主键集合
     * @param ids 需要删除的违约规则主键集合
     * @return 结果
     */
    public int deleteCalculateRuleByIds(Long[] ids);
    public int deleteDefaultRuleByIds(Long[] ids);

    /**
     * 删除核算规则信息
     * 删除违约规则信息
     *
     * @param id 核算规则主键
     * @param id 违约规则主键
     * @return 结果
     */
    public int deleteCalculateRuleById(Long id);
    public int deleteDefaultRuleById(Long id);
}

 ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java

File was renamed from ycl-server/src/main/java/com/ycl/platform/service/IDefaultResultService.java
@@ -10,7 +10,7 @@
 * @author ruoyi
 * @date 2024-04-01
 */
public interface IDefaultResultService
public interface IContractResultService
{
    /**
     * 查询合同考核结果

 ycl-server/src/main/java/com/ycl/platform/service/IContractScoreService.java

File was renamed from ycl-server/src/main/java/com/ycl/platform/service/IDefaultScoreService.java
@@ -10,7 +10,7 @@
 * @author ruoyi
 * @date 2024-04-01
 */
public interface IDefaultScoreService
public interface IContractScoreService
{
    /**
     * 查询合同打分

 ycl-server/src/main/java/com/ycl/platform/service/IDefaultPublishService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/IDefaultRuleService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/IDefaultTemplateRuleService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/IDefaultTemplateService.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateMoneyRuleServiceImpl.java

New file
@@ -0,0 +1,95 @@
package com.ycl.platform.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.CalculateMoneyRule;
import com.ycl.platform.mapper.CalculateMoneyRuleMapper;
import com.ycl.platform.service.ICalculateMoneyRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * 核算规则Service业务层处理
 *
 * @author ruoyi
 * @date 2024-04-03
 */
@Service
public class CalculateMoneyRuleServiceImpl extends ServiceImpl<CalculateMoneyRuleMapper, CalculateMoneyRule> implements ICalculateMoneyRuleService
{
    @Autowired
    private CalculateMoneyRuleMapper calculateMoneyRuleMapper;

    /**
     * 查询核算规则
     *
     * @param id 核算规则主键
     * @return 核算规则
     */
    @Override
    public CalculateMoneyRule selectCalculateRuleById(Long id)
    {
        return calculateMoneyRuleMapper.selectCalculateRuleById(id);
    }

    /**
     * 查询核算规则列表
     *
     * @param calculateMoneyRule 核算规则
     * @return 核算规则
     */
    @Override
    public List<CalculateMoneyRule> selectCalculateRuleList(CalculateMoneyRule calculateMoneyRule)
    {
        return calculateMoneyRuleMapper.selectCalculateRuleList(calculateMoneyRule);
    }

    /**
     * 新增核算规则
     *
     * @param calculateMoneyRule 核算规则
     * @return 结果
     */
    @Override
    public int insertCalculateRule(CalculateMoneyRule calculateMoneyRule)
    {
        return calculateMoneyRuleMapper.insertCalculateRule(calculateMoneyRule);
    }

    /**
     * 修改核算规则
     *
     * @param calculateMoneyRule 核算规则
     * @return 结果
     */
    @Override
    public int updateCalculateRule(CalculateMoneyRule calculateMoneyRule)
    {
        return calculateMoneyRuleMapper.updateCalculateRule(calculateMoneyRule);
    }

    /**
     * 批量删除核算规则
     *
     * @param ids 需要删除的核算规则主键
     * @return 结果
     */
    @Override
    public int deleteCalculateRuleByIds(Long[] ids)
    {
        return calculateMoneyRuleMapper.deleteCalculateRuleByIds(ids);
    }

    /**
     * 删除核算规则信息
     *
     * @param id 核算规则主键
     * @return 结果
     */
    @Override
    public int deleteCalculateRuleById(Long id)
    {
        return calculateMoneyRuleMapper.deleteCalculateRuleById(id);
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java

@@ -1,95 +1,98 @@
package com.ycl.platform.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.CalculateMoneyRule;
import com.ycl.platform.domain.entity.CalculateRule;
import com.ycl.platform.mapper.CalculateRuleMapper;
import com.ycl.platform.service.ICalculateRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import utils.DateUtils;

import java.util.List;

/**
 * 核算规则Service业务层处理
 * 违约规则Service业务层处理
 *
 * @author ruoyi
 * @date 2024-04-03
 * @date 2024-04-01
 */
@Service
public class CalculateRuleServiceImpl extends ServiceImpl<CalculateRuleMapper, CalculateMoneyRule> implements ICalculateRuleService
public class CalculateRuleServiceImpl extends ServiceImpl<CalculateRuleMapper, CalculateRule> implements ICalculateRuleService
{
    @Autowired
    private CalculateRuleMapper calculateRuleMapper;

    /**
     * 查询核算规则
     * 查询违约规则
     *
     * @param id 核算规则主键
     * @return 核算规则
     * @param id 违约规则主键
     * @return 违约规则
     */
    @Override
    public CalculateMoneyRule selectCalculateRuleById(Long id)
    public CalculateRule selectDefaultRuleById(Long id)
    {
        return calculateRuleMapper.selectCalculateRuleById(id);
        return calculateRuleMapper.selectDefaultRuleById(id);
    }

    /**
     * 查询核算规则列表
     * 查询违约规则列表
     *
     * @param calculateMoneyRule 核算规则
     * @return 核算规则
     * @param calculateRule 违约规则
     * @return 违约规则
     */
    @Override
    public List<CalculateMoneyRule> selectCalculateRuleList(CalculateMoneyRule calculateMoneyRule)
    public List<CalculateRule> selectDefaultRuleList(CalculateRule calculateRule)
    {
        return calculateRuleMapper.selectCalculateRuleList(calculateMoneyRule);
        return calculateRuleMapper.selectDefaultRuleList(calculateRule);
    }

    /**
     * 新增核算规则
     * 新增违约规则
     *
     * @param calculateMoneyRule 核算规则
     * @param calculateRule 违约规则
     * @return 结果
     */
    @Override
    public int insertCalculateRule(CalculateMoneyRule calculateMoneyRule)
    public int insertDefaultRule(CalculateRule calculateRule)
    {
        return calculateRuleMapper.insertCalculateRule(calculateMoneyRule);
        calculateRule.setCreateTime(DateUtils.getNowDate());
        return calculateRuleMapper.insertDefaultRule(calculateRule);
    }

    /**
     * 修改核算规则
     * 修改违约规则
     *
     * @param calculateMoneyRule 核算规则
     * @param calculateRule 违约规则
     * @return 结果
     */
    @Override
    public int updateCalculateRule(CalculateMoneyRule calculateMoneyRule)
    public int updateDefaultRule(CalculateRule calculateRule)
    {
        return calculateRuleMapper.updateCalculateRule(calculateMoneyRule);
        calculateRule.setUpdateTime(DateUtils.getNowDate());
        return calculateRuleMapper.updateDefaultRule(calculateRule);
    }

    /**
     * 批量删除核算规则
     * 批量删除违约规则
     *
     * @param ids 需要删除的核算规则主键
     * @param ids 需要删除的违约规则主键
     * @return 结果
     */
    @Override
    public int deleteCalculateRuleByIds(Long[] ids)
    public int deleteDefaultRuleByIds(Long[] ids)
    {
        return calculateRuleMapper.deleteCalculateRuleByIds(ids);
        return calculateRuleMapper.deleteDefaultRuleByIds(ids);
    }

    /**
     * 删除核算规则信息
     * 删除违约规则信息
     *
     * @param id 核算规则主键
     * @param id 违约规则主键
     * @return 结果
     */
    @Override
    public int deleteCalculateRuleById(Long id)
    public int deleteDefaultRuleById(Long id)
    {
        return calculateRuleMapper.deleteCalculateRuleById(id);
        return calculateRuleMapper.deleteDefaultRuleById(id);
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java

File was renamed from ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultResultServiceImpl.java
@@ -2,8 +2,8 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.ContractResult;
import com.ycl.platform.mapper.DefaultResultMapper;
import com.ycl.platform.service.IDefaultResultService;
import com.ycl.platform.mapper.ContractResultMapper;
import com.ycl.platform.service.IContractResultService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import utils.DateUtils;
@@ -17,10 +17,10 @@
 * @date 2024-04-01
 */
@Service
public class DefaultResultServiceImpl extends ServiceImpl<DefaultResultMapper, ContractResult> implements IDefaultResultService
public class ContractResultServiceImpl extends ServiceImpl<ContractResultMapper, ContractResult> implements IContractResultService
{
    @Autowired
    private DefaultResultMapper defaultResultMapper;
    private ContractResultMapper contractResultMapper;

    /**
     * 查询合同考核结果
@@ -31,7 +31,7 @@
    @Override
    public ContractResult selectDefaultResultById(Long id)
    {
        return defaultResultMapper.selectDefaultResultById(id);
        return contractResultMapper.selectDefaultResultById(id);
    }

    /**
@@ -43,7 +43,7 @@
    @Override
    public List<ContractResult> selectDefaultResultList(ContractResult contractResult)
    {
        return defaultResultMapper.selectDefaultResultList(contractResult);
        return contractResultMapper.selectDefaultResultList(contractResult);
    }

    /**
@@ -55,7 +55,7 @@
    @Override
    public int insertDefaultResult(ContractResult contractResult)
    {
        return defaultResultMapper.insertDefaultResult(contractResult);
        return contractResultMapper.insertDefaultResult(contractResult);
    }

    /**
@@ -68,7 +68,7 @@
    public int updateDefaultResult(ContractResult contractResult)
    {
        contractResult.setUpdateTime(DateUtils.getNowDate());
        return defaultResultMapper.updateDefaultResult(contractResult);
        return contractResultMapper.updateDefaultResult(contractResult);
    }

    /**
@@ -80,7 +80,7 @@
    @Override
    public int deleteDefaultResultByIds(Long[] ids)
    {
        return defaultResultMapper.deleteDefaultResultByIds(ids);
        return contractResultMapper.deleteDefaultResultByIds(ids);
    }

    /**
@@ -92,6 +92,6 @@
    @Override
    public int deleteDefaultResultById(Long id)
    {
        return defaultResultMapper.deleteDefaultResultById(id);
        return contractResultMapper.deleteDefaultResultById(id);
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java

File was renamed from ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultScoreServiceImpl.java
@@ -2,8 +2,8 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.ContractScore;
import com.ycl.platform.mapper.DefaultScoreMapper;
import com.ycl.platform.service.IDefaultScoreService;
import com.ycl.platform.mapper.ContractScoreMapper;
import com.ycl.platform.service.IContractScoreService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import utils.DateUtils;
@@ -17,10 +17,10 @@
 * @date 2024-04-01
 */
@Service
public class DefaultScoreServiceImpl extends ServiceImpl<DefaultScoreMapper, ContractScore> implements IDefaultScoreService
public class ContractScoreServiceImpl extends ServiceImpl<ContractScoreMapper, ContractScore> implements IContractScoreService
{
    @Autowired
    private DefaultScoreMapper defaultScoreMapper;
    private ContractScoreMapper contractScoreMapper;

    /**
     * 查询合同打分
@@ -31,7 +31,7 @@
    @Override
    public ContractScore selectDefaultScoreById(Long id)
    {
        return defaultScoreMapper.selectDefaultScoreById(id);
        return contractScoreMapper.selectDefaultScoreById(id);
    }

    /**
@@ -43,7 +43,7 @@
    @Override
    public List<ContractScore> selectDefaultScoreList(ContractScore contractScore)
    {
        return defaultScoreMapper.selectDefaultScoreList(contractScore);
        return contractScoreMapper.selectDefaultScoreList(contractScore);
    }

    /**
@@ -56,7 +56,7 @@
    public int insertDefaultScore(ContractScore contractScore)
    {
        contractScore.setCreateTime(DateUtils.getNowDate());
        return defaultScoreMapper.insertDefaultScore(contractScore);
        return contractScoreMapper.insertDefaultScore(contractScore);
    }

    /**
@@ -69,7 +69,7 @@
    public int updateDefaultScore(ContractScore contractScore)
    {
        contractScore.setUpdateTime(DateUtils.getNowDate());
        return defaultScoreMapper.updateDefaultScore(contractScore);
        return contractScoreMapper.updateDefaultScore(contractScore);
    }

    /**
@@ -81,7 +81,7 @@
    @Override
    public int deleteDefaultScoreByIds(Long[] ids)
    {
        return defaultScoreMapper.deleteDefaultScoreByIds(ids);
        return contractScoreMapper.deleteDefaultScoreByIds(ids);
    }

    /**
@@ -93,6 +93,6 @@
    @Override
    public int deleteDefaultScoreById(Long id)
    {
        return defaultScoreMapper.deleteDefaultScoreById(id);
        return contractScoreMapper.deleteDefaultScoreById(id);
    }
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultPublishServiceImpl.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultTemplateRuleServiceImpl.java

File was deleted

 ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultTemplateServiceImpl.java

File was deleted

 ycl-server/src/main/resources/mapper/zgyw/CalculateMoneyRuleMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.CalculateRuleMapper">
<mapper namespace="com.ycl.platform.mapper.CalculateMoneyRuleMapper">

    <resultMap type="com.ycl.platform.domain.entity.CalculateMoneyRule" id="CalculateRuleResult">
        <result property="id"    column="id"    />

 ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.DefaultRuleMapper">
<mapper namespace="com.ycl.platform.mapper.CalculateRuleMapper">

    <resultMap type="com.ycl.platform.domain.entity.CalculateRule" id="DefaultRuleResult">
        <result property="id"    column="id"    />

 ycl-server/src/main/resources/mapper/zgyw/ContractPublishMapper.xml

File was deleted

 ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.DefaultResultMapper">
<mapper namespace="com.ycl.platform.mapper.ContractResultMapper">

    <resultMap type="com.ycl.platform.domain.entity.ContractResult" id="DefaultResultResult">
        <result property="id"    column="id"    />

 ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.DefaultScoreMapper">
<mapper namespace="com.ycl.platform.mapper.ContractScoreMapper">

    <resultMap type="com.ycl.platform.domain.entity.ContractScore" id="DefaultScoreResult">
        <result property="id"    column="id"    />

 ycl-server/src/main/resources/mapper/zgyw/DefaultTemplateMapper.xml

File was deleted

 ycl-server/src/main/resources/mapper/zgyw/DefaultTemplateRuleMapper.xml

File was deleted