From d1b39618205b7e4030e522bcdfc93a3719582b2f Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 23 四月 2024 10:52:07 +0800 Subject: [PATCH] 表名修改 --- ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java | 63 ++-- ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java | 46 +- ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java | 8 ycl-server/src/main/java/com/ycl/platform/mapper/CalculateMoneyRuleMapper.java | 63 +++++ ycl-server/src/main/java/com/ycl/platform/controller/CalculateMoneyRuleController.java | 96 ++++++++ ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java | 2 ycl-server/src/main/java/com/ycl/platform/mapper/ContractScoreMapper.java | 2 ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java | 64 ++-- ycl-server/src/main/java/com/ycl/platform/service/ICalculateMoneyRuleService.java | 62 +++++ ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java | 20 ycl-server/src/main/java/com/ycl/platform/service/IContractScoreService.java | 2 ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml | 2 ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java | 8 ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateMoneyRuleServiceImpl.java | 95 +++++++ ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml | 2 /dev/null | 71 ----- ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java | 46 +- ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java | 2 ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java | 20 ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml | 2 ycl-server/src/main/resources/mapper/zgyw/CalculateMoneyRuleMapper.xml | 2 21 files changed, 463 insertions(+), 215 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractPublish.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractPublish.java deleted file mode 100644 index e81efeb..0000000 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractPublish.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.ycl.platform.domain.entity; - -import annotation.Excel; -import com.ycl.system.entity.BaseEntity; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; - -import java.math.BigDecimal; - -/** - * 鍚堝悓鑰冩牳鍙戝竷瀵硅薄 t_default_publish - * - * @author ruoyi - * @date 2024-04-01 - */ -public class ContractPublish extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** */ - private Long id; - - /** 鑰冩牳鍚嶇О */ - @Excel(name = "鑰冩牳鍚嶇О") - private String examineName; - - /** */ - @Excel(name = "") - private Long templateId; - - /** 棰戠巼 */ - @Excel(name = "棰戠巼") - private Long frequency; - - /** 鎶ヨ鍒嗘暟 */ - @Excel(name = "鎶ヨ鍒嗘暟") - private BigDecimal alarmScore; - - /** 鍚堝悓鑰冩牳鎻忚堪 */ - @Excel(name = "鍚堝悓鑰冩牳鎻忚堪") - private String description; - - /** 鍚敤/鍋滅敤 */ - @Excel(name = "鍚敤/鍋滅敤") - private Long state; - - /** 瀹℃牳鐘舵�� */ - @Excel(name = "瀹℃牳鐘舵��") - private Long auditState; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setExamineName(String examineName) - { - this.examineName = examineName; - } - - public String getExamineName() - { - return examineName; - } - public void setTemplateId(Long templateId) - { - this.templateId = templateId; - } - - public Long getTemplateId() - { - return templateId; - } - public void setFrequency(Long frequency) - { - this.frequency = frequency; - } - - public Long getFrequency() - { - return frequency; - } - public void setAlarmScore(BigDecimal alarmScore) - { - this.alarmScore = alarmScore; - } - - public BigDecimal getAlarmScore() - { - return alarmScore; - } - public void setDescription(String description) - { - this.description = description; - } - - public String getDescription() - { - return description; - } - public void setState(Long state) - { - this.state = state; - } - - public Long getState() - { - return state; - } - public void setAuditState(Long auditState) - { - this.auditState = auditState; - } - - public Long getAuditState() - { - return auditState; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("examineName", getExamineName()) - .append("templateId", getTemplateId()) - .append("frequency", getFrequency()) - .append("alarmScore", getAlarmScore()) - .append("description", getDescription()) - .append("state", getState()) - .append("auditState", getAuditState()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultTemplate.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultTemplate.java deleted file mode 100644 index afa28c5..0000000 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultTemplate.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.ycl.platform.domain.entity; - -import annotation.Excel; -import com.ycl.system.entity.BaseEntity; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; - -/** - * 杩濈害瑙勫垯妯℃澘瀵硅薄 t_default_template - * - * @author ruoyi - * @date 2024-04-01 - */ -public class DefaultTemplate extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** */ - private Long id; - - /** 妯℃澘鍚嶇О */ - @Excel(name = "妯℃澘鍚嶇О") - private String templateName; - - /** 鍏宠仈杩愮淮鍏徃id */ - @Excel(name = "鍏宠仈杩愮淮鍏徃id") - private Long unitId; - - /** 瀹℃牳鐘舵�� */ - @Excel(name = "瀹℃牳鐘舵��") - private Long auditState; - - /** 鑰冩牳绫诲瀷 */ - @Excel(name = "鑰冩牳绫诲瀷") - private Long examineCategory; - - /** 鍚敤鐘舵�� */ - @Excel(name = "鍚敤鐘舵��") - private Long status; - - /** */ - @Excel(name = "") - private Long createUser; - - /** */ - @Excel(name = "") - private Long updateUser; - - /** */ - private String createUserName; - - /** */ - private String updateUserName; - - /** */ - private String deleted; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setTemplateName(String templateName) - { - this.templateName = templateName; - } - - public String getTemplateName() - { - return templateName; - } - public void setUnitId(Long unitId) - { - this.unitId = unitId; - } - - public Long getUnitId() - { - return unitId; - } - public void setAuditState(Long auditState) - { - this.auditState = auditState; - } - - public Long getAuditState() - { - return auditState; - } - public void setExamineCategory(Long examineCategory) - { - this.examineCategory = examineCategory; - } - - public Long getExamineCategory() - { - return examineCategory; - } - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - public void setCreateUser(Long createUser) - { - this.createUser = createUser; - } - - public Long getCreateUser() - { - return createUser; - } - public void setUpdateUser(Long updateUser) - { - this.updateUser = updateUser; - } - - public Long getUpdateUser() - { - return updateUser; - } - public void setCreateUserName(String createUserName) - { - this.createUserName = createUserName; - } - - public String getCreateUserName() - { - return createUserName; - } - public void setUpdateUserName(String updateUserName) - { - this.updateUserName = updateUserName; - } - - public String getUpdateUserName() - { - return updateUserName; - } - public void setDeleted(String deleted) - { - this.deleted = deleted; - } - - public String getDeleted() - { - return deleted; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("templateName", getTemplateName()) - .append("unitId", getUnitId()) - .append("auditState", getAuditState()) - .append("examineCategory", getExamineCategory()) - .append("status", getStatus()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("createUser", getCreateUser()) - .append("updateUser", getUpdateUser()) - .append("createUserName", getCreateUserName()) - .append("updateUserName", getUpdateUserName()) - .append("deleted", getDeleted()) - .toString(); - } -} diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultTemplateRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultTemplateRule.java deleted file mode 100644 index ecf8a2f..0000000 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultTemplateRule.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.ycl.platform.domain.entity; - -import annotation.Excel; -import com.ycl.system.entity.BaseEntity; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; - -import java.math.BigDecimal; - -/** - * 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿瀵硅薄 t_default_template_rule - * - * @author ruoyi - * @date 2024-04-01 - */ -public class DefaultTemplateRule extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** */ - private Long id; - - /** 鑰冩牳妯℃澘ID */ - @Excel(name = "鑰冩牳妯℃澘ID") - private Long defaultTemplateId; - - /** 鑰冩牳瑙勫垯ID */ - @Excel(name = "鑰冩牳瑙勫垯ID") - private Long defaultRuleId; - - /** 鎵e垎绯绘暟 */ - @Excel(name = "鎵e垎绯绘暟") - private BigDecimal value; - - /** */ - @Excel(name = "") - private Long auditState; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDefaultTemplateId(Long defaultTemplateId) - { - this.defaultTemplateId = defaultTemplateId; - } - - public Long getDefaultTemplateId() - { - return defaultTemplateId; - } - public void setDefaultRuleId(Long defaultRuleId) - { - this.defaultRuleId = defaultRuleId; - } - - public Long getDefaultRuleId() - { - return defaultRuleId; - } - public void setValue(BigDecimal value) - { - this.value = value; - } - - public BigDecimal getValue() - { - return value; - } - public void setAuditState(Long auditState) - { - this.auditState = auditState; - } - - public Long getAuditState() - { - return auditState; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("defaultTemplateId", getDefaultTemplateId()) - .append("defaultRuleId", getDefaultRuleId()) - .append("value", getValue()) - .append("auditState", getAuditState()) - .toString(); - } -} diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateMoneyRuleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateMoneyRuleController.java new file mode 100644 index 0000000..55d06e1 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateMoneyRuleController.java @@ -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)); + } +} diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java index 90367a5..efc2f01 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java +++ b/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)); } } diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java similarity index 93% rename from ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java rename to ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java index 0a60f05..aac85ac 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.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; /** * 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃 diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java similarity index 93% rename from ycl-server/src/main/java/com/ycl/platform/controller/DefaultScoreController.java rename to ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java index 8525073..6a479fc 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultScoreController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.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; /** * 鏌ヨ鍚堝悓鎵撳垎鍒楄〃 diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultPublishController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultPublishController.java deleted file mode 100644 index 9a19f4b..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultPublishController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.ycl.platform.controller; - -import annotation.Log; -import com.ycl.platform.domain.entity.ContractPublish; -import com.ycl.platform.service.IDefaultPublishService; -import com.ycl.system.AjaxResult; -import com.ycl.system.controller.BaseController; -import com.ycl.system.page.TableDataInfo; -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-01 - */ -@RestController -@RequestMapping("/default/publish") -public class DefaultPublishController extends BaseController -{ - @Autowired - private IDefaultPublishService defaultPublishService; - - /** - * 鏌ヨ鍚堝悓鑰冩牳鍙戝竷鍒楄〃 - */ - @PreAuthorize("@ss.hasPermi('system:publish:list')") - @GetMapping("/list") - public TableDataInfo list(ContractPublish contractPublish) - { - startPage(); - List<ContractPublish> list = defaultPublishService.selectDefaultPublishList(contractPublish); - return getDataTable(list); - } - - /** - * 瀵煎嚭鍚堝悓鑰冩牳鍙戝竷鍒楄〃 - */ - @PreAuthorize("@ss.hasPermi('system:publish:export')") - @Log(title = "鍚堝悓鑰冩牳鍙戝竷", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, ContractPublish contractPublish) - { - List<ContractPublish> list = defaultPublishService.selectDefaultPublishList(contractPublish); - ExcelUtil<ContractPublish> util = new ExcelUtil<ContractPublish>(ContractPublish.class); - util.exportExcel(response, list, "鍚堝悓鑰冩牳鍙戝竷鏁版嵁"); - } - - /** - * 鑾峰彇鍚堝悓鑰冩牳鍙戝竷璇︾粏淇℃伅 - */ - @PreAuthorize("@ss.hasPermi('system:publish:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(defaultPublishService.selectDefaultPublishById(id)); - } - - /** - * 鏂板鍚堝悓鑰冩牳鍙戝竷 - */ - @PreAuthorize("@ss.hasPermi('system:publish:add')") - @Log(title = "鍚堝悓鑰冩牳鍙戝竷", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ContractPublish contractPublish) - { - return toAjax(defaultPublishService.insertDefaultPublish(contractPublish)); - } - - /** - * 淇敼鍚堝悓鑰冩牳鍙戝竷 - */ - @PreAuthorize("@ss.hasPermi('system:publish:edit')") - @Log(title = "鍚堝悓鑰冩牳鍙戝竷", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ContractPublish contractPublish) - { - return toAjax(defaultPublishService.updateDefaultPublish(contractPublish)); - } - - /** - * 鍒犻櫎鍚堝悓鑰冩牳鍙戝竷 - */ - @PreAuthorize("@ss.hasPermi('system:publish:remove')") - @Log(title = "鍚堝悓鑰冩牳鍙戝竷", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(defaultPublishService.deleteDefaultPublishByIds(ids)); - } -} diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java deleted file mode 100644 index 0193cbc..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.ycl.platform.controller; - -import annotation.Log; -import com.ycl.platform.domain.entity.CalculateRule; -import com.ycl.platform.service.IDefaultRuleService; -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-01 - */ -@RestController -@RequestMapping("/default/rule") -public class DefaultRuleController extends BaseController -{ - @Autowired - private IDefaultRuleService defaultRuleService; - - /** - * 鏌ヨ杩濈害瑙勫垯鍒楄〃 - */ - @PreAuthorize("@ss.hasPermi('system:rule:list')") - @GetMapping("/list") - public AjaxResult list(CalculateRule calculateRule) - { - List<CalculateRule> list = defaultRuleService.selectDefaultRuleList(calculateRule); - return success(list); - } - - /** - * 瀵煎嚭杩濈害瑙勫垯鍒楄〃 - */ - @PreAuthorize("@ss.hasPermi('system:rule:export')") - @Log(title = "杩濈害瑙勫垯", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, CalculateRule calculateRule) - { - List<CalculateRule> list = defaultRuleService.selectDefaultRuleList(calculateRule); - ExcelUtil<CalculateRule> util = new ExcelUtil<CalculateRule>(CalculateRule.class); - util.exportExcel(response, list, "杩濈害瑙勫垯鏁版嵁"); - } - - /** - * 鑾峰彇杩濈害瑙勫垯璇︾粏淇℃伅 - */ - @PreAuthorize("@ss.hasPermi('system:rule:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(defaultRuleService.selectDefaultRuleById(id)); - } - - /** - * 鏂板杩濈害瑙勫垯 - */ - @PreAuthorize("@ss.hasPermi('system:rule:add')") - @Log(title = "杩濈害瑙勫垯", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody CalculateRule calculateRule) - { - return toAjax(defaultRuleService.insertDefaultRule(calculateRule)); - } - - /** - * 淇敼杩濈害瑙勫垯 - */ - @PreAuthorize("@ss.hasPermi('system:rule:edit')") - @Log(title = "杩濈害瑙勫垯", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody CalculateRule calculateRule) - { - return toAjax(defaultRuleService.updateDefaultRule(calculateRule)); - } - - /** - * 鍒犻櫎杩濈害瑙勫垯 - */ - @PreAuthorize("@ss.hasPermi('system:rule:remove')") - @Log(title = "杩濈害瑙勫垯", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(defaultRuleService.deleteDefaultRuleByIds(ids)); - } -} diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultTemplateController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultTemplateController.java deleted file mode 100644 index b4ec40c..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultTemplateController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.ycl.platform.controller; - -import annotation.Log; -import com.ycl.platform.domain.entity.DefaultTemplate; -import com.ycl.platform.service.IDefaultTemplateService; -import com.ycl.system.AjaxResult; -import com.ycl.system.controller.BaseController; -import com.ycl.system.page.TableDataInfo; -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-01 - */ -@RestController -@RequestMapping("/default/template") -public class DefaultTemplateController extends BaseController -{ - @Autowired - private IDefaultTemplateService defaultTemplateService; - - /** - * 鏌ヨ杩濈害瑙勫垯妯℃澘鍒楄〃 - */ - @PreAuthorize("@ss.hasPermi('platform:template:list')") - @GetMapping("/list") - public TableDataInfo list(DefaultTemplate defaultTemplate) - { - startPage(); - List<DefaultTemplate> list = defaultTemplateService.selectDefaultTemplateList(defaultTemplate); - return getDataTable(list); - } - - /** - * 瀵煎嚭杩濈害瑙勫垯妯℃澘鍒楄〃 - */ - @PreAuthorize("@ss.hasPermi('platform:template:export')") - @Log(title = "杩濈害瑙勫垯妯℃澘", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DefaultTemplate defaultTemplate) - { - List<DefaultTemplate> list = defaultTemplateService.selectDefaultTemplateList(defaultTemplate); - ExcelUtil<DefaultTemplate> util = new ExcelUtil<DefaultTemplate>(DefaultTemplate.class); - util.exportExcel(response, list, "杩濈害瑙勫垯妯℃澘鏁版嵁"); - } - - /** - * 鑾峰彇杩濈害瑙勫垯妯℃澘璇︾粏淇℃伅 - */ - @PreAuthorize("@ss.hasPermi('platform:template:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(defaultTemplateService.selectDefaultTemplateById(id)); - } - - /** - * 鏂板杩濈害瑙勫垯妯℃澘 - */ - @PreAuthorize("@ss.hasPermi('platform:template:add')") - @Log(title = "杩濈害瑙勫垯妯℃澘", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody DefaultTemplate defaultTemplate) - { - return toAjax(defaultTemplateService.insertDefaultTemplate(defaultTemplate)); - } - - /** - * 淇敼杩濈害瑙勫垯妯℃澘 - */ - @PreAuthorize("@ss.hasPermi('platform:template:edit')") - @Log(title = "杩濈害瑙勫垯妯℃澘", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody DefaultTemplate defaultTemplate) - { - return toAjax(defaultTemplateService.updateDefaultTemplate(defaultTemplate)); - } - - /** - * 鍒犻櫎杩濈害瑙勫垯妯℃澘 - */ - @PreAuthorize("@ss.hasPermi('platform:template:remove')") - @Log(title = "杩濈害瑙勫垯妯℃澘", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(defaultTemplateService.deleteDefaultTemplateByIds(ids)); - } -} diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateMoneyRuleMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateMoneyRuleMapper.java new file mode 100644 index 0000000..71952d6 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateMoneyRuleMapper.java @@ -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); +} diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java index d484433..c0aa17e 100644 --- a/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java +++ b/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); } diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultResultMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java similarity index 95% rename from ycl-server/src/main/java/com/ycl/platform/mapper/DefaultResultMapper.java rename to ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java index d191816..ba950e5 100644 --- a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultResultMapper.java +++ b/ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java @@ -11,7 +11,7 @@ * @author ruoyi * @date 2024-04-01 */ -public interface DefaultResultMapper extends BaseMapper<ContractResult> +public interface ContractResultMapper extends BaseMapper<ContractResult> { /** * 鏌ヨ鍚堝悓鑰冩牳缁撴灉 diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultScoreMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/ContractScoreMapper.java similarity index 94% rename from ycl-server/src/main/java/com/ycl/platform/mapper/DefaultScoreMapper.java rename to ycl-server/src/main/java/com/ycl/platform/mapper/ContractScoreMapper.java index dbf2873..69cec0c 100644 --- a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultScoreMapper.java +++ b/ycl-server/src/main/java/com/ycl/platform/mapper/ContractScoreMapper.java @@ -11,7 +11,7 @@ * @author ruoyi * @date 2024-04-01 */ -public interface DefaultScoreMapper extends BaseMapper<ContractScore> +public interface ContractScoreMapper extends BaseMapper<ContractScore> { /** * 鏌ヨ鍚堝悓鎵撳垎 diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultPublishMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultPublishMapper.java deleted file mode 100644 index 9820be5..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultPublishMapper.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.ycl.platform.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ycl.platform.domain.entity.ContractPublish; - -import java.util.List; - -/** - * 鍚堝悓鑰冩牳鍙戝竷Mapper鎺ュ彛 - * - * @author ruoyi - * @date 2024-04-01 - */ -public interface DefaultPublishMapper extends BaseMapper<ContractPublish> -{ - /** - * 鏌ヨ鍚堝悓鑰冩牳鍙戝竷 - * - * @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭 - * @return 鍚堝悓鑰冩牳鍙戝竷 - */ - public ContractPublish selectDefaultPublishById(Long id); - - /** - * 鏌ヨ鍚堝悓鑰冩牳鍙戝竷鍒楄〃 - * - * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷 - * @return 鍚堝悓鑰冩牳鍙戝竷闆嗗悎 - */ - public List<ContractPublish> selectDefaultPublishList(ContractPublish contractPublish); - - /** - * 鏂板鍚堝悓鑰冩牳鍙戝竷 - * - * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷 - * @return 缁撴灉 - */ - public int insertDefaultPublish(ContractPublish contractPublish); - - /** - * 淇敼鍚堝悓鑰冩牳鍙戝竷 - * - * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷 - * @return 缁撴灉 - */ - public int updateDefaultPublish(ContractPublish contractPublish); - - /** - * 鍒犻櫎鍚堝悓鑰冩牳鍙戝竷 - * - * @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭 - * @return 缁撴灉 - */ - public int deleteDefaultPublishById(Long id); - - /** - * 鎵归噺鍒犻櫎鍚堝悓鑰冩牳鍙戝竷 - * - * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 - * @return 缁撴灉 - */ - public int deleteDefaultPublishByIds(Long[] ids); -} diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java deleted file mode 100644 index 83c7443..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.ycl.platform.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ycl.platform.domain.entity.CalculateRule; - -import java.util.List; - -/** - * 杩濈害瑙勫垯Mapper鎺ュ彛 - * - * @author ruoyi - * @date 2024-04-01 - */ -public interface DefaultRuleMapper extends BaseMapper<CalculateRule> -{ - /** - * 鏌ヨ杩濈害瑙勫垯 - * - * @param id 杩濈害瑙勫垯涓婚敭 - * @return 杩濈害瑙勫垯 - */ - public CalculateRule selectDefaultRuleById(Long id); - - /** - * 鏌ヨ杩濈害瑙勫垯鍒楄〃 - * - * @param calculateRule 杩濈害瑙勫垯 - * @return 杩濈害瑙勫垯闆嗗悎 - */ - public List<CalculateRule> selectDefaultRuleList(CalculateRule calculateRule); - - /** - * 鏂板杩濈害瑙勫垯 - * - * @param calculateRule 杩濈害瑙勫垯 - * @return 缁撴灉 - */ - public int insertDefaultRule(CalculateRule calculateRule); - - /** - * 淇敼杩濈害瑙勫垯 - * - * @param calculateRule 杩濈害瑙勫垯 - * @return 缁撴灉 - */ - public int updateDefaultRule(CalculateRule calculateRule); - - /** - * 鍒犻櫎杩濈害瑙勫垯 - * - * @param id 杩濈害瑙勫垯涓婚敭 - * @return 缁撴灉 - */ - public int deleteDefaultRuleById(Long id); - - /** - * 鎵归噺鍒犻櫎杩濈害瑙勫垯 - * - * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 - * @return 缁撴灉 - */ - public int deleteDefaultRuleByIds(Long[] ids); -} diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultTemplateMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultTemplateMapper.java deleted file mode 100644 index 428d736..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultTemplateMapper.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.ycl.platform.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ycl.platform.domain.entity.DefaultTemplate; - -import java.util.List; - -/** - * 杩濈害瑙勫垯妯℃澘Mapper鎺ュ彛 - * - * @author ruoyi - * @date 2024-04-01 - */ -public interface DefaultTemplateMapper extends BaseMapper<DefaultTemplate> -{ - /** - * 鏌ヨ杩濈害瑙勫垯妯℃澘 - * - * @param id 杩濈害瑙勫垯妯℃澘涓婚敭 - * @return 杩濈害瑙勫垯妯℃澘 - */ - public DefaultTemplate selectDefaultTemplateById(Long id); - - /** - * 鏌ヨ杩濈害瑙勫垯妯℃澘鍒楄〃 - * - * @param defaultTemplate 杩濈害瑙勫垯妯℃澘 - * @return 杩濈害瑙勫垯妯℃澘闆嗗悎 - */ - public List<DefaultTemplate> selectDefaultTemplateList(DefaultTemplate defaultTemplate); - - /** - * 鏂板杩濈害瑙勫垯妯℃澘 - * - * @param defaultTemplate 杩濈害瑙勫垯妯℃澘 - * @return 缁撴灉 - */ - public int insertDefaultTemplate(DefaultTemplate defaultTemplate); - - /** - * 淇敼杩濈害瑙勫垯妯℃澘 - * - * @param defaultTemplate 杩濈害瑙勫垯妯℃澘 - * @return 缁撴灉 - */ - public int updateDefaultTemplate(DefaultTemplate defaultTemplate); - - /** - * 鍒犻櫎杩濈害瑙勫垯妯℃澘 - * - * @param id 杩濈害瑙勫垯妯℃澘涓婚敭 - * @return 缁撴灉 - */ - public int deleteDefaultTemplateById(Long id); - - /** - * 鎵归噺鍒犻櫎杩濈害瑙勫垯妯℃澘 - * - * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 - * @return 缁撴灉 - */ - public int deleteDefaultTemplateByIds(Long[] ids); -} diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultTemplateRuleMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultTemplateRuleMapper.java deleted file mode 100644 index 6c3ab59..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultTemplateRuleMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ycl.platform.mapper; - -import com.ycl.platform.domain.entity.DefaultTemplateRule; - -import java.util.List; - -/** - * 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿Mapper鎺ュ彛 - * - * @author ruoyi - * @date 2024-04-01 - */ -public interface DefaultTemplateRuleMapper -{ - /** - * 鏌ヨ杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * - * @param id 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿涓婚敭 - * @return 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - */ - public DefaultTemplateRule selectDefaultTemplateRuleById(Long id); - - /** - * 鏌ヨ杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿鍒楄〃 - * - * @param defaultTemplateRule 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * @return 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿闆嗗悎 - */ - public List<DefaultTemplateRule> selectDefaultTemplateRuleList(DefaultTemplateRule defaultTemplateRule); - - /** - * 鏂板杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * - * @param defaultTemplateRule 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * @return 缁撴灉 - */ - public int insertDefaultTemplateRule(DefaultTemplateRule defaultTemplateRule); - - /** - * 淇敼杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * - * @param defaultTemplateRule 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * @return 缁撴灉 - */ - public int updateDefaultTemplateRule(DefaultTemplateRule defaultTemplateRule); - - /** - * 鍒犻櫎杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * - * @param id 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿涓婚敭 - * @return 缁撴灉 - */ - public int deleteDefaultTemplateRuleById(Long id); - - /** - * 鎵归噺鍒犻櫎杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * - * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 - * @return 缁撴灉 - */ - public int deleteDefaultTemplateRuleByIds(Long[] ids); -} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICalculateMoneyRuleService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICalculateMoneyRuleService.java new file mode 100644 index 0000000..60b0ba6 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/service/ICalculateMoneyRuleService.java @@ -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); +} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java index 9f543a1..81484a7 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java +++ b/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); } diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultResultService.java b/ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java similarity index 97% rename from ycl-server/src/main/java/com/ycl/platform/service/IDefaultResultService.java rename to ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java index 809631a..d5cf9f1 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultResultService.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java @@ -10,7 +10,7 @@ * @author ruoyi * @date 2024-04-01 */ -public interface IDefaultResultService +public interface IContractResultService { /** * 鏌ヨ鍚堝悓鑰冩牳缁撴灉 diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultScoreService.java b/ycl-server/src/main/java/com/ycl/platform/service/IContractScoreService.java similarity index 96% rename from ycl-server/src/main/java/com/ycl/platform/service/IDefaultScoreService.java rename to ycl-server/src/main/java/com/ycl/platform/service/IContractScoreService.java index 473328f..bb33340 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultScoreService.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/IContractScoreService.java @@ -10,7 +10,7 @@ * @author ruoyi * @date 2024-04-01 */ -public interface IDefaultScoreService +public interface IContractScoreService { /** * 鏌ヨ鍚堝悓鎵撳垎 diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultPublishService.java b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultPublishService.java deleted file mode 100644 index ea59a71..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultPublishService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ycl.platform.service; - -import com.ycl.platform.domain.entity.ContractPublish; - -import java.util.List; - -/** - * 鍚堝悓鑰冩牳鍙戝竷Service鎺ュ彛 - * - * @author ruoyi - * @date 2024-04-01 - */ -public interface IDefaultPublishService -{ - /** - * 鏌ヨ鍚堝悓鑰冩牳鍙戝竷 - * - * @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭 - * @return 鍚堝悓鑰冩牳鍙戝竷 - */ - public ContractPublish selectDefaultPublishById(Long id); - - /** - * 鏌ヨ鍚堝悓鑰冩牳鍙戝竷鍒楄〃 - * - * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷 - * @return 鍚堝悓鑰冩牳鍙戝竷闆嗗悎 - */ - public List<ContractPublish> selectDefaultPublishList(ContractPublish contractPublish); - - /** - * 鏂板鍚堝悓鑰冩牳鍙戝竷 - * - * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷 - * @return 缁撴灉 - */ - public int insertDefaultPublish(ContractPublish contractPublish); - - /** - * 淇敼鍚堝悓鑰冩牳鍙戝竷 - * - * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷 - * @return 缁撴灉 - */ - public int updateDefaultPublish(ContractPublish contractPublish); - - /** - * 鎵归噺鍒犻櫎鍚堝悓鑰冩牳鍙戝竷 - * - * @param ids 闇�瑕佸垹闄ょ殑鍚堝悓鑰冩牳鍙戝竷涓婚敭闆嗗悎 - * @return 缁撴灉 - */ - public int deleteDefaultPublishByIds(Long[] ids); - - /** - * 鍒犻櫎鍚堝悓鑰冩牳鍙戝竷淇℃伅 - * - * @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭 - * @return 缁撴灉 - */ - public int deleteDefaultPublishById(Long id); -} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultRuleService.java b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultRuleService.java deleted file mode 100644 index 0743e96..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultRuleService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ycl.platform.service; - -import com.ycl.platform.domain.entity.CalculateRule; - -import java.util.List; - -/** - * 杩濈害瑙勫垯Service鎺ュ彛 - * - * @author ruoyi - * @date 2024-04-01 - */ -public interface IDefaultRuleService -{ - /** - * 鏌ヨ杩濈害瑙勫垯 - * - * @param id 杩濈害瑙勫垯涓婚敭 - * @return 杩濈害瑙勫垯 - */ - public CalculateRule selectDefaultRuleById(Long id); - - /** - * 鏌ヨ杩濈害瑙勫垯鍒楄〃 - * - * @param calculateRule 杩濈害瑙勫垯 - * @return 杩濈害瑙勫垯闆嗗悎 - */ - public List<CalculateRule> selectDefaultRuleList(CalculateRule calculateRule); - - /** - * 鏂板杩濈害瑙勫垯 - * - * @param calculateRule 杩濈害瑙勫垯 - * @return 缁撴灉 - */ - public int insertDefaultRule(CalculateRule calculateRule); - - /** - * 淇敼杩濈害瑙勫垯 - * - * @param calculateRule 杩濈害瑙勫垯 - * @return 缁撴灉 - */ - public int updateDefaultRule(CalculateRule calculateRule); - - /** - * 鎵归噺鍒犻櫎杩濈害瑙勫垯 - * - * @param ids 闇�瑕佸垹闄ょ殑杩濈害瑙勫垯涓婚敭闆嗗悎 - * @return 缁撴灉 - */ - public int deleteDefaultRuleByIds(Long[] ids); - - /** - * 鍒犻櫎杩濈害瑙勫垯淇℃伅 - * - * @param id 杩濈害瑙勫垯涓婚敭 - * @return 缁撴灉 - */ - public int deleteDefaultRuleById(Long id); -} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultTemplateRuleService.java b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultTemplateRuleService.java deleted file mode 100644 index 4799941..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultTemplateRuleService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ycl.platform.service; - -import com.ycl.platform.domain.entity.DefaultTemplateRule; - -import java.util.List; - -/** - * 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿Service鎺ュ彛 - * - * @author ruoyi - * @date 2024-04-01 - */ -public interface IDefaultTemplateRuleService -{ - /** - * 鏌ヨ杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * - * @param id 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿涓婚敭 - * @return 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - */ - public DefaultTemplateRule selectDefaultTemplateRuleById(Long id); - - /** - * 鏌ヨ杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿鍒楄〃 - * - * @param defaultTemplateRule 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * @return 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿闆嗗悎 - */ - public List<DefaultTemplateRule> selectDefaultTemplateRuleList(DefaultTemplateRule defaultTemplateRule); - - /** - * 鏂板杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * - * @param defaultTemplateRule 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * @return 缁撴灉 - */ - public int insertDefaultTemplateRule(DefaultTemplateRule defaultTemplateRule); - - /** - * 淇敼杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * - * @param defaultTemplateRule 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * @return 缁撴灉 - */ - public int updateDefaultTemplateRule(DefaultTemplateRule defaultTemplateRule); - - /** - * 鎵归噺鍒犻櫎杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * - * @param ids 闇�瑕佸垹闄ょ殑杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿涓婚敭闆嗗悎 - * @return 缁撴灉 - */ - public int deleteDefaultTemplateRuleByIds(Long[] ids); - - /** - * 鍒犻櫎杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿淇℃伅 - * - * @param id 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿涓婚敭 - * @return 缁撴灉 - */ - public int deleteDefaultTemplateRuleById(Long id); -} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultTemplateService.java b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultTemplateService.java deleted file mode 100644 index e10bcc7..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/service/IDefaultTemplateService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ycl.platform.service; - -import com.ycl.platform.domain.entity.DefaultTemplate; - -import java.util.List; - -/** - * 杩濈害瑙勫垯妯℃澘Service鎺ュ彛 - * - * @author ruoyi - * @date 2024-04-01 - */ -public interface IDefaultTemplateService -{ - /** - * 鏌ヨ杩濈害瑙勫垯妯℃澘 - * - * @param id 杩濈害瑙勫垯妯℃澘涓婚敭 - * @return 杩濈害瑙勫垯妯℃澘 - */ - public DefaultTemplate selectDefaultTemplateById(Long id); - - /** - * 鏌ヨ杩濈害瑙勫垯妯℃澘鍒楄〃 - * - * @param defaultTemplate 杩濈害瑙勫垯妯℃澘 - * @return 杩濈害瑙勫垯妯℃澘闆嗗悎 - */ - public List<DefaultTemplate> selectDefaultTemplateList(DefaultTemplate defaultTemplate); - - /** - * 鏂板杩濈害瑙勫垯妯℃澘 - * - * @param defaultTemplate 杩濈害瑙勫垯妯℃澘 - * @return 缁撴灉 - */ - public int insertDefaultTemplate(DefaultTemplate defaultTemplate); - - /** - * 淇敼杩濈害瑙勫垯妯℃澘 - * - * @param defaultTemplate 杩濈害瑙勫垯妯℃澘 - * @return 缁撴灉 - */ - public int updateDefaultTemplate(DefaultTemplate defaultTemplate); - - /** - * 鎵归噺鍒犻櫎杩濈害瑙勫垯妯℃澘 - * - * @param ids 闇�瑕佸垹闄ょ殑杩濈害瑙勫垯妯℃澘涓婚敭闆嗗悎 - * @return 缁撴灉 - */ - public int deleteDefaultTemplateByIds(Long[] ids); - - /** - * 鍒犻櫎杩濈害瑙勫垯妯℃澘淇℃伅 - * - * @param id 杩濈害瑙勫垯妯℃澘涓婚敭 - * @return 缁撴灉 - */ - public int deleteDefaultTemplateById(Long id); -} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateMoneyRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateMoneyRuleServiceImpl.java new file mode 100644 index 0000000..62567e2 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateMoneyRuleServiceImpl.java @@ -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); + } +} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java index 19060ea..21935bf 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java +++ b/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); } } diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultResultServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java similarity index 72% rename from ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultResultServiceImpl.java rename to ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java index 7c418bf..cc566b8 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultResultServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.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); } } diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java similarity index 72% rename from ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultScoreServiceImpl.java rename to ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java index b6e9dfd..88e3711 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultScoreServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.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); } } diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultPublishServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultPublishServiceImpl.java deleted file mode 100644 index 7bfe9b7..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultPublishServiceImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.ycl.platform.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ycl.platform.domain.entity.ContractPublish; -import com.ycl.platform.mapper.DefaultPublishMapper; -import com.ycl.platform.service.IDefaultPublishService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import utils.DateUtils; - -import java.util.List; - -/** - * 鍚堝悓鑰冩牳鍙戝竷Service涓氬姟灞傚鐞� - * - * @author ruoyi - * @date 2024-04-01 - */ -@Service -public class DefaultPublishServiceImpl extends ServiceImpl<DefaultPublishMapper, ContractPublish> implements IDefaultPublishService -{ - @Autowired - private DefaultPublishMapper defaultPublishMapper; - - /** - * 鏌ヨ鍚堝悓鑰冩牳鍙戝竷 - * - * @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭 - * @return 鍚堝悓鑰冩牳鍙戝竷 - */ - @Override - public ContractPublish selectDefaultPublishById(Long id) - { - return defaultPublishMapper.selectDefaultPublishById(id); - } - - /** - * 鏌ヨ鍚堝悓鑰冩牳鍙戝竷鍒楄〃 - * - * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷 - * @return 鍚堝悓鑰冩牳鍙戝竷 - */ - @Override - public List<ContractPublish> selectDefaultPublishList(ContractPublish contractPublish) - { - return defaultPublishMapper.selectDefaultPublishList(contractPublish); - } - - /** - * 鏂板鍚堝悓鑰冩牳鍙戝竷 - * - * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷 - * @return 缁撴灉 - */ - @Override - public int insertDefaultPublish(ContractPublish contractPublish) - { - contractPublish.setCreateTime(DateUtils.getNowDate()); - return defaultPublishMapper.insertDefaultPublish(contractPublish); - } - - /** - * 淇敼鍚堝悓鑰冩牳鍙戝竷 - * - * @param contractPublish 鍚堝悓鑰冩牳鍙戝竷 - * @return 缁撴灉 - */ - @Override - public int updateDefaultPublish(ContractPublish contractPublish) - { - contractPublish.setUpdateTime(DateUtils.getNowDate()); - return defaultPublishMapper.updateDefaultPublish(contractPublish); - } - - /** - * 鎵归噺鍒犻櫎鍚堝悓鑰冩牳鍙戝竷 - * - * @param ids 闇�瑕佸垹闄ょ殑鍚堝悓鑰冩牳鍙戝竷涓婚敭 - * @return 缁撴灉 - */ - @Override - public int deleteDefaultPublishByIds(Long[] ids) - { - return defaultPublishMapper.deleteDefaultPublishByIds(ids); - } - - /** - * 鍒犻櫎鍚堝悓鑰冩牳鍙戝竷淇℃伅 - * - * @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭 - * @return 缁撴灉 - */ - @Override - public int deleteDefaultPublishById(Long id) - { - return defaultPublishMapper.deleteDefaultPublishById(id); - } -} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java deleted file mode 100644 index 94e3799..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.ycl.platform.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ycl.platform.domain.entity.CalculateRule; -import com.ycl.platform.mapper.DefaultRuleMapper; -import com.ycl.platform.service.IDefaultRuleService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import utils.DateUtils; - -import java.util.List; - -/** - * 杩濈害瑙勫垯Service涓氬姟灞傚鐞� - * - * @author ruoyi - * @date 2024-04-01 - */ -@Service -public class DefaultRuleServiceImpl extends ServiceImpl<DefaultRuleMapper, CalculateRule> implements IDefaultRuleService -{ - @Autowired - private DefaultRuleMapper defaultRuleMapper; - - /** - * 鏌ヨ杩濈害瑙勫垯 - * - * @param id 杩濈害瑙勫垯涓婚敭 - * @return 杩濈害瑙勫垯 - */ - @Override - public CalculateRule selectDefaultRuleById(Long id) - { - return defaultRuleMapper.selectDefaultRuleById(id); - } - - /** - * 鏌ヨ杩濈害瑙勫垯鍒楄〃 - * - * @param calculateRule 杩濈害瑙勫垯 - * @return 杩濈害瑙勫垯 - */ - @Override - public List<CalculateRule> selectDefaultRuleList(CalculateRule calculateRule) - { - return defaultRuleMapper.selectDefaultRuleList(calculateRule); - } - - /** - * 鏂板杩濈害瑙勫垯 - * - * @param calculateRule 杩濈害瑙勫垯 - * @return 缁撴灉 - */ - @Override - public int insertDefaultRule(CalculateRule calculateRule) - { - calculateRule.setCreateTime(DateUtils.getNowDate()); - return defaultRuleMapper.insertDefaultRule(calculateRule); - } - - /** - * 淇敼杩濈害瑙勫垯 - * - * @param calculateRule 杩濈害瑙勫垯 - * @return 缁撴灉 - */ - @Override - public int updateDefaultRule(CalculateRule calculateRule) - { - calculateRule.setUpdateTime(DateUtils.getNowDate()); - return defaultRuleMapper.updateDefaultRule(calculateRule); - } - - /** - * 鎵归噺鍒犻櫎杩濈害瑙勫垯 - * - * @param ids 闇�瑕佸垹闄ょ殑杩濈害瑙勫垯涓婚敭 - * @return 缁撴灉 - */ - @Override - public int deleteDefaultRuleByIds(Long[] ids) - { - return defaultRuleMapper.deleteDefaultRuleByIds(ids); - } - - /** - * 鍒犻櫎杩濈害瑙勫垯淇℃伅 - * - * @param id 杩濈害瑙勫垯涓婚敭 - * @return 缁撴灉 - */ - @Override - public int deleteDefaultRuleById(Long id) - { - return defaultRuleMapper.deleteDefaultRuleById(id); - } -} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultTemplateRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultTemplateRuleServiceImpl.java deleted file mode 100644 index 420f92a..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultTemplateRuleServiceImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.ycl.platform.service.impl; - -import com.ycl.platform.domain.entity.DefaultTemplateRule; -import com.ycl.platform.mapper.DefaultTemplateRuleMapper; -import com.ycl.platform.service.IDefaultTemplateRuleService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿Service涓氬姟灞傚鐞� - * - * @author ruoyi - * @date 2024-04-01 - */ -@Service -public class DefaultTemplateRuleServiceImpl implements IDefaultTemplateRuleService -{ - @Autowired - private DefaultTemplateRuleMapper defaultTemplateRuleMapper; - - /** - * 鏌ヨ杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * - * @param id 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿涓婚敭 - * @return 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - */ - @Override - public DefaultTemplateRule selectDefaultTemplateRuleById(Long id) - { - return defaultTemplateRuleMapper.selectDefaultTemplateRuleById(id); - } - - /** - * 鏌ヨ杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿鍒楄〃 - * - * @param defaultTemplateRule 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * @return 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - */ - @Override - public List<DefaultTemplateRule> selectDefaultTemplateRuleList(DefaultTemplateRule defaultTemplateRule) - { - return defaultTemplateRuleMapper.selectDefaultTemplateRuleList(defaultTemplateRule); - } - - /** - * 鏂板杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * - * @param defaultTemplateRule 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * @return 缁撴灉 - */ - @Override - public int insertDefaultTemplateRule(DefaultTemplateRule defaultTemplateRule) - { - return defaultTemplateRuleMapper.insertDefaultTemplateRule(defaultTemplateRule); - } - - /** - * 淇敼杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * - * @param defaultTemplateRule 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * @return 缁撴灉 - */ - @Override - public int updateDefaultTemplateRule(DefaultTemplateRule defaultTemplateRule) - { - return defaultTemplateRuleMapper.updateDefaultTemplateRule(defaultTemplateRule); - } - - /** - * 鎵归噺鍒犻櫎杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿 - * - * @param ids 闇�瑕佸垹闄ょ殑杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿涓婚敭 - * @return 缁撴灉 - */ - @Override - public int deleteDefaultTemplateRuleByIds(Long[] ids) - { - return defaultTemplateRuleMapper.deleteDefaultTemplateRuleByIds(ids); - } - - /** - * 鍒犻櫎杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿淇℃伅 - * - * @param id 杩濈害瑙勫垯妯℃澘-瑙勫垯涓棿涓婚敭 - * @return 缁撴灉 - */ - @Override - public int deleteDefaultTemplateRuleById(Long id) - { - return defaultTemplateRuleMapper.deleteDefaultTemplateRuleById(id); - } -} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultTemplateServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultTemplateServiceImpl.java deleted file mode 100644 index 06ae02c..0000000 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultTemplateServiceImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.ycl.platform.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ycl.platform.domain.entity.DefaultTemplate; -import com.ycl.platform.mapper.DefaultTemplateMapper; -import com.ycl.platform.service.IDefaultTemplateService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import utils.DateUtils; - -import java.util.List; - -/** - * 杩濈害瑙勫垯妯℃澘Service涓氬姟灞傚鐞� - * - * @author ruoyi - * @date 2024-04-01 - */ -@Service -public class DefaultTemplateServiceImpl extends ServiceImpl<DefaultTemplateMapper, DefaultTemplate> implements IDefaultTemplateService -{ - @Autowired - private DefaultTemplateMapper defaultTemplateMapper; - - /** - * 鏌ヨ杩濈害瑙勫垯妯℃澘 - * - * @param id 杩濈害瑙勫垯妯℃澘涓婚敭 - * @return 杩濈害瑙勫垯妯℃澘 - */ - @Override - public DefaultTemplate selectDefaultTemplateById(Long id) - { - return defaultTemplateMapper.selectDefaultTemplateById(id); - } - - /** - * 鏌ヨ杩濈害瑙勫垯妯℃澘鍒楄〃 - * - * @param defaultTemplate 杩濈害瑙勫垯妯℃澘 - * @return 杩濈害瑙勫垯妯℃澘 - */ - @Override - public List<DefaultTemplate> selectDefaultTemplateList(DefaultTemplate defaultTemplate) - { - return defaultTemplateMapper.selectDefaultTemplateList(defaultTemplate); - } - - /** - * 鏂板杩濈害瑙勫垯妯℃澘 - * - * @param defaultTemplate 杩濈害瑙勫垯妯℃澘 - * @return 缁撴灉 - */ - @Override - public int insertDefaultTemplate(DefaultTemplate defaultTemplate) - { - defaultTemplate.setCreateTime(DateUtils.getNowDate()); - return defaultTemplateMapper.insertDefaultTemplate(defaultTemplate); - } - - /** - * 淇敼杩濈害瑙勫垯妯℃澘 - * - * @param defaultTemplate 杩濈害瑙勫垯妯℃澘 - * @return 缁撴灉 - */ - @Override - public int updateDefaultTemplate(DefaultTemplate defaultTemplate) - { - defaultTemplate.setUpdateTime(DateUtils.getNowDate()); - return defaultTemplateMapper.updateDefaultTemplate(defaultTemplate); - } - - /** - * 鎵归噺鍒犻櫎杩濈害瑙勫垯妯℃澘 - * - * @param ids 闇�瑕佸垹闄ょ殑杩濈害瑙勫垯妯℃澘涓婚敭 - * @return 缁撴灉 - */ - @Override - public int deleteDefaultTemplateByIds(Long[] ids) - { - return defaultTemplateMapper.deleteDefaultTemplateByIds(ids); - } - - /** - * 鍒犻櫎杩濈害瑙勫垯妯℃澘淇℃伅 - * - * @param id 杩濈害瑙勫垯妯℃澘涓婚敭 - * @return 缁撴灉 - */ - @Override - public int deleteDefaultTemplateById(Long id) - { - return defaultTemplateMapper.deleteDefaultTemplateById(id); - } -} diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateMoneyRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateMoneyRuleMapper.xml index 2fa36dd..66516cd 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/CalculateMoneyRuleMapper.xml +++ b/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" /> diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml index 4d9f21e..ec90956 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml +++ b/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" /> diff --git a/ycl-server/src/main/resources/mapper/zgyw/ContractPublishMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ContractPublishMapper.xml deleted file mode 100644 index a6f8aca..0000000 --- a/ycl-server/src/main/resources/mapper/zgyw/ContractPublishMapper.xml +++ /dev/null @@ -1,92 +0,0 @@ -<?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.ycl.platform.mapper.DefaultPublishMapper"> - - <resultMap type="com.ycl.platform.domain.entity.ContractPublish" id="DefaultPublishResult"> - <result property="id" column="id" /> - <result property="examineName" column="examine_name" /> - <result property="templateId" column="template_id" /> - <result property="frequency" column="frequency" /> - <result property="alarmScore" column="alarm_score" /> - <result property="description" column="description" /> - <result property="state" column="state" /> - <result property="auditState" column="audit_state" /> - <result property="createTime" column="create_time" /> - <result property="updateTime" column="update_time" /> - </resultMap> - - <sql id="selectDefaultPublishVo"> - select id, examine_name, template_id, frequency, alarm_score, description, state, audit_state, create_time, update_time from t_contract_publish - </sql> - - <select id="selectDefaultPublishList" resultMap="DefaultPublishResult"> - <include refid="selectDefaultPublishVo"/> - <where> - <if test="examineName != null and examineName != ''"> and examine_name like concat('%', #{examineName}, '%')</if> - <if test="templateId != null "> and template_id = #{templateId}</if> - <if test="frequency != null "> and frequency = #{frequency}</if> - <if test="state != null "> and state = #{state}</if> - <if test="auditState != null "> and audit_state = #{auditState}</if> - </where> - </select> - - <select id="selectDefaultPublishById" resultMap="DefaultPublishResult"> - <include refid="selectDefaultPublishVo"/> - where id = #{id} - </select> - - <insert id="insertDefaultPublish" useGeneratedKeys="true" keyProperty="id"> - insert into t_contract_publish - <trim prefix="(" suffix=")" suffixOverrides=","> - <if test="examineName != null">examine_name,</if> - <if test="templateId != null">template_id,</if> - <if test="frequency != null">frequency,</if> - <if test="alarmScore != null">alarm_score,</if> - <if test="description != null">description,</if> - <if test="state != null">state,</if> - <if test="auditState != null">audit_state,</if> - <if test="createTime != null">create_time,</if> - <if test="updateTime != null">update_time,</if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides=","> - <if test="examineName != null">#{examineName},</if> - <if test="templateId != null">#{templateId},</if> - <if test="frequency != null">#{frequency},</if> - <if test="alarmScore != null">#{alarmScore},</if> - <if test="description != null">#{description},</if> - <if test="state != null">#{state},</if> - <if test="auditState != null">#{auditState},</if> - <if test="createTime != null">#{createTime},</if> - <if test="updateTime != null">#{updateTime},</if> - </trim> - </insert> - - <update id="updateDefaultPublish" > - update t_contract_publish - <trim prefix="SET" suffixOverrides=","> - <if test="examineName != null">examine_name = #{examineName},</if> - <if test="templateId != null">template_id = #{templateId},</if> - <if test="frequency != null">frequency = #{frequency},</if> - <if test="alarmScore != null">alarm_score = #{alarmScore},</if> - <if test="description != null">description = #{description},</if> - <if test="state != null">state = #{state},</if> - <if test="auditState != null">audit_state = #{auditState},</if> - <if test="createTime != null">create_time = #{createTime},</if> - <if test="updateTime != null">update_time = #{updateTime},</if> - </trim> - where id = #{id} - </update> - - <delete id="deleteDefaultPublishById" > - delete from t_contract_publish where id = #{id} - </delete> - - <delete id="deleteDefaultPublishByIds" > - delete from t_contract_publish where id in - <foreach item="id" collection="array" open="(" separator="," close=")"> - #{id} - </foreach> - </delete> -</mapper> diff --git a/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml index 6778a6d..83e5b33 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml +++ b/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" /> diff --git a/ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml index 523f5af..c834028 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml +++ b/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" /> diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultTemplateMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultTemplateMapper.xml deleted file mode 100644 index b2f1a93..0000000 --- a/ycl-server/src/main/resources/mapper/zgyw/DefaultTemplateMapper.xml +++ /dev/null @@ -1,104 +0,0 @@ -<?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.ycl.platform.mapper.DefaultTemplateMapper"> - - <resultMap type="com.ycl.platform.domain.entity.DefaultTemplate" id="DefaultTemplateResult"> - <result property="id" column="id" /> - <result property="templateName" column="template_name" /> - <result property="unitId" column="unit_id" /> - <result property="auditState" column="audit_state" /> - <result property="examineCategory" column="examine_category" /> - <result property="status" column="status" /> - <result property="createTime" column="create_time" /> - <result property="updateTime" column="update_time" /> - <result property="createUser" column="create_user" /> - <result property="updateUser" column="update_user" /> - <result property="createUserName" column="create_user_name" /> - <result property="updateUserName" column="update_user_name" /> - <result property="deleted" column="deleted" /> - </resultMap> - - <sql id="selectDefaultTemplateVo"> - select id, template_name, unit_id, audit_state, examine_category, status, create_time, update_time, create_user, update_user, create_user_name, update_user_name, deleted from t_default_template - </sql> - - <select id="selectDefaultTemplateList" resultMap="DefaultTemplateResult"> - <include refid="selectDefaultTemplateVo"/> - <where> - <if test="templateName != null and templateName != ''"> and template_name like concat('%', #{templateName}, '%')</if> - <if test="unitId != null "> and unit_id = #{unitId}</if> - <if test="auditState != null "> and audit_state = #{auditState}</if> - <if test="examineCategory != null "> and examine_category = #{examineCategory}</if> - <if test="status != null "> and status = #{status}</if> - </where> - </select> - - <select id="selectDefaultTemplateById" resultMap="DefaultTemplateResult"> - <include refid="selectDefaultTemplateVo"/> - where id = #{id} - </select> - - <insert id="insertDefaultTemplate" useGeneratedKeys="true" keyProperty="id"> - insert into t_default_template - <trim prefix="(" suffix=")" suffixOverrides=","> - <if test="templateName != null">template_name,</if> - <if test="unitId != null">unit_id,</if> - <if test="auditState != null">audit_state,</if> - <if test="examineCategory != null">examine_category,</if> - <if test="status != null">status,</if> - <if test="createTime != null">create_time,</if> - <if test="updateTime != null">update_time,</if> - <if test="createUser != null">create_user,</if> - <if test="updateUser != null">update_user,</if> - <if test="createUserName != null">create_user_name,</if> - <if test="updateUserName != null">update_user_name,</if> - <if test="deleted != null">deleted,</if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides=","> - <if test="templateName != null">#{templateName},</if> - <if test="unitId != null">#{unitId},</if> - <if test="auditState != null">#{auditState},</if> - <if test="examineCategory != null">#{examineCategory},</if> - <if test="status != null">#{status},</if> - <if test="createTime != null">#{createTime},</if> - <if test="updateTime != null">#{updateTime},</if> - <if test="createUser != null">#{createUser},</if> - <if test="updateUser != null">#{updateUser},</if> - <if test="createUserName != null">#{createUserName},</if> - <if test="updateUserName != null">#{updateUserName},</if> - <if test="deleted != null">#{deleted},</if> - </trim> - </insert> - - <update id="updateDefaultTemplate"> - update t_default_template - <trim prefix="SET" suffixOverrides=","> - <if test="templateName != null">template_name = #{templateName},</if> - <if test="unitId != null">unit_id = #{unitId},</if> - <if test="auditState != null">audit_state = #{auditState},</if> - <if test="examineCategory != null">examine_category = #{examineCategory},</if> - <if test="status != null">status = #{status},</if> - <if test="createTime != null">create_time = #{createTime},</if> - <if test="updateTime != null">update_time = #{updateTime},</if> - <if test="createUser != null">create_user = #{createUser},</if> - <if test="updateUser != null">update_user = #{updateUser},</if> - <if test="createUserName != null">create_user_name = #{createUserName},</if> - <if test="updateUserName != null">update_user_name = #{updateUserName},</if> - <if test="deleted != null">deleted = #{deleted},</if> - </trim> - where id = #{id} - </update> - - <delete id="deleteDefaultTemplateById" > - delete from t_default_template where id = #{id} - </delete> - - <delete id="deleteDefaultTemplateByIds" > - delete from t_default_template where id in - <foreach item="id" collection="array" open="(" separator="," close=")"> - #{id} - </foreach> - </delete> -</mapper> \ No newline at end of file diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultTemplateRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultTemplateRuleMapper.xml deleted file mode 100644 index 87f2c29..0000000 --- a/ycl-server/src/main/resources/mapper/zgyw/DefaultTemplateRuleMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?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.ycl.platform.mapper.DefaultTemplateRuleMapper"> - - <resultMap type="com.ycl.platform.domain.entity.DefaultTemplateRule" id="DefaultTemplateRuleResult"> - <result property="id" column="id" /> - <result property="defaultTemplateId" column="default_template_id" /> - <result property="defaultRuleId" column="default_rule_id" /> - <result property="value" column="value" /> - <result property="auditState" column="audit_state" /> - </resultMap> - - <sql id="selectDefaultTemplateRuleVo"> - select id, default_template_id, default_rule_id, value, audit_state from t_default_template_rule - </sql> - - <select id="selectDefaultTemplateRuleList" resultMap="DefaultTemplateRuleResult"> - <include refid="selectDefaultTemplateRuleVo"/> - <where> - <if test="defaultTemplateId != null "> and default_template_id = #{defaultTemplateId}</if> - <if test="defaultRuleId != null "> and default_rule_id = #{defaultRuleId}</if> - <if test="value != null "> and value = #{value}</if> - <if test="auditState != null "> and audit_state = #{auditState}</if> - </where> - </select> - - <select id="selectDefaultTemplateRuleById" resultMap="DefaultTemplateRuleResult"> - <include refid="selectDefaultTemplateRuleVo"/> - where id = #{id} - </select> - - <insert id="insertDefaultTemplateRule" useGeneratedKeys="true" keyProperty="id"> - insert into t_default_template_rule - <trim prefix="(" suffix=")" suffixOverrides=","> - <if test="defaultTemplateId != null">default_template_id,</if> - <if test="defaultRuleId != null">default_rule_id,</if> - <if test="value != null">value,</if> - <if test="auditState != null">audit_state,</if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides=","> - <if test="defaultTemplateId != null">#{defaultTemplateId},</if> - <if test="defaultRuleId != null">#{defaultRuleId},</if> - <if test="value != null">#{value},</if> - <if test="auditState != null">#{auditState},</if> - </trim> - </insert> - - <update id="updateDefaultTemplateRule" > - update t_default_template_rule - <trim prefix="SET" suffixOverrides=","> - <if test="defaultTemplateId != null">default_template_id = #{defaultTemplateId},</if> - <if test="defaultRuleId != null">default_rule_id = #{defaultRuleId},</if> - <if test="value != null">value = #{value},</if> - <if test="auditState != null">audit_state = #{auditState},</if> - </trim> - where id = #{id} - </update> - - <delete id="deleteDefaultTemplateRuleById"> - delete from t_default_template_rule where id = #{id} - </delete> - - <delete id="deleteDefaultTemplateRuleByIds"> - delete from t_default_template_rule where id in - <foreach item="id" collection="array" open="(" separator="," close=")"> - #{id} - </foreach> - </delete> -</mapper> \ No newline at end of file -- Gitblit v1.8.0