隐患考评调整
parent
751582636c
commit
3c513f9229
|
|
@ -1,6 +1,7 @@
|
|||
package com.zcloud.hidden.evaluation.command;
|
||||
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||
import com.zcloud.hidden.evaluation.domain.enums.CompliantFlagEnum;
|
||||
import com.zcloud.hidden.evaluation.domain.enums.EvaluationResultEnum;
|
||||
import com.zcloud.hidden.evaluation.domain.gateway.HiddenEvaluationDetailGateway;
|
||||
|
|
@ -11,10 +12,7 @@ import com.zcloud.hidden.evaluation.dto.HiddenEvaluationDetailAddCmd;
|
|||
import com.zcloud.hidden.evaluation.persistence.dataobject.EvaluationConfigDO;
|
||||
import com.zcloud.hidden.evaluation.persistence.dataobject.HiddenDO;
|
||||
import com.zcloud.hidden.evaluation.persistence.dataobject.HiddenEvaluationDetailDO;
|
||||
import com.zcloud.hidden.evaluation.persistence.repository.EvaluationConfigRepository;
|
||||
import com.zcloud.hidden.evaluation.persistence.repository.HiddenEvaluationDetailRepository;
|
||||
import com.zcloud.hidden.evaluation.persistence.repository.HiddenEvaluationRecordRepository;
|
||||
import com.zcloud.hidden.evaluation.persistence.repository.HiddenRepository;
|
||||
import com.zcloud.hidden.evaluation.persistence.repository.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
|
|
@ -43,14 +41,28 @@ public class HiddenEvaluationDetailAddExe {
|
|||
private final EvaluationConfigRepository evaluationConfigRepository;
|
||||
private final HiddenEvaluationDetailRepository hiddenEvaluationDetailRepository;
|
||||
private final HiddenRepository hiddenRepository;
|
||||
private final CorpInfoRepository corpInfoRepository;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean execute(HiddenEvaluationDetailAddCmd cmd) {
|
||||
List<EvaluationConfigDO> listByCorpId =evaluationConfigRepository.getListByCorpId(cmd.getCorpinfoId(), cmd.getEvaluationType());
|
||||
//判断当前人是否可以评论
|
||||
if (!listByCorpId.stream().anyMatch(config -> config.getUserId().equals(cmd.getEvaluationUserId()))) {
|
||||
throw new BizException("当前用户没有权限评审");
|
||||
//判断当前人是否可以评论,，如果是企业登录，当前人所在的 企业也可以评审
|
||||
if(corpInfoRepository.checkCorp()){
|
||||
// 企业登录：验证当前企业是否在配置列表中
|
||||
if (!listByCorpId.stream().anyMatch(config ->
|
||||
AuthContext.getTenantId().equals(config.getCorpinfoId()))) {
|
||||
throw new BizException("当前企业没有权限评论");
|
||||
}
|
||||
}else{
|
||||
// 个人登录：验证当前用户是否在配置列表中
|
||||
if (!listByCorpId.stream().anyMatch(config ->
|
||||
AuthContext.getUserId().equals(config.getUserId()))) {
|
||||
throw new BizException("当前用户没有权限评审");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
HiddenDO hiddenDO = hiddenRepository.getByHiddenId(cmd.getHiddenId());
|
||||
if (hiddenDO == null) {
|
||||
throw new BizException("隐患不存在");
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ public class HiddenEvaluationRecordQueryExe {
|
|||
|
||||
examCenterCOS.forEach(co -> {
|
||||
if (co.getCheckUserId() != null && co.getCheckUserId().contains(checkKey)) {
|
||||
co.setCurrentEvaluationFlag(true);
|
||||
co.setCurrentEvaluationFlag(false);
|
||||
}
|
||||
});
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ import java.io.Serializable;
|
|||
@AllArgsConstructor
|
||||
public class HiddenEvaluationDetailAddCmd implements Serializable {
|
||||
|
||||
@ApiModelProperty(value = "企业id", name = "corpinfoId", required = true)
|
||||
@ApiModelProperty(value = "需要考评的企业id", name = "corpinfoId", required = true)
|
||||
@NotNull(message = "企业不能为空")
|
||||
private Long corpinfoId;
|
||||
@ApiModelProperty(value = "隐患id", name = "hiddenId", required = true)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public class HiddenStatisticsCO implements Serializable {
|
|||
@ApiModelProperty(value = "考评结果.1:考核未完成,2:考评合格,3:考核不合格")
|
||||
private String evaluationResult;
|
||||
@ApiModelProperty(value = "当前人是否考评过,true是,false否")
|
||||
private Boolean currentEvaluationFlag = false;
|
||||
private Boolean currentEvaluationFlag = true;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,9 @@ public class EvaluationConfigDO extends BaseDO {
|
|||
//考评类型,1:安全类,2:环保类
|
||||
@ApiModelProperty(value = "考评类型,1:安全类,2:环保类")
|
||||
private Integer evaluationType;
|
||||
@ApiModelProperty(value = "企业id")
|
||||
@TableField(exist = false)
|
||||
private Long evalCorpinfoId;
|
||||
//部门id
|
||||
@ApiModelProperty(value = "部门id")
|
||||
private Long departmentId;
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ public interface EvaluationConfigMapper extends BaseMapper<EvaluationConfigDO> {
|
|||
|
||||
List<EvaluationConfigDO> listAll(Map<String, Object> params);
|
||||
|
||||
List<EvaluationConfigDO> getListByCorpId(Long corpinfoId);
|
||||
List<EvaluationConfigDO> getListByCorpId(Long corpinfoId, Integer evaluationType);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -43,11 +43,7 @@ public class EvaluationConfigRepositoryImpl extends BaseRepositoryImpl<Evaluatio
|
|||
|
||||
@Override
|
||||
public List<EvaluationConfigDO> getListByCorpId(Long corpinfoId, Integer evaluationType) {
|
||||
QueryWrapper<EvaluationConfigDO> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("corpinfo_id",corpinfoId);
|
||||
queryWrapper.eq("evaluation_type",evaluationType);
|
||||
|
||||
return list(queryWrapper);
|
||||
return evaluationConfigMapper.getListByCorpId(corpinfoId,evaluationType);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -72,5 +72,19 @@
|
|||
</if>
|
||||
order by ec.create_time desc
|
||||
</select>
|
||||
|
||||
<select id="getListByCorpId" resultType="com.zcloud.hidden.evaluation.persistence.dataobject.EvaluationConfigDO">
|
||||
SELECT ec.id,ec.corpinfo_id,ec.evaluation_type,ec.department_id,ec.user_id,
|
||||
d.name AS departmentName,u.name AS userName,u.corpinfo_id as evalCorpinfoId
|
||||
FROM evaluation_config ec
|
||||
JOIN department d ON ec.department_id = d.id
|
||||
JOIN user u ON ec.user_id = u.id
|
||||
WHERE ec.delete_enum = 'FALSE'
|
||||
AND ec.corpinfo_id = #{corpinfoId}
|
||||
<if test="evaluationType != null">
|
||||
AND ec.evaluation_type = #{evaluationType}
|
||||
</if>
|
||||
order by ec.create_time desc
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue