From 8c5a5863bdec90441d8afcb784308e7be84b57d7 Mon Sep 17 00:00:00 2001 From: lishiwei <3230787218@qq.com> Date: Wed, 10 Jun 2026 10:49:45 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"feat():=20=E6=B7=BB=E5=8A=A0=E8=80=83?= =?UTF-8?q?=E8=AF=84=E7=BB=93=E6=9D=9F=E5=BC=80=E5=85=B3=E5=8A=9F=E8=83=BD?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e91eff92479e170a97eefec38c0b0014adaa57f4. --- doc/sql/add_evaluation_closed.sql | 2 -- .../web/EvaluationConfigController.java | 7 ------ .../command/EvaluationCorpUpdateExe.java | 11 --------- .../service/EvaluationConfigServiceImpl.java | 7 ------ .../api/EvaluationConfigServiceI.java | 2 -- .../evaluation/dto/ToggleEvalClosedCmd.java | 24 ------------------- .../dto/clientobject/CorpEvalCO.java | 3 --- .../clientobject/CorpEvalStatisticsCO.java | 3 --- .../clientobject/CorpEvaluationConfigCO.java | 3 --- .../clientobject/CorpHiddenStatisticsCO.java | 3 --- .../domain/gateway/EvaluationCorpGateway.java | 5 ---- .../domain/model/EvaluationCorpE.java | 2 -- .../EvaluationCorpGatewayImpl.java | 9 ------- .../persistence/dataobject/CorpEvalDO.java | 3 --- .../dataobject/CorpEvalStatisticsDO.java | 3 --- .../dataobject/CorpEvaluationConfigDO.java | 3 --- .../dataobject/CorpHiddenStatisticsDO.java | 3 --- .../dataobject/EvaluationCorpDO.java | 3 --- .../mapper/EvaluationConfigMapper.xml | 3 +-- 19 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 doc/sql/add_evaluation_closed.sql delete mode 100644 web-client/src/main/java/com/zcloud/hidden/evaluation/dto/ToggleEvalClosedCmd.java diff --git a/doc/sql/add_evaluation_closed.sql b/doc/sql/add_evaluation_closed.sql deleted file mode 100644 index ec2e5e6..0000000 --- a/doc/sql/add_evaluation_closed.sql +++ /dev/null @@ -1,2 +0,0 @@ --- 考评组配置增加考评是否结束开关 -ALTER TABLE evaluation_corp ADD COLUMN evaluation_closed TINYINT DEFAULT 0 COMMENT '考评是否结束 0=未结束 1=已结束'; diff --git a/web-adapter/src/main/java/com/zcloud/hidden/evaluation/web/EvaluationConfigController.java b/web-adapter/src/main/java/com/zcloud/hidden/evaluation/web/EvaluationConfigController.java index 3887f74..fa43fda 100644 --- a/web-adapter/src/main/java/com/zcloud/hidden/evaluation/web/EvaluationConfigController.java +++ b/web-adapter/src/main/java/com/zcloud/hidden/evaluation/web/EvaluationConfigController.java @@ -55,13 +55,6 @@ public class EvaluationConfigController { return SingleResponse.buildSuccess(); } - @ApiOperation("考评结束开关") - @PostMapping("/toggleEvalClosed") - public SingleResponse toggleEvalClosed(@RequestBody ToggleEvalClosedCmd cmd) { - evaluationConfigService.toggleEvalClosed(cmd); - return SingleResponse.buildSuccess(); - } - diff --git a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/EvaluationCorpUpdateExe.java b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/EvaluationCorpUpdateExe.java index a21c532..905c201 100644 --- a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/EvaluationCorpUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/EvaluationCorpUpdateExe.java @@ -4,7 +4,6 @@ import com.alibaba.cola.exception.BizException; import com.zcloud.hidden.evaluation.domain.gateway.EvaluationCorpGateway; import com.zcloud.hidden.evaluation.domain.model.EvaluationCorpE; import com.zcloud.hidden.evaluation.dto.EvaluationCorpUpdateCmd; -import com.zcloud.hidden.evaluation.dto.ToggleEvalClosedCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -31,15 +30,5 @@ public class EvaluationCorpUpdateExe { throw new BizException("修改失败"); } } - - @Transactional(rollbackFor = Exception.class) - public void toggleEvalClosed(ToggleEvalClosedCmd cmd) { - EvaluationCorpE evaluationCorpE = new EvaluationCorpE(); - BeanUtils.copyProperties(cmd, evaluationCorpE); - boolean res = evaluationCorpGateway.toggleEvalClosed(evaluationCorpE); - if (!res) { - throw new BizException("配置失败"); - } - } } diff --git a/web-app/src/main/java/com/zcloud/hidden/evaluation/service/EvaluationConfigServiceImpl.java b/web-app/src/main/java/com/zcloud/hidden/evaluation/service/EvaluationConfigServiceImpl.java index 4e0115f..ff78ef2 100644 --- a/web-app/src/main/java/com/zcloud/hidden/evaluation/service/EvaluationConfigServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/hidden/evaluation/service/EvaluationConfigServiceImpl.java @@ -6,7 +6,6 @@ import com.zcloud.hidden.evaluation.api.EvaluationConfigServiceI; import com.zcloud.hidden.evaluation.command.EvaluationConfigAddExe; import com.zcloud.hidden.evaluation.command.EvaluationConfigRemoveExe; import com.zcloud.hidden.evaluation.command.EvaluationConfigUpdateExe; -import com.zcloud.hidden.evaluation.command.EvaluationCorpUpdateExe; import com.zcloud.hidden.evaluation.command.query.EvaluationConfigQueryExe; import com.zcloud.hidden.evaluation.dto.*; import com.zcloud.hidden.evaluation.dto.clientobject.CorpEvaluationConfigCO; @@ -30,7 +29,6 @@ public class EvaluationConfigServiceImpl implements EvaluationConfigServiceI { private final EvaluationConfigUpdateExe evaluationConfigUpdateExe; private final EvaluationConfigRemoveExe evaluationConfigRemoveExe; private final EvaluationConfigQueryExe evaluationConfigQueryExe; - private final EvaluationCorpUpdateExe evaluationCorpUpdateExe; @Override public PageResponse listPage(EvaluationConfigPageQry qry) { @@ -69,10 +67,5 @@ public class EvaluationConfigServiceImpl implements EvaluationConfigServiceI { public void editBath(EvaluationConfigBathUpdateCmd evaluationConfigBathUpdateCmd) { evaluationConfigUpdateExe.editBath(evaluationConfigBathUpdateCmd); } - - @Override - public void toggleEvalClosed(ToggleEvalClosedCmd cmd) { - evaluationCorpUpdateExe.toggleEvalClosed(cmd); - } } diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/api/EvaluationConfigServiceI.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/api/EvaluationConfigServiceI.java index 86e4961..774d3d4 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/api/EvaluationConfigServiceI.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/api/EvaluationConfigServiceI.java @@ -29,7 +29,5 @@ public interface EvaluationConfigServiceI { List listAll(EvaluationConfigQry qry); void editBath(EvaluationConfigBathUpdateCmd evaluationConfigBathUpdateCmd); - - void toggleEvalClosed(ToggleEvalClosedCmd cmd); } diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/ToggleEvalClosedCmd.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/ToggleEvalClosedCmd.java deleted file mode 100644 index 78a3e02..0000000 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/ToggleEvalClosedCmd.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.zcloud.hidden.evaluation.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * 考评结束开关命令 - * - * @Author zhaokai - * @Date 2026-06-09 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class ToggleEvalClosedCmd implements Serializable { - @ApiModelProperty(value = "企业id", required = true) - private Long corpinfoId; - @ApiModelProperty(value = "考评是否结束 0=未结束(开始考评) 1=已结束(结束考评)", required = true) - private Integer evaluationClosed; -} diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpEvalCO.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpEvalCO.java index 9e463a2..9884b45 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpEvalCO.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpEvalCO.java @@ -35,9 +35,6 @@ public class CorpEvalCO implements Serializable { private Integer exchangeScoreCount; @ApiModelProperty(value = "待兑换积分数") private Integer unExchangeScoreCount; - //考评是否结束 0=未结束 1=已结束 - @ApiModelProperty(value = "考评是否结束 0=未结束 1=已结束") - private Integer evaluationClosed; diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpEvalStatisticsCO.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpEvalStatisticsCO.java index c735f7e..5853c44 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpEvalStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpEvalStatisticsCO.java @@ -34,8 +34,5 @@ public class CorpEvalStatisticsCO implements Serializable { private String safeEvaluationMember; @ApiModelProperty(value = "环保类考评组成员") private String envEvaluationMember; - //考评是否结束 0=未结束 1=已结束 - @ApiModelProperty(value = "考评是否结束 0=未结束 1=已结束") - private Integer evaluationClosed; } diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpEvaluationConfigCO.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpEvaluationConfigCO.java index f0ed652..c32c7f4 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpEvaluationConfigCO.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpEvaluationConfigCO.java @@ -31,9 +31,6 @@ public class CorpEvaluationConfigCO implements Serializable { private String envEvaluationConfigStatus; @ApiModelProperty(value = "环保类考评组成员") private String envEvaluationMember; - //考评是否结束 0=未结束 1=已结束 - @ApiModelProperty(value = "考评是否结束 0=未结束 1=已结束") - private Integer evaluationClosed; } diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpHiddenStatisticsCO.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpHiddenStatisticsCO.java index 047caa0..bd59659 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpHiddenStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/CorpHiddenStatisticsCO.java @@ -67,8 +67,5 @@ public class CorpHiddenStatisticsCO implements Serializable { @ApiModelProperty(value = "考评组成员") private String evaluationMembers; - //考评是否结束 0=未结束 1=已结束 - @ApiModelProperty(value = "考评是否结束 0=未结束 1=已结束") - private Integer evaluationClosed; } diff --git a/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/gateway/EvaluationCorpGateway.java b/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/gateway/EvaluationCorpGateway.java index 889b3c6..862df41 100644 --- a/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/gateway/EvaluationCorpGateway.java +++ b/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/gateway/EvaluationCorpGateway.java @@ -20,11 +20,6 @@ public interface EvaluationCorpGateway { */ Boolean update(EvaluationCorpE evaluationCorpE); - /** - * 开关配置 - */ - Boolean toggleEvalClosed(EvaluationCorpE evaluationCorpE); - /** * 删除 */ diff --git a/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/model/EvaluationCorpE.java b/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/model/EvaluationCorpE.java index 608bcbd..e0cacea 100644 --- a/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/model/EvaluationCorpE.java +++ b/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/model/EvaluationCorpE.java @@ -43,7 +43,5 @@ public class EvaluationCorpE extends BaseE { private Long orgId; //环境 private String env; - //考评是否结束 0=未结束(开始考评) 1=已结束(结束考评) - private Integer evaluationClosed; } diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/gatewayimpl/EvaluationCorpGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/gatewayimpl/EvaluationCorpGatewayImpl.java index fabefb5..0cb0e8a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/gatewayimpl/EvaluationCorpGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/gatewayimpl/EvaluationCorpGatewayImpl.java @@ -42,15 +42,6 @@ public class EvaluationCorpGatewayImpl implements EvaluationCorpGateway { return true; } - @Override - public Boolean toggleEvalClosed(EvaluationCorpE evaluationCorpE) { - evaluationCorpRepository.list().forEach(corp -> { - corp.setEvaluationClosed(evaluationCorpE.getEvaluationClosed()); - evaluationCorpRepository.updateById(corp); - }); - return true; - } - @Override public Boolean deletedEvaluationCorpById(Long id) { return evaluationCorpRepository.removeById(id); diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpEvalDO.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpEvalDO.java index 309e41f..c844398 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpEvalDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpEvalDO.java @@ -33,9 +33,6 @@ public class CorpEvalDO implements Serializable { private Integer exchangeScoreCount; @ApiModelProperty(value = "待兑换积分数") private Integer unExchangeScoreCount; - //考评是否结束 0=未结束 1=已结束 - @ApiModelProperty(value = "考评是否结束 0=未结束 1=已结束") - private Integer evaluationClosed; diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpEvalStatisticsDO.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpEvalStatisticsDO.java index 4c46a17..2dcf34a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpEvalStatisticsDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpEvalStatisticsDO.java @@ -32,8 +32,5 @@ public class CorpEvalStatisticsDO implements Serializable { private String safeEvaluationMember; @ApiModelProperty(value = "环保类考评组成员") private String envEvaluationMember; - //考评是否结束 0=未结束 1=已结束 - @ApiModelProperty(value = "考评是否结束 0=未结束 1=已结束") - private Integer evaluationClosed; } diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpEvaluationConfigDO.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpEvaluationConfigDO.java index a3d669d..09f457d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpEvaluationConfigDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpEvaluationConfigDO.java @@ -29,9 +29,6 @@ public class CorpEvaluationConfigDO implements Serializable { private String envEvaluationConfigStatus; @ApiModelProperty(value = "环保类考评组成员") private String envEvaluationMember; - //考评是否结束 0=未结束 1=已结束 - @ApiModelProperty(value = "考评是否结束 0=未结束 1=已结束") - private Integer evaluationClosed; } diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpHiddenStatisticsDO.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpHiddenStatisticsDO.java index 7fbf9b7..9c65bf2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpHiddenStatisticsDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/CorpHiddenStatisticsDO.java @@ -64,8 +64,5 @@ public class CorpHiddenStatisticsDO implements Serializable { @ApiModelProperty(value = "考评组成员") private String evaluationMembers; - //考评是否结束 0=未结束 1=已结束 - @ApiModelProperty(value = "考评是否结束 0=未结束 1=已结束") - private Integer evaluationClosed; } diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/EvaluationCorpDO.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/EvaluationCorpDO.java index 2536db2..449b376 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/EvaluationCorpDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/EvaluationCorpDO.java @@ -24,9 +24,6 @@ public class EvaluationCorpDO extends BaseDO { //企业id @ApiModelProperty(value = "企业id") private Long corpinfoId; - //考评是否结束 0=未结束 1=已结束 - @ApiModelProperty(value = "考评是否结束 0=未结束 1=已结束") - private Integer evaluationClosed; public EvaluationCorpDO(String evaluationCorpId) { this.evaluationCorpId = evaluationCorpId; diff --git a/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml b/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml index fb5476b..230abd6 100644 --- a/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml @@ -10,8 +10,7 @@ CASE WHEN ec_safe.id IS NOT NULL THEN '已分配' ELSE '未分配' END AS safeEvaluationConfigStatus, COALESCE(ec_safe.members, '') AS safeEvaluationMember, CASE WHEN ec_env.id IS NOT NULL THEN '已分配' ELSE '未分配' END AS envEvaluationConfigStatus, - COALESCE(ec_env.members, '') AS envEvaluationMember, - (SELECT e.evaluation_closed FROM evaluation_corp e WHERE e.delete_enum = 'FALSE' LIMIT 1) AS evaluationClosed + COALESCE(ec_env.members, '') AS envEvaluationMember FROM evaluation_corp ec left join corp_info ci on ec.corpinfo_id = ci.id LEFT JOIN (SELECT ec.id,ec.corpinfo_id, GROUP_CONCAT(CONCAT(d.name, '-', u.name) SEPARATOR ',') AS members