From ea3e40330575519d9a4c7dbe4f6d63e4a22ea861 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 02 四月 2024 09:41:52 +0800
Subject: [PATCH] Revert "Revert "新考核""
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplateRule.java | 125
ycl-server/src/main/java/com/ycl/platform/controller/CheckPublishController.java | 99
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultRule.java | 133
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java | 94
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java | 160
ycl-server/src/main/resources/mapper/zgyw/CheckPublishMapper.xml | 107
ycl-server/src/main/resources/mapper/zgyw/DefaultPublishMapper.xml | 92
ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java | 63
ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml | 118
ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java | 62
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultResult.java | 140 +
ycl-server/src/main/java/com/ycl/platform/service/IDefaultTemplateService.java | 62
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java | 181 +
ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java | 148
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultTemplate.java | 176 +
ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java | 154
ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java | 98
ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml | 74
ycl-server/src/main/resources/mapper/zgyw/DefaultTemplateMapper.xml | 104
document/自贡项目任务分配.xlsx | 0
ycl-server/src/main/java/com/ycl/platform/mapper/CheckPublishMapper.java | 62
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java | 108
ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateRuleService.java | 62
ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateRuleMapper.java | 61
ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java | 197 -
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckPublish.java | 179 +
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultScore.java | 149 +
ycl-server/src/main/java/com/ycl/platform/service/ICheckResultService.java | 62
ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java | 98
ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateService.java | 62
ycl-server/src/main/java/com/ycl/platform/service/IDefaultRuleService.java | 62
ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java | 98
ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java | 62
ycl-server/src/main/java/com/ycl/platform/service/ICheckRuleService.java | 62
ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultTemplateServiceImpl.java | 97
ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java | 149
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 96
ycl-server/src/main/java/com/ycl/platform/mapper/DefaultPublishMapper.java | 62
ycl-server/src/main/resources/mapper/zgyw/DefaultResultMapper.xml | 88
ycl-server/src/main/java/com/ycl/platform/controller/DefaultTemplateController.java | 98
document/需求确认书3.27.docx | 0
ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml | 0
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateRuleServiceImpl.java | 94
ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultScoreServiceImpl.java | 97
pom.xml | 11
ycl-server/src/main/java/com/ycl/platform/mapper/DefaultTemplateRuleMapper.java | 62
ycl-server/src/main/java/com/ycl/platform/service/ICheckPublishService.java | 62
ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultTemplateRuleServiceImpl.java | 94
ycl-server/src/main/resources/mapper/zgyw/CheckTemplateRuleMapper.xml | 74
ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java | 63
ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java | 62
ycl-server/src/main/resources/mapper/zgyw/DefaultTemplateRuleMapper.xml | 71
ycl-server/src/main/java/com/ycl/platform/service/IDefaultScoreService.java | 62
ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultPublishServiceImpl.java | 97
ycl-server/src/main/java/com/ycl/platform/service/IDefaultPublishService.java | 62
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java | 151 +
ycl-server/src/main/java/com/ycl/platform/service/IDefaultTemplateRuleService.java | 62
ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java | 158
ycl-server/src/main/resources/mapper/zgyw/DefaultRuleMapper.xml | 99
ycl-server/src/main/resources/mapper/zgyw/DefaultScoreMapper.xml | 93
ycl-server/src/main/java/com/ycl/platform/service/IDefaultResultService.java | 62
ycl-server/src/main/java/com/ycl/platform/mapper/DefaultScoreMapper.java | 61
ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java | 62
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultPublish.java | 139 +
ycl-server/src/main/java/com/ycl/platform/mapper/DefaultTemplateMapper.java | 62
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckPublishServiceImpl.java | 97
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultTemplateRule.java | 95
ycl-server/src/main/resources/application-dev.yml | 8
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java | 178
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java | 185
ycl-server/src/main/java/com/ycl/platform/mapper/CheckResultMapper.java | 69
/dev/null | 87
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java | 213 +
ycl-server/src/main/java/com/ycl/platform/controller/DefaultPublishController.java | 98
ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java | 63
ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml | 130
ycl-server/src/main/java/com/ycl/platform/controller/DefaultScoreController.java | 98
ycl-server/src/main/java/com/ycl/platform/mapper/DefaultResultMapper.java | 62
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 91
ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultResultServiceImpl.java | 96
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java | 218 -
ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml | 108
82 files changed, 6,622 insertions(+), 1,238 deletions(-)
diff --git "a/document/\350\207\252\350\264\241\351\241\271\347\233\256\344\273\273\345\212\241\345\210\206\351\205\215.xlsx" "b/document/\350\207\252\350\264\241\351\241\271\347\233\256\344\273\273\345\212\241\345\210\206\351\205\215.xlsx"
new file mode 100644
index 0000000..7bc42a2
--- /dev/null
+++ "b/document/\350\207\252\350\264\241\351\241\271\347\233\256\344\273\273\345\212\241\345\210\206\351\205\215.xlsx"
Binary files differ
diff --git "a/document/\351\234\200\346\261\202\347\241\256\350\256\244\344\271\2463.27.docx" "b/document/\351\234\200\346\261\202\347\241\256\350\256\244\344\271\2463.27.docx"
new file mode 100644
index 0000000..2b4b5aa
--- /dev/null
+++ "b/document/\351\234\200\346\261\202\347\241\256\350\256\244\344\271\2463.27.docx"
Binary files differ
diff --git a/pom.xml b/pom.xml
index c45efd7..31104c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,12 +126,6 @@
</dependencyManagement>
<dependencies>
- <!-- Activiti7 -->
- <dependency>
- <groupId>org.activiti</groupId>
- <artifactId>activiti-spring-boot-starter</artifactId>
- <version>7.0.0.GA</version>
- </dependency>
<!-- jpa -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -148,6 +142,10 @@
<version>${mybatis.spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-mongodb</artifactId>
+ </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@@ -247,7 +245,6 @@
<build>
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/AccountingRules.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/AccountingRules.java
deleted file mode 100644
index bed10cf..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/AccountingRules.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.ycl.platform.domain.entity;
-
-
-import annotation.Excel;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.ycl.system.entity.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.math.BigDecimal;
-
-/**
- * 鏍哥畻瑙勫垯瀵硅薄 t_accounting_rules
- *
- * @author gonghl
- * @date 2024-03-21
- */
-public class AccountingRules extends BaseEntity {
- private static final long serialVersionUID = 1L;
-
- /**
- * $column.columnComment
- */
- private Integer id;
-
- /**
- * 瑙勫垯鍚嶇О
- */
- @Excel(name = "瑙勫垯鍚嶇О")
- private String rulesName;
-
- /**
- * 鍚堝悓鍚嶇О
- */
- @Excel(name = "鍚堝悓鍚嶇О")
- private String contractName;
-
- /**
- * 閲戦
- */
- @Excel(name = "閲戦")
- private BigDecimal amount;
-
- /**
- * 閫昏緫鍒犻櫎
- */
- @TableLogic
- private String deleted;
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setRulesName(String rulesName) {
- this.rulesName = rulesName;
- }
-
- public String getRulesName() {
- return rulesName;
- }
-
- public void setContractName(String contractName) {
- this.contractName = contractName;
- }
-
- public String getContractName() {
- return contractName;
- }
-
- public void setAmount(BigDecimal amount) {
- this.amount = amount;
- }
-
- public BigDecimal getAmount() {
- return amount;
- }
-
- 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("rulesName", getRulesName())
- .append("contractName", getContractName())
- .append("amount", getAmount())
- .append("createTime", getCreateTime())
- .append("updateTime", getUpdateTime())
- .append("deleted", getDeleted())
- .toString();
- }
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java
new file mode 100644
index 0000000..98a8a31
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRule.java
@@ -0,0 +1,108 @@
+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_calculate_rule
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public class CalculateRule extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ private Long id;
+
+ /** $column.columnComment */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String name;
+
+ /** $column.columnComment */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private Long templateId;
+
+ /** $column.columnComment */
+ private Long parentId;
+
+ /** 鍗曚綅id */
+ @Excel(name = "鍗曚綅id")
+ private Long unitId;
+
+ /** 姣忓皯1%鎵ｅ綋鏈堟�绘湇鍔¤垂鐨勫灏� */
+ @Excel(name = "姣忓皯1%鎵ｅ綋鏈堟�绘湇鍔¤垂鐨勫灏�")
+ private BigDecimal value;
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+ public void setTemplateId(Long templateId)
+ {
+ this.templateId = templateId;
+ }
+
+ public Long getTemplateId()
+ {
+ return templateId;
+ }
+ public void setParentId(Long parentId)
+ {
+ this.parentId = parentId;
+ }
+
+ public Long getParentId()
+ {
+ return parentId;
+ }
+ public void setUnitId(Long unitId)
+ {
+ this.unitId = unitId;
+ }
+
+ public Long getUnitId()
+ {
+ return unitId;
+ }
+ public void setValue(BigDecimal value)
+ {
+ this.value = value;
+ }
+
+ public BigDecimal getValue()
+ {
+ return value;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("name", getName())
+ .append("templateId", getTemplateId())
+ .append("parentId", getParentId())
+ .append("unitId", getUnitId())
+ .append("value", getValue())
+ .toString();
+ }
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckPublish.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckPublish.java
new file mode 100644
index 0000000..6e6bd16
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckPublish.java
@@ -0,0 +1,179 @@
+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_check_publish
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public class CheckPublish extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 涓婚敭 */
+ private Long id;
+
+ /** 鑰冩牳鍚嶇О */
+ @Excel(name = "鑰冩牳鍚嶇О")
+ private String examineName;
+
+ /** 鑰冩牳妯℃澘id */
+ @Excel(name = "鑰冩牳妯℃澘id")
+ private Long templateId;
+
+ /** 鑰冩牳棰戠巼 */
+ @Excel(name = "鑰冩牳棰戠巼")
+ private Long frequency;
+
+ /** 鑰冩牳绫诲瀷 */
+ @Excel(name = "鑰冩牳绫诲瀷")
+ private Long examineCategory;
+
+ /** 鎶ヨ闃堝�煎垎鏁� */
+ @Excel(name = "鎶ヨ闃堝�煎垎鏁�")
+ private BigDecimal alarmScore;
+
+ /** 鎻忚堪 */
+ @Excel(name = "鎻忚堪")
+ private String description;
+
+ /** 鍚敤 / 鍋滅敤 */
+ @Excel(name = "鍚敤 / 鍋滅敤")
+ private Long state;
+
+ /** 瀹℃牳鐘舵�� */
+ @Excel(name = "瀹℃牳鐘舵��")
+ private Long auditState;
+
+ /** */
+ private Long createUser;
+
+ /** */
+ private Long updateUser;
+
+ 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 setExamineCategory(Long examineCategory)
+ {
+ this.examineCategory = examineCategory;
+ }
+
+ public Long getExamineCategory()
+ {
+ return examineCategory;
+ }
+ 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;
+ }
+ 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;
+ }
+
+ @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("examineCategory", getExamineCategory())
+ .append("alarmScore", getAlarmScore())
+ .append("description", getDescription())
+ .append("state", getState())
+ .append("auditState", getAuditState())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .append("createUser", getCreateUser())
+ .append("updateUser", getUpdateUser())
+ .toString();
+ }
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java
index a453458..f4e22b8 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java
@@ -1,56 +1,140 @@
package com.ycl.platform.domain.entity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
+import annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.system.entity.BaseEntity;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import com.ycl.platform.base.AbsEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
+import java.util.Date;
/**
- * 鑰冩牳缁撴灉
- *
- * @author xp
- * @since 2024-03-07
+ * 鑰冩牳缁撴灉瀵硅薄 t_check_result
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Data
-@Accessors(chain = true)
-@TableName("t_check_result")
-@ApiModel(value = "CheckResult瀵硅薄", description = "鑰冩牳缁撴灉")
-public class CheckResult extends AbsEntity {
-
+public class CheckResult extends BaseEntity
+{
private static final long serialVersionUID = 1L;
- @ApiModelProperty("鑰冩牳瀵硅薄")
- @TableField("check_unit_id")
- private Integer checkUnitId;
+ /** */
+ private Long id;
- @ApiModelProperty("鑰冩牳鍙戝竷")
- @TableField("check_publish_id")
- private Integer checkPublishId;
+ /** 鑰冩牳瀵硅薄 */
+ @Excel(name = "鑰冩牳瀵硅薄")
+ private Long deptId;
- @ApiModelProperty("鏈�缁堝垎鏁�")
- @TableField("check_score")
+ /** 鑰冩牳鍙戝竷 */
+ @Excel(name = "鑰冩牳鍙戝竷")
+ private Long publishId;
+
+ /** 鑰冩牳绫诲瀷 */
+ @Excel(name = "鑰冩牳绫诲瀷")
+ private Long examineCategory;
+
+ /** 鑰冩牳鍒嗘暟 */
+ @Excel(name = "鑰冩牳鍒嗘暟")
private BigDecimal checkScore;
- @ApiModelProperty("绯荤粺鎵撳垎")
- @TableField("system_score")
- private BigDecimal systemScore;
+ /** 鏄惁鍙戝竷 */
+ @Excel(name = "鏄惁鍙戝竷")
+ private Long publish;
- @ApiModelProperty("浜哄伐鎵撳垎")
- @TableField("manual_score")
- private BigDecimal manualScore;
+ /** 鑰冩牳鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鑰冩牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date checkTime;
- @ApiModelProperty("鑰冩牳鏃堕棿")
- @TableField("check_time")
- private LocalDateTime checkTime;
+ /** 閫昏緫鍒犻櫎 */
+ private String deleted;
- @ApiModelProperty("鏄惁鍙戝竷")
- @TableField("publish")
- private Integer publish;
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+ public Long getId()
+ {
+ return id;
+ }
+ public void setDeptId(Long deptId)
+ {
+ this.deptId = deptId;
+ }
+ public Long getDeptId()
+ {
+ return deptId;
+ }
+ public void setPublishId(Long publishId)
+ {
+ this.publishId = publishId;
+ }
+
+ public Long getPublishId()
+ {
+ return publishId;
+ }
+ public void setExamineCategory(Long examineCategory)
+ {
+ this.examineCategory = examineCategory;
+ }
+
+ public Long getExamineCategory()
+ {
+ return examineCategory;
+ }
+ public void setCheckScore(BigDecimal checkScore)
+ {
+ this.checkScore = checkScore;
+ }
+
+ public BigDecimal getCheckScore()
+ {
+ return checkScore;
+ }
+ public void setPublish(Long publish)
+ {
+ this.publish = publish;
+ }
+
+ public Long getPublish()
+ {
+ return publish;
+ }
+ public void setCheckTime(Date checkTime)
+ {
+ this.checkTime = checkTime;
+ }
+
+ public Date getCheckTime()
+ {
+ return checkTime;
+ }
+ 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("deptId", getDeptId())
+ .append("publishId", getPublishId())
+ .append("examineCategory", getExamineCategory())
+ .append("checkScore", getCheckScore())
+ .append("publish", getPublish())
+ .append("checkTime", getCheckTime())
+ .append("updateTime", getUpdateTime())
+ .append("deleted", getDeleted())
+ .toString();
+ }
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java
index fbde5fb..4c7442f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java
@@ -1,69 +1,150 @@
package com.ycl.platform.domain.entity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ycl.platform.base.AbsEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
+import annotation.Excel;
+import com.ycl.system.entity.BaseEntity;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
/**
- * 鑰冩牳瑙勫垯
- *
- * @author xp
- * @since 2024-03-06
+ * 鑰冩牳瑙勫垯瀵硅薄 t_check_rule
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Data
-@Accessors(chain = true)
-@TableName("t_check_rule")
-@ApiModel(value = "CheckRule瀵硅薄", description = "鑰冩牳瑙勫垯")
-public class CheckRule extends AbsEntity {
-
+public class CheckRule extends BaseEntity
+{
private static final long serialVersionUID = 1L;
- @ApiModelProperty("瑙勫垯鍚嶇О")
- @TableField("rule_name")
+ /** */
+ private Long id;
+
+ /** 瑙勫垯鍚嶇О */
+ @Excel(name = "瑙勫垯鍚嶇О")
private String ruleName;
- @ApiModelProperty("瑙勫垯鎻忚堪")
- @TableField("rule_detail")
+ /** 瑙勫垯缁嗗垯 */
+ @Excel(name = "瑙勫垯缁嗗垯")
private String ruleDetail;
- @ApiModelProperty("澶╃綉瑙嗛鐐逛綅鏁�")
- @TableField("video_point_num")
- private Integer videoPointNum;
+ /** 瑙勫垯绫诲瀷 */
+ @Excel(name = "瑙勫垯绫诲瀷")
+ private Long ruleCategory;
- @ApiModelProperty("杞﹁締鍗″彛鐐逛綅鏁�")
- @TableField("vehicle_checkpoint_num")
- private Integer vehicleCheckpointNum;
+ /** 鑰冩牳绫诲瀷 */
+ @Excel(name = "鑰冩牳绫诲瀷")
+ private Long examineCategory;
- @ApiModelProperty("浜鸿劯鍗″彛鐐逛綅鏁�")
- @TableField("face_chceckpoint_num")
- private Integer faceChceckpointNum;
+ /** 瑙勫垯鎻忚堪 */
+ @Excel(name = "瑙勫垯鎻忚堪")
+ private String ruleDescription;
- @ApiModelProperty("杩愮淮绫诲埆")
- @TableField("category")
- private Integer category;
- @ApiModelProperty("鑰冩牳绫诲埆")
- @TableField("examine_category")
- private Integer examineCategory;
+ /** 瀹℃牳鐘舵�� */
+ @Excel(name = "瀹℃牳鐘舵��")
+ private Long auditState;
+ /** 鍚敤鐘舵�� */
+ @Excel(name = "鍚敤鐘舵��")
+ private Long state;
- @ApiModelProperty("瀹℃牳鐘舵��")
- @TableField("audit_state")
- private Integer auditState;
- @ApiModelProperty("瀹℃牳浜�")
- @TableField("audit_user")
- private String auditUser;
- @ApiModelProperty("瀹℃牳鏃堕棿")
- @TableField("audit_time")
- private Date auditTime;
- @ApiModelProperty("瀹℃牳鎰忚")
- @TableField("audit_description")
- private String auditDescription;
+ /** 閫昏緫鍒犻櫎 */
+ private String deleted;
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+ public Long getId()
+ {
+ return id;
+ }
+ public void setRuleName(String ruleName)
+ {
+ this.ruleName = ruleName;
+ }
+
+ public String getRuleName()
+ {
+ return ruleName;
+ }
+ public void setRuleDetail(String ruleDetail)
+ {
+ this.ruleDetail = ruleDetail;
+ }
+
+ public String getRuleDetail()
+ {
+ return ruleDetail;
+ }
+ public void setRuleCategory(Long ruleCategory)
+ {
+ this.ruleCategory = ruleCategory;
+ }
+
+ public Long getRuleCategory()
+ {
+ return ruleCategory;
+ }
+ public void setExamineCategory(Long examineCategory)
+ {
+ this.examineCategory = examineCategory;
+ }
+
+ public Long getExamineCategory()
+ {
+ return examineCategory;
+ }
+ public void setRuleDescription(String ruleDescription)
+ {
+ this.ruleDescription = ruleDescription;
+ }
+
+ public String getRuleDescription()
+ {
+ return ruleDescription;
+ }
+ public void setAuditState(Long auditState)
+ {
+ this.auditState = auditState;
+ }
+
+ public Long getAuditState()
+ {
+ return auditState;
+ }
+ public void setState(Long state)
+ {
+ this.state = state;
+ }
+
+ public Long getState()
+ {
+ return state;
+ }
+ 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("ruleName", getRuleName())
+ .append("ruleDetail", getRuleDetail())
+ .append("ruleCategory", getRuleCategory())
+ .append("examineCategory", getExamineCategory())
+ .append("ruleDescription", getRuleDescription())
+ .append("auditState", getAuditState())
+ .append("state", getState())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .append("deleted", getDeleted())
+ .toString();
+ }
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java
new file mode 100644
index 0000000..f544566
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java
@@ -0,0 +1,151 @@
+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_check_score
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public class CheckScore extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** */
+ private Long id;
+
+ /** 鍒嗗�� */
+ @Excel(name = "鍒嗗��")
+ private BigDecimal score;
+
+ /** 鍖哄幙 */
+ @Excel(name = "鍖哄幙")
+ private Long deptId;
+
+ /** 鑰冩牳 */
+ @Excel(name = "鑰冩牳")
+ private Long publishId;
+
+ /** 瑙勫垯 */
+ @Excel(name = "瑙勫垯")
+ private Long ruleId;
+
+ /** 鑰冩牳绫诲瀷 */
+ @Excel(name = "鑰冩牳绫诲瀷")
+ private Long examineCategory;
+
+ /** */
+ private Long updateUser;
+
+ /** */
+ @Excel(name = "")
+ private String updateUserName;
+
+ /** */
+ @Excel(name = "")
+ private Long auditState;
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+ public void setScore(BigDecimal score)
+ {
+ this.score = score;
+ }
+
+ public BigDecimal getScore()
+ {
+ return score;
+ }
+ public void setDeptId(Long deptId)
+ {
+ this.deptId = deptId;
+ }
+
+ public Long getDeptId()
+ {
+ return deptId;
+ }
+ public void setPublishId(Long publishId)
+ {
+ this.publishId = publishId;
+ }
+
+ public Long getPublishId()
+ {
+ return publishId;
+ }
+ public void setRuleId(Long ruleId)
+ {
+ this.ruleId = ruleId;
+ }
+
+ public Long getRuleId()
+ {
+ return ruleId;
+ }
+ public void setExamineCategory(Long examineCategory)
+ {
+ this.examineCategory = examineCategory;
+ }
+
+ public Long getExamineCategory()
+ {
+ return examineCategory;
+ }
+ public void setUpdateUser(Long updateUser)
+ {
+ this.updateUser = updateUser;
+ }
+
+ public Long getUpdateUser()
+ {
+ return updateUser;
+ }
+ public void setUpdateUserName(String updateUserName)
+ {
+ this.updateUserName = updateUserName;
+ }
+
+ public String getUpdateUserName()
+ {
+ return updateUserName;
+ }
+ 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("score", getScore())
+ .append("deptId", getDeptId())
+ .append("publishId", getPublishId())
+ .append("ruleId", getRuleId())
+ .append("examineCategory", getExamineCategory())
+ .append("createTime", getCreateTime())
+ .append("updateUser", getUpdateUser())
+ .append("updateUserName", getUpdateUserName())
+ .append("auditState", getAuditState())
+ .toString();
+ }
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java
index ff25a04..a89ec25 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java
@@ -1,55 +1,190 @@
package com.ycl.platform.domain.entity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ycl.platform.base.AbsEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.util.Date;
+import annotation.Excel;
+import com.ycl.system.entity.BaseEntity;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
/**
- * 鑰冩牳妯℃澘
- *
- * @author xp
- * @since 2024-03-06
+ * 鑰冩牳妯℃澘瀵硅薄 t_check_template
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Data
-@Accessors(chain = true)
-@TableName("t_check_template")
-@ApiModel(value = "CheckTemplate瀵硅薄", description = "鑰冩牳妯℃澘")
-public class CheckTemplate extends AbsEntity {
-
+public class CheckTemplate extends BaseEntity
+{
private static final long serialVersionUID = 1L;
- /**
- * 妯℃澘鍚嶇О
- */
- @TableField("template_name")
+ /** */
+ private Long id;
+
+ /** 妯℃澘鍚嶇О */
+ @Excel(name = "妯℃澘鍚嶇О")
private String templateName;
- @ApiModelProperty("璋冩暣绯绘暟")
- @TableField("adjust_coefficient")
- private BigDecimal adjustCoefficient;
+ /** 璋冩暣绯绘暟 */
+ @Excel(name = "璋冩暣绯绘暟")
+ private Long adjustCoefficient;
- /**
- * 璋冩暣绯绘暟鐨勬柟寮忥細涔橀櫎
- */
- @TableField("adjust_way")
+ /** 璋冩暣鏂瑰紡锛氫箻闄� */
+ @Excel(name = "璋冩暣鏂瑰紡锛氫箻闄�")
private String adjustWay;
- @ApiModelProperty("鐘舵��")
- @TableField("status")
+ /** 鑰冩牳绫诲瀷 */
+ @Excel(name = "鑰冩牳绫诲瀷")
+ private Long examineCategory;
+
+ /** 鍚敤/鍋滅敤 */
+ @Excel(name = "鍚敤/鍋滅敤")
private String status;
- @ApiModelProperty("鍗曚綅id")
- @TableField("unit_id")
- private Integer unitId;
+ /** 鍖哄幙 */
+ @Excel(name = "鍖哄幙")
+ private String deptId;
- @ApiModelProperty("鑰冩牳绫诲瀷")
- @TableField("examine_category")
- private String examineCategory;
+ /** 鍒涘缓浜篿d */
+ private Long createUser;
+
+ /** 鍒涘缓浜哄鍚� */
+ @Excel(name = "鍒涘缓浜哄鍚�")
+ private String createUserName;
+
+ /** */
+ private Long updateUser;
+
+ /** */
+ @Excel(name = "")
+ 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 setAdjustCoefficient(Long adjustCoefficient)
+ {
+ this.adjustCoefficient = adjustCoefficient;
+ }
+
+ public Long getAdjustCoefficient()
+ {
+ return adjustCoefficient;
+ }
+ public void setAdjustWay(String adjustWay)
+ {
+ this.adjustWay = adjustWay;
+ }
+
+ public String getAdjustWay()
+ {
+ return adjustWay;
+ }
+ public void setExamineCategory(Long examineCategory)
+ {
+ this.examineCategory = examineCategory;
+ }
+
+ public Long getExamineCategory()
+ {
+ return examineCategory;
+ }
+ public void setStatus(String status)
+ {
+ this.status = status;
+ }
+
+ public String getStatus()
+ {
+ return status;
+ }
+ public void setDeptId(String deptId)
+ {
+ this.deptId = deptId;
+ }
+
+ public String getDeptId()
+ {
+ return deptId;
+ }
+ public void setCreateUser(Long createUser)
+ {
+ this.createUser = createUser;
+ }
+
+ public Long getCreateUser()
+ {
+ return createUser;
+ }
+ public void setCreateUserName(String createUserName)
+ {
+ this.createUserName = createUserName;
+ }
+
+ public String getCreateUserName()
+ {
+ return createUserName;
+ }
+ public void setUpdateUser(Long updateUser)
+ {
+ this.updateUser = updateUser;
+ }
+
+ public Long getUpdateUser()
+ {
+ return updateUser;
+ }
+ 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("adjustCoefficient", getAdjustCoefficient())
+ .append("adjustWay", getAdjustWay())
+ .append("examineCategory", getExamineCategory())
+ .append("status", getStatus())
+ .append("deptId", getDeptId())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .append("createUser", getCreateUser())
+ .append("createUserName", getCreateUserName())
+ .append("updateUser", getUpdateUser())
+ .append("updateUserName", getUpdateUserName())
+ .append("deleted", getDeleted())
+ .toString();
+ }
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplateRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplateRule.java
index 24ec670..fbe2615 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplateRule.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplateRule.java
@@ -1,44 +1,109 @@
package com.ycl.platform.domain.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.experimental.Accessors;
+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;
/**
- * @author锛歺p
- * @date锛�2024/3/8 9:18
+ * 鑰冩牳妯℃澘-瑙勫垯涓棿瀵硅薄 t_check_template_rule
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Data
-@Accessors(chain = true)
-@TableName("t_check_template_rule")
-@ApiModel(value = "CheckTemplate瀵硅薄", description = "鑰冩牳妯℃澘")
-public class CheckTemplateRule {
+public class CheckTemplateRule extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ /** */
+ private Long id;
- /**
- * 妯℃澘ID
- */
- @TableField("check_template_id")
- private Integer checkTemplateId;
+ /** 鑰冩牳妯℃澘 */
+ @Excel(name = "鑰冩牳妯℃澘")
+ private Long checkTemplateId;
- /**
- * 瑙勫垯ID
- */
- @TableField("check_rule_id")
- private Integer checkRuleId;
+ /** 鑰冩牳瑙勫垯 */
+ @Excel(name = "鑰冩牳瑙勫垯")
+ private Long checkRuleId;
- /**
- * 鏉冮噸
- */
- @TableField("weight")
+ /** 瑙勫垯鏉冮噸 */
+ @Excel(name = "瑙勫垯鏉冮噸")
private BigDecimal weight;
+ /** 婊″垎 */
+ @Excel(name = "婊″垎")
+ private BigDecimal maxScore;
+
+ /** 瀹℃牳鐘舵�� */
+ @Excel(name = "瀹℃牳鐘舵��")
+ private Long auditState;
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+ public void setCheckTemplateId(Long checkTemplateId)
+ {
+ this.checkTemplateId = checkTemplateId;
+ }
+
+ public Long getCheckTemplateId()
+ {
+ return checkTemplateId;
+ }
+ public void setCheckRuleId(Long checkRuleId)
+ {
+ this.checkRuleId = checkRuleId;
+ }
+
+ public Long getCheckRuleId()
+ {
+ return checkRuleId;
+ }
+ public void setWeight(BigDecimal weight)
+ {
+ this.weight = weight;
+ }
+
+ public BigDecimal getWeight()
+ {
+ return weight;
+ }
+ public void setMaxScore(BigDecimal maxScore)
+ {
+ this.maxScore = maxScore;
+ }
+
+ public BigDecimal getMaxScore()
+ {
+ return maxScore;
+ }
+ 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("checkTemplateId", getCheckTemplateId())
+ .append("checkRuleId", getCheckRuleId())
+ .append("weight", getWeight())
+ .append("maxScore", getMaxScore())
+ .append("auditState", getAuditState())
+ .toString();
+ }
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java
deleted file mode 100644
index 6663ea8..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.ycl.platform.domain.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import com.ycl.platform.base.AbsEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 杩濊瀹℃牳
- *
- * @author xp
- * @since 2024-03-05
- */
-@Data
-@Accessors(chain = true)
-@TableName("t_default_auditing")
-@ApiModel(value = "DefaultAuditing瀵硅薄", description = "杩濊瀹℃牳")
-public class DefaultAuditing extends AbsEntity {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty("杩濊")
- @TableField("default_id")
- private Integer defaultId;
-
- @TableField("score")
- private BigDecimal score;
-
- @TableField("check_publish_id")
- private Integer checkPublishId;
-
- @ApiModelProperty("瀹℃牳鐘舵��")
- @TableField("auditing_status")
- private String auditingStatus;
-
- @ApiModelProperty("瀹℃牳璇存槑")
- @TableField("remark")
- private String remark;
-
- @ApiModelProperty("瀹℃牳鏃堕棿")
- @TableField("auditing_time")
- private LocalDateTime auditingTime;
-
- @ApiModelProperty("瀹℃牳浜�")
- @TableField("auditing_user")
- private Integer auditingUser;
-
- @ApiModelProperty("鍒涘缓浜�")
- @TableField("create_by")
- private String createBy;
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultPublish.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultPublish.java
new file mode 100644
index 0000000..39a0dc9
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultPublish.java
@@ -0,0 +1,139 @@
+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 DefaultPublish 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/DefaultResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultResult.java
new file mode 100644
index 0000000..42125e6
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultResult.java
@@ -0,0 +1,140 @@
+package com.ycl.platform.domain.entity;
+
+import annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.system.entity.BaseEntity;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 鍚堝悓鑰冩牳缁撴灉瀵硅薄 t_default_result
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public class DefaultResult extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** */
+ private Long id;
+
+ /** 鑰冩牳鍗曚綅 */
+ @Excel(name = "鑰冩牳鍗曚綅")
+ private Long unitId;
+
+ /** 鑰冩牳鍙戝竷 */
+ @Excel(name = "鑰冩牳鍙戝竷")
+ private Long publishId;
+
+ /** 鑰冩牳鍒嗘暟 */
+ @Excel(name = "鑰冩牳鍒嗘暟")
+ private BigDecimal defaultScore;
+
+ /** 瀹℃牳鐘舵�� */
+ @Excel(name = "瀹℃牳鐘舵��")
+ private Long auditState;
+
+ /** 鏄惁鍙戝竷 */
+ @Excel(name = "鏄惁鍙戝竷")
+ private Long publish;
+
+ /** 鑰冩牳鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鑰冩牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date checkTime;
+
+ /** 閫昏緫鍒犻櫎 */
+ private String deleted;
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+ public void setUnitId(Long unitId)
+ {
+ this.unitId = unitId;
+ }
+
+ public Long getUnitId()
+ {
+ return unitId;
+ }
+ public void setPublishId(Long publishId)
+ {
+ this.publishId = publishId;
+ }
+
+ public Long getPublishId()
+ {
+ return publishId;
+ }
+ public void setDefaultScore(BigDecimal defaultScore)
+ {
+ this.defaultScore = defaultScore;
+ }
+
+ public BigDecimal getDefaultScore()
+ {
+ return defaultScore;
+ }
+ public void setAuditState(Long auditState)
+ {
+ this.auditState = auditState;
+ }
+
+ public Long getAuditState()
+ {
+ return auditState;
+ }
+ public void setPublish(Long publish)
+ {
+ this.publish = publish;
+ }
+
+ public Long getPublish()
+ {
+ return publish;
+ }
+ public void setCheckTime(Date checkTime)
+ {
+ this.checkTime = checkTime;
+ }
+
+ public Date getCheckTime()
+ {
+ return checkTime;
+ }
+ 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("unitId", getUnitId())
+ .append("publishId", getPublishId())
+ .append("defaultScore", getDefaultScore())
+ .append("auditState", getAuditState())
+ .append("publish", getPublish())
+ .append("checkTime", getCheckTime())
+ .append("updateTime", getUpdateTime())
+ .append("deleted", getDeleted())
+ .toString();
+ }
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultRule.java
index 21b392b..ff3a69b 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultRule.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultRule.java
@@ -1,43 +1,122 @@
package com.ycl.platform.domain.entity;
-import com.ycl.platform.base.AbsEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.ycl.platform.base.AbsEntity;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
+import annotation.Excel;
+import com.ycl.system.domain.TreeEntity;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
/**
- * 杩濈害瑙勫垯
- *
- * @author xp
- * @since 2024-03-05
+ * 杩濈害瑙勫垯瀵硅薄 t_default_rule
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Data
-@Accessors(chain = true)
-@TableName("t_default_rule")
-@ApiModel(value = "DefaultRule瀵硅薄", description = "杩濈害瑙勫垯")
-public class DefaultRule extends AbsEntity {
-
+public class DefaultRule extends TreeEntity
+{
private static final long serialVersionUID = 1L;
- @ApiModelProperty("瑙勫垯鍚嶇О")
- @TableField("rule_name")
+ /** 涓婚敭 */
+ private Long id;
+
+ /** 瑙勫垯鍚嶇О */
+ @Excel(name = "瑙勫垯鍚嶇О")
private String ruleName;
- @ApiModelProperty("瑙勫垯璇︽儏JSON")
- @TableField("rule_detail")
- private String ruleDetail;
+ /** 鎵ｅ噺鏂瑰紡 */
+ @Excel(name = "鎵ｅ噺鏂瑰紡")
+ private Long deductCategory;
- @ApiModelProperty("瑙勫垯鎻忚堪")
- @TableField("rule_desc")
+ /** 浜哄伐鎵撳垎/绯荤粺鎵撳垎 */
+ private Long deductWay;
+
+ /** 瑙勫垯鎻忚堪 */
+ @Excel(name = "瑙勫垯鎻忚堪")
private String ruleDesc;
- @ApiModelProperty("瑙勫垯鐘舵�侊細鍚敤銆佹湭鍚敤")
- @TableField("rule_status")
+ /** 瑙勫垯鐘舵�� */
+ @Excel(name = "瑙勫垯鐘舵��")
private String ruleStatus;
+ /** 閫昏緫鍒犻櫎 */
+ private String deleted;
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+ public void setRuleName(String ruleName)
+ {
+ this.ruleName = ruleName;
+ }
+
+ public String getRuleName()
+ {
+ return ruleName;
+ }
+ public void setDeductCategory(Long deductCategory)
+ {
+ this.deductCategory = deductCategory;
+ }
+
+ public Long getDeductCategory()
+ {
+ return deductCategory;
+ }
+ public void setDeductWay(Long deductWay)
+ {
+ this.deductWay = deductWay;
+ }
+
+ public Long getDeductWay()
+ {
+ return deductWay;
+ }
+ public void setRuleDesc(String ruleDesc)
+ {
+ this.ruleDesc = ruleDesc;
+ }
+
+ public String getRuleDesc()
+ {
+ return ruleDesc;
+ }
+ public void setRuleStatus(String ruleStatus)
+ {
+ this.ruleStatus = ruleStatus;
+ }
+
+ public String getRuleStatus()
+ {
+ return ruleStatus;
+ }
+ 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("ruleName", getRuleName())
+ .append("parentId", getParentId())
+ .append("deductCategory", getDeductCategory())
+ .append("deductWay", getDeductWay())
+ .append("ruleDesc", getRuleDesc())
+ .append("ruleStatus", getRuleStatus())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .append("deleted", getDeleted())
+ .toString();
+ }
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultScore.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultScore.java
new file mode 100644
index 0000000..81e7b3f
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultScore.java
@@ -0,0 +1,149 @@
+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_score
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public class DefaultScore extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** */
+ private Long id;
+
+ /** 鍚堝悓鑰冩牳id */
+ @Excel(name = "鍚堝悓鑰冩牳id")
+ private Long publishId;
+
+ /** 妯℃澘id */
+ @Excel(name = "妯℃澘id")
+ private Long templateId;
+
+ /** 鍏蜂綋鏁伴噺銆佷釜鏁般�佸皬鏃舵暟 */
+ @Excel(name = "鍏蜂綋鏁伴噺銆佷釜鏁般�佸皬鏃舵暟")
+ private String num;
+
+ /** 鏍规嵁rule鐨勬墦鍒嗘柟寮忕粨鍚坱emplate鎵ｅ垎绯绘暟鍜宯um,绯荤粺璁＄畻鐨勫垎鏁� */
+ @Excel(name = "鏍规嵁rule鐨勬墦鍒嗘柟寮忕粨鍚坱emplate鎵ｅ垎绯绘暟鍜宯um,绯荤粺璁＄畻鐨勫垎鏁�")
+ private BigDecimal score;
+
+ /** */
+ private Long createUser;
+
+ /** */
+ private String createUserName;
+
+ /** */
+ private Long updateUser;
+
+ /** */
+ private String updateUserName;
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+ public void setPublishId(Long publishId)
+ {
+ this.publishId = publishId;
+ }
+
+ public Long getPublishId()
+ {
+ return publishId;
+ }
+ public void setTemplateId(Long templateId)
+ {
+ this.templateId = templateId;
+ }
+
+ public Long getTemplateId()
+ {
+ return templateId;
+ }
+ public void setNum(String num)
+ {
+ this.num = num;
+ }
+
+ public String getNum()
+ {
+ return num;
+ }
+ public void setScore(BigDecimal score)
+ {
+ this.score = score;
+ }
+
+ public BigDecimal getScore()
+ {
+ return score;
+ }
+ public void setCreateUser(Long createUser)
+ {
+ this.createUser = createUser;
+ }
+
+ public Long getCreateUser()
+ {
+ return createUser;
+ }
+ public void setCreateUserName(String createUserName)
+ {
+ this.createUserName = createUserName;
+ }
+
+ public String getCreateUserName()
+ {
+ return createUserName;
+ }
+ public void setUpdateUser(Long updateUser)
+ {
+ this.updateUser = updateUser;
+ }
+
+ public Long getUpdateUser()
+ {
+ return updateUser;
+ }
+ public void setUpdateUserName(String updateUserName)
+ {
+ this.updateUserName = updateUserName;
+ }
+
+ public String getUpdateUserName()
+ {
+ return updateUserName;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("publishId", getPublishId())
+ .append("templateId", getTemplateId())
+ .append("num", getNum())
+ .append("score", getScore())
+ .append("createUser", getCreateUser())
+ .append("createUserName", getCreateUserName())
+ .append("updateUser", getUpdateUser())
+ .append("updateUserName", getUpdateUserName())
+ .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
new file mode 100644
index 0000000..afa28c5
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultTemplate.java
@@ -0,0 +1,176 @@
+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
new file mode 100644
index 0000000..ecf8a2f
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultTemplateRule.java
@@ -0,0 +1,95 @@
+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;
+
+ /** 鎵ｅ垎绯绘暟 */
+ @Excel(name = "鎵ｅ垎绯绘暟")
+ 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-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java
deleted file mode 100644
index fce5d43..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package com.ycl.platform.domain.entity;
-
-import annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ycl.system.entity.BaseEntity;
-import lombok.Data;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 鑰冩牳鍙戝竷瀵硅薄 t_check_publish
- *
- * @author ruoyi
- * @date 2024-03-07
- */
-@Data
-public class TCheckPublish extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 涓婚敭 */
- private Long id;
-
- /** 鑰冩牳鍚� */
- @Excel(name = "鑰冩牳鍚�")
- private String examineName;
-
- /** 鑰冩牳妯℃澘id */
- @Excel(name = "鑰冩牳妯℃澘id")
- private Long templateId;
-
- /** 鑰冩牳鑼冨洿 1/2 鍒嗗眬/甯傚眬 */
- @Excel(name = "鑰冩牳鑼冨洿 1/2 鍒嗗眬/甯傚眬")
- private Long examineRange;
-
- /** 鑰冩牳棰戠巼 1/2 鏈堝害鑰冩牳/瀛ｅ害鑰冩牳 */
- @Excel(name = "鑰冩牳棰戠巼 1/2 鏈堝害鑰冩牳/瀛ｅ害鑰冩牳")
- private Long frequency;
-
- /** 鑰冩牳鐘舵�� 0/1 鍚敤 / 鍋滅敤 */
- @Excel(name = "鑰冩牳鐘舵�� 0/1 鍚敤 / 鍋滅敤")
- private Long state;
-
- /** 鎶ヨ鍒嗘暟闃堝�� */
- @Excel(name = "鎶ヨ鍒嗘暟闃堝��")
- private BigDecimal alarmScore;
-
- private Long createUser;
- @Excel(name = "鍒涘缓浜�")
- private String createUserName;
- @Excel(name = "淇敼浜�")
- private String updateUserName;
-
- private Long updateUser;
- /** 瀹℃牳鐘舵�� */
- private Short auditState;
- @Excel(name = "瀹℃牳浜�")
- private String auditUser;
- @Excel(name = "瀹℃牳鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date auditTime;
- @Excel(name = "瀹℃牳鎰忚")
- private String auditDescription;
- /** 鎻忚堪 */
- @Excel(name = "鎻忚堪")
- private String description;
-
- public String getAuditUser() {
- return auditUser;
- }
-
- public void setAuditUser(String auditUser) {
- this.auditUser = auditUser;
- }
-
- public Date getAuditTime() {
- return auditTime;
- }
-
- public void setAuditTime(Date auditTime) {
- this.auditTime = auditTime;
- }
-
- public String getAuditDescription() {
- return auditDescription;
- }
-
- public void setAuditDescription(String auditDescription) {
- this.auditDescription = auditDescription;
- }
-
- public Short getAuditState() {
- return auditState;
- }
-
- public void setAuditState(Short auditState) {
- this.auditState = auditState;
- }
-
- public String getExamineName() {
- return examineName;
- }
-
- public void setExamineName(String examineName) {
- this.examineName = examineName;
- }
-
- public BigDecimal getAlarmScore() {
- return alarmScore;
- }
-
- public void setAlarmScore(BigDecimal alarmScore) {
- this.alarmScore = alarmScore;
- }
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
- public void setTemplateId(Long templateId)
- {
- this.templateId = templateId;
- }
-
- public Long getTemplateId()
- {
- return templateId;
- }
-
- public Long getExamineRange() {
- return examineRange;
- }
-
- public void setExamineRange(Long examineRange) {
- this.examineRange = examineRange;
- }
-
- public String getCreateUserName() {
- return createUserName;
- }
-
- public void setCreateUserName(String createUserName) {
- this.createUserName = createUserName;
- }
-
- public String getUpdateUserName() {
- return updateUserName;
- }
-
- public void setUpdateUserName(String updateUserName) {
- this.updateUserName = updateUserName;
- }
-
- public void setFrequency(Long frequency)
- {
- this.frequency = frequency;
- }
-
- public Long getFrequency()
- {
- return frequency;
- }
- public void setState(Long state)
- {
- this.state = state;
- }
-
- public Long getState()
- {
- return state;
- }
- 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 setDescription(String description)
- {
- this.description = description;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- @Override
- public String toString() {
- return "TCheckPublish{" +
- "id=" + id +
- ", examineName='" + examineName + '\'' +
- ", templateId=" + templateId +
- ", examineRange=" + examineRange +
- ", frequency=" + frequency +
- ", state=" + state +
- ", alarmScore=" + alarmScore +
- ", createUser=" + createUser +
- ", createUserName='" + createUserName + '\'' +
- ", updateUserName='" + updateUserName + '\'' +
- ", updateUser=" + updateUser +
- ", auditState=" + auditState +
- ", auditUser='" + auditUser + '\'' +
- ", auditTime=" + auditTime +
- ", auditDescription='" + auditDescription + '\'' +
- ", description='" + description + '\'' +
- '}';
- }
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TExamineScore.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TExamineScore.java
deleted file mode 100644
index 6f898e7..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TExamineScore.java
+++ /dev/null
@@ -1,104 +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_examine_score
- *
- * @author ruoyi
- * @date 2024-03-13
- */
-public class TExamineScore extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** $column.columnComment */
- private Long id;
-
- /** 鍒嗗�� */
- @Excel(name = "鍒嗗��")
- private BigDecimal score;
-
- /** 鍗曚綅id */
- @Excel(name = "鍗曚綅id")
- private Long unitId;
-
- /** 鑰冩牳id */
- @Excel(name = "鑰冩牳id")
- private Long examineId;
-
- @Excel(name = "鑰冩牳绫诲瀷")
- private Long examineCategory;
- @Excel(name = "瑙勫垯绫诲瀷")
- private Long ruleCategory;
-
- public Long getRuleCategory() {
- return ruleCategory;
- }
-
- public void setRuleCategory(Long ruleCategory) {
- this.ruleCategory = ruleCategory;
- }
-
- public Long getExamineCategory() {
- return examineCategory;
- }
-
- public void setExamineCategory(Long examineCategory) {
- this.examineCategory = examineCategory;
- }
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
- public void setScore(BigDecimal score)
- {
- this.score = score;
- }
-
- public BigDecimal getScore()
- {
- return score;
- }
- public void setUnitId(Long unitId)
- {
- this.unitId = unitId;
- }
-
- public Long getUnitId()
- {
- return unitId;
- }
- public void setExamineId(Long examineId)
- {
- this.examineId = examineId;
- }
-
- public Long getExamineId()
- {
- return examineId;
- }
-
- @Override
- public String toString() {
- return "TExamineScore{" +
- "id=" + id +
- ", score=" + score +
- ", unitId=" + unitId +
- ", examineId=" + examineId +
- ", examineCategory=" + examineCategory +
- ", ruleCategory=" + ruleCategory +
- '}';
- }
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckResultForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckResultForm.java
deleted file mode 100644
index adc6ffb..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckResultForm.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.ycl.platform.domain.form;
-
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import com.ycl.platform.base.AbsForm;
-import com.ycl.platform.domain.entity.CheckResult;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import org.springframework.beans.BeanUtils;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import org.springframework.lang.NonNull;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 鑰冩牳缁撴灉琛ㄥ崟
- *
- * @author xp
- * @since 2024-03-07
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "CheckResult琛ㄥ崟", description = "鑰冩牳缁撴灉琛ㄥ崟")
-public class CheckResultForm extends AbsForm {
-
- @NotNull(message = "鑰冩牳瀵硅薄涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鑰冩牳瀵硅薄")
- private Integer checkUnitId;
-
- @NotNull(message = "鑰冩牳鍙戝竷涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鑰冩牳鍙戝竷")
- private Integer checkPublishId;
-
- @NotNull(message = "鏈�缁堝垎鏁颁笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("鏈�缁堝垎鏁�")
- private BigDecimal checkScore;
-
- @NotNull(message = "绯荤粺鎵撳垎涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("绯荤粺鎵撳垎")
- private BigDecimal systemScore;
-
- @NotNull(message = "浜哄伐鎵撳垎涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("浜哄伐鎵撳垎")
- private BigDecimal manualScore;
-
- @NotNull(message = "鑰冩牳鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鑰冩牳鏃堕棿")
- private LocalDateTime checkTime;
-
- @ApiModelProperty("鏄惁鍙戝竷")
- private Integer publish;
-
- public static CheckResult getEntityByForm(@NonNull CheckResultForm form, CheckResult entity) {
- if(entity == null) {
- entity = new CheckResult();
- }
- BeanUtils.copyProperties(form, entity);
- return entity;
- }
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckRuleForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckRuleForm.java
deleted file mode 100644
index 384d989..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckRuleForm.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.ycl.platform.domain.form;
-
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import com.ycl.platform.base.AbsForm;
-import com.ycl.platform.domain.entity.CheckRule;
-import java.time.LocalDateTime;
-import org.springframework.beans.BeanUtils;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import org.springframework.lang.NonNull;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 鑰冩牳瑙勫垯琛ㄥ崟
- *
- * @author xp
- * @since 2024-03-06
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "CheckRule琛ㄥ崟", description = "鑰冩牳瑙勫垯琛ㄥ崟")
-public class CheckRuleForm extends AbsForm {
-
- @NotBlank(message = "瑙勫垯鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("瑙勫垯鍚嶇О")
- private String ruleName;
-
- @NotBlank(message = "瑙勫垯鎻忚堪涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("瑙勫垯鎻忚堪")
- private String ruleDetail;
-
- @NotNull(message = "澶╃綉瑙嗛鐐逛綅鏁颁笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("澶╃綉瑙嗛鐐逛綅鏁�")
- private Integer videoPointNum;
-
- @NotNull(message = "杞﹁締鍗″彛鐐逛綅鏁颁笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("杞﹁締鍗″彛鐐逛綅鏁�")
- private Integer vehicleCheckpointNum;
-
- @NotNull(message = "浜鸿劯鍗″彛鐐逛綅鏁颁笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("浜鸿劯鍗″彛鐐逛綅鏁�")
- private Integer faceChceckpointNum;
-
- public static CheckRule getEntityByForm(@NonNull CheckRuleForm form, CheckRule entity) {
- if(entity == null) {
- entity = new CheckRule();
- }
- BeanUtils.copyProperties(form, entity);
- return entity;
- }
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckTemplateForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckTemplateForm.java
deleted file mode 100644
index d3b4890..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckTemplateForm.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ycl.platform.domain.form;
-
-import com.ycl.platform.domain.vo.RuleItemVO;
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import com.ycl.platform.base.AbsForm;
-import com.ycl.platform.domain.entity.CheckTemplate;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-import jakarta.validation.constraints.NotEmpty;
-import org.springframework.beans.BeanUtils;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import org.springframework.lang.NonNull;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 鑰冩牳妯℃澘琛ㄥ崟
- *
- * @author xp
- * @since 2024-03-06
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "CheckTemplate琛ㄥ崟", description = "鑰冩牳妯℃澘琛ㄥ崟")
-public class CheckTemplateForm extends AbsForm {
-
- @NotNull(message = "妯℃澘鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("妯℃澘鍚嶇О")
- private String templateName;
-
- @NotNull(message = "璋冩暣绯绘暟涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("璋冩暣绯绘暟")
- private BigDecimal adjustCoefficient;
-
- @NotNull(message = "璋冩暣绯绘暟璁＄畻鏂瑰紡涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("璋冩暣绯绘暟璁＄畻鏂瑰紡")
- private String adjustWay;
-
- @NotBlank(message = "鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("鐘舵��")
- private String status;
-
- @NotEmpty(message = "鑰冩牳瑙勫垯涓嶈兘涓虹┖")
- @ApiModelProperty("鑰冩牳瑙勫垯")
- private List<RuleItemVO> ruleFormList;
-
- public static CheckTemplate getEntityByForm(@NonNull CheckTemplateForm form, CheckTemplate entity) {
- if(entity == null) {
- entity = new CheckTemplate();
- }
- BeanUtils.copyProperties(form, entity);
- return entity;
- }
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditForm.java
deleted file mode 100644
index 030c5a6..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditForm.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ycl.platform.domain.form;
-
-import com.ycl.platform.base.AbsForm;
-import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-
-/**
- * 杩濈害瀹℃牳琛ㄥ崟
- *
- * @author锛歺p
- * @date锛�2024/3/6 8:59
- */
-@Data
-public class DefaultAuditForm extends AbsForm {
-
- /**
- * 瀹℃牳缁撴灉
- */
- @NotBlank(message = "瀹℃牳缁撴灉涓嶈兘涓虹┖")
- private String auditingResult;
-
- /**
- * 瀹℃牳璇存槑
- */
- private String remark;
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditingForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditingForm.java
deleted file mode 100644
index 9ccf2ae..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditingForm.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.ycl.platform.domain.form;
-
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import com.ycl.platform.base.AbsForm;
-import com.ycl.platform.domain.entity.DefaultAuditing;
-import java.time.LocalDateTime;
-import org.springframework.beans.BeanUtils;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import org.springframework.lang.NonNull;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 杩濊瀹℃牳琛ㄥ崟
- *
- * @author xp
- * @since 2024-03-05
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "DefaultAuditing琛ㄥ崟", description = "杩濊瀹℃牳琛ㄥ崟")
-public class DefaultAuditingForm extends AbsForm {
-
- @NotNull(message = "杩濊涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("杩濊")
- private Integer defaultId;
-
- @NotBlank(message = "瀹℃牳鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("瀹℃牳鐘舵��")
- private String auditingStatus;
-
- @NotBlank(message = "瀹℃牳璇存槑涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("瀹℃牳璇存槑")
- private String remark;
-
- @NotNull(message = "瀹℃牳鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("瀹℃牳鏃堕棿")
- private LocalDateTime auditingTime;
-
- @NotNull(message = "瀹℃牳浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("瀹℃牳浜�")
- private Integer auditingUser;
-
- public static DefaultAuditing getEntityByForm(@NonNull DefaultAuditingForm form, DefaultAuditing entity) {
- if(entity == null) {
- entity = new DefaultAuditing();
- }
- BeanUtils.copyProperties(form, entity);
- return entity;
- }
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleForm.java
deleted file mode 100644
index 52c5b19..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleForm.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.ycl.platform.domain.form;
-
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import com.ycl.platform.base.AbsForm;
-import com.ycl.platform.domain.entity.DefaultRule;
-import java.time.LocalDateTime;
-import org.springframework.beans.BeanUtils;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import org.springframework.lang.NonNull;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 杩濈害瑙勫垯琛ㄥ崟
- *
- * @author xp
- * @since 2024-03-05
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "DefaultRule琛ㄥ崟", description = "杩濈害瑙勫垯琛ㄥ崟")
-public class DefaultRuleForm extends AbsForm {
-
- @NotBlank(message = "瑙勫垯鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("瑙勫垯鍚嶇О")
- private String ruleName;
-
- @NotBlank(message = "瑙勫垯璁剧疆涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("瑙勫垯璇︽儏JSON")
- private String ruleDetail;
-
- @ApiModelProperty("瑙勫垯鎻忚堪")
- private String ruleDesc;
-
- public static DefaultRule getEntityByForm(@NonNull DefaultRuleForm form, DefaultRule entity) {
- if(entity == null) {
- entity = new DefaultRule();
- }
- BeanUtils.copyProperties(form, entity);
- return entity;
- }
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleSetForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleSetForm.java
deleted file mode 100644
index 9b43579..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleSetForm.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.ycl.platform.domain.form;
-
-import lombok.Data;
-
-/**
- * 鍚敤鍋滅敤-杩濈害瑙勫垯
- *
- * @author锛歺p
- * @date锛�2024/3/6 11:16
- */
-@Data
-public class DefaultRuleSetForm {
-
- private Integer id;
-
- /**
- * true 鍚敤
- * false 鍋滅敤
- */
- private Boolean flag;
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ManualScoreForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ManualScoreForm.java
deleted file mode 100644
index 4472c7f..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ManualScoreForm.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.ycl.platform.domain.form;
-
-import com.ycl.platform.base.AbsForm;
-import com.ycl.platform.domain.entity.CheckResult;
-import com.ycl.system.domain.group.Add;
-import com.ycl.system.domain.group.Update;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.beans.BeanUtils;
-import org.springframework.lang.NonNull;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 浜哄伐鎵撳垎琛ㄥ崟
- *
- * @author xp
- * @since 2024-03-07
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "CheckResult琛ㄥ崟", description = "浜哄伐鎵撳垎琛ㄥ崟")
-public class ManualScoreForm extends AbsForm {
-
- @NotNull(message = "浜哄伐鎵撳垎涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("浜哄伐鎵撳垎")
- private BigDecimal manualScore;
-
- public static CheckResult getEntityByForm(@NonNull ManualScoreForm form, CheckResult entity) {
- if(entity == null) {
- entity = new CheckResult();
- }
- BeanUtils.copyProperties(form, entity);
- return entity;
- }
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckResultQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckResultQuery.java
deleted file mode 100644
index 0e6fb6e..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckResultQuery.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.ycl.platform.domain.query;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ycl.platform.base.AbsQuery;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-
-import org.springframework.lang.NonNull;
-import jakarta.validation.constraints.NotBlank;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import utils.DateUtils;
-
-/**
- * 鑰冩牳缁撴灉鏌ヨ
- *
- * @author xp
- * @since 2024-03-07
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "CheckResult鏌ヨ", description = "鑰冩牳缁撴灉鏌ヨ")
-public class CheckResultQuery extends AbsQuery {
-
- /**
- * 鑰冩牳瀵硅薄
- */
- private String checkUnitName;
-
- /**
- * 鑰冩牳棰戠巼
- */
- private String frequency;
-
- /**
- * 鑰冩牳鑼冨洿
- */
- private String examineRange;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date start;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date end;
-
- public void setTime() {
- if (Objects.nonNull(start)) {
- start = DateUtils.getDayStart(start);
- }
- if (Objects.nonNull(end)) {
- end = DateUtils.getDayEnd(end);
- }
- }
-
-}
-
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckRuleQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckRuleQuery.java
deleted file mode 100644
index be16f97..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckRuleQuery.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.ycl.platform.domain.query;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ycl.platform.base.AbsQuery;
-
-import java.util.Date;
-import java.util.List;
-import org.springframework.lang.NonNull;
-import jakarta.validation.constraints.NotBlank;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 鑰冩牳瑙勫垯鏌ヨ
- *
- * @author xp
- * @since 2024-03-06
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "CheckRule鏌ヨ", description = "鑰冩牳瑙勫垯鏌ヨ")
-public class CheckRuleQuery extends AbsQuery {
-
- /**
- * 瑙勫垯鍚嶇О
- */
- private String ruleName;
-
- /**
- * 寮�濮嬫椂闂�
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date start;
-
- /**
- * 缁撴潫鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date end;
-
- /** 瀹℃牳鐘舵�� */
- private Integer auditState;
-}
-
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java
deleted file mode 100644
index 5e37380..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.ycl.platform.domain.query;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ycl.platform.base.AbsQuery;
-
-import java.util.Date;
-import java.util.List;
-import org.springframework.lang.NonNull;
-import jakarta.validation.constraints.NotBlank;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 鑰冩牳妯℃澘鏌ヨ
- *
- * @author xp
- * @since 2024-03-06
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "CheckTemplate鏌ヨ", description = "鑰冩牳妯℃澘鏌ヨ")
-public class CheckTemplateQuery extends AbsQuery {
-
- /**
- * 妯℃澘鍚嶇О
- */
- private String templateName;
-
- /**
- * 鐘舵��
- */
- private String status;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date start;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date end;
-
-}
-
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultAuditingQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultAuditingQuery.java
deleted file mode 100644
index 96576ba..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultAuditingQuery.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.ycl.platform.domain.query;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ycl.platform.base.AbsQuery;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-
-import org.springframework.lang.NonNull;
-import jakarta.validation.constraints.NotBlank;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import utils.DateUtils;
-
-/**
- * 杩濊瀹℃牳鏌ヨ
- *
- * @author xp
- * @since 2024-03-05
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "DefaultAuditing鏌ヨ", description = "杩濊瀹℃牳鏌ヨ")
-public class DefaultAuditingQuery extends AbsQuery {
-
- /**
- * 杩濊鍗曚綅
- */
- private Integer unitId;
-
- /**
- * 瀹℃牳鏃堕棿鑼冨洿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date auditingStartTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date auditingEndTime;
-
- /**
- * 鍒涘缓鏃堕棿鑼冨洿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createStartTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createEndTime;
-
- /**
- * 璁剧疆鏃堕棿锛屼娇鍏跺寘鍚粖澶�
- */
- public void setTime() {
- if (Objects.nonNull(auditingStartTime)) {
- auditingStartTime = DateUtils.getDayStart(auditingStartTime);
- }
- if (Objects.nonNull(auditingEndTime)) {
- auditingEndTime = DateUtils.getDayEnd(auditingEndTime);
- }
- if (Objects.nonNull(createStartTime)) {
- createStartTime = DateUtils.getDayStart(createStartTime);
- }
- if (Objects.nonNull(createEndTime)) {
- createEndTime = DateUtils.getDayEnd(createEndTime);
- }
- }
-
-}
-
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultRuleQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultRuleQuery.java
deleted file mode 100644
index 306e0d8..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultRuleQuery.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.ycl.platform.domain.query;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ycl.platform.base.AbsQuery;
-
-import java.util.Date;
-import java.util.List;
-import org.springframework.lang.NonNull;
-import jakarta.validation.constraints.NotBlank;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 杩濈害瑙勫垯鏌ヨ
- *
- * @author xp
- * @since 2024-03-05
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "DefaultRule鏌ヨ", description = "杩濈害瑙勫垯鏌ヨ")
-public class DefaultRuleQuery extends AbsQuery {
-
- /**
- * 瑙勫垯鍚嶇О
- */
- private String ruleName;
-
- /**
- * 寮�濮嬫椂闂�
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date start;
-
- /**
- * 缁撴潫鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date end;
-
-}
-
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java
deleted file mode 100644
index 448e871..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.ycl.platform.domain.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ycl.platform.base.AbsVo;
-import com.ycl.platform.domain.entity.CheckResult;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.time.LocalDateTime;
-import org.springframework.lang.NonNull;
-import org.springframework.beans.BeanUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 鑰冩牳缁撴灉灞曠ず
- *
- * @author xp
- * @since 2024-03-07
- */
-@Data
-@Accessors(chain = true)
-public class CheckResultVO extends AbsVo {
-
- /** 鑰冩牳瀵硅薄 */
- private Integer checkUnitId;
- private String checkUnitName;
-
- /** 鑰冩牳 */
- private String examineName;
-
- /** 鑰冩牳棰戠巼 */
- private String frequency;
-
- /** 鑰冩牳鑼冨洿 */
- private String examineRange;
-
- /** 鏈�缁堝垎鏁� */
- private BigDecimal checkScore;
-
- /** 绯荤粺鎵撳垎 */
- private BigDecimal systemScore;
-
- /** 浜哄伐鎵撳垎 */
- private BigDecimal manualScore;
-
- /** 鑰冩牳鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime checkTime;
-
- /** 鏄惁鍙戝竷 */
- private Integer publish;
-
- public static CheckResultVO getVoByEntity(@NonNull CheckResult entity, CheckResultVO vo) {
- if(vo == null) {
- vo = new CheckResultVO();
- }
- BeanUtils.copyProperties(entity, vo);
- return vo;
- }
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java
deleted file mode 100644
index 480dbea..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ycl.platform.domain.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ycl.platform.base.AbsVo;
-import com.ycl.platform.domain.entity.CheckRule;
-
-import java.util.Date;
-import java.util.List;
-import java.time.LocalDateTime;
-import org.springframework.lang.NonNull;
-import org.springframework.beans.BeanUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 鑰冩牳瑙勫垯灞曠ず
- *
- * @author xp
- * @since 2024-03-06
- */
-@Data
-@Accessors(chain = true)
-public class CheckRuleVO extends AbsVo {
-
- /** 瑙勫垯鍚嶇О */
- private String ruleName;
-
- /** 瑙勫垯鎻忚堪 */
- private String ruleDetail;
-
- /** 澶╃綉瑙嗛鐐逛綅鏁� */
- private Integer videoPointNum;
-
- /** 杞﹁締鍗″彛鐐逛綅鏁� */
- private Integer vehicleCheckpointNum;
-
- /** 浜鸿劯鍗″彛鐐逛綅鏁� */
- private Integer faceChceckpointNum;
-
- private Integer category;
- private Integer examineCategory;
- /** 瀹℃牳鐘舵�� */
- private Integer auditState;
- /** 瀹℃牳浜� */
- private String auditUser;
- /** 瀹℃牳鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date auditTime;
- /** 瀹℃牳鎰忚 */
- private String auditDescription;
- public static CheckRuleVO getVoByEntity(@NonNull CheckRule entity, CheckRuleVO vo) {
- if(vo == null) {
- vo = new CheckRuleVO();
- }
- BeanUtils.copyProperties(entity, vo);
- return vo;
- }
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java
deleted file mode 100644
index 0373017..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.ycl.platform.domain.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ycl.platform.base.AbsVo;
-import com.ycl.platform.domain.entity.CheckTemplate;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.time.LocalDateTime;
-
-import com.ycl.platform.domain.form.CheckTemplateForm;
-import org.springframework.lang.NonNull;
-import org.springframework.beans.BeanUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 鑰冩牳妯℃澘灞曠ず
- *
- * @author xp
- * @since 2024-03-06
- */
-@Data
-@Accessors(chain = true)
-public class CheckTemplateVO extends AbsVo {
-
- /** 妯℃澘鍚嶇О */
- private String templateName;
-
- /** 璋冩暣绯绘暟 */
- private BigDecimal adjustCoefficient;
-
- /** 璋冩暣绯绘暟鐨勬柟寮忥細涔橀櫎 */
- private String adjustWay;
-
- /** 鐘舵�� */
- private String status;
-
- /** 瑙勫垯鍒楄〃 */
- private List<RuleItemVO> ruleFormList;
- /** 鍗曚綅鍚� */
- private String unitName;
- private Integer unitId;
- /** 鑰冩牳绫诲瀷 */
- private String examineCategory;
-
- public static CheckTemplateVO getVoByEntity(@NonNull CheckTemplate entity, CheckTemplateVO vo) {
- if(vo == null) {
- vo = new CheckTemplateVO();
- }
- BeanUtils.copyProperties(entity, vo);
- return vo;
- }
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java
deleted file mode 100644
index a985b09..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.ycl.platform.domain.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ycl.platform.base.AbsVo;
-import com.ycl.platform.domain.entity.DefaultAuditing;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.time.LocalDateTime;
-import org.springframework.lang.NonNull;
-import org.springframework.beans.BeanUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 杩濊瀹℃牳灞曠ず
- *
- * @author xp
- * @since 2024-03-05
- */
-@Data
-@Accessors(chain = true)
-public class DefaultAuditingVO extends AbsVo {
-
- /** 杩濊 */
- private Integer defaultId;
-
- /** 杩濊鎵ｅ垎 */
- private BigDecimal score;
-
- /** 鑰冩牳鍙戝竷ID */
- private Integer checkPublishId;
-
- /**
- * 杩濈害瑙勫垯鍚�
- */
- private String defaultRuleName;
-
- /**
- * 杩濈害杩愮淮鍗曚綅
- */
- private String unitName;
-
- /** 瀹℃牳鐘舵�� */
- private String auditingStatus;
-
- /** 瀹℃牳璇存槑 */
- private String remark;
-
- /** 瀹℃牳鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime auditingTime;
-
- /** 瀹℃牳浜� */
- private Integer auditingUser;
- private String auditingUserName;
-
- private String createBy;
- public static DefaultAuditingVO getVoByEntity(@NonNull DefaultAuditing entity, DefaultAuditingVO vo) {
- if(vo == null) {
- vo = new DefaultAuditingVO();
- }
- BeanUtils.copyProperties(entity, vo);
- return vo;
- }
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultRuleVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultRuleVO.java
deleted file mode 100644
index 927f0f3..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultRuleVO.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.ycl.platform.domain.vo;
-
-import com.ycl.platform.base.AbsVo;
-import com.ycl.platform.domain.entity.DefaultRule;
-import java.util.List;
-import java.time.LocalDateTime;
-import org.springframework.lang.NonNull;
-import org.springframework.beans.BeanUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 杩濈害瑙勫垯灞曠ず
- *
- * @author xp
- * @since 2024-03-05
- */
-@Data
-@Accessors(chain = true)
-public class DefaultRuleVO extends AbsVo {
-
- /** 瑙勫垯鍚嶇О */
- private String ruleName;
-
- /** 瑙勫垯璇︽儏JSON */
- private String ruleDetail;
-
- /** 瑙勫垯鎻忚堪 */
- private String ruleDesc;
-
- /** 瑙勫垯鐘舵�侊細鍚敤銆佹湭鍚敤 */
- private String ruleStatus;
-
- public static DefaultRuleVO getVoByEntity(@NonNull DefaultRule entity, DefaultRuleVO vo) {
- if(vo == null) {
- vo = new DefaultRuleVO();
- }
- BeanUtils.copyProperties(entity, vo);
- return vo;
- }
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/Rule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/Rule.java
deleted file mode 100644
index 7ada223..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/Rule.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.ycl.platform.domain.vo;
-
-import lombok.Data;
-
-/**
- * @author锛歺p
- * @date锛�2024/3/6 10:49
- */
-@Data
-public class Rule {
-
- /** 瓒呮椂鏈鐞嗗伐鍗曟暟 */
- private Integer overTime;
-
- /** 宸ュ崟澶勭悊澶辫触鏁� */
- private Integer failNum;
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/RuleItemVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/RuleItemVO.java
deleted file mode 100644
index c0241ed..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/RuleItemVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ycl.platform.domain.vo;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author锛歺p
- * @date锛�2024/3/7 9:24
- */
-@Data
-public class RuleItemVO {
-
- /**
- * 瑙勫垯
- */
- private Integer ruleId;
-
- /**
- * 鏉冮噸
- */
- private BigDecimal weight;
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TExamineScoreVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TExamineScoreVO.java
deleted file mode 100644
index 775fa37..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TExamineScoreVO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.ycl.platform.domain.vo;
-
-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_examine_score
- *
- * @author ruoyi
- * @date 2024-03-13
- */
-public class TExamineScoreVO extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** $column.columnComment */
- private Long id;
-
- /** 鍒嗗�� */
- @Excel(name = "鍒嗗��")
- private BigDecimal score;
-
- /** 鍗曚綅id */
- @Excel(name = "鍗曚綅id")
- private Long unitId;
-
- /** 鑰冩牳id */
- @Excel(name = "鑰冩牳id")
- private Long examineId;
-
- private String examineCategory;
- private String ruleCategory;
-
- private String unitName;
-
- private String examineName;
-
- public String getRuleCategory() {
- return ruleCategory;
- }
-
- public void setRuleCategory(String ruleCategory) {
- this.ruleCategory = ruleCategory;
- }
-
- public String getUnitName() {
- return unitName;
- }
-
- public void setUnitName(String unitName) {
- this.unitName = unitName;
- }
-
- public String getExamineName() {
- return examineName;
- }
-
- public void setExamineName(String examineName) {
- this.examineName = examineName;
- }
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
- public void setScore(BigDecimal score)
- {
- this.score = score;
- }
-
- public BigDecimal getScore()
- {
- return score;
- }
- public void setUnitId(Long unitId)
- {
- this.unitId = unitId;
- }
-
- public Long getUnitId()
- {
- return unitId;
- }
- public void setExamineId(Long examineId)
- {
- this.examineId = examineId;
- }
-
- public Long getExamineId()
- {
- return examineId;
- }
-
- public String getExamineCategory() {
- return examineCategory;
- }
-
- public void setExamineCategory(String examineCategory) {
- this.examineCategory = examineCategory;
- }
-
- @Override
- public String toString() {
- return "TExamineScoreVO{" +
- "id=" + id +
- ", score=" + score +
- ", unitId=" + unitId +
- ", examineId=" + examineId +
- ", examineCategory='" + examineCategory + '\'' +
- ", ruleCategory='" + ruleCategory + '\'' +
- ", unitName='" + unitName + '\'' +
- ", examineName='" + examineName + '\'' +
- '}';
- }
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/AccountingRulesController.java b/ycl-server/src/main/java/com/ycl/platform/controller/AccountingRulesController.java
deleted file mode 100644
index 3f10f75..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/controller/AccountingRulesController.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.ycl.platform.controller;
-
-import annotation.Log;
-import com.ycl.platform.domain.entity.AccountingRules;
-import com.ycl.platform.service.IAccountingRulesService;
-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 gonghl
- * @date 2024-03-21
- */
-@RestController
-@RequestMapping("/platform/rules")
-public class AccountingRulesController extends BaseController {
- @Autowired
- private IAccountingRulesService accountingRulesService;
-
- /**
- * 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
- */
-// @PreAuthorize("@ss.hasPermi('platform:rules:list')")
- @GetMapping("/list")
- public TableDataInfo list(AccountingRules accountingRules) {
- startPage();
- List<AccountingRules> list = accountingRulesService.selectAccountingRulesList(accountingRules);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭鏍哥畻瑙勫垯鍒楄〃
- */
-// @PreAuthorize("@ss.hasPermi('platform:rules:export')")
- @Log(title = "鏍哥畻瑙勫垯", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, AccountingRules accountingRules) {
- List<AccountingRules> list = accountingRulesService.selectAccountingRulesList(accountingRules);
- ExcelUtil<AccountingRules> util = new ExcelUtil<AccountingRules>(AccountingRules.class);
- util.exportExcel(response, list, "鏍哥畻瑙勫垯鏁版嵁");
- }
-
- /**
- * 鑾峰彇鏍哥畻瑙勫垯璇︾粏淇℃伅
- */
-// @PreAuthorize("@ss.hasPermi('platform:rules:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Integer id) {
- return success(accountingRulesService.selectAccountingRulesById(id));
- }
-
- /**
- * 鏂板鏍哥畻瑙勫垯
- */
-// @PreAuthorize("@ss.hasPermi('platform:rules:add')")
- @Log(title = "鏍哥畻瑙勫垯", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody AccountingRules accountingRules) {
- return toAjax(accountingRulesService.insertAccountingRules(accountingRules));
- }
-
- /**
- * 淇敼鏍哥畻瑙勫垯
- */
-// @PreAuthorize("@ss.hasPermi('platform:rules:edit')")
- @Log(title = "鏍哥畻瑙勫垯", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody AccountingRules accountingRules) {
- return toAjax(accountingRulesService.updateAccountingRules(accountingRules));
- }
-
- /**
- * 鍒犻櫎鏍哥畻瑙勫垯
- */
-// @PreAuthorize("@ss.hasPermi('platform:rules:remove')")
- @Log(title = "鏍哥畻瑙勫垯", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Integer[] ids) {
- return toAjax(accountingRulesService.deleteAccountingRulesByIds(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
new file mode 100644
index 0000000..d72bc17
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java
@@ -0,0 +1,98 @@
+package com.ycl.platform.controller;
+
+import annotation.Log;
+import com.ycl.platform.domain.entity.CalculateRule;
+import com.ycl.platform.service.ICalculateRuleService;
+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("/check/calculateRule")
+public class CalculateRuleController extends BaseController
+{
+ @Autowired
+ private ICalculateRuleService calculateRuleService;
+
+ /**
+ * 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(CalculateRule calculateRule)
+ {
+ startPage();
+ List<CalculateRule> list = calculateRuleService.selectCalculateRuleList(calculateRule);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鏍哥畻瑙勫垯鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:export')")
+ @Log(title = "鏍哥畻瑙勫垯", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, CalculateRule calculateRule)
+ {
+ List<CalculateRule> list = calculateRuleService.selectCalculateRuleList(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(calculateRuleService.selectCalculateRuleById(id));
+ }
+
+ /**
+ * 鏂板鏍哥畻瑙勫垯
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:add')")
+ @Log(title = "鏍哥畻瑙勫垯", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody CalculateRule calculateRule)
+ {
+ return toAjax(calculateRuleService.insertCalculateRule(calculateRule));
+ }
+
+ /**
+ * 淇敼鏍哥畻瑙勫垯
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:edit')")
+ @Log(title = "鏍哥畻瑙勫垯", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody CalculateRule calculateRule)
+ {
+ return toAjax(calculateRuleService.updateCalculateRule(calculateRule));
+ }
+
+ /**
+ * 鍒犻櫎鏍哥畻瑙勫垯
+ */
+ @PreAuthorize("@ss.hasPermi('system: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/CheckPublishController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckPublishController.java
new file mode 100644
index 0000000..06fbe5c
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckPublishController.java
@@ -0,0 +1,99 @@
+package com.ycl.platform.controller;
+
+import annotation.Log;
+import com.ycl.platform.domain.entity.CheckPublish;
+import com.ycl.platform.service.ICheckPublishService;
+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("/check/publish")
+public class CheckPublishController extends BaseController
+{
+ @Autowired
+ private ICheckPublishService checkPublishService;
+
+ /**
+ * 鏌ヨ鑰冩牳鍙戝竷鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:publish:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(CheckPublish checkPublish)
+ {
+ startPage();
+ List<CheckPublish> list = checkPublishService.selectCheckPublishList(checkPublish);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鑰冩牳鍙戝竷鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:publish:export')")
+ @Log(title = "鑰冩牳鍙戝竷", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, CheckPublish checkPublish)
+ {
+ List<CheckPublish> list = checkPublishService.selectCheckPublishList(checkPublish);
+ ExcelUtil<CheckPublish> util = new ExcelUtil<CheckPublish>(CheckPublish.class);
+ util.exportExcel(response, list, "鑰冩牳鍙戝竷鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鑰冩牳鍙戝竷璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:publish:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(checkPublishService.selectCheckPublishById(id));
+ }
+
+ /**
+ * 鏂板鑰冩牳鍙戝竷
+ */
+ @PreAuthorize("@ss.hasPermi('system:publish:add')")
+ @Log(title = "鑰冩牳鍙戝竷", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody CheckPublish checkPublish)
+ {
+ return toAjax(checkPublishService.insertCheckPublish(checkPublish));
+ }
+
+ /**
+ * 淇敼鑰冩牳鍙戝竷
+ */
+ @PreAuthorize("@ss.hasPermi('system:publish:edit')")
+ @Log(title = "鑰冩牳鍙戝竷", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody CheckPublish checkPublish)
+ {
+ return toAjax(checkPublishService.updateCheckPublish(checkPublish));
+ }
+
+ /**
+ * 鍒犻櫎鑰冩牳鍙戝竷
+ */
+ @PreAuthorize("@ss.hasPermi('system:publish:remove')")
+ @Log(title = "鑰冩牳鍙戝竷", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(checkPublishService.deleteCheckPublishByIds(ids));
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java
index 0ca4a47..78bbeec 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java
@@ -1,88 +1,98 @@
package com.ycl.platform.controller;
-import com.ycl.platform.domain.form.ManualScoreForm;
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import org.springframework.validation.annotation.Validated;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import jakarta.validation.constraints.NotEmpty;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.ycl.platform.service.CheckResultService;
-import com.ycl.system.Result;
-import com.ycl.platform.domain.form.CheckResultForm;
-import com.ycl.platform.domain.query.CheckResultQuery;
-import lombok.RequiredArgsConstructor;
+import annotation.Log;
+import com.ycl.platform.domain.entity.CheckResult;
+import com.ycl.platform.service.ICheckResultService;
+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 xp
- * @since 2024-03-07
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Validated
-@RequiredArgsConstructor
-@Api(value = "鑰冩牳缁撴灉", tags = "鑰冩牳缁撴灉绠＄悊")
@RestController
-@RequestMapping("/check-result")
-public class CheckResultController {
+@RequestMapping("/check/result")
+public class CheckResultController extends BaseController
+{
+ @Autowired
+ private ICheckResultService checkResultService;
- private final CheckResultService checkResultService;
-
- @PostMapping
- @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- public Result add(@RequestBody @Validated(Add.class) CheckResultForm form) {
- return checkResultService.add(form);
- }
-
- @PutMapping
- @ApiOperation(value = "淇敼", notes = "淇敼")
- public Result update(@RequestBody @Validated(Update.class) CheckResultForm form) {
- return checkResultService.update(form);
- }
-
- @DeleteMapping("/{id}")
- @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
- public Result removeById(@PathVariable("id") String id) {
- return checkResultService.removeById(id);
- }
-
- @PutMapping("/publish/{id}")
- @ApiOperation(value = "ID鍙戝竷", notes = "ID鍙戝竷")
- public Result publishById(@PathVariable("id") String id) {
- return checkResultService.publishById(id);
- }
-
- @DeleteMapping("/batch")
- @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
- return checkResultService.remove(ids);
- }
-
- @PostMapping("/page")
- @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- public Result page(@RequestBody CheckResultQuery query) {
- return checkResultService.page(query);
- }
-
- @GetMapping("/{id}")
- @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- public Result detail(@PathVariable("id") String id) {
- return checkResultService.detail(id);
- }
-
+ /**
+ * 鏌ヨ鑰冩牳缁撴灉鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:list')")
@GetMapping("/list")
- @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
- public Result list() {
- return checkResultService.all();
+ public TableDataInfo list(CheckResult checkResult)
+ {
+ startPage();
+ List<CheckResult> list = checkResultService.selectCheckResultList(checkResult);
+ return getDataTable(list);
}
- @PostMapping("/manual-score")
- @ApiOperation(value = "浜哄伐鎵撳垎", notes = "浜哄伐鎵撳垎")
- public Result manualScore(@RequestBody ManualScoreForm form) {
- return checkResultService.manualScore(form);
+ /**
+ * 瀵煎嚭鑰冩牳缁撴灉鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:export')")
+ @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, CheckResult checkResult)
+ {
+ List<CheckResult> list = checkResultService.selectCheckResultList(checkResult);
+ ExcelUtil<CheckResult> util = new ExcelUtil<CheckResult>(CheckResult.class);
+ util.exportExcel(response, list, "鑰冩牳缁撴灉鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鑰冩牳缁撴灉璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(checkResultService.selectCheckResultById(id));
+ }
+
+ /**
+ * 鏂板鑰冩牳缁撴灉
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:add')")
+ @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody CheckResult checkResult)
+ {
+ return toAjax(checkResultService.insertCheckResult(checkResult));
+ }
+
+ /**
+ * 淇敼鑰冩牳缁撴灉
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:edit')")
+ @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody CheckResult checkResult)
+ {
+ return toAjax(checkResultService.updateCheckResult(checkResult));
+ }
+
+ /**
+ * 鍒犻櫎鑰冩牳缁撴灉
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:remove')")
+ @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(checkResultService.deleteCheckResultByIds(ids));
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java
index 8fd63eb..bac5c34 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java
@@ -1,73 +1,99 @@
package com.ycl.platform.controller;
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import org.springframework.validation.annotation.Validated;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import jakarta.validation.constraints.NotEmpty;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.ycl.platform.service.CheckRuleService;
-import com.ycl.system.Result;
-import com.ycl.platform.domain.form.CheckRuleForm;
-import com.ycl.platform.domain.query.CheckRuleQuery;
+import annotation.Log;
+import com.ycl.platform.domain.entity.CheckRule;
+import com.ycl.platform.service.ICheckRuleService;
+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 xp
- * @since 2024-03-06
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Validated
-@RequiredArgsConstructor
-@Api(value = "鑰冩牳瑙勫垯", tags = "鑰冩牳瑙勫垯绠＄悊")
@RestController
-@RequestMapping("/check-rule")
-public class CheckRuleController {
+@RequestMapping("/check/rule")
+public class CheckRuleController extends BaseController
+{
+ @Autowired
+ private ICheckRuleService checkRuleService;
- private final CheckRuleService checkRuleService;
-
- @PostMapping
- @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- public Result add(@RequestBody @Validated(Add.class) CheckRuleForm form) {
- return checkRuleService.add(form);
- }
-
- @PutMapping
- @ApiOperation(value = "淇敼", notes = "淇敼")
- public Result update(@RequestBody @Validated(Update.class) CheckRuleForm form) {
- return checkRuleService.update(form);
- }
-
- @DeleteMapping("/{id}")
- @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
- public Result removeById(@PathVariable("id") String id) {
- return checkRuleService.removeById(id);
- }
-
- @DeleteMapping("/batch")
- @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
- return checkRuleService.remove(ids);
- }
-
- @PostMapping("/page")
- @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- public Result page(@RequestBody CheckRuleQuery query) {
- return checkRuleService.page(query);
- }
-
- @GetMapping("/{id}")
- @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- public Result detail(@PathVariable("id") String id) {
- return checkRuleService.detail(id);
- }
-
+ /**
+ * 鏌ヨ鑰冩牳瑙勫垯鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:list')")
@GetMapping("/list")
- @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
- public Result list() {
- return checkRuleService.all();
+ public TableDataInfo list(CheckRule checkRule)
+ {
+ startPage();
+ List<CheckRule> list = checkRuleService.selectCheckRuleList(checkRule);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鑰冩牳瑙勫垯鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:export')")
+ @Log(title = "鑰冩牳瑙勫垯", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, CheckRule checkRule)
+ {
+ List<CheckRule> list = checkRuleService.selectCheckRuleList(checkRule);
+ ExcelUtil<CheckRule> util = new ExcelUtil<CheckRule>(CheckRule.class);
+ util.exportExcel(response, list, "鑰冩牳瑙勫垯鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鑰冩牳瑙勫垯璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(checkRuleService.selectCheckRuleById(id));
+ }
+
+ /**
+ * 鏂板鑰冩牳瑙勫垯
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:add')")
+ @Log(title = "鑰冩牳瑙勫垯", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody CheckRule checkRule)
+ {
+ return toAjax(checkRuleService.insertCheckRule(checkRule));
+ }
+
+ /**
+ * 淇敼鑰冩牳瑙勫垯
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:edit')")
+ @Log(title = "鑰冩牳瑙勫垯", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody CheckRule checkRule)
+ {
+ return toAjax(checkRuleService.updateCheckRule(checkRule));
+ }
+
+ /**
+ * 鍒犻櫎鑰冩牳瑙勫垯
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:remove')")
+ @Log(title = "鑰冩牳瑙勫垯", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(checkRuleService.deleteCheckRuleByIds(ids));
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
new file mode 100644
index 0000000..a9d5283
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
@@ -0,0 +1,98 @@
+package com.ycl.platform.controller;
+
+import annotation.Log;
+import com.ycl.platform.domain.entity.CheckScore;
+import com.ycl.platform.service.ICheckScoreService;
+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("/check/score")
+public class CheckScoreController extends BaseController
+{
+ @Autowired
+ private ICheckScoreService checkScoreService;
+
+ /**
+ * 鏌ヨ鑰冩牳绉垎鏄庣粏鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:score:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(CheckScore checkScore)
+ {
+ startPage();
+ List<CheckScore> list = checkScoreService.selectCheckScoreList(checkScore);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鑰冩牳绉垎鏄庣粏鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:score:export')")
+ @Log(title = "鑰冩牳绉垎鏄庣粏", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, CheckScore checkScore)
+ {
+ List<CheckScore> list = checkScoreService.selectCheckScoreList(checkScore);
+ ExcelUtil<CheckScore> util = new ExcelUtil<CheckScore>(CheckScore.class);
+ util.exportExcel(response, list, "鑰冩牳绉垎鏄庣粏鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鑰冩牳绉垎鏄庣粏璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:score:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(checkScoreService.selectCheckScoreById(id));
+ }
+
+ /**
+ * 鏂板鑰冩牳绉垎鏄庣粏
+ */
+ @PreAuthorize("@ss.hasPermi('system:score:add')")
+ @Log(title = "鑰冩牳绉垎鏄庣粏", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody CheckScore checkScore)
+ {
+ return toAjax(checkScoreService.insertCheckScore(checkScore));
+ }
+
+ /**
+ * 淇敼鑰冩牳绉垎鏄庣粏
+ */
+ @PreAuthorize("@ss.hasPermi('system:score:edit')")
+ @Log(title = "鑰冩牳绉垎鏄庣粏", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody CheckScore checkScore)
+ {
+ return toAjax(checkScoreService.updateCheckScore(checkScore));
+ }
+
+ /**
+ * 鍒犻櫎鑰冩牳绉垎鏄庣粏
+ */
+ @PreAuthorize("@ss.hasPermi('system:score:remove')")
+ @Log(title = "鑰冩牳绉垎鏄庣粏", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(checkScoreService.deleteCheckScoreByIds(ids));
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
index 749448a..2ec9af4 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
@@ -1,75 +1,98 @@
package com.ycl.platform.controller;
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import org.springframework.validation.annotation.Validated;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import jakarta.validation.constraints.NotEmpty;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.ycl.platform.service.CheckTemplateService;
-import com.ycl.system.Result;
-import com.ycl.platform.domain.form.CheckTemplateForm;
-import com.ycl.platform.domain.query.CheckTemplateQuery;
-import lombok.RequiredArgsConstructor;
+import annotation.Log;
+import com.ycl.platform.domain.entity.CheckTemplate;
+import com.ycl.platform.service.ICheckTemplateService;
+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 xp
- * @since 2024-03-06
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Validated
-@RequiredArgsConstructor
-@Api(value = "鑰冩牳妯℃澘", tags = "鑰冩牳妯℃澘绠＄悊")
@RestController
-@RequestMapping("/check-template")
-public class CheckTemplateController {
+@RequestMapping("/check/template")
+public class CheckTemplateController extends BaseController
+{
+ @Autowired
+ private ICheckTemplateService checkTemplateService;
- private final CheckTemplateService checkTemplateService;
-
- @PostMapping
- @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- public Result add(@RequestBody @Validated(Add.class) CheckTemplateForm form) {
- return checkTemplateService.add(form);
- }
-
- @PutMapping
- @ApiOperation(value = "淇敼", notes = "淇敼")
- public Result update(@RequestBody @Validated(Update.class) CheckTemplateForm form) {
- return checkTemplateService.update(form);
- }
-
- @DeleteMapping("/{id}")
- @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
- public Result removeById(@PathVariable("id") String id) {
- return checkTemplateService.removeById(id);
- }
-
- @DeleteMapping("/batch")
- @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
- return checkTemplateService.remove(ids);
- }
-
- @PostMapping("/page")
- @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- public Result page(@RequestBody CheckTemplateQuery query) {
- return checkTemplateService.page(query);
- }
-
- @GetMapping("/{id}")
- @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- public Result detail(@PathVariable("id") String id) {
- return checkTemplateService.detail(id);
- }
-
+ /**
+ * 鏌ヨ鑰冩牳妯℃澘鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:template:list')")
@GetMapping("/list")
- @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
- public Result list() {
- return checkTemplateService.all();
+ public TableDataInfo list(CheckTemplate checkTemplate)
+ {
+ startPage();
+ List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplate);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鑰冩牳妯℃澘鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:template:export')")
+ @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, CheckTemplate checkTemplate)
+ {
+ List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplate);
+ ExcelUtil<CheckTemplate> util = new ExcelUtil<CheckTemplate>(CheckTemplate.class);
+ util.exportExcel(response, list, "鑰冩牳妯℃澘鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鑰冩牳妯℃澘璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:template:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(checkTemplateService.selectCheckTemplateById(id));
+ }
+
+ /**
+ * 鏂板鑰冩牳妯℃澘
+ */
+ @PreAuthorize("@ss.hasPermi('system:template:add')")
+ @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody CheckTemplate checkTemplate)
+ {
+ return toAjax(checkTemplateService.insertCheckTemplate(checkTemplate));
+ }
+
+ /**
+ * 淇敼鑰冩牳妯℃澘
+ */
+ @PreAuthorize("@ss.hasPermi('system:template:edit')")
+ @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody CheckTemplate checkTemplate)
+ {
+ return toAjax(checkTemplateService.updateCheckTemplate(checkTemplate));
+ }
+
+ /**
+ * 鍒犻櫎鑰冩牳妯℃澘
+ */
+ @PreAuthorize("@ss.hasPermi('system:template:remove')")
+ @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(checkTemplateService.deleteCheckTemplateByIds(ids));
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultAuditingController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultAuditingController.java
deleted file mode 100644
index 1f3003b..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultAuditingController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.ycl.platform.controller;
-
-import com.ycl.platform.domain.form.DefaultAuditForm;
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import org.springframework.validation.annotation.Validated;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import jakarta.validation.constraints.NotEmpty;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.ycl.platform.service.DefaultAuditingService;
-import com.ycl.system.Result;
-import com.ycl.platform.domain.form.DefaultAuditingForm;
-import com.ycl.platform.domain.query.DefaultAuditingQuery;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 杩濊瀹℃牳 鍓嶇鎺у埗鍣�
- *
- * @author xp
- * @since 2024-03-05
- */
-@Validated
-@RequiredArgsConstructor
-@Api(value = "杩濊瀹℃牳", tags = "杩濊瀹℃牳绠＄悊")
-@RestController
-@RequestMapping("/default-auditing")
-public class DefaultAuditingController {
-
- private final DefaultAuditingService defaultAuditingService;
-
- @PostMapping
- @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- public Result add(@RequestBody @Validated(Add.class) DefaultAuditingForm form) {
- return defaultAuditingService.add(form);
- }
-
- @PutMapping
- @ApiOperation(value = "淇敼", notes = "淇敼")
- public Result update(@RequestBody @Validated(Update.class) DefaultAuditingForm form) {
- return defaultAuditingService.update(form);
- }
-
- @DeleteMapping("/{id}")
- @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
- public Result removeById(@PathVariable("id") String id) {
- return defaultAuditingService.removeById(id);
- }
-
- @DeleteMapping("/batch")
- @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
- return defaultAuditingService.remove(ids);
- }
-
- @PostMapping("/page")
- @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- public Result page(@RequestBody DefaultAuditingQuery query) {
- return defaultAuditingService.page(query);
- }
-
- @GetMapping("/{id}")
- @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- public Result detail(@PathVariable("id") String id) {
- return defaultAuditingService.detail(id);
- }
-
- @GetMapping("/list")
- @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
- public Result list() {
- return defaultAuditingService.all();
- }
-
- @PostMapping("/auditing")
- @ApiOperation(value = "瀹℃牳", notes = "瀹℃牳")
- public Result auditing(@RequestBody @Validated DefaultAuditForm form) {
- return defaultAuditingService.auditing(form);
- }
-}
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
new file mode 100644
index 0000000..91ad7f3
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultPublishController.java
@@ -0,0 +1,98 @@
+package com.ycl.platform.controller;
+
+import annotation.Log;
+import com.ycl.platform.domain.entity.DefaultPublish;
+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(DefaultPublish defaultPublish)
+ {
+ startPage();
+ List<DefaultPublish> list = defaultPublishService.selectDefaultPublishList(defaultPublish);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鍚堝悓鑰冩牳鍙戝竷鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:publish:export')")
+ @Log(title = "鍚堝悓鑰冩牳鍙戝竷", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, DefaultPublish defaultPublish)
+ {
+ List<DefaultPublish> list = defaultPublishService.selectDefaultPublishList(defaultPublish);
+ ExcelUtil<DefaultPublish> util = new ExcelUtil<DefaultPublish>(DefaultPublish.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 DefaultPublish defaultPublish)
+ {
+ return toAjax(defaultPublishService.insertDefaultPublish(defaultPublish));
+ }
+
+ /**
+ * 淇敼鍚堝悓鑰冩牳鍙戝竷
+ */
+ @PreAuthorize("@ss.hasPermi('system:publish:edit')")
+ @Log(title = "鍚堝悓鑰冩牳鍙戝竷", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody DefaultPublish defaultPublish)
+ {
+ return toAjax(defaultPublishService.updateDefaultPublish(defaultPublish));
+ }
+
+ /**
+ * 鍒犻櫎鍚堝悓鑰冩牳鍙戝竷
+ */
+ @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/DefaultResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java
new file mode 100644
index 0000000..260fb18
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java
@@ -0,0 +1,98 @@
+package com.ycl.platform.controller;
+
+import annotation.Log;
+import com.ycl.platform.domain.entity.DefaultResult;
+import com.ycl.platform.service.IDefaultResultService;
+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/result")
+public class DefaultResultController extends BaseController
+{
+ @Autowired
+ private IDefaultResultService defaultResultService;
+
+ /**
+ * 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(DefaultResult defaultResult)
+ {
+ startPage();
+ List<DefaultResult> list = defaultResultService.selectDefaultResultList(defaultResult);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鍚堝悓鑰冩牳缁撴灉鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:export')")
+ @Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, DefaultResult defaultResult)
+ {
+ List<DefaultResult> list = defaultResultService.selectDefaultResultList(defaultResult);
+ ExcelUtil<DefaultResult> util = new ExcelUtil<DefaultResult>(DefaultResult.class);
+ util.exportExcel(response, list, "鍚堝悓鑰冩牳缁撴灉鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鍚堝悓鑰冩牳缁撴灉璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(defaultResultService.selectDefaultResultById(id));
+ }
+
+ /**
+ * 鏂板鍚堝悓鑰冩牳缁撴灉
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:add')")
+ @Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody DefaultResult defaultResult)
+ {
+ return toAjax(defaultResultService.insertDefaultResult(defaultResult));
+ }
+
+ /**
+ * 淇敼鍚堝悓鑰冩牳缁撴灉
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:edit')")
+ @Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody DefaultResult defaultResult)
+ {
+ return toAjax(defaultResultService.updateDefaultResult(defaultResult));
+ }
+
+ /**
+ * 鍒犻櫎鍚堝悓鑰冩牳缁撴灉
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:remove')")
+ @Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(defaultResultService.deleteDefaultResultByIds(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
index 6fac87c..06ed1ef 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java
@@ -1,82 +1,96 @@
package com.ycl.platform.controller;
-import com.ycl.platform.domain.form.DefaultRuleSetForm;
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import org.springframework.validation.annotation.Validated;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import jakarta.validation.constraints.NotEmpty;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.ycl.platform.service.DefaultRuleService;
-import com.ycl.system.Result;
-import com.ycl.platform.domain.form.DefaultRuleForm;
-import com.ycl.platform.domain.query.DefaultRuleQuery;
-import lombok.RequiredArgsConstructor;
+import annotation.Log;
+import com.ycl.platform.domain.entity.DefaultRule;
+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 xp
- * @since 2024-03-05
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Validated
-@RequiredArgsConstructor
-@Api(value = "杩濈害瑙勫垯", tags = "杩濈害瑙勫垯绠＄悊")
@RestController
-@RequestMapping("/default-rule")
-public class DefaultRuleController {
+@RequestMapping("/default/rule")
+public class DefaultRuleController extends BaseController
+{
+ @Autowired
+ private IDefaultRuleService defaultRuleService;
- private final DefaultRuleService defaultRuleService;
-
- @PostMapping
- @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- public Result add(@RequestBody @Validated(Add.class) DefaultRuleForm form) {
- return defaultRuleService.add(form);
- }
-
- @PutMapping
- @ApiOperation(value = "淇敼", notes = "淇敼")
- public Result update(@RequestBody @Validated(Update.class) DefaultRuleForm form) {
- return defaultRuleService.update(form);
- }
-
- @PostMapping("/set")
- @ApiOperation(value = "鍚敤/鍋滅敤", notes = "鍚敤/鍋滅敤")
- public Result set(@RequestBody DefaultRuleSetForm form) {
- return defaultRuleService.set(form);
- }
-
- @DeleteMapping("/{id}")
- @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
- public Result removeById(@PathVariable("id") String id) {
- return defaultRuleService.removeById(id);
- }
-
- @DeleteMapping("/batch")
- @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
- return defaultRuleService.remove(ids);
- }
-
- @PostMapping("/page")
- @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- public Result page(@RequestBody DefaultRuleQuery query) {
- return defaultRuleService.page(query);
- }
-
- @GetMapping("/{id}")
- @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- public Result detail(@PathVariable("id") String id) {
- return defaultRuleService.detail(id);
- }
-
+ /**
+ * 鏌ヨ杩濈害瑙勫垯鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:list')")
@GetMapping("/list")
- @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
- public Result list() {
- return defaultRuleService.all();
+ public AjaxResult list(DefaultRule defaultRule)
+ {
+ List<DefaultRule> list = defaultRuleService.selectDefaultRuleList(defaultRule);
+ return success(list);
+ }
+
+ /**
+ * 瀵煎嚭杩濈害瑙勫垯鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:export')")
+ @Log(title = "杩濈害瑙勫垯", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, DefaultRule defaultRule)
+ {
+ List<DefaultRule> list = defaultRuleService.selectDefaultRuleList(defaultRule);
+ ExcelUtil<DefaultRule> util = new ExcelUtil<DefaultRule>(DefaultRule.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 DefaultRule defaultRule)
+ {
+ return toAjax(defaultRuleService.insertDefaultRule(defaultRule));
+ }
+
+ /**
+ * 淇敼杩濈害瑙勫垯
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:edit')")
+ @Log(title = "杩濈害瑙勫垯", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody DefaultRule defaultRule)
+ {
+ return toAjax(defaultRuleService.updateDefaultRule(defaultRule));
+ }
+
+ /**
+ * 鍒犻櫎杩濈害瑙勫垯
+ */
+ @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/DefaultScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultScoreController.java
new file mode 100644
index 0000000..07ef5fc
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultScoreController.java
@@ -0,0 +1,98 @@
+package com.ycl.platform.controller;
+
+import annotation.Log;
+import com.ycl.platform.domain.entity.DefaultScore;
+import com.ycl.platform.service.IDefaultScoreService;
+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/score")
+public class DefaultScoreController extends BaseController
+{
+ @Autowired
+ private IDefaultScoreService defaultScoreService;
+
+ /**
+ * 鏌ヨ鍚堝悓鎵撳垎鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('platform:score:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(DefaultScore defaultScore)
+ {
+ startPage();
+ List<DefaultScore> list = defaultScoreService.selectDefaultScoreList(defaultScore);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鍚堝悓鎵撳垎鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('platform:score:export')")
+ @Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, DefaultScore defaultScore)
+ {
+ List<DefaultScore> list = defaultScoreService.selectDefaultScoreList(defaultScore);
+ ExcelUtil<DefaultScore> util = new ExcelUtil<DefaultScore>(DefaultScore.class);
+ util.exportExcel(response, list, "鍚堝悓鎵撳垎鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鍚堝悓鎵撳垎璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('platform:score:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(defaultScoreService.selectDefaultScoreById(id));
+ }
+
+ /**
+ * 鏂板鍚堝悓鎵撳垎
+ */
+ @PreAuthorize("@ss.hasPermi('platform:score:add')")
+ @Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody DefaultScore defaultScore)
+ {
+ return toAjax(defaultScoreService.insertDefaultScore(defaultScore));
+ }
+
+ /**
+ * 淇敼鍚堝悓鎵撳垎
+ */
+ @PreAuthorize("@ss.hasPermi('platform:score:edit')")
+ @Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody DefaultScore defaultScore)
+ {
+ return toAjax(defaultScoreService.updateDefaultScore(defaultScore));
+ }
+
+ /**
+ * 鍒犻櫎鍚堝悓鎵撳垎
+ */
+ @PreAuthorize("@ss.hasPermi('platform:score:remove')")
+ @Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(defaultScoreService.deleteDefaultScoreByIds(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
new file mode 100644
index 0000000..b4ec40c
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultTemplateController.java
@@ -0,0 +1,98 @@
+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/controller/TCheckPublishController.java b/ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java
deleted file mode 100644
index e101f3f..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/controller/TCheckPublishController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.ycl.platform.controller;
-
-import annotation.Log;
-import com.ycl.platform.domain.entity.TCheckPublish;
-import com.ycl.platform.service.ITCheckPublishService;
-import com.ycl.system.AjaxResult;
-import com.ycl.system.Result;
-import com.ycl.system.controller.BaseController;
-import com.ycl.system.page.TableDataInfo;
-import com.ycl.utils.poi.ExcelUtil;
-import enumeration.BusinessType;
-import io.swagger.annotations.ApiOperation;
-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-03-07
- */
-@RestController
-@RequestMapping("/system/publish")
-public class TCheckPublishController extends BaseController
-{
- @Autowired
- private ITCheckPublishService tCheckPublishService;
-
- /**
- * 鏌ヨ鑰冩牳鍙戝竷鍒楄〃
- */
-// @PreAuthorize("@ss.hasPermi('system:publish:list')")
- @GetMapping("/list")
- public TableDataInfo list(TCheckPublish tCheckPublish)
- {
- startPage();
- List<TCheckPublish> list = tCheckPublishService.selectTCheckPublishList(tCheckPublish);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭鑰冩牳鍙戝竷鍒楄〃
- */
-// @PreAuthorize("@ss.hasPermi('system:publish:export')")
- @Log(title = "鑰冩牳鍙戝竷", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, TCheckPublish tCheckPublish)
- {
- List<TCheckPublish> list = tCheckPublishService.selectTCheckPublishList(tCheckPublish);
- ExcelUtil<TCheckPublish> util = new ExcelUtil<TCheckPublish>(TCheckPublish.class);
- util.exportExcel(response, list, "鑰冩牳鍙戝竷鏁版嵁");
- }
-
- /**
- * 鑾峰彇鑰冩牳鍙戝竷璇︾粏淇℃伅
- */
-// @PreAuthorize("@ss.hasPermi('system:publish:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(tCheckPublishService.selectTCheckPublishById(id));
- }
-
- /**
- * 鏂板鑰冩牳鍙戝竷
- */
-// @PreAuthorize("@ss.hasPermi('system:publish:add')")
- @Log(title = "鑰冩牳鍙戝竷", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody TCheckPublish tCheckPublish)
- {
- return toAjax(tCheckPublishService.insertTCheckPublish(tCheckPublish));
- }
-
- /**
- * 淇敼鑰冩牳鍙戝竷
- */
-// @PreAuthorize("@ss.hasPermi('system:publish:edit')")
- @Log(title = "鑰冩牳鍙戝竷", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody TCheckPublish tCheckPublish)
- {
- return toAjax(tCheckPublishService.updateTCheckPublish(tCheckPublish));
- }
-
- /**
- * 鍒犻櫎鑰冩牳鍙戝竷
- */
-// @PreAuthorize("@ss.hasPermi('system:publish:remove')")
- @Log(title = "鑰冩牳鍙戝竷", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(tCheckPublishService.deleteTCheckPublishByIds(ids));
- }
-
- @GetMapping("/all")
- @ApiOperation(value = "涓嬫媺鍒楄〃", notes = "涓嬫媺鍒楄〃")
- public Result all() {
- return tCheckPublishService.all();
- }
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/TExamineScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/TExamineScoreController.java
deleted file mode 100644
index 1b5fdb9..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/controller/TExamineScoreController.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.ycl.platform.controller;
-
-import annotation.Log;
-import com.ycl.platform.domain.entity.TExamineScore;
-import com.ycl.platform.domain.vo.TExamineScoreVO;
-import com.ycl.platform.service.ITExamineScoreService;
-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-03-13
- */
-@RestController
-@RequestMapping("/platform/score")
-public class TExamineScoreController extends BaseController
-{
- @Autowired
- private ITExamineScoreService tExamineScoreService;
-
- /**
- * 鏌ヨ鑰冩牳璁″垎鍒楄〃
- */
-// @PreAuthorize("@ss.hasPermi('platform:score:list')")
- @GetMapping("/list")
- public TableDataInfo list(TExamineScore tExamineScore)
- {
- startPage();
- List<TExamineScoreVO> list = tExamineScoreService.selectTExamineScoreList(tExamineScore);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭鑰冩牳璁″垎鍒楄〃
- */
-// @PreAuthorize("@ss.hasPermi('platform:score:export')")
- @Log(title = "鑰冩牳璁″垎", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, TExamineScore tExamineScore)
- {
- List<TExamineScoreVO> list = tExamineScoreService.selectTExamineScoreList(tExamineScore);
- ExcelUtil<TExamineScoreVO> util = new ExcelUtil<TExamineScoreVO>(TExamineScoreVO.class);
- util.exportExcel(response, list, "鑰冩牳璁″垎鏁版嵁");
- }
-
- /**
- * 鑾峰彇鑰冩牳璁″垎璇︾粏淇℃伅
- */
-// @PreAuthorize("@ss.hasPermi('platform:score:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(tExamineScoreService.selectTExamineScoreById(id));
- }
-
- /**
- * 鏂板鑰冩牳璁″垎
- */
-// @PreAuthorize("@ss.hasPermi('platform:score:add')")
- @Log(title = "鑰冩牳璁″垎", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody TExamineScore tExamineScore)
- {
- return toAjax(tExamineScoreService.insertTExamineScore(tExamineScore));
- }
-
- /**
- * 淇敼鑰冩牳璁″垎
- */
-// @PreAuthorize("@ss.hasPermi('platform:score:edit')")
- @Log(title = "鑰冩牳璁″垎", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody TExamineScore tExamineScore)
- {
- return toAjax(tExamineScoreService.updateTExamineScore(tExamineScore));
- }
-
- /**
- * 鍒犻櫎鑰冩牳璁″垎
- */
-// @PreAuthorize("@ss.hasPermi('platform:score:remove')")
- @Log(title = "鑰冩牳璁″垎", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(tExamineScoreService.deleteTExamineScoreByIds(ids));
- }
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/AccountingRulesMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/AccountingRulesMapper.java
deleted file mode 100644
index 54a81cd..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/AccountingRulesMapper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ycl.platform.mapper;
-
-
-import com.ycl.platform.domain.entity.AccountingRules;
-
-import java.util.List;
-
-/**
- * 鏍哥畻瑙勫垯Mapper鎺ュ彛
- *
- * @author gonghl
- * @date 2024-03-21
- */
-public interface AccountingRulesMapper {
- /**
- * 鏌ヨ鏍哥畻瑙勫垯
- *
- * @param id 鏍哥畻瑙勫垯涓婚敭
- * @return 鏍哥畻瑙勫垯
- */
- public AccountingRules selectAccountingRulesById(Integer id);
-
- /**
- * 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
- *
- * @param accountingRules 鏍哥畻瑙勫垯
- * @return 鏍哥畻瑙勫垯闆嗗悎
- */
- public List<AccountingRules> selectAccountingRulesList(AccountingRules accountingRules);
-
- /**
- * 鏂板鏍哥畻瑙勫垯
- *
- * @param accountingRules 鏍哥畻瑙勫垯
- * @return 缁撴灉
- */
- public int insertAccountingRules(AccountingRules accountingRules);
-
- /**
- * 淇敼鏍哥畻瑙勫垯
- *
- * @param accountingRules 鏍哥畻瑙勫垯
- * @return 缁撴灉
- */
- public int updateAccountingRules(AccountingRules accountingRules);
-
- /**
- * 鍒犻櫎鏍哥畻瑙勫垯
- *
- * @param id 鏍哥畻瑙勫垯涓婚敭
- * @return 缁撴灉
- */
- public int deleteAccountingRulesById(Integer id);
-
- /**
- * 鎵归噺鍒犻櫎鏍哥畻瑙勫垯
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteAccountingRulesByIds(Integer[] 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
new file mode 100644
index 0000000..b09a678
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.CalculateRule;
+
+import java.util.List;
+
+/**
+ * 鏍哥畻瑙勫垯Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface CalculateRuleMapper
+{
+ /**
+ * 鏌ヨ鏍哥畻瑙勫垯
+ *
+ * @param id 鏍哥畻瑙勫垯涓婚敭
+ * @return 鏍哥畻瑙勫垯
+ */
+ public CalculateRule selectCalculateRuleById(Long id);
+
+ /**
+ * 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
+ *
+ * @param calculateRule 鏍哥畻瑙勫垯
+ * @return 鏍哥畻瑙勫垯闆嗗悎
+ */
+ public List<CalculateRule> selectCalculateRuleList(CalculateRule calculateRule);
+
+ /**
+ * 鏂板鏍哥畻瑙勫垯
+ *
+ * @param calculateRule 鏍哥畻瑙勫垯
+ * @return 缁撴灉
+ */
+ public int insertCalculateRule(CalculateRule calculateRule);
+
+ /**
+ * 淇敼鏍哥畻瑙勫垯
+ *
+ * @param calculateRule 鏍哥畻瑙勫垯
+ * @return 缁撴灉
+ */
+ public int updateCalculateRule(CalculateRule calculateRule);
+
+ /**
+ * 鍒犻櫎鏍哥畻瑙勫垯
+ *
+ * @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/CheckPublishMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckPublishMapper.java
new file mode 100644
index 0000000..49545c8
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckPublishMapper.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.CheckPublish;
+
+import java.util.List;
+
+/**
+ * 鑰冩牳鍙戝竷Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface CheckPublishMapper
+{
+ /**
+ * 鏌ヨ鑰冩牳鍙戝竷
+ *
+ * @param id 鑰冩牳鍙戝竷涓婚敭
+ * @return 鑰冩牳鍙戝竷
+ */
+ public CheckPublish selectCheckPublishById(Long id);
+
+ /**
+ * 鏌ヨ鑰冩牳鍙戝竷鍒楄〃
+ *
+ * @param checkPublish 鑰冩牳鍙戝竷
+ * @return 鑰冩牳鍙戝竷闆嗗悎
+ */
+ public List<CheckPublish> selectCheckPublishList(CheckPublish checkPublish);
+
+ /**
+ * 鏂板鑰冩牳鍙戝竷
+ *
+ * @param checkPublish 鑰冩牳鍙戝竷
+ * @return 缁撴灉
+ */
+ public int insertCheckPublish(CheckPublish checkPublish);
+
+ /**
+ * 淇敼鑰冩牳鍙戝竷
+ *
+ * @param checkPublish 鑰冩牳鍙戝竷
+ * @return 缁撴灉
+ */
+ public int updateCheckPublish(CheckPublish checkPublish);
+
+ /**
+ * 鍒犻櫎鑰冩牳鍙戝竷
+ *
+ * @param id 鑰冩牳鍙戝竷涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteCheckPublishById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳鍙戝竷
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteCheckPublishByIds(Long[] ids);
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckResultMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckResultMapper.java
index 9b3228d..0f14310 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckResultMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckResultMapper.java
@@ -1,29 +1,62 @@
package com.ycl.platform.mapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.platform.domain.entity.CheckResult;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.platform.domain.query.CheckResultQuery;
-import com.ycl.platform.domain.vo.CheckResultVO;
-import com.ycl.platform.domain.form.CheckResultForm;
+
import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
/**
- * 鑰冩牳缁撴灉 Mapper 鎺ュ彛
- *
- * @author xp
- * @since 2024-03-07
+ * 鑰冩牳缁撴灉Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Mapper
-public interface CheckResultMapper extends BaseMapper<CheckResult> {
+public interface CheckResultMapper
+{
+ /**
+ * 鏌ヨ鑰冩牳缁撴灉
+ *
+ * @param id 鑰冩牳缁撴灉涓婚敭
+ * @return 鑰冩牳缁撴灉
+ */
+ public CheckResult selectCheckResultById(Long id);
/**
- * 鍒嗛〉
- * @param page
- * @param query
+ * 鏌ヨ鑰冩牳缁撴灉鍒楄〃
+ *
+ * @param checkResult 鑰冩牳缁撴灉
+ * @return 鑰冩牳缁撴灉闆嗗悎
*/
- Page page(IPage page, @Param("query") CheckResultQuery query);
+ public List<CheckResult> selectCheckResultList(CheckResult checkResult);
+
+ /**
+ * 鏂板鑰冩牳缁撴灉
+ *
+ * @param checkResult 鑰冩牳缁撴灉
+ * @return 缁撴灉
+ */
+ public int insertCheckResult(CheckResult checkResult);
+
+ /**
+ * 淇敼鑰冩牳缁撴灉
+ *
+ * @param checkResult 鑰冩牳缁撴灉
+ * @return 缁撴灉
+ */
+ public int updateCheckResult(CheckResult checkResult);
+
+ /**
+ * 鍒犻櫎鑰冩牳缁撴灉
+ *
+ * @param id 鑰冩牳缁撴灉涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteCheckResultById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳缁撴灉
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteCheckResultByIds(Long[] ids);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java
index 44c50ee..f3b4016 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java
@@ -1,19 +1,62 @@
package com.ycl.platform.mapper;
import com.ycl.platform.domain.entity.CheckRule;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.platform.domain.vo.CheckRuleVO;
-import com.ycl.platform.domain.form.CheckRuleForm;
+
import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
/**
- * 鑰冩牳瑙勫垯 Mapper 鎺ュ彛
- *
- * @author xp
- * @since 2024-03-06
+ * 鑰冩牳瑙勫垯Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Mapper
-public interface CheckRuleMapper extends BaseMapper<CheckRule> {
+public interface CheckRuleMapper
+{
+ /**
+ * 鏌ヨ鑰冩牳瑙勫垯
+ *
+ * @param id 鑰冩牳瑙勫垯涓婚敭
+ * @return 鑰冩牳瑙勫垯
+ */
+ public CheckRule selectCheckRuleById(Long id);
+ /**
+ * 鏌ヨ鑰冩牳瑙勫垯鍒楄〃
+ *
+ * @param checkRule 鑰冩牳瑙勫垯
+ * @return 鑰冩牳瑙勫垯闆嗗悎
+ */
+ public List<CheckRule> selectCheckRuleList(CheckRule checkRule);
+
+ /**
+ * 鏂板鑰冩牳瑙勫垯
+ *
+ * @param checkRule 鑰冩牳瑙勫垯
+ * @return 缁撴灉
+ */
+ public int insertCheckRule(CheckRule checkRule);
+
+ /**
+ * 淇敼鑰冩牳瑙勫垯
+ *
+ * @param checkRule 鑰冩牳瑙勫垯
+ * @return 缁撴灉
+ */
+ public int updateCheckRule(CheckRule checkRule);
+
+ /**
+ * 鍒犻櫎鑰冩牳瑙勫垯
+ *
+ * @param id 鑰冩牳瑙勫垯涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteCheckRuleById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳瑙勫垯
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteCheckRuleByIds(Long[] ids);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java
new file mode 100644
index 0000000..1ea0740
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.CheckScore;
+
+import java.util.List;
+
+/**
+ * 鑰冩牳绉垎鏄庣粏Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface CheckScoreMapper
+{
+ /**
+ * 鏌ヨ鑰冩牳绉垎鏄庣粏
+ *
+ * @param id 鑰冩牳绉垎鏄庣粏涓婚敭
+ * @return 鑰冩牳绉垎鏄庣粏
+ */
+ public CheckScore selectCheckScoreById(Long id);
+
+ /**
+ * 鏌ヨ鑰冩牳绉垎鏄庣粏鍒楄〃
+ *
+ * @param checkScore 鑰冩牳绉垎鏄庣粏
+ * @return 鑰冩牳绉垎鏄庣粏闆嗗悎
+ */
+ public List<CheckScore> selectCheckScoreList(CheckScore checkScore);
+
+ /**
+ * 鏂板鑰冩牳绉垎鏄庣粏
+ *
+ * @param checkScore 鑰冩牳绉垎鏄庣粏
+ * @return 缁撴灉
+ */
+ public int insertCheckScore(CheckScore checkScore);
+
+ /**
+ * 淇敼鑰冩牳绉垎鏄庣粏
+ *
+ * @param checkScore 鑰冩牳绉垎鏄庣粏
+ * @return 缁撴灉
+ */
+ public int updateCheckScore(CheckScore checkScore);
+
+ /**
+ * 鍒犻櫎鑰冩牳绉垎鏄庣粏
+ *
+ * @param id 鑰冩牳绉垎鏄庣粏涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteCheckScoreById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳绉垎鏄庣粏
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteCheckScoreByIds(Long[] ids);
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java
index ca49830..8cbfb63 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java
@@ -1,19 +1,62 @@
package com.ycl.platform.mapper;
import com.ycl.platform.domain.entity.CheckTemplate;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.platform.domain.vo.CheckTemplateVO;
-import com.ycl.platform.domain.form.CheckTemplateForm;
+
import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
/**
- * 鑰冩牳妯℃澘 Mapper 鎺ュ彛
- *
- * @author xp
- * @since 2024-03-06
+ * 鑰冩牳妯℃澘Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Mapper
-public interface CheckTemplateMapper extends BaseMapper<CheckTemplate> {
+public interface CheckTemplateMapper
+{
+ /**
+ * 鏌ヨ鑰冩牳妯℃澘
+ *
+ * @param id 鑰冩牳妯℃澘涓婚敭
+ * @return 鑰冩牳妯℃澘
+ */
+ public CheckTemplate selectCheckTemplateById(Long id);
+ /**
+ * 鏌ヨ鑰冩牳妯℃澘鍒楄〃
+ *
+ * @param checkTemplate 鑰冩牳妯℃澘
+ * @return 鑰冩牳妯℃澘闆嗗悎
+ */
+ public List<CheckTemplate> selectCheckTemplateList(CheckTemplate checkTemplate);
+
+ /**
+ * 鏂板鑰冩牳妯℃澘
+ *
+ * @param checkTemplate 鑰冩牳妯℃澘
+ * @return 缁撴灉
+ */
+ public int insertCheckTemplate(CheckTemplate checkTemplate);
+
+ /**
+ * 淇敼鑰冩牳妯℃澘
+ *
+ * @param checkTemplate 鑰冩牳妯℃澘
+ * @return 缁撴灉
+ */
+ public int updateCheckTemplate(CheckTemplate checkTemplate);
+
+ /**
+ * 鍒犻櫎鑰冩牳妯℃澘
+ *
+ * @param id 鑰冩牳妯℃澘涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteCheckTemplateById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳妯℃澘
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteCheckTemplateByIds(Long[] ids);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateRuleMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateRuleMapper.java
index d7e1ad2..3bf44a8 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateRuleMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateRuleMapper.java
@@ -1,13 +1,62 @@
package com.ycl.platform.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.entity.CheckTemplateRule;
-import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
/**
- * @author锛歺p
- * @date锛�2024/3/8 9:18
+ * 鑰冩牳妯℃澘-瑙勫垯涓棿Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Mapper
-public interface CheckTemplateRuleMapper extends BaseMapper<CheckTemplateRule> {
+public interface CheckTemplateRuleMapper
+{
+ /**
+ * 鏌ヨ鑰冩牳妯℃澘-瑙勫垯涓棿
+ *
+ * @param id 鑰冩牳妯℃澘-瑙勫垯涓棿涓婚敭
+ * @return 鑰冩牳妯℃澘-瑙勫垯涓棿
+ */
+ public CheckTemplateRule selectCheckTemplateRuleById(Long id);
+
+ /**
+ * 鏌ヨ鑰冩牳妯℃澘-瑙勫垯涓棿鍒楄〃
+ *
+ * @param checkTemplateRule 鑰冩牳妯℃澘-瑙勫垯涓棿
+ * @return 鑰冩牳妯℃澘-瑙勫垯涓棿闆嗗悎
+ */
+ public List<CheckTemplateRule> selectCheckTemplateRuleList(CheckTemplateRule checkTemplateRule);
+
+ /**
+ * 鏂板鑰冩牳妯℃澘-瑙勫垯涓棿
+ *
+ * @param checkTemplateRule 鑰冩牳妯℃澘-瑙勫垯涓棿
+ * @return 缁撴灉
+ */
+ public int insertCheckTemplateRule(CheckTemplateRule checkTemplateRule);
+
+ /**
+ * 淇敼鑰冩牳妯℃澘-瑙勫垯涓棿
+ *
+ * @param checkTemplateRule 鑰冩牳妯℃澘-瑙勫垯涓棿
+ * @return 缁撴灉
+ */
+ public int updateCheckTemplateRule(CheckTemplateRule checkTemplateRule);
+
+ /**
+ * 鍒犻櫎鑰冩牳妯℃澘-瑙勫垯涓棿
+ *
+ * @param id 鑰冩牳妯℃澘-瑙勫垯涓棿涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteCheckTemplateRuleById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳妯℃澘-瑙勫垯涓棿
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteCheckTemplateRuleByIds(Long[] ids);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultAuditingMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultAuditingMapper.java
deleted file mode 100644
index 2b76016..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultAuditingMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ycl.platform.mapper;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ycl.platform.domain.entity.DefaultAuditing;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.platform.domain.query.DefaultAuditingQuery;
-import com.ycl.platform.domain.vo.DefaultAuditingVO;
-import com.ycl.platform.domain.form.DefaultAuditingForm;
-import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 杩濊瀹℃牳 Mapper 鎺ュ彛
- *
- * @author xp
- * @since 2024-03-05
- */
-@Mapper
-public interface DefaultAuditingMapper extends BaseMapper<DefaultAuditing> {
-
- Page page(IPage page, @Param("query") DefaultAuditingQuery query);
-}
-
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
new file mode 100644
index 0000000..c8ea8ab
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultPublishMapper.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.DefaultPublish;
+
+import java.util.List;
+
+/**
+ * 鍚堝悓鑰冩牳鍙戝竷Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface DefaultPublishMapper
+{
+ /**
+ * 鏌ヨ鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭
+ * @return 鍚堝悓鑰冩牳鍙戝竷
+ */
+ public DefaultPublish selectDefaultPublishById(Long id);
+
+ /**
+ * 鏌ヨ鍚堝悓鑰冩牳鍙戝竷鍒楄〃
+ *
+ * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ * @return 鍚堝悓鑰冩牳鍙戝竷闆嗗悎
+ */
+ public List<DefaultPublish> selectDefaultPublishList(DefaultPublish defaultPublish);
+
+ /**
+ * 鏂板鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ * @return 缁撴灉
+ */
+ public int insertDefaultPublish(DefaultPublish defaultPublish);
+
+ /**
+ * 淇敼鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ * @return 缁撴灉
+ */
+ public int updateDefaultPublish(DefaultPublish defaultPublish);
+
+ /**
+ * 鍒犻櫎鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @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/DefaultResultMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultResultMapper.java
new file mode 100644
index 0000000..1db462f
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultResultMapper.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.DefaultResult;
+
+import java.util.List;
+
+/**
+ * 鍚堝悓鑰冩牳缁撴灉Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface DefaultResultMapper
+{
+ /**
+ * 鏌ヨ鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
+ * @return 鍚堝悓鑰冩牳缁撴灉
+ */
+ public DefaultResult selectDefaultResultById(Long id);
+
+ /**
+ * 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃
+ *
+ * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ * @return 鍚堝悓鑰冩牳缁撴灉闆嗗悎
+ */
+ public List<DefaultResult> selectDefaultResultList(DefaultResult defaultResult);
+
+ /**
+ * 鏂板鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ * @return 缁撴灉
+ */
+ public int insertDefaultResult(DefaultResult defaultResult);
+
+ /**
+ * 淇敼鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ * @return 缁撴灉
+ */
+ public int updateDefaultResult(DefaultResult defaultResult);
+
+ /**
+ * 鍒犻櫎鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteDefaultResultById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteDefaultResultByIds(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
index a3e18e3..bf19a90 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java
@@ -1,19 +1,62 @@
package com.ycl.platform.mapper;
import com.ycl.platform.domain.entity.DefaultRule;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.platform.domain.vo.DefaultRuleVO;
-import com.ycl.platform.domain.form.DefaultRuleForm;
+
import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
/**
- * 杩濈害瑙勫垯 Mapper 鎺ュ彛
- *
- * @author xp
- * @since 2024-03-05
+ * 杩濈害瑙勫垯Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Mapper
-public interface DefaultRuleMapper extends BaseMapper<DefaultRule> {
+public interface DefaultRuleMapper
+{
+ /**
+ * 鏌ヨ杩濈害瑙勫垯
+ *
+ * @param id 杩濈害瑙勫垯涓婚敭
+ * @return 杩濈害瑙勫垯
+ */
+ public DefaultRule selectDefaultRuleById(Long id);
+ /**
+ * 鏌ヨ杩濈害瑙勫垯鍒楄〃
+ *
+ * @param defaultRule 杩濈害瑙勫垯
+ * @return 杩濈害瑙勫垯闆嗗悎
+ */
+ public List<DefaultRule> selectDefaultRuleList(DefaultRule defaultRule);
+
+ /**
+ * 鏂板杩濈害瑙勫垯
+ *
+ * @param defaultRule 杩濈害瑙勫垯
+ * @return 缁撴灉
+ */
+ public int insertDefaultRule(DefaultRule defaultRule);
+
+ /**
+ * 淇敼杩濈害瑙勫垯
+ *
+ * @param defaultRule 杩濈害瑙勫垯
+ * @return 缁撴灉
+ */
+ public int updateDefaultRule(DefaultRule defaultRule);
+
+ /**
+ * 鍒犻櫎杩濈害瑙勫垯
+ *
+ * @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/DefaultScoreMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultScoreMapper.java
new file mode 100644
index 0000000..a6f50d7
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultScoreMapper.java
@@ -0,0 +1,61 @@
+package com.ycl.platform.mapper;
+
+import java.util.List;
+import com.ycl.platform.domain.entity.DefaultScore;
+
+/**
+ * 鍚堝悓鎵撳垎Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface DefaultScoreMapper
+{
+ /**
+ * 鏌ヨ鍚堝悓鎵撳垎
+ *
+ * @param id 鍚堝悓鎵撳垎涓婚敭
+ * @return 鍚堝悓鎵撳垎
+ */
+ public DefaultScore selectDefaultScoreById(Long id);
+
+ /**
+ * 鏌ヨ鍚堝悓鎵撳垎鍒楄〃
+ *
+ * @param defaultScore 鍚堝悓鎵撳垎
+ * @return 鍚堝悓鎵撳垎闆嗗悎
+ */
+ public List<DefaultScore> selectDefaultScoreList(DefaultScore defaultScore);
+
+ /**
+ * 鏂板鍚堝悓鎵撳垎
+ *
+ * @param defaultScore 鍚堝悓鎵撳垎
+ * @return 缁撴灉
+ */
+ public int insertDefaultScore(DefaultScore defaultScore);
+
+ /**
+ * 淇敼鍚堝悓鎵撳垎
+ *
+ * @param defaultScore 鍚堝悓鎵撳垎
+ * @return 缁撴灉
+ */
+ public int updateDefaultScore(DefaultScore defaultScore);
+
+ /**
+ * 鍒犻櫎鍚堝悓鎵撳垎
+ *
+ * @param id 鍚堝悓鎵撳垎涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteDefaultScoreById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鍚堝悓鎵撳垎
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteDefaultScoreByIds(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
new file mode 100644
index 0000000..7c3ac7f
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultTemplateMapper.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.DefaultTemplate;
+
+import java.util.List;
+
+/**
+ * 杩濈害瑙勫垯妯℃澘Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface DefaultTemplateMapper
+{
+ /**
+ * 鏌ヨ杩濈害瑙勫垯妯℃澘
+ *
+ * @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
new file mode 100644
index 0000000..6c3ab59
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultTemplateRuleMapper.java
@@ -0,0 +1,62 @@
+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/mapper/TCheckPublishMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TCheckPublishMapper.java
deleted file mode 100644
index 3e3bac1..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/TCheckPublishMapper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ycl.platform.mapper;
-
-import com.ycl.platform.domain.entity.TCheckPublish;
-
-import java.util.List;
-
-/**
- * 鑰冩牳鍙戝竷Mapper鎺ュ彛
- *
- * @author ruoyi
- * @date 2024-03-07
- */
-public interface TCheckPublishMapper
-{
- /**
- * 鏌ヨ鑰冩牳鍙戝竷
- *
- * @param id 鑰冩牳鍙戝竷涓婚敭
- * @return 鑰冩牳鍙戝竷
- */
- public TCheckPublish selectTCheckPublishById(Long id);
-
- /**
- * 鏌ヨ鑰冩牳鍙戝竷鍒楄〃
- *
- * @param tCheckPublish 鑰冩牳鍙戝竷
- * @return 鑰冩牳鍙戝竷闆嗗悎
- */
- public List<TCheckPublish> selectTCheckPublishList(TCheckPublish tCheckPublish);
-
- /**
- * 鏂板鑰冩牳鍙戝竷
- *
- * @param tCheckPublish 鑰冩牳鍙戝竷
- * @return 缁撴灉
- */
- public int insertTCheckPublish(TCheckPublish tCheckPublish);
-
- /**
- * 淇敼鑰冩牳鍙戝竷
- *
- * @param tCheckPublish 鑰冩牳鍙戝竷
- * @return 缁撴灉
- */
- public int updateTCheckPublish(TCheckPublish tCheckPublish);
-
- /**
- * 鍒犻櫎鑰冩牳鍙戝竷
- *
- * @param id 鑰冩牳鍙戝竷涓婚敭
- * @return 缁撴灉
- */
- public int deleteTCheckPublishById(Long id);
-
- /**
- * 鎵归噺鍒犻櫎鑰冩牳鍙戝竷
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteTCheckPublishByIds(Long[] ids);
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/TExamineScoreMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TExamineScoreMapper.java
deleted file mode 100644
index 007f23c..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/TExamineScoreMapper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.ycl.platform.mapper;
-
-import com.ycl.platform.domain.entity.TExamineScore;
-import com.ycl.platform.domain.vo.TExamineScoreVO;
-
-import java.util.List;
-
-/**
- * 鑰冩牳璁″垎Mapper鎺ュ彛
- *
- * @author ruoyi
- * @date 2024-03-13
- */
-public interface TExamineScoreMapper
-{
- /**
- * 鏌ヨ鑰冩牳璁″垎
- *
- * @param id 鑰冩牳璁″垎涓婚敭
- * @return 鑰冩牳璁″垎
- */
- public TExamineScore selectTExamineScoreById(Long id);
-
- /**
- * 鏌ヨ鑰冩牳璁″垎鍒楄〃
- *
- * @param tExamineScore 鑰冩牳璁″垎
- * @return 鑰冩牳璁″垎闆嗗悎
- */
- public List<TExamineScoreVO> selectTExamineScoreList(TExamineScore tExamineScore);
-
- /**
- * 鏂板鑰冩牳璁″垎
- *
- * @param tExamineScore 鑰冩牳璁″垎
- * @return 缁撴灉
- */
- public int insertTExamineScore(TExamineScore tExamineScore);
-
- /**
- * 淇敼鑰冩牳璁″垎
- *
- * @param tExamineScore 鑰冩牳璁″垎
- * @return 缁撴灉
- */
- public int updateTExamineScore(TExamineScore tExamineScore);
-
- /**
- * 鍒犻櫎鑰冩牳璁″垎
- *
- * @param id 鑰冩牳璁″垎涓婚敭
- * @return 缁撴灉
- */
- public int deleteTExamineScoreById(Long id);
-
- /**
- * 鎵归噺鍒犻櫎鑰冩牳璁″垎
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteTExamineScoreByIds(Long[] ids);
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/CheckResultService.java b/ycl-server/src/main/java/com/ycl/platform/service/CheckResultService.java
deleted file mode 100644
index d89025d..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/service/CheckResultService.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.ycl.platform.service;
-
-import com.ycl.platform.domain.entity.CheckResult;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.platform.domain.form.ManualScoreForm;
-import com.ycl.system.Result;
-import com.ycl.platform.domain.form.CheckResultForm;
-import com.ycl.platform.domain.query.CheckResultQuery;
-import java.util.List;
-
-/**
- * 鑰冩牳缁撴灉 鏈嶅姟绫�
- *
- * @author xp
- * @since 2024-03-07
- */
-public interface CheckResultService extends IService<CheckResult> {
-
- /**
- * 娣诲姞
- * @param form
- * @return
- */
- Result add(CheckResultForm form);
-
- /**
- * 淇敼
- * @param form
- * @return
- */
- Result update(CheckResultForm form);
-
- /**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
- */
- Result remove(List<String> ids);
-
- /**
- * id鍒犻櫎
- * @param id
- * @return
- */
- Result removeById(String id);
-
- /**
- * 鍒嗛〉鏌ヨ
- * @param query
- * @return
- */
- Result page(CheckResultQuery query);
-
- /**
- * 鏍规嵁id鏌ユ壘
- * @param id
- * @return
- */
- Result detail(String id);
-
- /**
- * 鍒楄〃
- * @return
- */
- Result all();
-
- /**
- * 浜哄伐鎵撳垎
- * @param form
- * @return
- */
- Result manualScore(ManualScoreForm form);
-
- /**
- * id鍙戝竷
- * @param id
- * @return
- */
- Result publishById(String id);
-
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/CheckRuleService.java b/ycl-server/src/main/java/com/ycl/platform/service/CheckRuleService.java
deleted file mode 100644
index 8c0de70..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/service/CheckRuleService.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.ycl.platform.service;
-
-import com.ycl.platform.domain.entity.CheckRule;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.system.Result;
-import com.ycl.platform.domain.form.CheckRuleForm;
-import com.ycl.platform.domain.query.CheckRuleQuery;
-import java.util.List;
-
-/**
- * 鑰冩牳瑙勫垯 鏈嶅姟绫�
- *
- * @author xp
- * @since 2024-03-06
- */
-public interface CheckRuleService extends IService<CheckRule> {
-
- /**
- * 娣诲姞
- * @param form
- * @return
- */
- Result add(CheckRuleForm form);
-
- /**
- * 淇敼
- * @param form
- * @return
- */
- Result update(CheckRuleForm form);
-
- /**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
- */
- Result remove(List<String> ids);
-
- /**
- * id鍒犻櫎
- * @param id
- * @return
- */
- Result removeById(String id);
-
- /**
- * 鍒嗛〉鏌ヨ
- * @param query
- * @return
- */
- Result page(CheckRuleQuery query);
-
- /**
- * 鏍规嵁id鏌ユ壘
- * @param id
- * @return
- */
- Result detail(String id);
-
- /**
- * 鍒楄〃
- * @return
- */
- Result all();
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/CheckTemplateService.java b/ycl-server/src/main/java/com/ycl/platform/service/CheckTemplateService.java
deleted file mode 100644
index d6b845c..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/service/CheckTemplateService.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.ycl.platform.service;
-
-import com.ycl.platform.domain.entity.CheckTemplate;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.system.Result;
-import com.ycl.platform.domain.form.CheckTemplateForm;
-import com.ycl.platform.domain.query.CheckTemplateQuery;
-import java.util.List;
-
-/**
- * 鑰冩牳妯℃澘 鏈嶅姟绫�
- *
- * @author xp
- * @since 2024-03-06
- */
-public interface CheckTemplateService extends IService<CheckTemplate> {
-
- /**
- * 娣诲姞
- * @param form
- * @return
- */
- Result add(CheckTemplateForm form);
-
- /**
- * 淇敼
- * @param form
- * @return
- */
- Result update(CheckTemplateForm form);
-
- /**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
- */
- Result remove(List<String> ids);
-
- /**
- * id鍒犻櫎
- * @param id
- * @return
- */
- Result removeById(String id);
-
- /**
- * 鍒嗛〉鏌ヨ
- * @param query
- * @return
- */
- Result page(CheckTemplateQuery query);
-
- /**
- * 鏍规嵁id鏌ユ壘
- * @param id
- * @return
- */
- Result detail(String id);
-
- /**
- * 鍒楄〃
- * @return
- */
- Result all();
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/DefaultAuditingService.java b/ycl-server/src/main/java/com/ycl/platform/service/DefaultAuditingService.java
deleted file mode 100644
index 39906f9..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/service/DefaultAuditingService.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.ycl.platform.service;
-
-import com.ycl.platform.domain.entity.DefaultAuditing;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.platform.domain.form.DefaultAuditForm;
-import com.ycl.system.Result;
-import com.ycl.platform.domain.form.DefaultAuditingForm;
-import com.ycl.platform.domain.query.DefaultAuditingQuery;
-import java.util.List;
-
-/**
- * 杩濊瀹℃牳 鏈嶅姟绫�
- *
- * @author xp
- * @since 2024-03-05
- */
-public interface DefaultAuditingService extends IService<DefaultAuditing> {
-
- /**
- * 娣诲姞
- * @param form
- * @return
- */
- Result add(DefaultAuditingForm form);
-
- /**
- * 淇敼
- * @param form
- * @return
- */
- Result update(DefaultAuditingForm form);
-
- /**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
- */
- Result remove(List<String> ids);
-
- /**
- * id鍒犻櫎
- * @param id
- * @return
- */
- Result removeById(String id);
-
- /**
- * 鍒嗛〉鏌ヨ
- * @param query
- * @return
- */
- Result page(DefaultAuditingQuery query);
-
- /**
- * 鏍规嵁id鏌ユ壘
- * @param id
- * @return
- */
- Result detail(String id);
-
- /**
- * 鍒楄〃
- * @return
- */
- Result all();
-
- /**
- * 瀹℃牳
- * @param form
- * @return
- */
- Result auditing(DefaultAuditForm form);
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/DefaultRuleService.java b/ycl-server/src/main/java/com/ycl/platform/service/DefaultRuleService.java
deleted file mode 100644
index b6fc9f7..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/service/DefaultRuleService.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.ycl.platform.service;
-
-import com.ycl.platform.domain.entity.DefaultRule;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.platform.domain.form.DefaultRuleSetForm;
-import com.ycl.system.Result;
-import com.ycl.platform.domain.form.DefaultRuleForm;
-import com.ycl.platform.domain.query.DefaultRuleQuery;
-import java.util.List;
-
-/**
- * 杩濈害瑙勫垯 鏈嶅姟绫�
- *
- * @author xp
- * @since 2024-03-05
- */
-public interface DefaultRuleService extends IService<DefaultRule> {
-
- /**
- * 娣诲姞
- * @param form
- * @return
- */
- Result add(DefaultRuleForm form);
-
- /**
- * 淇敼
- * @param form
- * @return
- */
- Result update(DefaultRuleForm form);
-
- /**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
- */
- Result remove(List<String> ids);
-
- /**
- * id鍒犻櫎
- * @param id
- * @return
- */
- Result removeById(String id);
-
- /**
- * 鍒嗛〉鏌ヨ
- * @param query
- * @return
- */
- Result page(DefaultRuleQuery query);
-
- /**
- * 鏍规嵁id鏌ユ壘
- * @param id
- * @return
- */
- Result detail(String id);
-
- /**
- * 鍒楄〃
- * @return
- */
- Result all();
-
- /**
- * 鍚敤/鍋滅敤
- * @param form
- * @return
- */
- Result set(DefaultRuleSetForm form);
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IAccountingRulesService.java b/ycl-server/src/main/java/com/ycl/platform/service/IAccountingRulesService.java
deleted file mode 100644
index c65edf7..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/service/IAccountingRulesService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ycl.platform.service;
-
-
-import com.ycl.platform.domain.entity.AccountingRules;
-
-import java.util.List;
-
-/**
- * 鏍哥畻瑙勫垯Service鎺ュ彛
- *
- * @author gonghl
- * @date 2024-03-21
- */
-public interface IAccountingRulesService {
- /**
- * 鏌ヨ鏍哥畻瑙勫垯
- *
- * @param id 鏍哥畻瑙勫垯涓婚敭
- * @return 鏍哥畻瑙勫垯
- */
- public AccountingRules selectAccountingRulesById(Integer id);
-
- /**
- * 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
- *
- * @param accountingRules 鏍哥畻瑙勫垯
- * @return 鏍哥畻瑙勫垯闆嗗悎
- */
- public List<AccountingRules> selectAccountingRulesList(AccountingRules accountingRules);
-
- /**
- * 鏂板鏍哥畻瑙勫垯
- *
- * @param accountingRules 鏍哥畻瑙勫垯
- * @return 缁撴灉
- */
- public int insertAccountingRules(AccountingRules accountingRules);
-
- /**
- * 淇敼鏍哥畻瑙勫垯
- *
- * @param accountingRules 鏍哥畻瑙勫垯
- * @return 缁撴灉
- */
- public int updateAccountingRules(AccountingRules accountingRules);
-
- /**
- * 鎵归噺鍒犻櫎鏍哥畻瑙勫垯
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏍哥畻瑙勫垯涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteAccountingRulesByIds(Integer[] ids);
-
- /**
- * 鍒犻櫎鏍哥畻瑙勫垯淇℃伅
- *
- * @param id 鏍哥畻瑙勫垯涓婚敭
- * @return 缁撴灉
- */
- public int deleteAccountingRulesById(Integer 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
new file mode 100644
index 0000000..a6c3c03
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java
@@ -0,0 +1,62 @@
+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 ICalculateRuleService
+{
+ /**
+ * 鏌ヨ鏍哥畻瑙勫垯
+ *
+ * @param id 鏍哥畻瑙勫垯涓婚敭
+ * @return 鏍哥畻瑙勫垯
+ */
+ public CalculateRule selectCalculateRuleById(Long id);
+
+ /**
+ * 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
+ *
+ * @param calculateRule 鏍哥畻瑙勫垯
+ * @return 鏍哥畻瑙勫垯闆嗗悎
+ */
+ public List<CalculateRule> selectCalculateRuleList(CalculateRule calculateRule);
+
+ /**
+ * 鏂板鏍哥畻瑙勫垯
+ *
+ * @param calculateRule 鏍哥畻瑙勫垯
+ * @return 缁撴灉
+ */
+ public int insertCalculateRule(CalculateRule calculateRule);
+
+ /**
+ * 淇敼鏍哥畻瑙勫垯
+ *
+ * @param calculateRule 鏍哥畻瑙勫垯
+ * @return 缁撴灉
+ */
+ public int updateCalculateRule(CalculateRule calculateRule);
+
+ /**
+ * 鎵归噺鍒犻櫎鏍哥畻瑙勫垯
+ *
+ * @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/ICheckPublishService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICheckPublishService.java
new file mode 100644
index 0000000..d71ba7f
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ICheckPublishService.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.CheckPublish;
+
+import java.util.List;
+
+/**
+ * 鑰冩牳鍙戝竷Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface ICheckPublishService
+{
+ /**
+ * 鏌ヨ鑰冩牳鍙戝竷
+ *
+ * @param id 鑰冩牳鍙戝竷涓婚敭
+ * @return 鑰冩牳鍙戝竷
+ */
+ public CheckPublish selectCheckPublishById(Long id);
+
+ /**
+ * 鏌ヨ鑰冩牳鍙戝竷鍒楄〃
+ *
+ * @param checkPublish 鑰冩牳鍙戝竷
+ * @return 鑰冩牳鍙戝竷闆嗗悎
+ */
+ public List<CheckPublish> selectCheckPublishList(CheckPublish checkPublish);
+
+ /**
+ * 鏂板鑰冩牳鍙戝竷
+ *
+ * @param checkPublish 鑰冩牳鍙戝竷
+ * @return 缁撴灉
+ */
+ public int insertCheckPublish(CheckPublish checkPublish);
+
+ /**
+ * 淇敼鑰冩牳鍙戝竷
+ *
+ * @param checkPublish 鑰冩牳鍙戝竷
+ * @return 缁撴灉
+ */
+ public int updateCheckPublish(CheckPublish checkPublish);
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳鍙戝竷
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳鍙戝竷涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteCheckPublishByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鑰冩牳鍙戝竷淇℃伅
+ *
+ * @param id 鑰冩牳鍙戝竷涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteCheckPublishById(Long id);
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICheckResultService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICheckResultService.java
new file mode 100644
index 0000000..fe0a755
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ICheckResultService.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.CheckResult;
+
+import java.util.List;
+
+/**
+ * 鑰冩牳缁撴灉Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface ICheckResultService
+{
+ /**
+ * 鏌ヨ鑰冩牳缁撴灉
+ *
+ * @param id 鑰冩牳缁撴灉涓婚敭
+ * @return 鑰冩牳缁撴灉
+ */
+ public CheckResult selectCheckResultById(Long id);
+
+ /**
+ * 鏌ヨ鑰冩牳缁撴灉鍒楄〃
+ *
+ * @param checkResult 鑰冩牳缁撴灉
+ * @return 鑰冩牳缁撴灉闆嗗悎
+ */
+ public List<CheckResult> selectCheckResultList(CheckResult checkResult);
+
+ /**
+ * 鏂板鑰冩牳缁撴灉
+ *
+ * @param checkResult 鑰冩牳缁撴灉
+ * @return 缁撴灉
+ */
+ public int insertCheckResult(CheckResult checkResult);
+
+ /**
+ * 淇敼鑰冩牳缁撴灉
+ *
+ * @param checkResult 鑰冩牳缁撴灉
+ * @return 缁撴灉
+ */
+ public int updateCheckResult(CheckResult checkResult);
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳缁撴灉
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳缁撴灉涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteCheckResultByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鑰冩牳缁撴灉淇℃伅
+ *
+ * @param id 鑰冩牳缁撴灉涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteCheckResultById(Long id);
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICheckRuleService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICheckRuleService.java
new file mode 100644
index 0000000..1d599fd
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ICheckRuleService.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.CheckRule;
+
+import java.util.List;
+
+/**
+ * 鑰冩牳瑙勫垯Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface ICheckRuleService
+{
+ /**
+ * 鏌ヨ鑰冩牳瑙勫垯
+ *
+ * @param id 鑰冩牳瑙勫垯涓婚敭
+ * @return 鑰冩牳瑙勫垯
+ */
+ public CheckRule selectCheckRuleById(Long id);
+
+ /**
+ * 鏌ヨ鑰冩牳瑙勫垯鍒楄〃
+ *
+ * @param checkRule 鑰冩牳瑙勫垯
+ * @return 鑰冩牳瑙勫垯闆嗗悎
+ */
+ public List<CheckRule> selectCheckRuleList(CheckRule checkRule);
+
+ /**
+ * 鏂板鑰冩牳瑙勫垯
+ *
+ * @param checkRule 鑰冩牳瑙勫垯
+ * @return 缁撴灉
+ */
+ public int insertCheckRule(CheckRule checkRule);
+
+ /**
+ * 淇敼鑰冩牳瑙勫垯
+ *
+ * @param checkRule 鑰冩牳瑙勫垯
+ * @return 缁撴灉
+ */
+ public int updateCheckRule(CheckRule checkRule);
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳瑙勫垯
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳瑙勫垯涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteCheckRuleByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鑰冩牳瑙勫垯淇℃伅
+ *
+ * @param id 鑰冩牳瑙勫垯涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteCheckRuleById(Long id);
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java
new file mode 100644
index 0000000..3d48876
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.CheckScore;
+
+import java.util.List;
+
+/**
+ * 鑰冩牳绉垎鏄庣粏Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface ICheckScoreService
+{
+ /**
+ * 鏌ヨ鑰冩牳绉垎鏄庣粏
+ *
+ * @param id 鑰冩牳绉垎鏄庣粏涓婚敭
+ * @return 鑰冩牳绉垎鏄庣粏
+ */
+ public CheckScore selectCheckScoreById(Long id);
+
+ /**
+ * 鏌ヨ鑰冩牳绉垎鏄庣粏鍒楄〃
+ *
+ * @param checkScore 鑰冩牳绉垎鏄庣粏
+ * @return 鑰冩牳绉垎鏄庣粏闆嗗悎
+ */
+ public List<CheckScore> selectCheckScoreList(CheckScore checkScore);
+
+ /**
+ * 鏂板鑰冩牳绉垎鏄庣粏
+ *
+ * @param checkScore 鑰冩牳绉垎鏄庣粏
+ * @return 缁撴灉
+ */
+ public int insertCheckScore(CheckScore checkScore);
+
+ /**
+ * 淇敼鑰冩牳绉垎鏄庣粏
+ *
+ * @param checkScore 鑰冩牳绉垎鏄庣粏
+ * @return 缁撴灉
+ */
+ public int updateCheckScore(CheckScore checkScore);
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳绉垎鏄庣粏
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳绉垎鏄庣粏涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteCheckScoreByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鑰冩牳绉垎鏄庣粏淇℃伅
+ *
+ * @param id 鑰冩牳绉垎鏄庣粏涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteCheckScoreById(Long id);
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateRuleService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateRuleService.java
new file mode 100644
index 0000000..e833e20
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateRuleService.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.CheckTemplateRule;
+
+import java.util.List;
+
+/**
+ * 鑰冩牳妯℃澘-瑙勫垯涓棿Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface ICheckTemplateRuleService
+{
+ /**
+ * 鏌ヨ鑰冩牳妯℃澘-瑙勫垯涓棿
+ *
+ * @param id 鑰冩牳妯℃澘-瑙勫垯涓棿涓婚敭
+ * @return 鑰冩牳妯℃澘-瑙勫垯涓棿
+ */
+ public CheckTemplateRule selectCheckTemplateRuleById(Long id);
+
+ /**
+ * 鏌ヨ鑰冩牳妯℃澘-瑙勫垯涓棿鍒楄〃
+ *
+ * @param checkTemplateRule 鑰冩牳妯℃澘-瑙勫垯涓棿
+ * @return 鑰冩牳妯℃澘-瑙勫垯涓棿闆嗗悎
+ */
+ public List<CheckTemplateRule> selectCheckTemplateRuleList(CheckTemplateRule checkTemplateRule);
+
+ /**
+ * 鏂板鑰冩牳妯℃澘-瑙勫垯涓棿
+ *
+ * @param checkTemplateRule 鑰冩牳妯℃澘-瑙勫垯涓棿
+ * @return 缁撴灉
+ */
+ public int insertCheckTemplateRule(CheckTemplateRule checkTemplateRule);
+
+ /**
+ * 淇敼鑰冩牳妯℃澘-瑙勫垯涓棿
+ *
+ * @param checkTemplateRule 鑰冩牳妯℃澘-瑙勫垯涓棿
+ * @return 缁撴灉
+ */
+ public int updateCheckTemplateRule(CheckTemplateRule checkTemplateRule);
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳妯℃澘-瑙勫垯涓棿
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳妯℃澘-瑙勫垯涓棿涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteCheckTemplateRuleByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鑰冩牳妯℃澘-瑙勫垯涓棿淇℃伅
+ *
+ * @param id 鑰冩牳妯℃澘-瑙勫垯涓棿涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteCheckTemplateRuleById(Long id);
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateService.java
new file mode 100644
index 0000000..6ce7191
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateService.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.CheckTemplate;
+
+import java.util.List;
+
+/**
+ * 鑰冩牳妯℃澘Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface ICheckTemplateService
+{
+ /**
+ * 鏌ヨ鑰冩牳妯℃澘
+ *
+ * @param id 鑰冩牳妯℃澘涓婚敭
+ * @return 鑰冩牳妯℃澘
+ */
+ public CheckTemplate selectCheckTemplateById(Long id);
+
+ /**
+ * 鏌ヨ鑰冩牳妯℃澘鍒楄〃
+ *
+ * @param checkTemplate 鑰冩牳妯℃澘
+ * @return 鑰冩牳妯℃澘闆嗗悎
+ */
+ public List<CheckTemplate> selectCheckTemplateList(CheckTemplate checkTemplate);
+
+ /**
+ * 鏂板鑰冩牳妯℃澘
+ *
+ * @param checkTemplate 鑰冩牳妯℃澘
+ * @return 缁撴灉
+ */
+ public int insertCheckTemplate(CheckTemplate checkTemplate);
+
+ /**
+ * 淇敼鑰冩牳妯℃澘
+ *
+ * @param checkTemplate 鑰冩牳妯℃澘
+ * @return 缁撴灉
+ */
+ public int updateCheckTemplate(CheckTemplate checkTemplate);
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳妯℃澘
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳妯℃澘涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteCheckTemplateByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鑰冩牳妯℃澘淇℃伅
+ *
+ * @param id 鑰冩牳妯℃澘涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteCheckTemplateById(Long id);
+}
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
new file mode 100644
index 0000000..b688726
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultPublishService.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.DefaultPublish;
+
+import java.util.List;
+
+/**
+ * 鍚堝悓鑰冩牳鍙戝竷Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface IDefaultPublishService
+{
+ /**
+ * 鏌ヨ鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭
+ * @return 鍚堝悓鑰冩牳鍙戝竷
+ */
+ public DefaultPublish selectDefaultPublishById(Long id);
+
+ /**
+ * 鏌ヨ鍚堝悓鑰冩牳鍙戝竷鍒楄〃
+ *
+ * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ * @return 鍚堝悓鑰冩牳鍙戝竷闆嗗悎
+ */
+ public List<DefaultPublish> selectDefaultPublishList(DefaultPublish defaultPublish);
+
+ /**
+ * 鏂板鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ * @return 缁撴灉
+ */
+ public int insertDefaultPublish(DefaultPublish defaultPublish);
+
+ /**
+ * 淇敼鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ * @return 缁撴灉
+ */
+ public int updateDefaultPublish(DefaultPublish defaultPublish);
+
+ /**
+ * 鎵归噺鍒犻櫎鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @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/IDefaultResultService.java b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultResultService.java
new file mode 100644
index 0000000..d7d685a
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultResultService.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.DefaultResult;
+
+import java.util.List;
+
+/**
+ * 鍚堝悓鑰冩牳缁撴灉Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface IDefaultResultService
+{
+ /**
+ * 鏌ヨ鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
+ * @return 鍚堝悓鑰冩牳缁撴灉
+ */
+ public DefaultResult selectDefaultResultById(Long id);
+
+ /**
+ * 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃
+ *
+ * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ * @return 鍚堝悓鑰冩牳缁撴灉闆嗗悎
+ */
+ public List<DefaultResult> selectDefaultResultList(DefaultResult defaultResult);
+
+ /**
+ * 鏂板鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ * @return 缁撴灉
+ */
+ public int insertDefaultResult(DefaultResult defaultResult);
+
+ /**
+ * 淇敼鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ * @return 缁撴灉
+ */
+ public int updateDefaultResult(DefaultResult defaultResult);
+
+ /**
+ * 鎵归噺鍒犻櫎鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鍚堝悓鑰冩牳缁撴灉涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteDefaultResultByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鍚堝悓鑰冩牳缁撴灉淇℃伅
+ *
+ * @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteDefaultResultById(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
new file mode 100644
index 0000000..36281cf
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultRuleService.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.DefaultRule;
+
+import java.util.List;
+
+/**
+ * 杩濈害瑙勫垯Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface IDefaultRuleService
+{
+ /**
+ * 鏌ヨ杩濈害瑙勫垯
+ *
+ * @param id 杩濈害瑙勫垯涓婚敭
+ * @return 杩濈害瑙勫垯
+ */
+ public DefaultRule selectDefaultRuleById(Long id);
+
+ /**
+ * 鏌ヨ杩濈害瑙勫垯鍒楄〃
+ *
+ * @param defaultRule 杩濈害瑙勫垯
+ * @return 杩濈害瑙勫垯闆嗗悎
+ */
+ public List<DefaultRule> selectDefaultRuleList(DefaultRule defaultRule);
+
+ /**
+ * 鏂板杩濈害瑙勫垯
+ *
+ * @param defaultRule 杩濈害瑙勫垯
+ * @return 缁撴灉
+ */
+ public int insertDefaultRule(DefaultRule defaultRule);
+
+ /**
+ * 淇敼杩濈害瑙勫垯
+ *
+ * @param defaultRule 杩濈害瑙勫垯
+ * @return 缁撴灉
+ */
+ public int updateDefaultRule(DefaultRule defaultRule);
+
+ /**
+ * 鎵归噺鍒犻櫎杩濈害瑙勫垯
+ *
+ * @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/IDefaultScoreService.java b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultScoreService.java
new file mode 100644
index 0000000..8ede37d
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultScoreService.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.DefaultScore;
+
+import java.util.List;
+
+/**
+ * 鍚堝悓鎵撳垎Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+public interface IDefaultScoreService
+{
+ /**
+ * 鏌ヨ鍚堝悓鎵撳垎
+ *
+ * @param id 鍚堝悓鎵撳垎涓婚敭
+ * @return 鍚堝悓鎵撳垎
+ */
+ public DefaultScore selectDefaultScoreById(Long id);
+
+ /**
+ * 鏌ヨ鍚堝悓鎵撳垎鍒楄〃
+ *
+ * @param defaultScore 鍚堝悓鎵撳垎
+ * @return 鍚堝悓鎵撳垎闆嗗悎
+ */
+ public List<DefaultScore> selectDefaultScoreList(DefaultScore defaultScore);
+
+ /**
+ * 鏂板鍚堝悓鎵撳垎
+ *
+ * @param defaultScore 鍚堝悓鎵撳垎
+ * @return 缁撴灉
+ */
+ public int insertDefaultScore(DefaultScore defaultScore);
+
+ /**
+ * 淇敼鍚堝悓鎵撳垎
+ *
+ * @param defaultScore 鍚堝悓鎵撳垎
+ * @return 缁撴灉
+ */
+ public int updateDefaultScore(DefaultScore defaultScore);
+
+ /**
+ * 鎵归噺鍒犻櫎鍚堝悓鎵撳垎
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鍚堝悓鎵撳垎涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteDefaultScoreByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鍚堝悓鎵撳垎淇℃伅
+ *
+ * @param id 鍚堝悓鎵撳垎涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteDefaultScoreById(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
new file mode 100644
index 0000000..4799941
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultTemplateRuleService.java
@@ -0,0 +1,62 @@
+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
new file mode 100644
index 0000000..e10bcc7
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IDefaultTemplateService.java
@@ -0,0 +1,62 @@
+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/ITCheckPublishService.java b/ycl-server/src/main/java/com/ycl/platform/service/ITCheckPublishService.java
deleted file mode 100644
index fd416e4..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/service/ITCheckPublishService.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.ycl.platform.service;
-
-import com.ycl.platform.domain.entity.TCheckPublish;
-import com.ycl.system.Result;
-
-import java.util.List;
-
-/**
- * 鑰冩牳鍙戝竷Service鎺ュ彛
- *
- * @author ruoyi
- * @date 2024-03-07
- */
-public interface ITCheckPublishService
-{
- /**
- * 鏌ヨ鑰冩牳鍙戝竷
- *
- * @param id 鑰冩牳鍙戝竷涓婚敭
- * @return 鑰冩牳鍙戝竷
- */
- public TCheckPublish selectTCheckPublishById(Long id);
-
- /**
- * 鏌ヨ鑰冩牳鍙戝竷鍒楄〃
- *
- * @param tCheckPublish 鑰冩牳鍙戝竷
- * @return 鑰冩牳鍙戝竷闆嗗悎
- */
- public List<TCheckPublish> selectTCheckPublishList(TCheckPublish tCheckPublish);
-
- /**
- * 鏂板鑰冩牳鍙戝竷
- *
- * @param tCheckPublish 鑰冩牳鍙戝竷
- * @return 缁撴灉
- */
- public int insertTCheckPublish(TCheckPublish tCheckPublish);
-
- /**
- * 淇敼鑰冩牳鍙戝竷
- *
- * @param tCheckPublish 鑰冩牳鍙戝竷
- * @return 缁撴灉
- */
- public int updateTCheckPublish(TCheckPublish tCheckPublish);
-
- /**
- * 鎵归噺鍒犻櫎鑰冩牳鍙戝竷
- *
- * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳鍙戝竷涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteTCheckPublishByIds(Long[] ids);
-
- /**
- * 鍒犻櫎鑰冩牳鍙戝竷淇℃伅
- *
- * @param id 鑰冩牳鍙戝竷涓婚敭
- * @return 缁撴灉
- */
- public int deleteTCheckPublishById(Long id);
-
- Result all();
-
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ITExamineScoreService.java b/ycl-server/src/main/java/com/ycl/platform/service/ITExamineScoreService.java
deleted file mode 100644
index 6f31bc5..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/service/ITExamineScoreService.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.ycl.platform.service;
-
-import com.ycl.platform.domain.entity.TExamineScore;
-import com.ycl.platform.domain.vo.TExamineScoreVO;
-
-import java.util.List;
-
-/**
- * 鑰冩牳璁″垎Service鎺ュ彛
- *
- * @author ruoyi
- * @date 2024-03-13
- */
-public interface ITExamineScoreService
-{
- /**
- * 鏌ヨ鑰冩牳璁″垎
- *
- * @param id 鑰冩牳璁″垎涓婚敭
- * @return 鑰冩牳璁″垎
- */
- public TExamineScore selectTExamineScoreById(Long id);
-
- /**
- * 鏌ヨ鑰冩牳璁″垎鍒楄〃
- *
- * @param tExamineScore 鑰冩牳璁″垎
- * @return 鑰冩牳璁″垎闆嗗悎
- */
- public List<TExamineScoreVO> selectTExamineScoreList(TExamineScore tExamineScore);
-
- /**
- * 鏂板鑰冩牳璁″垎
- *
- * @param tExamineScore 鑰冩牳璁″垎
- * @return 缁撴灉
- */
- public int insertTExamineScore(TExamineScore tExamineScore);
-
- /**
- * 淇敼鑰冩牳璁″垎
- *
- * @param tExamineScore 鑰冩牳璁″垎
- * @return 缁撴灉
- */
- public int updateTExamineScore(TExamineScore tExamineScore);
-
- /**
- * 鎵归噺鍒犻櫎鑰冩牳璁″垎
- *
- * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳璁″垎涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteTExamineScoreByIds(Long[] ids);
-
- /**
- * 鍒犻櫎鑰冩牳璁″垎淇℃伅
- *
- * @param id 鑰冩牳璁″垎涓婚敭
- * @return 缁撴灉
- */
- public int deleteTExamineScoreById(Long id);
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/AccountingRulesServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/AccountingRulesServiceImpl.java
deleted file mode 100644
index 626a045..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/AccountingRulesServiceImpl.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.ycl.platform.service.impl;
-
-import com.ycl.platform.domain.entity.AccountingRules;
-import com.ycl.platform.mapper.AccountingRulesMapper;
-import com.ycl.platform.service.IAccountingRulesService;
-import com.ycl.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 鏍哥畻瑙勫垯Service涓氬姟灞傚鐞�
- *
- * @author gonghl
- * @date 2024-03-21
- */
-@Service
-public class AccountingRulesServiceImpl implements IAccountingRulesService {
- @Autowired
- private AccountingRulesMapper accountingRulesMapper;
-
- /**
- * 鏌ヨ鏍哥畻瑙勫垯
- *
- * @param id 鏍哥畻瑙勫垯涓婚敭
- * @return 鏍哥畻瑙勫垯
- */
- @Override
- public AccountingRules selectAccountingRulesById(Integer id) {
- return accountingRulesMapper.selectAccountingRulesById(id);
- }
-
- /**
- * 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
- *
- * @param accountingRules 鏍哥畻瑙勫垯
- * @return 鏍哥畻瑙勫垯
- */
- @Override
- public List<AccountingRules> selectAccountingRulesList(AccountingRules accountingRules) {
- return accountingRulesMapper.selectAccountingRulesList(accountingRules);
- }
-
- /**
- * 鏂板鏍哥畻瑙勫垯
- *
- * @param accountingRules 鏍哥畻瑙勫垯
- * @return 缁撴灉
- */
- @Override
- public int insertAccountingRules(AccountingRules accountingRules) {
- accountingRules.setCreateTime(DateUtils.getNowDate());
- accountingRules.setDeleted("0");
- return accountingRulesMapper.insertAccountingRules(accountingRules);
- }
-
- /**
- * 淇敼鏍哥畻瑙勫垯
- *
- * @param accountingRules 鏍哥畻瑙勫垯
- * @return 缁撴灉
- */
- @Override
- public int updateAccountingRules(AccountingRules accountingRules) {
- accountingRules.setUpdateTime(DateUtils.getNowDate());
- return accountingRulesMapper.updateAccountingRules(accountingRules);
- }
-
- /**
- * 鎵归噺鍒犻櫎鏍哥畻瑙勫垯
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏍哥畻瑙勫垯涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteAccountingRulesByIds(Integer[] ids) {
- return accountingRulesMapper.deleteAccountingRulesByIds(ids);
- }
-
- /**
- * 鍒犻櫎鏍哥畻瑙勫垯淇℃伅
- *
- * @param id 鏍哥畻瑙勫垯涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteAccountingRulesById(Integer id) {
- return accountingRulesMapper.deleteAccountingRulesById(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
new file mode 100644
index 0000000..bd960bb
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
@@ -0,0 +1,94 @@
+package com.ycl.platform.service.impl;
+
+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 java.util.List;
+
+/**
+ * 鏍哥畻瑙勫垯Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2024-04-01
+ */
+@Service
+public class CalculateRuleServiceImpl implements ICalculateRuleService
+{
+ @Autowired
+ private CalculateRuleMapper calculateRuleMapper;
+
+ /**
+ * 鏌ヨ鏍哥畻瑙勫垯
+ *
+ * @param id 鏍哥畻瑙勫垯涓婚敭
+ * @return 鏍哥畻瑙勫垯
+ */
+ @Override
+ public CalculateRule selectCalculateRuleById(Long id)
+ {
+ return calculateRuleMapper.selectCalculateRuleById(id);
+ }
+
+ /**
+ * 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
+ *
+ * @param calculateRule 鏍哥畻瑙勫垯
+ * @return 鏍哥畻瑙勫垯
+ */
+ @Override
+ public List<CalculateRule> selectCalculateRuleList(CalculateRule calculateRule)
+ {
+ return calculateRuleMapper.selectCalculateRuleList(calculateRule);
+ }
+
+ /**
+ * 鏂板鏍哥畻瑙勫垯
+ *
+ * @param calculateRule 鏍哥畻瑙勫垯
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertCalculateRule(CalculateRule calculateRule)
+ {
+ return calculateRuleMapper.insertCalculateRule(calculateRule);
+ }
+
+ /**
+ * 淇敼鏍哥畻瑙勫垯
+ *
+ * @param calculateRule 鏍哥畻瑙勫垯
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateCalculateRule(CalculateRule calculateRule)
+ {
+ return calculateRuleMapper.updateCalculateRule(calculateRule);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鏍哥畻瑙勫垯
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏍哥畻瑙勫垯涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteCalculateRuleByIds(Long[] ids)
+ {
+ return calculateRuleMapper.deleteCalculateRuleByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鏍哥畻瑙勫垯淇℃伅
+ *
+ * @param id 鏍哥畻瑙勫垯涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteCalculateRuleById(Long id)
+ {
+ return calculateRuleMapper.deleteCalculateRuleById(id);
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckPublishServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckPublishServiceImpl.java
new file mode 100644
index 0000000..b855ad4
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckPublishServiceImpl.java
@@ -0,0 +1,97 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.platform.domain.entity.CheckPublish;
+import com.ycl.platform.mapper.CheckPublishMapper;
+import com.ycl.platform.service.ICheckPublishService;
+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 CheckPublishServiceImpl implements ICheckPublishService
+{
+ @Autowired
+ private CheckPublishMapper checkPublishMapper;
+
+ /**
+ * 鏌ヨ鑰冩牳鍙戝竷
+ *
+ * @param id 鑰冩牳鍙戝竷涓婚敭
+ * @return 鑰冩牳鍙戝竷
+ */
+ @Override
+ public CheckPublish selectCheckPublishById(Long id)
+ {
+ return checkPublishMapper.selectCheckPublishById(id);
+ }
+
+ /**
+ * 鏌ヨ鑰冩牳鍙戝竷鍒楄〃
+ *
+ * @param checkPublish 鑰冩牳鍙戝竷
+ * @return 鑰冩牳鍙戝竷
+ */
+ @Override
+ public List<CheckPublish> selectCheckPublishList(CheckPublish checkPublish)
+ {
+ return checkPublishMapper.selectCheckPublishList(checkPublish);
+ }
+
+ /**
+ * 鏂板鑰冩牳鍙戝竷
+ *
+ * @param checkPublish 鑰冩牳鍙戝竷
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertCheckPublish(CheckPublish checkPublish)
+ {
+ checkPublish.setCreateTime(DateUtils.getNowDate());
+ return checkPublishMapper.insertCheckPublish(checkPublish);
+ }
+
+ /**
+ * 淇敼鑰冩牳鍙戝竷
+ *
+ * @param checkPublish 鑰冩牳鍙戝竷
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateCheckPublish(CheckPublish checkPublish)
+ {
+ checkPublish.setUpdateTime(DateUtils.getNowDate());
+ return checkPublishMapper.updateCheckPublish(checkPublish);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳鍙戝竷
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳鍙戝竷涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteCheckPublishByIds(Long[] ids)
+ {
+ return checkPublishMapper.deleteCheckPublishByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鑰冩牳鍙戝竷淇℃伅
+ *
+ * @param id 鑰冩牳鍙戝竷涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteCheckPublishById(Long id)
+ {
+ return checkPublishMapper.deleteCheckPublishById(id);
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java
index 870ff90..158bb36 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java
@@ -1,169 +1,96 @@
package com.ycl.platform.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.CheckResult;
-import com.ycl.platform.domain.form.ManualScoreForm;
import com.ycl.platform.mapper.CheckResultMapper;
-import com.ycl.platform.service.CheckResultService;
-import com.ycl.system.Result;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.form.CheckResultForm;
-import com.ycl.platform.domain.vo.CheckResultVO;
-import com.ycl.platform.domain.query.CheckResultQuery;
+import com.ycl.platform.service.ICheckResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import utils.DateUtils;
+
import java.util.List;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ycl.system.page.PageUtil;
-import org.springframework.stereotype.Service;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.beans.BeanUtils;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-import java.util.ArrayList;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import lombok.RequiredArgsConstructor;
-import org.springframework.util.StringUtils;
-
/**
- * 鑰冩牳缁撴灉 鏈嶅姟瀹炵幇绫�
- *
- * @author xp
- * @since 2024-03-07
+ * 鑰冩牳缁撴灉Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
@Service
-@RequiredArgsConstructor
-public class CheckResultServiceImpl extends ServiceImpl<CheckResultMapper, CheckResult> implements CheckResultService {
-
- private final CheckResultMapper checkResultMapper;
+public class CheckResultServiceImpl implements ICheckResultService
+{
+ @Autowired
+ private CheckResultMapper checkResultMapper;
/**
- * 娣诲姞
- * @param form
- * @return
+ * 鏌ヨ鑰冩牳缁撴灉
+ *
+ * @param id 鑰冩牳缁撴灉涓婚敭
+ * @return 鑰冩牳缁撴灉
*/
@Override
- public Result add(CheckResultForm form) {
- CheckResult entity = CheckResultForm.getEntityByForm(form, null);
- if(baseMapper.insert(entity) > 0) {
- return Result.ok("娣诲姞鎴愬姛");
- }
- return Result.error("娣诲姞澶辫触");
+ public CheckResult selectCheckResultById(Long id)
+ {
+ return checkResultMapper.selectCheckResultById(id);
}
/**
- * 淇敼
- * @param form
- * @return
+ * 鏌ヨ鑰冩牳缁撴灉鍒楄〃
+ *
+ * @param checkResult 鑰冩牳缁撴灉
+ * @return 鑰冩牳缁撴灉
*/
@Override
- public Result update(CheckResultForm form) {
-
- CheckResult entity = baseMapper.selectById(form.getId());
-
- // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- BeanUtils.copyProperties(form, entity);
- if (baseMapper.updateById(entity) > 0) {
- return Result.ok("淇敼鎴愬姛");
- }
- return Result.error("淇敼澶辫触");
+ public List<CheckResult> selectCheckResultList(CheckResult checkResult)
+ {
+ return checkResultMapper.selectCheckResultList(checkResult);
}
/**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
+ * 鏂板鑰冩牳缁撴灉
+ *
+ * @param checkResult 鑰冩牳缁撴灉
+ * @return 缁撴灉
*/
@Override
- public Result remove(List<String> ids) {
- if(baseMapper.deleteBatchIds(ids) > 0) {
- return Result.ok("鍒犻櫎鎴愬姛");
- }
- return Result.error("鍒犻櫎澶辫触");
+ public int insertCheckResult(CheckResult checkResult)
+ {
+ return checkResultMapper.insertCheckResult(checkResult);
}
/**
- * id鍒犻櫎
- * @param id
- * @return
+ * 淇敼鑰冩牳缁撴灉
+ *
+ * @param checkResult 鑰冩牳缁撴灉
+ * @return 缁撴灉
*/
@Override
- public Result removeById(String id) {
- if(baseMapper.deleteById(id) > 0) {
- return Result.ok("鍒犻櫎鎴愬姛");
- }
- return Result.error("鍒犻櫎澶辫触");
+ public int updateCheckResult(CheckResult checkResult)
+ {
+ checkResult.setUpdateTime(DateUtils.getNowDate());
+ return checkResultMapper.updateCheckResult(checkResult);
}
/**
- * 鍒嗛〉鏌ヨ
- * @param query
- * @return
+ * 鎵归噺鍒犻櫎鑰冩牳缁撴灉
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳缁撴灉涓婚敭
+ * @return 缁撴灉
*/
@Override
- public Result page(CheckResultQuery query) {
- query.setTime();
- IPage page = PageUtil.getPage(query, CheckResult.class);
- baseMapper.page(page, query);
- return Result.ok().data(page.getRecords()).total(page.getTotal());
+ public int deleteCheckResultByIds(Long[] ids)
+ {
+ return checkResultMapper.deleteCheckResultByIds(ids);
}
/**
- * 鏍规嵁id鏌ユ壘
- * @param id
- * @return
+ * 鍒犻櫎鑰冩牳缁撴灉淇℃伅
+ *
+ * @param id 鑰冩牳缁撴灉涓婚敭
+ * @return 缁撴灉
*/
@Override
- public Result detail(String id) {
-
- CheckResult entity = baseMapper.selectById(id);
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- CheckResultVO vo = CheckResultVO.getVoByEntity(entity, null);
- return Result.ok().data(vo);
- }
-
- /**
- * 鍒楄〃
- * @return
- */
- @Override
- public Result all() {
- List<CheckResult> entities = baseMapper.selectList(null);
- List<CheckResultVO> vos = entities.stream()
- .map(
- entity -> CheckResultVO.getVoByEntity(entity, null)
- )
- .collect(Collectors.toList());
- return Result.ok().data(vos);
- }
-
- @Override
- public Result manualScore(ManualScoreForm form) {
- CheckResult checkResult = baseMapper.selectById(form.getId());
- if (Objects.isNull(checkResult)) {
- throw new ServiceException("鑰冩牳缁撴灉涓嶅瓨鍦�");
- }
- checkResult.setManualScore(form.getManualScore());
- checkResult.setCheckScore(form.getManualScore().add(checkResult.getSystemScore()));
- baseMapper.updateById(checkResult);
- return Result.ok();
- }
-
- @Override
- public Result publishById(String id) {
- CheckResult checkResult = baseMapper.selectById(id);
- if(Objects.equals(1, checkResult.getPublish())) {
- checkResult.setPublish(0);
- } else {
- checkResult.setPublish(1);
- }
- if(baseMapper.updateById(checkResult) > 0) {
- return Result.ok("鍙戝竷鎴愬姛");
- }
- return Result.error("鍙戝竷澶辫触");
+ public int deleteCheckResultById(Long id)
+ {
+ return checkResultMapper.deleteCheckResultById(id);
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java
index 8374785..518e882 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java
@@ -1,161 +1,97 @@
package com.ycl.platform.service.impl;
-import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.CheckRule;
-import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.mapper.CheckRuleMapper;
-import com.ycl.platform.service.CheckRuleService;
-import com.ycl.system.Result;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.form.CheckRuleForm;
-import com.ycl.platform.domain.vo.CheckRuleVO;
-import com.ycl.platform.domain.query.CheckRuleQuery;
+import com.ycl.platform.service.ICheckRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import utils.DateUtils;
+
import java.util.List;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ycl.system.page.PageUtil;
-import com.ycl.utils.DateUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.beans.BeanUtils;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-import java.util.ArrayList;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import lombok.RequiredArgsConstructor;
-import org.springframework.util.StringUtils;
-
/**
- * 鑰冩牳瑙勫垯 鏈嶅姟瀹炵幇绫�
- *
- * @author xp
- * @since 2024-03-06
+ * 鑰冩牳瑙勫垯Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
@Service
-@RequiredArgsConstructor
-public class CheckRuleServiceImpl extends ServiceImpl<CheckRuleMapper, CheckRule> implements CheckRuleService {
-
- private final CheckRuleMapper checkRuleMapper;
+public class CheckRuleServiceImpl implements ICheckRuleService
+{
+ @Autowired
+ private CheckRuleMapper checkRuleMapper;
/**
- * 娣诲姞
- * @param form
- * @return
+ * 鏌ヨ鑰冩牳瑙勫垯
+ *
+ * @param id 鑰冩牳瑙勫垯涓婚敭
+ * @return 鑰冩牳瑙勫垯
*/
@Override
- public Result add(CheckRuleForm form) {
- CheckRule entity = CheckRuleForm.getEntityByForm(form, null);
- if(baseMapper.insert(entity) > 0) {
- return Result.ok("娣诲姞鎴愬姛");
- }
- return Result.error("娣诲姞澶辫触");
+ public CheckRule selectCheckRuleById(Long id)
+ {
+ return checkRuleMapper.selectCheckRuleById(id);
}
/**
- * 淇敼
- * @param form
- * @return
+ * 鏌ヨ鑰冩牳瑙勫垯鍒楄〃
+ *
+ * @param checkRule 鑰冩牳瑙勫垯
+ * @return 鑰冩牳瑙勫垯
*/
@Override
- public Result update(CheckRuleForm form) {
-
- CheckRule entity = baseMapper.selectById(form.getId());
-
- // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- BeanUtils.copyProperties(form, entity);
- if (baseMapper.updateById(entity) > 0) {
- return Result.ok("淇敼鎴愬姛");
- }
- return Result.error("淇敼澶辫触");
+ public List<CheckRule> selectCheckRuleList(CheckRule checkRule)
+ {
+ return checkRuleMapper.selectCheckRuleList(checkRule);
}
/**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
+ * 鏂板鑰冩牳瑙勫垯
+ *
+ * @param checkRule 鑰冩牳瑙勫垯
+ * @return 缁撴灉
*/
@Override
- public Result remove(List<String> ids) {
- if(baseMapper.deleteBatchIds(ids) > 0) {
- return Result.ok("鍒犻櫎鎴愬姛");
- }
- return Result.error("鍒犻櫎澶辫触");
+ public int insertCheckRule(CheckRule checkRule)
+ {
+ checkRule.setCreateTime(DateUtils.getNowDate());
+ return checkRuleMapper.insertCheckRule(checkRule);
}
/**
- * id鍒犻櫎
- * @param id
- * @return
+ * 淇敼鑰冩牳瑙勫垯
+ *
+ * @param checkRule 鑰冩牳瑙勫垯
+ * @return 缁撴灉
*/
@Override
- public Result removeById(String id) {
- if(baseMapper.deleteById(id) > 0) {
- return Result.ok("鍒犻櫎鎴愬姛");
- }
- return Result.error("鍒犻櫎澶辫触");
+ public int updateCheckRule(CheckRule checkRule)
+ {
+ checkRule.setUpdateTime(DateUtils.getNowDate());
+ return checkRuleMapper.updateCheckRule(checkRule);
}
/**
- * 鍒嗛〉鏌ヨ
- * @param query
- * @return
+ * 鎵归噺鍒犻櫎鑰冩牳瑙勫垯
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳瑙勫垯涓婚敭
+ * @return 缁撴灉
*/
@Override
- public Result page(CheckRuleQuery query) {
-
- IPage<CheckRule> page = new LambdaQueryChainWrapper<>(baseMapper)
- .like(StringUtils.hasText(query.getRuleName()), CheckRule::getRuleName, query.getRuleName())
- .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
- CheckRule::getCreateTime,
- DateUtils.getDayStart(query.getStart()),
- DateUtils.getDayEnd(query.getEnd()))
- .eq(Objects.nonNull(query.getAuditState()),CheckRule::getAuditState, query.getAuditState())
- .orderByDesc(CheckRule::getCreateTime)
- .page(PageUtil.getPage(query, CheckRule.class));
-
- List<CheckRuleVO> vos = page.getRecords().stream()
- .map(
- entity -> CheckRuleVO.getVoByEntity(entity, null)
- )
- .collect(Collectors.toList());
- return Result.ok().data(vos).total(page.getTotal());
+ public int deleteCheckRuleByIds(Long[] ids)
+ {
+ return checkRuleMapper.deleteCheckRuleByIds(ids);
}
/**
- * 鏍规嵁id鏌ユ壘
- * @param id
- * @return
+ * 鍒犻櫎鑰冩牳瑙勫垯淇℃伅
+ *
+ * @param id 鑰冩牳瑙勫垯涓婚敭
+ * @return 缁撴灉
*/
@Override
- public Result detail(String id) {
-
- CheckRule entity = baseMapper.selectById(id);
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- CheckRuleVO vo = CheckRuleVO.getVoByEntity(entity, null);
- return Result.ok().data(vo);
- }
-
- /**
- * 鍒楄〃
- * @return
- */
- @Override
- public Result all() {
- List<CheckRule> entities = baseMapper.selectList(null);
- List<BaseSelect> vos = entities.stream()
- .map(
- entity -> {
- BaseSelect vo = new BaseSelect();
- vo.setId(entity.getId());
- vo.setValue(entity.getRuleName());
- return vo;
- }
- )
- .collect(Collectors.toList());
- return Result.ok().data(vos);
+ public int deleteCheckRuleById(Long id)
+ {
+ return checkRuleMapper.deleteCheckRuleById(id);
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
new file mode 100644
index 0000000..6cea23e
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -0,0 +1,96 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.platform.domain.entity.CheckScore;
+import com.ycl.platform.mapper.CheckScoreMapper;
+import com.ycl.platform.service.ICheckScoreService;
+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 CheckScoreServiceImpl implements ICheckScoreService
+{
+ @Autowired
+ private CheckScoreMapper checkScoreMapper;
+
+ /**
+ * 鏌ヨ鑰冩牳绉垎鏄庣粏
+ *
+ * @param id 鑰冩牳绉垎鏄庣粏涓婚敭
+ * @return 鑰冩牳绉垎鏄庣粏
+ */
+ @Override
+ public CheckScore selectCheckScoreById(Long id)
+ {
+ return checkScoreMapper.selectCheckScoreById(id);
+ }
+
+ /**
+ * 鏌ヨ鑰冩牳绉垎鏄庣粏鍒楄〃
+ *
+ * @param checkScore 鑰冩牳绉垎鏄庣粏
+ * @return 鑰冩牳绉垎鏄庣粏
+ */
+ @Override
+ public List<CheckScore> selectCheckScoreList(CheckScore checkScore)
+ {
+ return checkScoreMapper.selectCheckScoreList(checkScore);
+ }
+
+ /**
+ * 鏂板鑰冩牳绉垎鏄庣粏
+ *
+ * @param checkScore 鑰冩牳绉垎鏄庣粏
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertCheckScore(CheckScore checkScore)
+ {
+ checkScore.setCreateTime(DateUtils.getNowDate());
+ return checkScoreMapper.insertCheckScore(checkScore);
+ }
+
+ /**
+ * 淇敼鑰冩牳绉垎鏄庣粏
+ *
+ * @param checkScore 鑰冩牳绉垎鏄庣粏
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateCheckScore(CheckScore checkScore)
+ {
+ return checkScoreMapper.updateCheckScore(checkScore);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳绉垎鏄庣粏
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳绉垎鏄庣粏涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteCheckScoreByIds(Long[] ids)
+ {
+ return checkScoreMapper.deleteCheckScoreByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鑰冩牳绉垎鏄庣粏淇℃伅
+ *
+ * @param id 鑰冩牳绉垎鏄庣粏涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteCheckScoreById(Long id)
+ {
+ return checkScoreMapper.deleteCheckScoreById(id);
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateRuleServiceImpl.java
new file mode 100644
index 0000000..a04f93b
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateRuleServiceImpl.java
@@ -0,0 +1,94 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.platform.domain.entity.CheckTemplateRule;
+import com.ycl.platform.mapper.CheckTemplateRuleMapper;
+import com.ycl.platform.service.ICheckTemplateRuleService;
+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 CheckTemplateRuleServiceImpl implements ICheckTemplateRuleService
+{
+ @Autowired
+ private CheckTemplateRuleMapper checkTemplateRuleMapper;
+
+ /**
+ * 鏌ヨ鑰冩牳妯℃澘-瑙勫垯涓棿
+ *
+ * @param id 鑰冩牳妯℃澘-瑙勫垯涓棿涓婚敭
+ * @return 鑰冩牳妯℃澘-瑙勫垯涓棿
+ */
+ @Override
+ public CheckTemplateRule selectCheckTemplateRuleById(Long id)
+ {
+ return checkTemplateRuleMapper.selectCheckTemplateRuleById(id);
+ }
+
+ /**
+ * 鏌ヨ鑰冩牳妯℃澘-瑙勫垯涓棿鍒楄〃
+ *
+ * @param checkTemplateRule 鑰冩牳妯℃澘-瑙勫垯涓棿
+ * @return 鑰冩牳妯℃澘-瑙勫垯涓棿
+ */
+ @Override
+ public List<CheckTemplateRule> selectCheckTemplateRuleList(CheckTemplateRule checkTemplateRule)
+ {
+ return checkTemplateRuleMapper.selectCheckTemplateRuleList(checkTemplateRule);
+ }
+
+ /**
+ * 鏂板鑰冩牳妯℃澘-瑙勫垯涓棿
+ *
+ * @param checkTemplateRule 鑰冩牳妯℃澘-瑙勫垯涓棿
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertCheckTemplateRule(CheckTemplateRule checkTemplateRule)
+ {
+ return checkTemplateRuleMapper.insertCheckTemplateRule(checkTemplateRule);
+ }
+
+ /**
+ * 淇敼鑰冩牳妯℃澘-瑙勫垯涓棿
+ *
+ * @param checkTemplateRule 鑰冩牳妯℃澘-瑙勫垯涓棿
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateCheckTemplateRule(CheckTemplateRule checkTemplateRule)
+ {
+ return checkTemplateRuleMapper.updateCheckTemplateRule(checkTemplateRule);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鑰冩牳妯℃澘-瑙勫垯涓棿
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳妯℃澘-瑙勫垯涓棿涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteCheckTemplateRuleByIds(Long[] ids)
+ {
+ return checkTemplateRuleMapper.deleteCheckTemplateRuleByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鑰冩牳妯℃澘-瑙勫垯涓棿淇℃伅
+ *
+ * @param id 鑰冩牳妯℃澘-瑙勫垯涓棿涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteCheckTemplateRuleById(Long id)
+ {
+ return checkTemplateRuleMapper.deleteCheckTemplateRuleById(id);
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
index b7d8729..db6d9a1 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
@@ -1,203 +1,97 @@
package com.ycl.platform.service.impl;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
-import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.CheckTemplate;
-import com.ycl.platform.domain.entity.CheckTemplateRule;
-import com.ycl.platform.domain.entity.YwUnit;
-import com.ycl.platform.domain.vo.RuleItemVO;
import com.ycl.platform.mapper.CheckTemplateMapper;
-import com.ycl.platform.mapper.CheckTemplateRuleMapper;
-import com.ycl.platform.service.CheckTemplateService;
-import com.ycl.platform.service.YwUnitService;
-import com.ycl.system.Result;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.form.CheckTemplateForm;
-import com.ycl.platform.domain.vo.CheckTemplateVO;
-import com.ycl.platform.domain.query.CheckTemplateQuery;
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ycl.system.page.PageUtil;
-import com.ycl.utils.DateUtils;
+import com.ycl.platform.service.ICheckTemplateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.beans.BeanUtils;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-import java.util.ArrayList;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import lombok.RequiredArgsConstructor;
-import org.springframework.util.StringUtils;
+import utils.DateUtils;
+
+import java.util.List;
/**
- * 鑰冩牳妯℃澘 鏈嶅姟瀹炵幇绫�
- *
- * @author xp
- * @since 2024-03-06
+ * 鑰冩牳妯℃澘Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
@Service
-@RequiredArgsConstructor
-public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateMapper, CheckTemplate> implements CheckTemplateService {
-
- private final CheckTemplateMapper checkTemplateMapper;
- private final CheckTemplateRuleMapper checkTemplateRuleMapper;
+public class CheckTemplateServiceImpl implements ICheckTemplateService
+{
@Autowired
- private YwUnitService unitService;
+ private CheckTemplateMapper checkTemplateMapper;
+
/**
- * 娣诲姞
- * @param form
- * @return
+ * 鏌ヨ鑰冩牳妯℃澘
+ *
+ * @param id 鑰冩牳妯℃澘涓婚敭
+ * @return 鑰冩牳妯℃澘
*/
@Override
- @Transactional(rollbackFor = Exception.class)
- public Result add(CheckTemplateForm form) {
- CheckTemplate entity = CheckTemplateForm.getEntityByForm(form, null);
- baseMapper.insert(entity);
- form.getRuleFormList().stream().forEach(rule -> {
- CheckTemplateRule checkTemplateRule = new CheckTemplateRule();
- checkTemplateRule.setCheckTemplateId(entity.getId());
- checkTemplateRule.setCheckRuleId(rule.getRuleId());
- checkTemplateRule.setWeight(rule.getWeight());
- checkTemplateRuleMapper.insert(checkTemplateRule);
- });
- return Result.ok("娣诲姞鎴愬姛");
+ public CheckTemplate selectCheckTemplateById(Long id)
+ {
+ return checkTemplateMapper.selectCheckTemplateById(id);
}
/**
- * 淇敼
- * @param form
- * @return
+ * 鏌ヨ鑰冩牳妯℃澘鍒楄〃
+ *
+ * @param checkTemplate 鑰冩牳妯℃澘
+ * @return 鑰冩牳妯℃澘
*/
@Override
- @Transactional(rollbackFor = Exception.class)
- public Result update(CheckTemplateForm form) {
-
- CheckTemplate entity = baseMapper.selectById(form.getId());
- // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- BeanUtils.copyProperties(form, entity);
- baseMapper.updateById(entity);
-
- // 鍏堝垹闄ゅ師鍏堢殑瀵瑰簲鍏崇郴
- new LambdaUpdateChainWrapper<>(checkTemplateRuleMapper)
- .eq(CheckTemplateRule::getCheckTemplateId, form.getId())
- .remove();
- // 鍐嶉噸鏂版坊鍔�
- form.getRuleFormList().stream().forEach(rule -> {
- CheckTemplateRule checkTemplateRule = new CheckTemplateRule();
- checkTemplateRule.setCheckTemplateId(entity.getId());
- checkTemplateRule.setCheckRuleId(rule.getRuleId());
- checkTemplateRule.setWeight(rule.getWeight());
- checkTemplateRuleMapper.insert(checkTemplateRule);
- });
- return Result.ok("淇敼鎴愬姛");
+ public List<CheckTemplate> selectCheckTemplateList(CheckTemplate checkTemplate)
+ {
+ return checkTemplateMapper.selectCheckTemplateList(checkTemplate);
}
/**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
+ * 鏂板鑰冩牳妯℃澘
+ *
+ * @param checkTemplate 鑰冩牳妯℃澘
+ * @return 缁撴灉
*/
@Override
- @Transactional(rollbackFor = Exception.class)
- public Result remove(List<String> ids) {
- baseMapper.deleteBatchIds(ids);
- new LambdaUpdateChainWrapper<>(checkTemplateRuleMapper)
- .in(CheckTemplateRule::getCheckTemplateId, ids)
- .remove();
- return Result.ok("鍒犻櫎鎴愬姛");
+ public int insertCheckTemplate(CheckTemplate checkTemplate)
+ {
+ checkTemplate.setCreateTime(DateUtils.getNowDate());
+ return checkTemplateMapper.insertCheckTemplate(checkTemplate);
}
/**
- * id鍒犻櫎
- * @param id
- * @return
+ * 淇敼鑰冩牳妯℃澘
+ *
+ * @param checkTemplate 鑰冩牳妯℃澘
+ * @return 缁撴灉
*/
@Override
- @Transactional(rollbackFor = Exception.class)
- public Result removeById(String id) {
- baseMapper.deleteById(id);
- new LambdaUpdateChainWrapper<>(checkTemplateRuleMapper)
- .eq(CheckTemplateRule::getCheckTemplateId, id)
- .remove();
- return Result.ok("鍒犻櫎鎴愬姛");
+ public int updateCheckTemplate(CheckTemplate checkTemplate)
+ {
+ checkTemplate.setUpdateTime(DateUtils.getNowDate());
+ return checkTemplateMapper.updateCheckTemplate(checkTemplate);
}
/**
- * 鍒嗛〉鏌ヨ
- * @param query
- * @return
+ * 鎵归噺鍒犻櫎鑰冩牳妯℃澘
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳妯℃澘涓婚敭
+ * @return 缁撴灉
*/
@Override
- public Result page(CheckTemplateQuery query) {
- IPage<CheckTemplate> page = new LambdaQueryChainWrapper<>(baseMapper)
- .like(StringUtils.hasText(query.getTemplateName()), CheckTemplate::getTemplateName, query.getTemplateName())
- .eq(StringUtils.hasText(query.getStatus()), CheckTemplate::getStatus, query.getStatus())
- .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
- CheckTemplate::getCreateTime,
- DateUtils.getDayStart(query.getStart()),
- DateUtils.getDayEnd(query.getEnd()))
- .orderByDesc(CheckTemplate::getCreateTime)
- .page(PageUtil.getPage(query, CheckTemplate.class));
-
- List<CheckTemplateVO> vos = page.getRecords().stream()
- .map(
- entity -> CheckTemplateVO.getVoByEntity(entity, null)
-// .setUnitName(unitService.getById(entity.getUnitId()).getUnitName())
- )
- .collect(Collectors.toList());
- return Result.ok().data(vos).total(page.getTotal());
+ public int deleteCheckTemplateByIds(Long[] ids)
+ {
+ return checkTemplateMapper.deleteCheckTemplateByIds(ids);
}
/**
- * 鏍规嵁id鏌ユ壘
- * @param id
- * @return
+ * 鍒犻櫎鑰冩牳妯℃澘淇℃伅
+ *
+ * @param id 鑰冩牳妯℃澘涓婚敭
+ * @return 缁撴灉
*/
@Override
- public Result detail(String id) {
-
- CheckTemplate entity = baseMapper.selectById(id);
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- CheckTemplateVO vo = CheckTemplateVO.getVoByEntity(entity, null);
-
- // 鏌ヨ�冩牳瑙勫垯
- List<CheckTemplateRule> ruleList = new LambdaQueryChainWrapper<>(checkTemplateRuleMapper)
- .eq(CheckTemplateRule::getCheckTemplateId, entity.getId())
- .list();
- List<RuleItemVO> ruleVOS = ruleList.stream().map(rule -> {
- RuleItemVO ruleItemVO = new RuleItemVO();
- ruleItemVO.setRuleId(rule.getCheckRuleId());
- ruleItemVO.setWeight(rule.getWeight());
- return ruleItemVO;
- }).collect(Collectors.toList());
- vo.setRuleFormList(ruleVOS);
-
- return Result.ok().data(vo);
- }
-
- /**
- * 鍒楄〃
- * @return
- */
- @Override
- public Result all() {
- List<CheckTemplate> entities = baseMapper.selectList(null);
- List<BaseSelect> vos = entities.stream()
- .map(
- entity -> {
- BaseSelect baseSelect = new BaseSelect();
- baseSelect.setId(entity.getId());
- baseSelect.setValue(entity.getTemplateName());
- return baseSelect;
- }
- )
- .collect(Collectors.toList());
- return Result.ok().data(vos);
+ public int deleteCheckTemplateById(Long id)
+ {
+ return checkTemplateMapper.deleteCheckTemplateById(id);
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java
deleted file mode 100644
index 000eadd..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.ycl.platform.service.impl;
-
-import com.ycl.exception.ServiceException;
-import com.ycl.platform.domain.entity.DefaultAuditing;
-import com.ycl.platform.domain.form.DefaultAuditForm;
-import com.ycl.platform.mapper.DefaultAuditingMapper;
-import com.ycl.platform.service.DefaultAuditingService;
-import com.ycl.system.Result;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.form.DefaultAuditingForm;
-import com.ycl.platform.domain.vo.DefaultAuditingVO;
-import com.ycl.platform.domain.query.DefaultAuditingQuery;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ycl.system.page.PageUtil;
-import org.springframework.stereotype.Service;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.beans.BeanUtils;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-import java.util.ArrayList;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import lombok.RequiredArgsConstructor;
-
-/**
- * 杩濊瀹℃牳 鏈嶅姟瀹炵幇绫�
- *
- * @author xp
- * @since 2024-03-05
- */
-@Service
-@RequiredArgsConstructor
-public class DefaultAuditingServiceImpl extends ServiceImpl<DefaultAuditingMapper, DefaultAuditing> implements DefaultAuditingService {
-
- private final DefaultAuditingMapper defaultAuditingMapper;
-
- /**
- * 娣诲姞
- * @param form
- * @return
- */
- @Override
- public Result add(DefaultAuditingForm form) {
- DefaultAuditing entity = DefaultAuditingForm.getEntityByForm(form, null);
- if(baseMapper.insert(entity) > 0) {
- return Result.ok("娣诲姞鎴愬姛");
- }
- return Result.error("娣诲姞澶辫触");
- }
-
- /**
- * 淇敼
- * @param form
- * @return
- */
- @Override
- public Result update(DefaultAuditingForm form) {
-
- DefaultAuditing entity = baseMapper.selectById(form.getId());
-
- // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- BeanUtils.copyProperties(form, entity);
- if (baseMapper.updateById(entity) > 0) {
- return Result.ok("淇敼鎴愬姛");
- }
- return Result.error("淇敼澶辫触");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
- */
- @Override
- public Result remove(List<String> ids) {
- if(baseMapper.deleteBatchIds(ids) > 0) {
- return Result.ok("鍒犻櫎鎴愬姛");
- }
- return Result.error("鍒犻櫎澶辫触");
- }
-
- /**
- * id鍒犻櫎
- * @param id
- * @return
- */
- @Override
- public Result removeById(String id) {
- if(baseMapper.deleteById(id) > 0) {
- return Result.ok("鍒犻櫎鎴愬姛");
- }
- return Result.error("鍒犻櫎澶辫触");
- }
-
- /**
- * 鍒嗛〉鏌ヨ
- * @param query
- * @return
- */
- @Override
- public Result page(DefaultAuditingQuery query) {
- query.setTime();
- IPage page = PageUtil.getPage(query, DefaultAuditing.class);
- baseMapper.page(page, query);
- return Result.ok().data(page.getRecords()).total(page.getTotal());
- }
-
- /**
- * 鏍规嵁id鏌ユ壘
- * @param id
- * @return
- */
- @Override
- public Result detail(String id) {
-
- DefaultAuditing entity = baseMapper.selectById(id);
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- DefaultAuditingVO vo = DefaultAuditingVO.getVoByEntity(entity, null);
- return Result.ok().data(vo);
- }
-
- /**
- * 鍒楄〃
- * @return
- */
- @Override
- public Result all() {
- List<DefaultAuditing> entities = baseMapper.selectList(null);
- List<DefaultAuditingVO> vos = entities.stream()
- .map(
- entity -> DefaultAuditingVO.getVoByEntity(entity, null)
- )
- .collect(Collectors.toList());
- return Result.ok().data(vos);
- }
-
- @Override
- public Result auditing(DefaultAuditForm form) {
- DefaultAuditing defaultAuditing = baseMapper.selectById(form.getId());
- if (Objects.isNull(defaultAuditing)) {
- throw new ServiceException("璇ヨ繚绾︿笉瀛樺湪");
- }
- if ("pass".equals(form.getAuditingResult())) {
- defaultAuditing.setAuditingStatus("瀹℃牳閫氳繃");
- } else {
- defaultAuditing.setAuditingStatus("瀹℃牳鏈�氳繃");
- }
- BeanUtils.copyProperties(form, defaultAuditing);
- defaultAuditing.setAuditingTime(LocalDateTime.now());
- baseMapper.updateById(defaultAuditing);
- return Result.ok("鎿嶄綔鎴愬姛");
- }
-}
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
new file mode 100644
index 0000000..68ef23c
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultPublishServiceImpl.java
@@ -0,0 +1,97 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.platform.domain.entity.DefaultPublish;
+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 implements IDefaultPublishService
+{
+ @Autowired
+ private DefaultPublishMapper defaultPublishMapper;
+
+ /**
+ * 鏌ヨ鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param id 鍚堝悓鑰冩牳鍙戝竷涓婚敭
+ * @return 鍚堝悓鑰冩牳鍙戝竷
+ */
+ @Override
+ public DefaultPublish selectDefaultPublishById(Long id)
+ {
+ return defaultPublishMapper.selectDefaultPublishById(id);
+ }
+
+ /**
+ * 鏌ヨ鍚堝悓鑰冩牳鍙戝竷鍒楄〃
+ *
+ * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ * @return 鍚堝悓鑰冩牳鍙戝竷
+ */
+ @Override
+ public List<DefaultPublish> selectDefaultPublishList(DefaultPublish defaultPublish)
+ {
+ return defaultPublishMapper.selectDefaultPublishList(defaultPublish);
+ }
+
+ /**
+ * 鏂板鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertDefaultPublish(DefaultPublish defaultPublish)
+ {
+ defaultPublish.setCreateTime(DateUtils.getNowDate());
+ return defaultPublishMapper.insertDefaultPublish(defaultPublish);
+ }
+
+ /**
+ * 淇敼鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @param defaultPublish 鍚堝悓鑰冩牳鍙戝竷
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateDefaultPublish(DefaultPublish defaultPublish)
+ {
+ defaultPublish.setUpdateTime(DateUtils.getNowDate());
+ return defaultPublishMapper.updateDefaultPublish(defaultPublish);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鍚堝悓鑰冩牳鍙戝竷
+ *
+ * @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/DefaultResultServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultResultServiceImpl.java
new file mode 100644
index 0000000..a2f16a5
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultResultServiceImpl.java
@@ -0,0 +1,96 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.platform.domain.entity.DefaultResult;
+import com.ycl.platform.mapper.DefaultResultMapper;
+import com.ycl.platform.service.IDefaultResultService;
+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 DefaultResultServiceImpl implements IDefaultResultService
+{
+ @Autowired
+ private DefaultResultMapper defaultResultMapper;
+
+ /**
+ * 鏌ヨ鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
+ * @return 鍚堝悓鑰冩牳缁撴灉
+ */
+ @Override
+ public DefaultResult selectDefaultResultById(Long id)
+ {
+ return defaultResultMapper.selectDefaultResultById(id);
+ }
+
+ /**
+ * 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃
+ *
+ * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ * @return 鍚堝悓鑰冩牳缁撴灉
+ */
+ @Override
+ public List<DefaultResult> selectDefaultResultList(DefaultResult defaultResult)
+ {
+ return defaultResultMapper.selectDefaultResultList(defaultResult);
+ }
+
+ /**
+ * 鏂板鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertDefaultResult(DefaultResult defaultResult)
+ {
+ return defaultResultMapper.insertDefaultResult(defaultResult);
+ }
+
+ /**
+ * 淇敼鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param defaultResult 鍚堝悓鑰冩牳缁撴灉
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateDefaultResult(DefaultResult defaultResult)
+ {
+ defaultResult.setUpdateTime(DateUtils.getNowDate());
+ return defaultResultMapper.updateDefaultResult(defaultResult);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鍚堝悓鑰冩牳缁撴灉
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鍚堝悓鑰冩牳缁撴灉涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteDefaultResultByIds(Long[] ids)
+ {
+ return defaultResultMapper.deleteDefaultResultByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鍚堝悓鑰冩牳缁撴灉淇℃伅
+ *
+ * @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteDefaultResultById(Long id)
+ {
+ return defaultResultMapper.deleteDefaultResultById(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
index 3b297fc..bb33bf6 100644
--- 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
@@ -1,180 +1,97 @@
package com.ycl.platform.service.impl;
-import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.DefaultRule;
-import com.ycl.platform.domain.entity.YwUnit;
-import com.ycl.platform.domain.form.DefaultRuleSetForm;
import com.ycl.platform.mapper.DefaultRuleMapper;
-import com.ycl.platform.service.DefaultRuleService;
-import com.ycl.system.Result;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.form.DefaultRuleForm;
-import com.ycl.platform.domain.vo.DefaultRuleVO;
-import com.ycl.platform.domain.query.DefaultRuleQuery;
+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;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ycl.system.page.PageUtil;
-import com.ycl.utils.DateUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.beans.BeanUtils;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-import java.util.ArrayList;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import lombok.RequiredArgsConstructor;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
/**
- * 杩濈害瑙勫垯 鏈嶅姟瀹炵幇绫�
- *
- * @author xp
- * @since 2024-03-05
+ * 杩濈害瑙勫垯Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2024-04-01
*/
@Service
-@RequiredArgsConstructor
-public class DefaultRuleServiceImpl extends ServiceImpl<DefaultRuleMapper, DefaultRule> implements DefaultRuleService {
-
- private final DefaultRuleMapper defaultRuleMapper;
+public class DefaultRuleServiceImpl implements IDefaultRuleService
+{
+ @Autowired
+ private DefaultRuleMapper defaultRuleMapper;
/**
- * 娣诲姞
- * @param form
- * @return
+ * 鏌ヨ杩濈害瑙勫垯
+ *
+ * @param id 杩濈害瑙勫垯涓婚敭
+ * @return 杩濈害瑙勫垯
*/
@Override
- public Result add(DefaultRuleForm form) {
- DefaultRule entity = DefaultRuleForm.getEntityByForm(form, null);
- entity.setRuleStatus("鏈惎鐢�");
- if(baseMapper.insert(entity) > 0) {
- return Result.ok("娣诲姞鎴愬姛");
- }
- return Result.error("娣诲姞澶辫触");
+ public DefaultRule selectDefaultRuleById(Long id)
+ {
+ return defaultRuleMapper.selectDefaultRuleById(id);
}
/**
- * 淇敼
- * @param form
- * @return
+ * 鏌ヨ杩濈害瑙勫垯鍒楄〃
+ *
+ * @param defaultRule 杩濈害瑙勫垯
+ * @return 杩濈害瑙勫垯
*/
@Override
- public Result update(DefaultRuleForm form) {
-
- DefaultRule entity = baseMapper.selectById(form.getId());
-
- // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- BeanUtils.copyProperties(form, entity);
- if (baseMapper.updateById(entity) > 0) {
- return Result.ok("淇敼鎴愬姛");
- }
- return Result.error("淇敼澶辫触");
+ public List<DefaultRule> selectDefaultRuleList(DefaultRule defaultRule)
+ {
+ return defaultRuleMapper.selectDefaultRuleList(defaultRule);
}
/**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
+ * 鏂板杩濈害瑙勫垯
+ *
+ * @param defaultRule 杩濈害瑙勫垯
+ * @return 缁撴灉
*/
@Override
- public Result remove(List<String> ids) {
- if(baseMapper.deleteBatchIds(ids) > 0) {
- return Result.ok("鍒犻櫎鎴愬姛");
- }
- return Result.error("鍒犻櫎澶辫触");
+ public int insertDefaultRule(DefaultRule defaultRule)
+ {
+ defaultRule.setCreateTime(DateUtils.getNowDate());
+ return defaultRuleMapper.insertDefaultRule(defaultRule);
}
/**
- * id鍒犻櫎
- * @param id
- * @return
+ * 淇敼杩濈害瑙勫垯
+ *
+ * @param defaultRule 杩濈害瑙勫垯
+ * @return 缁撴灉
*/
@Override
- public Result removeById(String id) {
- if(baseMapper.deleteById(id) > 0) {
- return Result.ok("鍒犻櫎鎴愬姛");
- }
- return Result.error("鍒犻櫎澶辫触");
+ public int updateDefaultRule(DefaultRule defaultRule)
+ {
+ defaultRule.setUpdateTime(DateUtils.getNowDate());
+ return defaultRuleMapper.updateDefaultRule(defaultRule);
}
/**
- * 鍒嗛〉鏌ヨ
- * @param query
- * @return
+ * 鎵归噺鍒犻櫎杩濈害瑙勫垯
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑杩濈害瑙勫垯涓婚敭
+ * @return 缁撴灉
*/
@Override
- public Result page(DefaultRuleQuery query) {
-
- IPage<DefaultRule> page = new LambdaQueryChainWrapper<>(baseMapper)
- .like(StringUtils.hasText(query.getRuleName()), DefaultRule::getRuleName, query.getRuleName())
- .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
- DefaultRule::getCreateTime,
- DateUtils.getDayStart(query.getStart()),
- DateUtils.getDayEnd(query.getEnd()))
- .orderByDesc(DefaultRule::getCreateTime)
- .page(PageUtil.getPage(query, DefaultRule.class));
-
- List<DefaultRuleVO> vos = page.getRecords().stream()
- .map(
- entity -> DefaultRuleVO.getVoByEntity(entity, null)
- )
- .collect(Collectors.toList());
- return Result.ok().data(vos).total(page.getTotal());
+ public int deleteDefaultRuleByIds(Long[] ids)
+ {
+ return defaultRuleMapper.deleteDefaultRuleByIds(ids);
}
/**
- * 鏍规嵁id鏌ユ壘
- * @param id
- * @return
+ * 鍒犻櫎杩濈害瑙勫垯淇℃伅
+ *
+ * @param id 杩濈害瑙勫垯涓婚敭
+ * @return 缁撴灉
*/
@Override
- public Result detail(String id) {
-
- DefaultRule entity = baseMapper.selectById(id);
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- DefaultRuleVO vo = DefaultRuleVO.getVoByEntity(entity, null);
- return Result.ok().data(vo);
- }
-
- /**
- * 鍒楄〃
- * @return
- */
- @Override
- public Result all() {
- List<DefaultRule> entities = baseMapper.selectList(null);
- List<DefaultRuleVO> vos = entities.stream()
- .map(
- entity -> DefaultRuleVO.getVoByEntity(entity, null)
- )
- .collect(Collectors.toList());
- return Result.ok().data(vos);
- }
-
- @Override
- public Result set(DefaultRuleSetForm form) {
- DefaultRule defaultRule = baseMapper.selectById(form.getId());
- if (Objects.isNull(defaultRule)) {
- throw new ServiceException("杩濈害瑙勫垯涓嶅瓨鍦�");
- }
- if (form.getFlag()) {
- // 鍚敤涔嬪墠妫�鏌ユ槸鍚﹀凡缁忔湁鍚敤鐨勮鍒欎簡锛屼繚鎸佷竴涓紑鍚�
- List<DefaultRule> useList = new LambdaQueryChainWrapper<>(baseMapper)
- .eq(DefaultRule::getRuleStatus, "鍚敤")
- .list();
- if (! CollectionUtils.isEmpty(useList)) {
- throw new ServiceException("宸茬粡鏈夎鍒欒鍚敤浜嗭紝鍙兘鍚屾椂鍚敤涓�涓鍒�");
- }
- defaultRule.setRuleStatus("鍚敤");
- } else {
- defaultRule.setRuleStatus("鏈惎鐢�");
- }
- baseMapper.updateById(defaultRule);
- return Result.ok("鎿嶄綔鎴愬姛");
+ public int deleteDefaultRuleById(Long id)
+ {
+ return defaultRuleMapper.deleteDefaultRuleById(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/DefaultScoreServiceImpl.java
new file mode 100644
index 0000000..cd59429
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultScoreServiceImpl.java
@@ -0,0 +1,97 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.platform.domain.entity.DefaultScore;
+import com.ycl.platform.mapper.DefaultScoreMapper;
+import com.ycl.platform.service.IDefaultScoreService;
+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 DefaultScoreServiceImpl implements IDefaultScoreService
+{
+ @Autowired
+ private DefaultScoreMapper defaultScoreMapper;
+
+ /**
+ * 鏌ヨ鍚堝悓鎵撳垎
+ *
+ * @param id 鍚堝悓鎵撳垎涓婚敭
+ * @return 鍚堝悓鎵撳垎
+ */
+ @Override
+ public DefaultScore selectDefaultScoreById(Long id)
+ {
+ return defaultScoreMapper.selectDefaultScoreById(id);
+ }
+
+ /**
+ * 鏌ヨ鍚堝悓鎵撳垎鍒楄〃
+ *
+ * @param defaultScore 鍚堝悓鎵撳垎
+ * @return 鍚堝悓鎵撳垎
+ */
+ @Override
+ public List<DefaultScore> selectDefaultScoreList(DefaultScore defaultScore)
+ {
+ return defaultScoreMapper.selectDefaultScoreList(defaultScore);
+ }
+
+ /**
+ * 鏂板鍚堝悓鎵撳垎
+ *
+ * @param defaultScore 鍚堝悓鎵撳垎
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertDefaultScore(DefaultScore defaultScore)
+ {
+ defaultScore.setCreateTime(DateUtils.getNowDate());
+ return defaultScoreMapper.insertDefaultScore(defaultScore);
+ }
+
+ /**
+ * 淇敼鍚堝悓鎵撳垎
+ *
+ * @param defaultScore 鍚堝悓鎵撳垎
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateDefaultScore(DefaultScore defaultScore)
+ {
+ defaultScore.setUpdateTime(DateUtils.getNowDate());
+ return defaultScoreMapper.updateDefaultScore(defaultScore);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鍚堝悓鎵撳垎
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鍚堝悓鎵撳垎涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteDefaultScoreByIds(Long[] ids)
+ {
+ return defaultScoreMapper.deleteDefaultScoreByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鍚堝悓鎵撳垎淇℃伅
+ *
+ * @param id 鍚堝悓鎵撳垎涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteDefaultScoreById(Long id)
+ {
+ return defaultScoreMapper.deleteDefaultScoreById(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
new file mode 100644
index 0000000..420f92a
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultTemplateRuleServiceImpl.java
@@ -0,0 +1,94 @@
+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
new file mode 100644
index 0000000..dc08e7f
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultTemplateServiceImpl.java
@@ -0,0 +1,97 @@
+package com.ycl.platform.service.impl;
+
+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 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/java/com/ycl/platform/service/impl/TCheckPublishServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TCheckPublishServiceImpl.java
deleted file mode 100644
index 2585ccf..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TCheckPublishServiceImpl.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.ycl.platform.service.impl;
-
-import com.ycl.platform.base.BaseSelect;
-import com.ycl.platform.domain.entity.TCheckPublish;
-import com.ycl.platform.mapper.TCheckPublishMapper;
-import com.ycl.platform.service.ITCheckPublishService;
-import com.ycl.system.Result;
-import com.ycl.system.entity.SysDept;
-import com.ycl.system.entity.SysUser;
-import com.ycl.system.mapper.SysUserMapper;
-import com.ycl.system.model.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Service;
-import utils.DateUtils;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 鑰冩牳鍙戝竷Service涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2024-03-07
- */
-@Service
-public class TCheckPublishServiceImpl implements ITCheckPublishService
-{
- @Autowired
- private TCheckPublishMapper tCheckPublishMapper;
- @Autowired
- private SysUserMapper userMapper;
- /**
- * 鏌ヨ鑰冩牳鍙戝竷
- *
- * @param id 鑰冩牳鍙戝竷涓婚敭
- * @return 鑰冩牳鍙戝竷
- */
- @Override
- public TCheckPublish selectTCheckPublishById(Long id)
- {
- return tCheckPublishMapper.selectTCheckPublishById(id);
- }
-
- /**
- * 鏌ヨ鑰冩牳鍙戝竷鍒楄〃
- *
- * @param tCheckPublish 鑰冩牳鍙戝竷
- * @return 鑰冩牳鍙戝竷
- */
- @Override
- public List<TCheckPublish> selectTCheckPublishList(TCheckPublish tCheckPublish)
- {
- return tCheckPublishMapper.selectTCheckPublishList(tCheckPublish);
- }
-
- /**
- * 鏂板鑰冩牳鍙戝竷
- *
- * @param tCheckPublish 鑰冩牳鍙戝竷
- * @return 缁撴灉
- */
- @Override
- public int insertTCheckPublish(TCheckPublish tCheckPublish)
- {
- Date nowDate = DateUtils.getNowDate();
- tCheckPublish.setCreateTime(nowDate);
- tCheckPublish.setUpdateTime(nowDate);
- LoginUser user = (LoginUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
- tCheckPublish.setCreateUser(user.getUserId());
- tCheckPublish.setCreateUserName(user.getUsername());
- tCheckPublish.setUpdateUser(user.getUserId());
- tCheckPublish.setUpdateUserName(user.getUsername());
- return tCheckPublishMapper.insertTCheckPublish(tCheckPublish);
- }
-
- /**
- * 淇敼鑰冩牳鍙戝竷
- *
- * @param tCheckPublish 鑰冩牳鍙戝竷
- * @return 缁撴灉
- */
- @Override
- public int updateTCheckPublish(TCheckPublish tCheckPublish)
- {
- tCheckPublish.setUpdateTime(DateUtils.getNowDate());
- LoginUser user = (LoginUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
- tCheckPublish.setUpdateUser(user.getUserId());
- tCheckPublish.setUpdateUserName(user.getUsername());
- return tCheckPublishMapper.updateTCheckPublish(tCheckPublish);
- }
-
- /**
- * 鎵归噺鍒犻櫎鑰冩牳鍙戝竷
- *
- * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳鍙戝竷涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteTCheckPublishByIds(Long[] ids)
- {
- return tCheckPublishMapper.deleteTCheckPublishByIds(ids);
- }
-
- /**
- * 鍒犻櫎鑰冩牳鍙戝竷淇℃伅
- *
- * @param id 鑰冩牳鍙戝竷涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteTCheckPublishById(Long id)
- {
- return tCheckPublishMapper.deleteTCheckPublishById(id);
- }
- /**
- * 涓嬫媺鍒楄〃
- * */
- @Override
- public Result all() {
- List<BaseSelect> vos = tCheckPublishMapper.selectTCheckPublishList(new TCheckPublish()).stream().map(checkPublish -> {
- BaseSelect baseSelect = new BaseSelect();
- baseSelect.setId(Integer.parseInt(checkPublish.getId() + ""));
- baseSelect.setValue(checkPublish.getExamineName());
- return baseSelect;
- }
- ).collect(Collectors.toList());
- return Result.ok().data(vos);
- }
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TExamineScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TExamineScoreServiceImpl.java
deleted file mode 100644
index 49e197b..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TExamineScoreServiceImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.ycl.platform.service.impl;
-
-import com.ycl.platform.domain.entity.TExamineScore;
-import com.ycl.platform.domain.vo.TExamineScoreVO;
-import com.ycl.platform.mapper.TExamineScoreMapper;
-import com.ycl.platform.service.ITExamineScoreService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import utils.DateUtils;
-
-import java.util.List;
-
-/**
- * 鑰冩牳璁″垎Service涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2024-03-13
- */
-@Service
-public class TExamineScoreServiceImpl implements ITExamineScoreService
-{
- @Autowired
- private TExamineScoreMapper tExamineScoreMapper;
-
- /**
- * 鏌ヨ鑰冩牳璁″垎
- *
- * @param id 鑰冩牳璁″垎涓婚敭
- * @return 鑰冩牳璁″垎
- */
- @Override
- public TExamineScore selectTExamineScoreById(Long id)
- {
- return tExamineScoreMapper.selectTExamineScoreById(id);
- }
-
- /**
- * 鏌ヨ鑰冩牳璁″垎鍒楄〃
- *
- * @param tExamineScore 鑰冩牳璁″垎
- * @return 鑰冩牳璁″垎
- */
- @Override
- public List<TExamineScoreVO> selectTExamineScoreList(TExamineScore tExamineScore)
- {
-
-
- return tExamineScoreMapper.selectTExamineScoreList(tExamineScore);
- }
-
- /**
- * 鏂板鑰冩牳璁″垎
- *
- * @param tExamineScore 鑰冩牳璁″垎
- * @return 缁撴灉
- */
- @Override
- public int insertTExamineScore(TExamineScore tExamineScore)
- {
- tExamineScore.setCreateTime(DateUtils.getNowDate());
- return tExamineScoreMapper.insertTExamineScore(tExamineScore);
- }
-
- /**
- * 淇敼鑰冩牳璁″垎
- *
- * @param tExamineScore 鑰冩牳璁″垎
- * @return 缁撴灉
- */
- @Override
- public int updateTExamineScore(TExamineScore tExamineScore)
- {
- return tExamineScoreMapper.updateTExamineScore(tExamineScore);
- }
-
- /**
- * 鎵归噺鍒犻櫎鑰冩牳璁″垎
- *
- * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳璁″垎涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteTExamineScoreByIds(Long[] ids)
- {
- return tExamineScoreMapper.deleteTExamineScoreByIds(ids);
- }
-
- /**
- * 鍒犻櫎鑰冩牳璁″垎淇℃伅
- *
- * @param id 鑰冩牳璁″垎涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteTExamineScoreById(Long id)
- {
- return tExamineScoreMapper.deleteTExamineScoreById(id);
- }
-}
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index 08f01db..8997c91 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -116,3 +116,11 @@
# 璇锋眰鍓嶇紑
pathMapping: /dev-api
+# MongoDB閰嶇疆
+spring:
+ data:
+ mongodb:
+ host: 42.193.1.25
+ database: zgyw
+ port: 27017
+
diff --git a/ycl-server/src/main/resources/mapper/zgyw/AccountingRulesMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/AccountingRulesMapper.xml
deleted file mode 100644
index 8c1923b..0000000
--- a/ycl-server/src/main/resources/mapper/zgyw/AccountingRulesMapper.xml
+++ /dev/null
@@ -1,81 +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.AccountingRulesMapper">
-
- <resultMap type="com.ycl.platform.domain.entity.AccountingRules" id="AccountingRulesResult">
- <result property="id" column="id"/>
- <result property="rulesName" column="rules_name"/>
- <result property="contractName" column="contract_name"/>
- <result property="amount" column="amount"/>
- <result property="createTime" column="create_time"/>
- <result property="updateTime" column="update_time"/>
- <result property="deleted" column="deleted"/>
- </resultMap>
-
- <sql id="selectAccountingRulesVo">
- select id, rules_name, contract_name, amount, create_time, update_time, deleted
- from t_accounting_rules
- </sql>
-
- <select id="selectAccountingRulesList" parameterType="com.ycl.platform.domain.entity.AccountingRules" resultMap="AccountingRulesResult">
- <include refid="selectAccountingRulesVo"/>
- <where>
- <if test="rulesName != null and rulesName != ''">and rules_name like concat('%', #{rulesName}, '%')</if>
- <if test="contractName != null and contractName != ''">and contract_name like concat('%', #{contractName}, '%')</if>
- <if test="deleted != null and deleted != ''">and deleted = #{deleted}</if>
- </where>
- </select>
-
- <select id="selectAccountingRulesById" parameterType="Integer" resultMap="AccountingRulesResult">
- <include refid="selectAccountingRulesVo"/>
- where id = #{id}
- </select>
-
- <insert id="insertAccountingRules" parameterType="com.ycl.platform.domain.entity.AccountingRules" useGeneratedKeys="true" keyProperty="id">
- insert into t_accounting_rules
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="rulesName != null">rules_name,</if>
- <if test="contractName != null">contract_name,</if>
- <if test="amount != null">amount,</if>
- <if test="createTime != null">create_time,</if>
- <if test="updateTime != null">update_time,</if>
- <if test="deleted != null">deleted,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="rulesName != null">#{rulesName},</if>
- <if test="contractName != null">#{contractName},</if>
- <if test="amount != null">#{amount},</if>
- <if test="createTime != null">#{createTime},</if>
- <if test="updateTime != null">#{updateTime},</if>
- <if test="deleted != null">#{deleted},</if>
- </trim>
- </insert>
-
- <update id="updateAccountingRules" parameterType="com.ycl.platform.domain.entity.AccountingRules">
- update t_accounting_rules
- <trim prefix="SET" suffixOverrides=",">
- <if test="rulesName != null">rules_name = #{rulesName},</if>
- <if test="contractName != null">contract_name = #{contractName},</if>
- <if test="amount != null">amount = #{amount},</if>
- <if test="createTime != null">create_time = #{createTime},</if>
- <if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="deleted != null">deleted = #{deleted},</if>
- </trim>
- where id = #{id}
- </update>
-
- <delete id="deleteAccountingRulesById" parameterType="Integer">
- delete
- from t_accounting_rules
- where id = #{id}
- </delete>
-
- <delete id="deleteAccountingRulesByIds" parameterType="String">
- delete from t_accounting_rules 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/CalculateRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
new file mode 100644
index 0000000..a742e0d
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
@@ -0,0 +1,74 @@
+<?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.CalculateRuleMapper">
+
+ <resultMap type="com.ycl.platform.domain.entity.CalculateRule" id="CalculateRuleResult">
+ <result property="id" column="id" />
+ <result property="name" column="name" />
+ <result property="templateId" column="template_id" />
+ <result property="parentId" column="parent_id" />
+ <result property="unitId" column="unit_id" />
+ <result property="value" column="value" />
+ </resultMap>
+
+ <sql id="selectCalculateRuleVo">
+ select id, name, template_id, parent_id, unit_id, value from t_calculate_rule
+ </sql>
+
+ <select id="selectCalculateRuleList" resultMap="CalculateRuleResult">
+ <include refid="selectCalculateRuleVo"/>
+ <where>
+ <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
+ <if test="templateId != null "> and template_id = #{templateId}</if>
+ <if test="unitId != null "> and unit_id = #{unitId}</if>
+ </where>
+ </select>
+
+ <select id="selectCalculateRuleById" resultMap="CalculateRuleResult">
+ <include refid="selectCalculateRuleVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertCalculateRule" useGeneratedKeys="true" keyProperty="id">
+ insert into t_calculate_rule
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="name != null">name,</if>
+ <if test="templateId != null">template_id,</if>
+ <if test="parentId != null">parent_id,</if>
+ <if test="unitId != null">unit_id,</if>
+ <if test="value != null">value,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="name != null">#{name},</if>
+ <if test="templateId != null">#{templateId},</if>
+ <if test="parentId != null">#{parentId},</if>
+ <if test="unitId != null">#{unitId},</if>
+ <if test="value != null">#{value},</if>
+ </trim>
+ </insert>
+
+ <update id="updateCalculateRule">
+ update t_calculate_rule
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="name != null">name = #{name},</if>
+ <if test="templateId != null">template_id = #{templateId},</if>
+ <if test="parentId != null">parent_id = #{parentId},</if>
+ <if test="unitId != null">unit_id = #{unitId},</if>
+ <if test="value != null">value = #{value},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteCalculateRuleById">
+ delete from t_calculate_rule where id = #{id}
+ </delete>
+
+ <delete id="deleteCalculateRuleByIds" >
+ delete from t_calculate_rule 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/CheckPublishMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckPublishMapper.xml
new file mode 100644
index 0000000..63da8ea
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckPublishMapper.xml
@@ -0,0 +1,107 @@
+<?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.CheckPublishMapper">
+
+ <resultMap type="com.ycl.platform.domain.entity.CheckPublish" id="CheckPublishResult">
+ <result property="id" column="id" />
+ <result property="examineName" column="examine_name" />
+ <result property="templateId" column="template_id" />
+ <result property="frequency" column="frequency" />
+ <result property="examineCategory" column="examine_category" />
+ <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" />
+ <result property="createUser" column="create_user" />
+ <result property="updateUser" column="update_user" />
+ </resultMap>
+
+ <sql id="selectCheckPublishVo">
+ select id, examine_name, template_id, frequency, examine_category, alarm_score, description, state, audit_state, create_time, update_time, create_user, update_user from t_check_publish
+ </sql>
+
+ <select id="selectCheckPublishList" resultMap="CheckPublishResult">
+ <include refid="selectCheckPublishVo"/>
+ <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="examineCategory != null "> and examine_category = #{examineCategory}</if>
+ <if test="alarmScore != null "> and alarm_score = #{alarmScore}</if>
+ <if test="description != null and description != ''"> and description = #{description}</if>
+ <if test="state != null "> and state = #{state}</if>
+ <if test="auditState != null "> and audit_state = #{auditState}</if>
+ </where>
+ </select>
+
+ <select id="selectCheckPublishById" resultMap="CheckPublishResult">
+ <include refid="selectCheckPublishVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertCheckPublish" useGeneratedKeys="true" keyProperty="id">
+ insert into t_check_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="examineCategory != null">examine_category,</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>
+ <if test="createUser != null">create_user,</if>
+ <if test="updateUser != null">update_user,</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="examineCategory != null">#{examineCategory},</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>
+ <if test="createUser != null">#{createUser},</if>
+ <if test="updateUser != null">#{updateUser},</if>
+ </trim>
+ </insert>
+
+ <update id="updateCheckPublish">
+ update t_check_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="examineCategory != null">examine_category = #{examineCategory},</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>
+ <if test="createUser != null">create_user = #{createUser},</if>
+ <if test="updateUser != null">update_user = #{updateUser},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteCheckPublishById" >
+ delete from t_check_publish where id = #{id}
+ </delete>
+
+ <delete id="deleteCheckPublishByIds">
+ delete from t_check_publish 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/CheckResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml
index 11aedde..752da17 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml
@@ -1,54 +1,88 @@
-<?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">
+<?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.CheckResultMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.CheckResultVO">
- <result column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="unit_name" property="checkUnitName" />
- <result column="examine_name" property="examineName" />
- <result column="check_score" property="checkScore" />
- <result column="system_score" property="systemScore" />
- <result column="manual_score" property="manualScore" />
- <result column="check_time" property="checkTime" />
- <result column="frequency" property="frequency" />
- <result column="examine_range" property="examineRange" />
- <result column="publish" property="publish" />
+
+ <resultMap type="com.ycl.platform.domain.entity.CheckResult" id="CheckResultResult">
+ <result property="id" column="id" />
+ <result property="deptId" column="dept_id" />
+ <result property="publishId" column="publish_id" />
+ <result property="examineCategory" column="examine_category" />
+ <result property="checkScore" column="check_score" />
+ <result property="publish" column="publish" />
+ <result property="checkTime" column="check_time" />
+ <result property="updateTime" column="update_time" />
+ <result property="deleted" column="deleted" />
</resultMap>
- <select id="page" resultMap="BaseResultMap">
- SELECT
- tcr.id,
- tyu.unit_name,
- tcp.examine_name,
- tcp.examine_range,
- tcp.frequency,
- tcr.check_time,
- tcr.check_score,
- tcr.system_score,
- tcr.manual_score,
- tcr.publish
- FROM
- t_check_result tcr
- INNER JOIN t_check_publish tcp ON tcr.check_publish_id = tcp.id
- INNER JOIN t_yw_unit tyu ON tcr.check_unit_id = tyu.id
- <where>
- AND tcr.deleted = 0
- <if test="query.checkUnitName != null and query.checkUnitName != ''">
- AND tyu.unit_name like concat('%', #{query.checkUnitName}, '%')
- </if>
- <if test="query.frequency != null and query.frequency != ''">
- AND tcp.frequency = #{query.frequency}
- </if>
- <if test="query.frequency != null and query.frequency != ''">
- AND tcp.examine_range = #{query.examineRange}
- </if>
- <if test="query.start != null and query.end != null">
- AND tcr.check_time BETWEEN #{query.start} AND #{query.end}
- </if>
+ <sql id="selectCheckResultVo">
+ select id, dept_id, publish_id, examine_category, check_score, publish, check_time, update_time, deleted from t_check_result
+ </sql>
+
+ <select id="selectCheckResultList" resultMap="CheckResultResult">
+ <include refid="selectCheckResultVo"/>
+ <where>
+ <if test="deptId != null "> and dept_id = #{deptId}</if>
+ <if test="publishId != null "> and publish_id = #{publishId}</if>
+ <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
+ <if test="publish != null "> and publish = #{publish}</if>
+ <if test="checkTime != null "> and check_time = #{checkTime}</if>
</where>
</select>
+
+ <select id="selectCheckResultById" resultMap="CheckResultResult">
+ <include refid="selectCheckResultVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertCheckResult" useGeneratedKeys="true" keyProperty="id">
+ insert into t_check_result
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="deptId != null">dept_id,</if>
+ <if test="publishId != null">publish_id,</if>
+ <if test="examineCategory != null">examine_category,</if>
+ <if test="checkScore != null">check_score,</if>
+ <if test="publish != null">publish,</if>
+ <if test="checkTime != null">check_time,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="deleted != null">deleted,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="deptId != null">#{deptId},</if>
+ <if test="publishId != null">#{publishId},</if>
+ <if test="examineCategory != null">#{examineCategory},</if>
+ <if test="checkScore != null">#{checkScore},</if>
+ <if test="publish != null">#{publish},</if>
+ <if test="checkTime != null">#{checkTime},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="deleted != null">#{deleted},</if>
+ </trim>
+ </insert>
-</mapper>
+ <update id="updateCheckResult" >
+ update t_check_result
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="deptId != null">dept_id = #{deptId},</if>
+ <if test="publishId != null">publish_id = #{publishId},</if>
+ <if test="examineCategory != null">examine_category = #{examineCategory},</if>
+ <if test="checkScore != null">check_score = #{checkScore},</if>
+ <if test="publish != null">publish = #{publish},</if>
+ <if test="checkTime != null">check_time = #{checkTime},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="deleted != null">deleted = #{deleted},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteCheckResultById" >
+ delete from t_check_result where id = #{id}
+ </delete>
+
+ <delete id="deleteCheckResultByIds" >
+ delete from t_check_result 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/CheckRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml
index fd4157c..b24f9a0 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml
@@ -1,17 +1,97 @@
-<?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">
+<?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.CheckRuleMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.CheckRuleVO">
- <result column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="rule_name" property="ruleName" />
- <result column="rule_detail" property="ruleDetail" />
- <result column="video_point_num" property="videoPointNum" />
- <result column="vehicle_checkpoint_num" property="vehicleCheckpointNum" />
- <result column="face_chceckpoint_num" property="faceChceckpointNum" />
+
+ <resultMap type="com.ycl.platform.domain.entity.CheckRule" id="CheckRuleResult">
+ <result property="id" column="id" />
+ <result property="ruleName" column="rule_name" />
+ <result property="ruleDetail" column="rule_detail" />
+ <result property="ruleCategory" column="rule_category" />
+ <result property="examineCategory" column="examine_category" />
+ <result property="ruleDescription" column="rule_description" />
+ <result property="auditState" column="audit_state" />
+ <result property="state" column="state" />
+ <result property="createTime" column="create_time" />
+ <result property="updateTime" column="update_time" />
+ <result property="deleted" column="deleted" />
</resultMap>
-</mapper>
+ <sql id="selectCheckRuleVo">
+ select id, rule_name, rule_detail, rule_category, examine_category, rule_description, audit_state, state, create_time, update_time, deleted from t_check_rule
+ </sql>
+
+ <select id="selectCheckRuleList" resultMap="CheckRuleResult">
+ <include refid="selectCheckRuleVo"/>
+ <where>
+ <if test="ruleName != null and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
+ <if test="ruleCategory != null "> and rule_category = #{ruleCategory}</if>
+ <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
+ <if test="ruleDescription != null and ruleDescription != ''"> and rule_description = #{ruleDescription}</if>
+ <if test="auditState != null "> and audit_state = #{auditState}</if>
+ <if test="state != null "> and state = #{state}</if>
+ </where>
+ </select>
+
+ <select id="selectCheckRuleById" resultMap="CheckRuleResult">
+ <include refid="selectCheckRuleVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertCheckRule" useGeneratedKeys="true" keyProperty="id">
+ insert into t_check_rule
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="ruleName != null and ruleName != ''">rule_name,</if>
+ <if test="ruleDetail != null">rule_detail,</if>
+ <if test="ruleCategory != null">rule_category,</if>
+ <if test="examineCategory != null">examine_category,</if>
+ <if test="ruleDescription != null">rule_description,</if>
+ <if test="auditState != null">audit_state,</if>
+ <if test="state != null">state,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="deleted != null">deleted,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="ruleName != null and ruleName != ''">#{ruleName},</if>
+ <if test="ruleDetail != null">#{ruleDetail},</if>
+ <if test="ruleCategory != null">#{ruleCategory},</if>
+ <if test="examineCategory != null">#{examineCategory},</if>
+ <if test="ruleDescription != null">#{ruleDescription},</if>
+ <if test="auditState != null">#{auditState},</if>
+ <if test="state != null">#{state},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="deleted != null">#{deleted},</if>
+ </trim>
+ </insert>
+
+ <update id="updateCheckRule" >
+ update t_check_rule
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="ruleName != null and ruleName != ''">rule_name = #{ruleName},</if>
+ <if test="ruleDetail != null">rule_detail = #{ruleDetail},</if>
+ <if test="ruleCategory != null">rule_category = #{ruleCategory},</if>
+ <if test="examineCategory != null">examine_category = #{examineCategory},</if>
+ <if test="ruleDescription != null">rule_description = #{ruleDescription},</if>
+ <if test="auditState != null">audit_state = #{auditState},</if>
+ <if test="state != null">state = #{state},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="deleted != null">deleted = #{deleted},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteCheckRuleById" >
+ delete from t_check_rule where id = #{id}
+ </delete>
+
+ <delete id="deleteCheckRuleByIds" >
+ delete from t_check_rule 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/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
new file mode 100644
index 0000000..5154ce6
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -0,0 +1,91 @@
+<?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.CheckScoreMapper">
+
+ <resultMap type="com.ycl.platform.domain.entity.CheckScore" id="CheckScoreResult">
+ <result property="id" column="id" />
+ <result property="score" column="score" />
+ <result property="deptId" column="dept_id" />
+ <result property="publishId" column="publish_id" />
+ <result property="ruleId" column="rule_id" />
+ <result property="examineCategory" column="examine_category" />
+ <result property="createTime" column="create_time" />
+ <result property="updateUser" column="update_user" />
+ <result property="updateUserName" column="update_user_name" />
+ <result property="auditState" column="audit_state" />
+ </resultMap>
+
+ <sql id="selectCheckScoreVo">
+ select id, score, dept_id, publish_id, rule_id, examine_category, create_time, update_user, update_user_name, audit_state from t_check_score
+ </sql>
+
+ <select id="selectCheckScoreList" resultMap="CheckScoreResult">
+ <include refid="selectCheckScoreVo"/>
+ <where>
+ <if test="deptId != null "> and dept_id = #{deptId}</if>
+ <if test="publishId != null "> and publish_id = #{publishId}</if>
+ <if test="ruleId != null "> and rule_id = #{ruleId}</if>
+ <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
+ </where>
+ </select>
+
+ <select id="selectCheckScoreById" resultMap="CheckScoreResult">
+ <include refid="selectCheckScoreVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertCheckScore" useGeneratedKeys="true" keyProperty="id">
+ insert into t_check_score
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="score != null">score,</if>
+ <if test="deptId != null">dept_id,</if>
+ <if test="publishId != null">publish_id,</if>
+ <if test="ruleId != null">rule_id,</if>
+ <if test="examineCategory != null">examine_category,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateUser != null">update_user,</if>
+ <if test="updateUserName != null">update_user_name,</if>
+ <if test="auditState != null">audit_state,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="score != null">#{score},</if>
+ <if test="deptId != null">#{deptId},</if>
+ <if test="publishId != null">#{publishId},</if>
+ <if test="ruleId != null">#{ruleId},</if>
+ <if test="examineCategory != null">#{examineCategory},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateUser != null">#{updateUser},</if>
+ <if test="updateUserName != null">#{updateUserName},</if>
+ <if test="auditState != null">#{auditState},</if>
+ </trim>
+ </insert>
+
+ <update id="updateCheckScore">
+ update t_check_score
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="score != null">score = #{score},</if>
+ <if test="deptId != null">dept_id = #{deptId},</if>
+ <if test="publishId != null">publish_id = #{publishId},</if>
+ <if test="ruleId != null">rule_id = #{ruleId},</if>
+ <if test="examineCategory != null">examine_category = #{examineCategory},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateUser != null">update_user = #{updateUser},</if>
+ <if test="updateUserName != null">update_user_name = #{updateUserName},</if>
+ <if test="auditState != null">audit_state = #{auditState},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteCheckScoreById" >
+ delete from t_check_score where id = #{id}
+ </delete>
+
+ <delete id="deleteCheckScoreByIds" >
+ delete from t_check_score 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/CheckTemplateMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml
index 545dd3e..c02a06e 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml
@@ -1,15 +1,109 @@
-<?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">
+<?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.CheckTemplateMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.CheckTemplateVO">
- <result column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="adjust_coefficient" property="adjustCoefficient" />
- <result column="adjust_way" property="adjustWay" />
- <result column="status" property="status" />
+
+ <resultMap type="com.ycl.platform.domain.entity.CheckTemplate" id="CheckTemplateResult">
+ <result property="id" column="id" />
+ <result property="templateName" column="template_name" />
+ <result property="adjustCoefficient" column="adjust_coefficient" />
+ <result property="adjustWay" column="adjust_way" />
+ <result property="examineCategory" column="examine_category" />
+ <result property="status" column="status" />
+ <result property="deptId" column="dept_id" />
+ <result property="createTime" column="create_time" />
+ <result property="updateTime" column="update_time" />
+ <result property="createUser" column="create_user" />
+ <result property="createUserName" column="create_user_name" />
+ <result property="updateUser" column="update_user" />
+ <result property="updateUserName" column="update_user_name" />
+ <result property="deleted" column="deleted" />
</resultMap>
-</mapper>
+ <sql id="selectCheckTemplateVo">
+ select id, template_name, adjust_coefficient, adjust_way, examine_category, status, dept_id, create_time, update_time, create_user, create_user_name, update_user, update_user_name, deleted from t_check_template
+ </sql>
+
+ <select id="selectCheckTemplateList" resultMap="CheckTemplateResult">
+ <include refid="selectCheckTemplateVo"/>
+ <where>
+ <if test="templateName != null and templateName != ''"> and template_name like concat('%', #{templateName}, '%')</if>
+ <if test="adjustCoefficient != null "> and adjust_coefficient = #{adjustCoefficient}</if>
+ <if test="adjustWay != null and adjustWay != ''"> and adjust_way = #{adjustWay}</if>
+ <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
+ <if test="status != null and status != ''"> and status = #{status}</if>
+ <if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
+ </where>
+ </select>
+
+ <select id="selectCheckTemplateById" resultMap="CheckTemplateResult">
+ <include refid="selectCheckTemplateVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertCheckTemplate" useGeneratedKeys="true" keyProperty="id">
+ insert into t_check_template
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="templateName != null and templateName != ''">template_name,</if>
+ <if test="adjustCoefficient != null">adjust_coefficient,</if>
+ <if test="adjustWay != null and adjustWay != ''">adjust_way,</if>
+ <if test="examineCategory != null">examine_category,</if>
+ <if test="status != null">status,</if>
+ <if test="deptId != null">dept_id,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="createUser != null">create_user,</if>
+ <if test="createUserName != null">create_user_name,</if>
+ <if test="updateUser != null">update_user,</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 and templateName != ''">#{templateName},</if>
+ <if test="adjustCoefficient != null">#{adjustCoefficient},</if>
+ <if test="adjustWay != null and adjustWay != ''">#{adjustWay},</if>
+ <if test="examineCategory != null">#{examineCategory},</if>
+ <if test="status != null">#{status},</if>
+ <if test="deptId != null">#{deptId},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="createUser != null">#{createUser},</if>
+ <if test="createUserName != null">#{createUserName},</if>
+ <if test="updateUser != null">#{updateUser},</if>
+ <if test="updateUserName != null">#{updateUserName},</if>
+ <if test="deleted != null">#{deleted},</if>
+ </trim>
+ </insert>
+
+ <update id="updateCheckTemplate">
+ update t_check_template
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="templateName != null and templateName != ''">template_name = #{templateName},</if>
+ <if test="adjustCoefficient != null">adjust_coefficient = #{adjustCoefficient},</if>
+ <if test="adjustWay != null and adjustWay != ''">adjust_way = #{adjustWay},</if>
+ <if test="examineCategory != null">examine_category = #{examineCategory},</if>
+ <if test="status != null">status = #{status},</if>
+ <if test="deptId != null">dept_id = #{deptId},</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="createUserName != null">create_user_name = #{createUserName},</if>
+ <if test="updateUser != null">update_user = #{updateUser},</if>
+ <if test="updateUserName != null">update_user_name = #{updateUserName},</if>
+ <if test="deleted != null">deleted = #{deleted},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteCheckTemplateById" parameterType="Long">
+ delete from t_check_template where id = #{id}
+ </delete>
+
+ <delete id="deleteCheckTemplateByIds" parameterType="String">
+ delete from t_check_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/CheckTemplateRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateRuleMapper.xml
new file mode 100644
index 0000000..0f94c61
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateRuleMapper.xml
@@ -0,0 +1,74 @@
+<?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.CheckTemplateRuleMapper">
+
+ <resultMap type="com.ycl.platform.domain.entity.CheckTemplateRule" id="CheckTemplateRuleResult">
+ <result property="id" column="id" />
+ <result property="checkTemplateId" column="check_template_id" />
+ <result property="checkRuleId" column="check_rule_id" />
+ <result property="weight" column="weight" />
+ <result property="maxScore" column="max_score" />
+ <result property="auditState" column="audit_state" />
+ </resultMap>
+
+ <sql id="selectCheckTemplateRuleVo">
+ select id, check_template_id, check_rule_id, weight, max_score, audit_state from t_check_template_rule
+ </sql>
+
+ <select id="selectCheckTemplateRuleList" resultMap="CheckTemplateRuleResult">
+ <include refid="selectCheckTemplateRuleVo"/>
+ <where>
+ <if test="checkTemplateId != null "> and check_template_id = #{checkTemplateId}</if>
+ <if test="checkRuleId != null "> and check_rule_id = #{checkRuleId}</if>
+ <if test="auditState != null "> and audit_state = #{auditState}</if>
+ </where>
+ </select>
+
+ <select id="selectCheckTemplateRuleById" resultMap="CheckTemplateRuleResult">
+ <include refid="selectCheckTemplateRuleVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertCheckTemplateRule" useGeneratedKeys="true" keyProperty="id">
+ insert into t_check_template_rule
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="checkTemplateId != null">check_template_id,</if>
+ <if test="checkRuleId != null">check_rule_id,</if>
+ <if test="weight != null">weight,</if>
+ <if test="maxScore != null">max_score,</if>
+ <if test="auditState != null">audit_state,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="checkTemplateId != null">#{checkTemplateId},</if>
+ <if test="checkRuleId != null">#{checkRuleId},</if>
+ <if test="weight != null">#{weight},</if>
+ <if test="maxScore != null">#{maxScore},</if>
+ <if test="auditState != null">#{auditState},</if>
+ </trim>
+ </insert>
+
+ <update id="updateCheckTemplateRule">
+ update t_check_template_rule
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="checkTemplateId != null">check_template_id = #{checkTemplateId},</if>
+ <if test="checkRuleId != null">check_rule_id = #{checkRuleId},</if>
+ <if test="weight != null">weight = #{weight},</if>
+ <if test="maxScore != null">max_score = #{maxScore},</if>
+ <if test="auditState != null">audit_state = #{auditState},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteCheckTemplateRuleById">
+ delete from t_check_template_rule where id = #{id}
+ </delete>
+
+ <delete id="deleteCheckTemplateRuleByIds">
+ delete from t_check_template_rule 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/DefaultAuditingMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
deleted file mode 100644
index fb8674c..0000000
--- a/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
+++ /dev/null
@@ -1,54 +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.DefaultAuditingMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.DefaultAuditingVO">
- <result column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="score" property="score" />
- <result column="check_publish_id" property="checkPublishId" />
- <result column="default_id" property="defaultId" />
- <result column="auditing_status" property="auditingStatus" />
- <result column="remark" property="remark" />
- <result column="auditing_time" property="auditingTime" />
- <result column="nick_name" property="auditingUserName" />
- <result column="rule_name" property="defaultRuleName" />
- <result column="unit_name" property="unitName" />
- <result column="create_by" property="createBy" />
- </resultMap>
-
- <select id="page" resultMap="BaseResultMap">
- SELECT
- tda.id,
- tda.score,
- tda.check_publish_id,
- tda.create_time,
- tda.default_id,
- tda.auditing_status,
- tda.remark,
- tda.auditing_time,
- tda.auditing_user,
- su.nick_name,
- tda.create_by,
- (SELECT unit_name FROM t_yw_unit WHERE id = tdr.unit_id AND deleted = 0) as unit_name,
- (SELECT rule_name FROM t_default_rule WHERE id = tdr.default_rule_id AND deleted = 0) as rule_name
- FROM
- t_default_auditing tda
- INNER JOIN t_default_record tdr ON tda.default_id = tdr.id AND tda.deleted = 0 AND tdr.deleted = 0
- LEFT JOIN sys_user su ON tda.auditing_user = su.user_id
- <where>
-
- <if test="query.unitId != null and query.unitId != ''">
- AND tdr.unit_id = #{query.unitId}
- </if>
- <if test="query.auditingStartTime != null and query.auditingEndTime != null">
- AND tda.auditing_time BETWEEN #{query.auditingStartTime} AND #{query.auditingEndTime}
- </if>
- <if test="query.createStartTime != null and query.createEndTime != null">
- AND tda.create_time BETWEEN #{query.createStartTime} AND #{query.createEndTime}
- </if>
- </where>
- </select>
-
-</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultPublishMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultPublishMapper.xml
new file mode 100644
index 0000000..c8e6803
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/DefaultPublishMapper.xml
@@ -0,0 +1,92 @@
+<?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.DefaultPublish" 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_default_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_default_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_default_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_default_publish where id = #{id}
+ </delete>
+
+ <delete id="deleteDefaultPublishByIds" >
+ delete from t_default_publish 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/DefaultResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultResultMapper.xml
new file mode 100644
index 0000000..687461b
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/DefaultResultMapper.xml
@@ -0,0 +1,88 @@
+<?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.DefaultResultMapper">
+
+ <resultMap type="com.ycl.platform.domain.entity.DefaultResult" id="DefaultResultResult">
+ <result property="id" column="id" />
+ <result property="unitId" column="unit_id" />
+ <result property="publishId" column="publish_id" />
+ <result property="defaultScore" column="default_score" />
+ <result property="auditState" column="audit_state" />
+ <result property="publish" column="publish" />
+ <result property="checkTime" column="check_time" />
+ <result property="updateTime" column="update_time" />
+ <result property="deleted" column="deleted" />
+ </resultMap>
+
+ <sql id="selectDefaultResultVo">
+ select id, unit_id, publish_id, default_score, audit_state, publish, check_time, update_time, deleted from t_default_result
+ </sql>
+
+ <select id="selectDefaultResultList" resultMap="DefaultResultResult">
+ <include refid="selectDefaultResultVo"/>
+ <where>
+ <if test="unitId != null "> and unit_id = #{unitId}</if>
+ <if test="publishId != null "> and publish_id = #{publishId}</if>
+ <if test="auditState != null "> and audit_state = #{auditState}</if>
+ <if test="publish != null "> and publish = #{publish}</if>
+ <if test="checkTime != null "> and check_time = #{checkTime}</if>
+ </where>
+ </select>
+
+ <select id="selectDefaultResultById" resultMap="DefaultResultResult">
+ <include refid="selectDefaultResultVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertDefaultResult" useGeneratedKeys="true" keyProperty="id">
+ insert into t_default_result
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="unitId != null">unit_id,</if>
+ <if test="publishId != null">publish_id,</if>
+ <if test="defaultScore != null">default_score,</if>
+ <if test="auditState != null">audit_state,</if>
+ <if test="publish != null">publish,</if>
+ <if test="checkTime != null">check_time,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="deleted != null">deleted,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="unitId != null">#{unitId},</if>
+ <if test="publishId != null">#{publishId},</if>
+ <if test="defaultScore != null">#{defaultScore},</if>
+ <if test="auditState != null">#{auditState},</if>
+ <if test="publish != null">#{publish},</if>
+ <if test="checkTime != null">#{checkTime},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="deleted != null">#{deleted},</if>
+ </trim>
+ </insert>
+
+ <update id="updateDefaultResult" >
+ update t_default_result
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="unitId != null">unit_id = #{unitId},</if>
+ <if test="publishId != null">publish_id = #{publishId},</if>
+ <if test="defaultScore != null">default_score = #{defaultScore},</if>
+ <if test="auditState != null">audit_state = #{auditState},</if>
+ <if test="publish != null">publish = #{publish},</if>
+ <if test="checkTime != null">check_time = #{checkTime},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="deleted != null">deleted = #{deleted},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteDefaultResultById">
+ delete from t_default_result where id = #{id}
+ </delete>
+
+ <delete id="deleteDefaultResultByIds" >
+ delete from t_default_result 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/DefaultRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultRuleMapper.xml
index afff39f..795032e 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/DefaultRuleMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/DefaultRuleMapper.xml
@@ -1,15 +1,90 @@
-<?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">
+<?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.DefaultRuleMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.DefaultRuleVO">
- <result column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="rule_name" property="ruleName" />
- <result column="rule_detail" property="ruleDetail" />
- <result column="rule_desc" property="ruleDesc" />
- <result column="rule_status" property="ruleStatus" />
+
+ <resultMap type="com.ycl.platform.domain.entity.DefaultRule" id="DefaultRuleResult">
+ <result property="id" column="id" />
+ <result property="ruleName" column="rule_name" />
+ <result property="parentId" column="parent_id" />
+ <result property="deductCategory" column="deduct_category" />
+ <result property="deductWay" column="deduct_way" />
+ <result property="ruleDesc" column="rule_desc" />
+ <result property="ruleStatus" column="rule_status" />
+ <result property="createTime" column="create_time" />
+ <result property="updateTime" column="update_time" />
+ <result property="deleted" column="deleted" />
</resultMap>
-</mapper>
+ <sql id="selectDefaultRuleVo">
+ select id, rule_name, parent_id, deduct_category, deduct_way, rule_desc, rule_status, create_time, update_time, deleted from t_default_rule
+ </sql>
+
+ <select id="selectDefaultRuleList" resultMap="DefaultRuleResult">
+ <include refid="selectDefaultRuleVo"/>
+ <where>
+ <if test="ruleName != null and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
+ <if test="deductCategory != null "> and deduct_category = #{deductCategory}</if>
+ <if test="ruleStatus != null and ruleStatus != ''"> and rule_status = #{ruleStatus}</if>
+ </where>
+ </select>
+
+ <select id="selectDefaultRuleById" resultMap="DefaultRuleResult">
+ <include refid="selectDefaultRuleVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertDefaultRule" useGeneratedKeys="true" keyProperty="id">
+ insert into t_default_rule
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="ruleName != null and ruleName != ''">rule_name,</if>
+ <if test="parentId != null">parent_id,</if>
+ <if test="deductCategory != null">deduct_category,</if>
+ <if test="deductWay != null">deduct_way,</if>
+ <if test="ruleDesc != null">rule_desc,</if>
+ <if test="ruleStatus != null">rule_status,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="deleted != null">deleted,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="ruleName != null and ruleName != ''">#{ruleName},</if>
+ <if test="parentId != null">#{parentId},</if>
+ <if test="deductCategory != null">#{deductCategory},</if>
+ <if test="deductWay != null">#{deductWay},</if>
+ <if test="ruleDesc != null">#{ruleDesc},</if>
+ <if test="ruleStatus != null">#{ruleStatus},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="deleted != null">#{deleted},</if>
+ </trim>
+ </insert>
+
+ <update id="updateDefaultRule" >
+ update t_default_rule
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="ruleName != null and ruleName != ''">rule_name = #{ruleName},</if>
+ <if test="parentId != null">parent_id = #{parentId},</if>
+ <if test="deductCategory != null">deduct_category = #{deductCategory},</if>
+ <if test="deductWay != null">deduct_way = #{deductWay},</if>
+ <if test="ruleDesc != null">rule_desc = #{ruleDesc},</if>
+ <if test="ruleStatus != null">rule_status = #{ruleStatus},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="deleted != null">deleted = #{deleted},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteDefaultRuleById" >
+ delete from t_default_rule where id = #{id}
+ </delete>
+
+ <delete id="deleteDefaultRuleByIds" >
+ delete from t_default_rule 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/DefaultScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultScoreMapper.xml
new file mode 100644
index 0000000..6e6c83d
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/DefaultScoreMapper.xml
@@ -0,0 +1,93 @@
+<?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.DefaultScoreMapper">
+
+ <resultMap type="com.ycl.platform.domain.entity.DefaultScore" id="DefaultScoreResult">
+ <result property="id" column="id" />
+ <result property="publishId" column="publish_id" />
+ <result property="templateId" column="template_id" />
+ <result property="num" column="num" />
+ <result property="score" column="score" />
+ <result property="createUser" column="create_user" />
+ <result property="createUserName" column="create_user_name" />
+ <result property="updateUser" column="update_user" />
+ <result property="updateUserName" column="update_user_name" />
+ <result property="createTime" column="create_time" />
+ <result property="updateTime" column="update_time" />
+ </resultMap>
+
+ <sql id="selectDefaultScoreVo">
+ select id, publish_id, template_id, num, score, create_user, create_user_name, update_user, update_user_name, create_time, update_time from t_default_score
+ </sql>
+
+ <select id="selectDefaultScoreList" resultMap="DefaultScoreResult">
+ <include refid="selectDefaultScoreVo"/>
+ <where>
+ <if test="publishId != null "> and publish_id = #{publishId}</if>
+ <if test="templateId != null "> and template_id = #{templateId}</if>
+ </where>
+ </select>
+
+ <select id="selectDefaultScoreById" resultMap="DefaultScoreResult">
+ <include refid="selectDefaultScoreVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertDefaultScore" useGeneratedKeys="true" keyProperty="id">
+ insert into t_default_score
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="publishId != null">publish_id,</if>
+ <if test="templateId != null">template_id,</if>
+ <if test="num != null">num,</if>
+ <if test="score != null">score,</if>
+ <if test="createUser != null">create_user,</if>
+ <if test="createUserName != null">create_user_name,</if>
+ <if test="updateUser != null">update_user,</if>
+ <if test="updateUserName != null">update_user_name,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateTime != null">update_time,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="publishId != null">#{publishId},</if>
+ <if test="templateId != null">#{templateId},</if>
+ <if test="num != null">#{num},</if>
+ <if test="score != null">#{score},</if>
+ <if test="createUser != null">#{createUser},</if>
+ <if test="createUserName != null">#{createUserName},</if>
+ <if test="updateUser != null">#{updateUser},</if>
+ <if test="updateUserName != null">#{updateUserName},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ </trim>
+ </insert>
+
+ <update id="updateDefaultScore">
+ update t_default_score
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="publishId != null">publish_id = #{publishId},</if>
+ <if test="templateId != null">template_id = #{templateId},</if>
+ <if test="num != null">num = #{num},</if>
+ <if test="score != null">score = #{score},</if>
+ <if test="createUser != null">create_user = #{createUser},</if>
+ <if test="createUserName != null">create_user_name = #{createUserName},</if>
+ <if test="updateUser != null">update_user = #{updateUser},</if>
+ <if test="updateUserName != null">update_user_name = #{updateUserName},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteDefaultScoreById">
+ delete from t_default_score where id = #{id}
+ </delete>
+
+ <delete id="deleteDefaultScoreByIds">
+ delete from t_default_score 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/DefaultTemplateMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultTemplateMapper.xml
new file mode 100644
index 0000000..b2f1a93
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/DefaultTemplateMapper.xml
@@ -0,0 +1,104 @@
+<?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
new file mode 100644
index 0000000..87f2c29
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/DefaultTemplateRuleMapper.xml
@@ -0,0 +1,71 @@
+<?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
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml
deleted file mode 100644
index f5dadc8..0000000
--- a/ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml
+++ /dev/null
@@ -1,133 +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.TCheckPublishMapper">
-
- <resultMap type="com.ycl.platform.domain.entity.TCheckPublish" id="TCheckPublishResult">
- <result property="id" column="id" />
- <result property="examineName" column="examine_name" />
- <result property="templateId" column="template_id" />
- <result property="examineRange" column="examine_range" />
- <result property="frequency" column="frequency" />
- <result property="state" column="state" />
- <result property="createTime" column="create_time" />
- <result property="createUser" column="create_user" />
- <result property="createUserName" column="create_user_name" />
- <result property="updateTime" column="update_time" />
- <result property="updateUser" column="update_user" />
- <result property="updateUserName" column="update_user_name" />
- <result property="description" column="description" />
- <result property="alarmScore" column="alarm_score" />
- <result property="auditState" column="audit_state" />
- <result property="auditUser" column="audit_user" />
- <result property="auditDescription" column="audit_description" />
- <result property="auditTime" column="audit_time" />
- </resultMap>
-
- <sql id="selectTCheckPublishVo">
- select id , examine_name, template_id , examine_range , frequency , state , create_time , create_user , update_time ,
- update_user , description,create_user_name,update_user_name,alarm_score ,audit_state,audit_user,audit_description,audit_time
- from t_check_publish
- </sql>
-
- <select id="selectTCheckPublishList" parameterType="com.ycl.platform.domain.entity.TCheckPublish" resultMap="TCheckPublishResult">
- <include refid="selectTCheckPublishVo"/>
- <where>
- <if test="templateId != null "> and template_id = #{templateId}</if>
- <if test="examineName != null and examineName != '' "> and examine_name = #{examineName}</if>
- <if test="examineRange != null "> and examine_range = #{examineRange}</if>
- <if test="frequency != null "> and frequency = #{frequency}</if>
- <if test="state != null "> and state = #{state}</if>
- <if test="createUser != null "> and create_user = #{createUser}</if>
- <if test="updateUser != null "> and update_user = #{updateUser}</if>
- <if test="description != null and description != ''"> and description = #{description}</if>
- <if test="alarmScore != null"> and alarm_score = #{alarmScore}</if>
- <if test="auditState != null"> and audit_state = #{auditState}</if>
- </where>
- </select>
-
- <select id="selectTCheckPublishById" parameterType="Long" resultMap="TCheckPublishResult">
- <include refid="selectTCheckPublishVo"/>
- where id = #{id}
- </select>
-
- <insert id="insertTCheckPublish" parameterType="com.ycl.platform.domain.entity.TCheckPublish">
- insert into t_check_publish
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
- <if test="examineName != null and examineName != ''">examine_name,</if>
- <if test="templateId != null">template_id,</if>
- <if test="examineRange != null">examine_range,</if>
- <if test="frequency != null">frequency,</if>
- <if test="state != null">state,</if>
- <if test="createTime != null">create_time,</if>
- <if test="createUser != null">create_user,</if>
- <if test="createUserName != null and createUserName!= ''">create_user_name,</if>
- <if test="updateTime != null">update_time,</if>
- <if test="updateUser != null">update_user,</if>
- <if test="updateUserName != null and updateUserName!= ''">update_user_name,</if>
- <if test="description != null">description,</if>
- <if test="alarmScore != null">alarm_score,</if>
- <if test="auditState != null">alarm_state,</if>
- <if test="auditUser != null and auditUser!=''">alarm_user,</if>
- <if test="auditDescription != null auditDescription!=''">alarm_description,</if>
- <if test="auditTime != null">alarm_time,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id},</if>
- <if test="examineName != null and examineName != ''">#{examineName},</if>
- <if test="templateId != null">#{templateId},</if>
- <if test="examineRange != null">#{examineRange},</if>
- <if test="frequency != null">#{frequency},</if>
- <if test="state != null">#{state},</if>
- <if test="createTime != null">#{createTime},</if>
- <if test="createUser != null">#{createUser},</if>
- <if test="createUserName != null and createUserName!= ''">#{createUserName},</if>
- <if test="updateTime != null">#{updateTime},</if>
- <if test="updateUser != null">#{updateUser},</if>
- <if test="updateUserName != null and updateUserName!= ''">#{updateUserName},</if>
- <if test="description != null">#{description},</if>
- <if test="alarmScore != null">#{alarmScore},</if>
- <if test="auditState != null">#{alarmState),</if>
- <if test="auditUser != null and auditUser!=''">#{auditUser},</if>
- <if test="auditDescription != null auditDescription!=''">#{auditDescription},</if>
- <if test="auditTime != null">#{auditTime},</if>
- </trim>
- </insert>
-
- <update id="updateTCheckPublish" parameterType="com.ycl.platform.domain.entity.TCheckPublish">
- update t_check_publish
- <trim prefix="SET" suffixOverrides=",">
- <if test="examineName != null and examineName != ''">examine_name = #{examineName},</if>
- <if test="templateId != null">template_id = #{templateId},</if>
- <if test="examineRange != null">examine_range = #{examineRange},</if>
- <if test="frequency != null">frequency = #{frequency},</if>
- <if test="state != null">state = #{state},</if>
- <if test="createTime != null">create_time = #{createTime},</if>
- <if test="createUser != null">create_user = #{createUser},</if>
- <if test="createUserName != null and createUserName!= ''">create_user_name = #{createUserName},</if>
- <if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="updateUser != null">update_user = #{updateUser},</if>
- <if test="updateUserName != null and updateUserName!= ''">update_user_name = #{updateUserName},</if>
- <if test="description != null">description = #{description},</if>
- <if test="alarmScore != null">alarm_score = #{alarmScore},</if>
- <if test="auditState != null">audit_state = #{alarmState),</if>
- <if test="auditUser != null and auditUser!=''">audit_user = #{auditUser},</if>
- <if test="auditDescription != null auditDescription!=''">audit_description = #{auditDescription},</if>
- <if test="auditTime != null">audit_time = #{auditTime},</if>
- </trim>
- where id = #{id}
- </update>
-
- <delete id="deleteTCheckPublishById" parameterType="Long">
- delete from t_check_publish where id = #{id}
- </delete>
-
- <delete id="deleteTCheckPublishByIds" parameterType="String">
- delete from t_check_publish 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/TExamineScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TExamineScoreMapper.xml
deleted file mode 100644
index b81a6d8..0000000
--- a/ycl-server/src/main/resources/mapper/zgyw/TExamineScoreMapper.xml
+++ /dev/null
@@ -1,87 +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.TExamineScoreMapper">
-
- <resultMap type="com.ycl.platform.domain.entity.TExamineScore" id="TExamineScoreResult">
- <result property="id" column="id" />
- <result property="score" column="score" />
- <result property="unitId" column="unit_id" />
- <result property="examineId" column="examine_id" />
- <result property="examineCategory" column="examine_category" />
- <result property="ruleCategory" column="rule_category" />
- <result property="createTime" column="create_time" />
- <result property="createBy" column="create_by" />
- </resultMap>
-
- <sql id="selectTExamineScoreVo">
- select id, score, unit_id, examine_id, examine_category, rule_category, create_time, create_by from t_examine_score
- </sql>
-
- <select id="selectTExamineScoreList" resultType="com.ycl.platform.domain.vo.TExamineScoreVO">
- select tes.id, tes.score, tyu.unit_name, tcp.examine_name, tes.examine_category,tes.rule_category,tes.create_time, tes.create_by
- from t_examine_score tes
- left join t_check_publish tcp on tes.examine_id = tcp.id
- left join t_yw_unit tyu on tes.unit_id = tyu.id
- <where>
- <if test="score != null "> and score = #{score}</if>
- <if test="unitId != null "> and unit_id = #{unitId}</if>
- <if test="examineId != null "> and examine_id = #{examineId}</if>
- <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
- <if test="ruleCategory != null "> and rule_category = #{ruleCategory</if>
- </where>
- </select>
-
- <select id="selectTExamineScoreById" parameterType="Long" resultMap="TExamineScoreResult">
- <include refid="selectTExamineScoreVo"/>
- where id = #{id}
- </select>
-
- <insert id="insertTExamineScore" useGeneratedKeys="true" keyProperty="id">
- insert into t_examine_score
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="score != null">score,</if>
- <if test="unitId != null">unit_id,</if>
- <if test="examineId != null">examine_id,</if>
- <if test="examineCategory != null">examine_category,</if>
- <if test="ruleCategory != null">rule_category,</if>
- <if test="createTime != null">create_time,</if>
- <if test="createBy != null">create_by,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="score != null">#{score},</if>
- <if test="unitId != null">#{unitId},</if>
- <if test="examineId != null">#{examineId},</if>
- <if test="examineCategory != null">#{examineCategory},</if>
- <if test="ruleCategory != null">#{ruleCategory},</if>
- <if test="createTime != null">#{createTime},</if>
- <if test="createBy != null">#{createBy},</if>
- </trim>
- </insert>
-
- <update id="updateTExamineScore">
- update t_examine_score
- <trim prefix="SET" suffixOverrides=",">
- <if test="score != null">score = #{score},</if>
- <if test="unitId != null">unit_id = #{unitId},</if>
- <if test="examineId != null">examine_id = #{examineId},</if>
- <if test="examineCategory != null">examine_category = #{examineCategory},</if>
- <if test="ruleCategory != null">rule_category = #{ruleCategory},</if>
- <if test="createTime != null">create_time = #{createTime},</if>
- <if test="createBy != null">create_by = #{createBy},</if>
- </trim>
- where id = #{id}
- </update>
-
- <delete id="deleteTExamineScoreById" parameterType="Long">
- delete from t_examine_score where id = #{id}
- </delete>
-
- <delete id="deleteTExamineScoreByIds" parameterType="String">
- delete from t_examine_score 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/ycl/YwThresholdMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
similarity index 100%
rename from ycl-server/src/main/resources/mapper/ycl/YwThresholdMapper.xml
rename to ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
--
Gitblit v1.8.0