From 30f6b3146942576c301f164e73f0d2306c0ddd28 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 4 Aug 2026 18:37:46 +0800 Subject: [PATCH 1/3] person --- .../qinan/safetyeval/client/co/QualFilingPersonnelInfoCO.java | 3 +++ .../src/main/resources/mapper/OrgPersonnelMapper.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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/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 fp.source_personnel_id, fp.id, p.user_name personName, po.position_name, p.post_id, p.gender_code, p.gender_name - , p.birth_date, p.register_engineer_flag, p.evaluator_cert_no,fp.filing_id, p.join_work_date + , p.birth_date, p.register_engineer_flag, p.evaluator_cert_no,fp.filing_id, p.join_work_date,d.dept_name FROM org_personnel p join qual_filing_personnel fp on p.id = fp.source_personnel_id left join org_department d on p.dept_id = d.id and d.delete_enum = 'false' From 21fa58aec75d9fab7c4984674fa1f8929dc1f39d Mon Sep 17 00:00:00 2001 From: zhanglei Date: Tue, 4 Aug 2026 19:45:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82,=E8=B5=84?= =?UTF-8?q?=E8=B4=A8=E7=AE=A1=E7=90=86=E4=B8=8B=E5=8F=91app=E7=AD=BE?= =?UTF-8?q?=E5=AD=97=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qinan/safetyeval/app/executor/OrgEquipmentExecutor.java | 1 + .../qinan/safetyeval/app/executor/OrgPersonnelExecutor.java | 4 +++- .../safetyeval/app/orchestrator/QualFilingOrchestrator.java | 1 + .../infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java | 1 + .../src/main/resources/mapper/QualFilingMapper.xml | 2 +- 5 files changed, 7 insertions(+), 2 deletions(-) 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-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/QualFilingMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml index 586ba60..b385c1d 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml @@ -62,7 +62,7 @@