diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java index a25ae99..c551eb2 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java @@ -93,6 +93,7 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi { entity.setFieldCalibrationTypeName(cmd.getFieldCalibrationTypeName()); entity.setDualChannelFlag(cmd.getDualChannelFlag()); entity.setEnableFlag(cmd.getEnableFlag()); + entity.setEquipmentValue(cmd.getEquipmentValue()); OrgEquipmentEntity result = orgEquipmentDomainService.modify(entity); return SingleResponse.success(toCO(result)); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java index 7061df7..12e7def 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.app.executor; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jjb.saas.system.client.user.request.UserAddCmd; import com.jjb.saas.system.client.user.request.UserRoleUpdateCmd; import com.jjb.saas.system.client.user.request.UserUpdatePasswordCmd; @@ -361,7 +362,8 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { @Override public SingleResponse> getOrgPersonnel() { - List orgPersonnelDOS = orgPersonnelMapper.selectList(null); + List orgPersonnelDOS = orgPersonnelMapper.selectList(new LambdaQueryWrapper() + .eq(OrgPersonnelDO::getOrgId, ThreadLocalUserInfoAdapter.getOrgId())); List orgPersonnelCOS = orgPersonnelDOS.stream().map(item -> { OrgPersonnelCO orgPersonnelCO = new OrgPersonnelCO(); BeanUtils.copyProperties(item, orgPersonnelCO); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java index 07a97c7..e2be0cd 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java @@ -869,6 +869,7 @@ public class QualFilingOrchestrator { co.setDualChannelFlag(entity.getDualChannelFlag()); co.setCalibrationReportUrl(entity.getCalibrationReportUrl()); co.setTenantId(entity.getTenantId()); + co.setEquipmentValue(entity.getEquipmentValue()); return co; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelInfoCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelInfoCO.java index 5a85f70..7138400 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelInfoCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelInfoCO.java @@ -26,6 +26,9 @@ public class QualFilingPersonnelInfoCO { @ApiModelProperty(value = "人员姓名") private String personName; + @ApiModelProperty(value = "部门名称") + private String deptName; + @ApiModelProperty(value = "职位名称") private String positionName; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java index bb83f9c..b363444 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java @@ -113,6 +113,7 @@ public class OrgEquipmentGatewayImpl implements OrgEquipmentGateway { dataObject.setDualChannelFlag(entity.getDualChannelFlag()); dataObject.setEnableFlag(entity.getEnableFlag()); dataObject.setTenantId(entity.getTenantId()); + dataObject.setEquipmentValue(entity.getEquipmentValue()); return dataObject; } diff --git a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml index d60db5b..6ed721b 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml @@ -70,7 +70,7 @@ select info.credit_code as orgInfoCreditCode, info.unit_name as unitName, filing.* from org_info as info left join qual_filing as filing on info.id = filing.org_id - where info.delete_enum = 'false' + where info.delete_enum = 'false' and filing.filing_status_code = 1 and (info.credit_code like concat('%',#{query.keyword},'%') or info.unit_name like concat('%',#{query.keyword},'%')) diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml index b1aab73..7f57448 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml @@ -50,7 +50,7 @@