bug
parent
550353265b
commit
828c9b6e57
|
|
@ -216,7 +216,7 @@ public class QualFilingOrchestrator {
|
||||||
domainQuery.setSupervision(query.getSupervision());
|
domainQuery.setSupervision(query.getSupervision());
|
||||||
PageResult<QualFilingEntity> pageResult = qualFilingGateway.page(domainQuery);
|
PageResult<QualFilingEntity> pageResult = qualFilingGateway.page(domainQuery);
|
||||||
List<QualFilingCO> records = pageResult.getRecords().stream()
|
List<QualFilingCO> records = pageResult.getRecords().stream()
|
||||||
.map(entity -> toCO(entity))
|
.map(this::toCO)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
return PageResult.of(records, pageResult.getTotal(), pageResult.getPageNum(), pageResult.getPageSize());
|
return PageResult.of(records, pageResult.getTotal(), pageResult.getPageNum(), pageResult.getPageSize());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
package org.qinan.safetyeval.client.dto;
|
package org.qinan.safetyeval.client.dto;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import java.math.BigDecimal;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 资质备案申请新增命令
|
* 资质备案申请新增命令
|
||||||
*
|
*
|
||||||
|
|
@ -87,7 +88,7 @@ public class QualFilingAddCmd {
|
||||||
@ApiModelProperty(value = "备案状态名称")
|
@ApiModelProperty(value = "备案状态名称")
|
||||||
private String filingStatusName;
|
private String filingStatusName;
|
||||||
|
|
||||||
@ApiModelProperty(value = "申请类型编码(1资质备案申请2变更备案草稿3已备案资质填报-暂时不用)")
|
@ApiModelProperty(value = "申请类型编码(1资质备案申请2变更备案草稿-暂时不用3已备案资质填报)")
|
||||||
private Integer applyTypeCode;
|
private Integer applyTypeCode;
|
||||||
|
|
||||||
@ApiModelProperty(value = "申请类型名称")
|
@ApiModelProperty(value = "申请类型名称")
|
||||||
|
|
|
||||||
|
|
@ -366,6 +366,7 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway {
|
||||||
entity.setFilingRecordStatusCode(dataObject.getFilingRecordStatusCode());
|
entity.setFilingRecordStatusCode(dataObject.getFilingRecordStatusCode());
|
||||||
entity.setFilingRecordStatusName(dataObject.getFilingRecordStatusName());
|
entity.setFilingRecordStatusName(dataObject.getFilingRecordStatusName());
|
||||||
entity.setAttachmentUrls(dataObject.getAttachmentUrls());
|
entity.setAttachmentUrls(dataObject.getAttachmentUrls());
|
||||||
|
entity.setCreateId(dataObject.getCreateId());
|
||||||
entity.setState(dataObject.getState());
|
entity.setState(dataObject.getState());
|
||||||
entity.setTenantId(dataObject.getTenantId());
|
entity.setTenantId(dataObject.getTenantId());
|
||||||
entity.setCreateTime(dataObject.getCreateTime());
|
entity.setCreateTime(dataObject.getCreateTime());
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import org.qinan.safetyeval.domain.entity.OrgResignApplyEntity;
|
import org.qinan.safetyeval.domain.entity.OrgResignApplyEntity;
|
||||||
|
import org.qinan.safetyeval.domain.exception.BizException;
|
||||||
|
import org.qinan.safetyeval.domain.exception.ErrorCode;
|
||||||
import org.qinan.safetyeval.domain.gateway.OrgResignApplyGateway;
|
import org.qinan.safetyeval.domain.gateway.OrgResignApplyGateway;
|
||||||
import org.qinan.safetyeval.domain.query.OrgResignApplyQuery;
|
import org.qinan.safetyeval.domain.query.OrgResignApplyQuery;
|
||||||
import org.qinan.safetyeval.domain.query.PageResult;
|
import org.qinan.safetyeval.domain.query.PageResult;
|
||||||
|
|
@ -36,6 +38,11 @@ public class OrgResignApplyGatewayImpl implements OrgResignApplyGateway {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public OrgResignApplyEntity save(OrgResignApplyEntity entity) {
|
public OrgResignApplyEntity save(OrgResignApplyEntity entity) {
|
||||||
|
if (orgResignApplyMapper.exists(new LambdaQueryWrapper<OrgResignApplyDO>()
|
||||||
|
.eq(OrgResignApplyDO::getPersonnelId, entity.getPersonnelId())
|
||||||
|
.eq(OrgResignApplyDO::getAuditStatusCode, 0))) {
|
||||||
|
throw new BizException(ErrorCode.UNKNOWN_ERROR, "人员离职申请已存在");
|
||||||
|
}
|
||||||
OrgResignApplyDO dataObject = toDO(entity);
|
OrgResignApplyDO dataObject = toDO(entity);
|
||||||
InsertFieldDefaults.apply(dataObject);
|
InsertFieldDefaults.apply(dataObject);
|
||||||
orgResignApplyMapper.insert(dataObject);
|
orgResignApplyMapper.insert(dataObject);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue