diff --git a/doc/sql/add_evaluation_closed.sql b/doc/sql/add_evaluation_closed.sql new file mode 100644 index 0000000..ec2e5e6 --- /dev/null +++ b/doc/sql/add_evaluation_closed.sql @@ -0,0 +1,2 @@ +-- 考评组配置增加考评是否结束开关 +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 fa43fda..3887f74 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,6 +55,13 @@ 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 905c201..a21c532 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,6 +4,7 @@ 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; @@ -30,5 +31,15 @@ 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 ff78ef2..4e0115f 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,6 +6,7 @@ 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; @@ -29,6 +30,7 @@ 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) { @@ -67,5 +69,10 @@ 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 774d3d4..86e4961 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,5 +29,7 @@ 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 new file mode 100644 index 0000000..78a3e02 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/ToggleEvalClosedCmd.java @@ -0,0 +1,24 @@ +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 9884b45..9e463a2 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,6 +35,9 @@ 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 5853c44..c735f7e 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,5 +34,8 @@ 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 c32c7f4..f0ed652 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,6 +31,9 @@ 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 bd59659..047caa0 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,5 +67,8 @@ 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 862df41..889b3c6 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,6 +20,11 @@ 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 e0cacea..608bcbd 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,5 +43,7 @@ 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 0cb0e8a..fabefb5 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,6 +42,15 @@ 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 c844398..309e41f 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,6 +33,9 @@ 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 2dcf34a..4c46a17 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,5 +32,8 @@ 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 09f457d..a3d669d 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,6 +29,9 @@ 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 9c65bf2..7fbf9b7 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,5 +64,8 @@ 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 449b376..2536db2 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,6 +24,9 @@ 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 230abd6..fb5476b 100644 --- a/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml @@ -10,7 +10,8 @@ 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 + COALESCE(ec_env.members, '') AS envEvaluationMember, + (SELECT e.evaluation_closed FROM evaluation_corp e WHERE e.delete_enum = 'FALSE' LIMIT 1) AS evaluationClosed 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