cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新需求,资质管理下发app签字管理

dev
zhanglei 2026-08-04 19:45:30 +08:00
parent c5b354b04d
commit 21fa58aec7
5 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java
View File

@ -93,6 +93,7 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi {
entity.setFieldCalibrationTypeName(cmd.getFieldCalibrationTypeName()); entity.setFieldCalibrationTypeName(cmd.getFieldCalibrationTypeName());
entity.setDualChannelFlag(cmd.getDualChannelFlag()); entity.setDualChannelFlag(cmd.getDualChannelFlag());
entity.setEnableFlag(cmd.getEnableFlag()); entity.setEnableFlag(cmd.getEnableFlag());
entity.setEquipmentValue(cmd.getEquipmentValue());
OrgEquipmentEntity result = orgEquipmentDomainService.modify(entity); OrgEquipmentEntity result = orgEquipmentDomainService.modify(entity);
return SingleResponse.success(toCO(result)); return SingleResponse.success(toCO(result));

4
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java
View File

@ -1,5 +1,6 @@
package org.qinan.safetyeval.app.executor; 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.UserAddCmd;
import com.jjb.saas.system.client.user.request.UserRoleUpdateCmd; import com.jjb.saas.system.client.user.request.UserRoleUpdateCmd;
import com.jjb.saas.system.client.user.request.UserUpdatePasswordCmd; import com.jjb.saas.system.client.user.request.UserUpdatePasswordCmd;
@ -361,7 +362,8 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
@Override @Override
public SingleResponse<List<OrgPersonnelCO>> getOrgPersonnel() { public SingleResponse<List<OrgPersonnelCO>> getOrgPersonnel() {
List<OrgPersonnelDO> orgPersonnelDOS = orgPersonnelMapper.selectList(null); List<OrgPersonnelDO> orgPersonnelDOS = orgPersonnelMapper.selectList(new LambdaQueryWrapper<OrgPersonnelDO>()
.eq(OrgPersonnelDO::getOrgId, ThreadLocalUserInfoAdapter.getOrgId()));
List<OrgPersonnelCO> orgPersonnelCOS = orgPersonnelDOS.stream().map(item -> { List<OrgPersonnelCO> orgPersonnelCOS = orgPersonnelDOS.stream().map(item -> {
OrgPersonnelCO orgPersonnelCO = new OrgPersonnelCO(); OrgPersonnelCO orgPersonnelCO = new OrgPersonnelCO();
BeanUtils.copyProperties(item, orgPersonnelCO); BeanUtils.copyProperties(item, orgPersonnelCO);

1
safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java
View File

@ -869,6 +869,7 @@ public class QualFilingOrchestrator {
co.setDualChannelFlag(entity.getDualChannelFlag()); co.setDualChannelFlag(entity.getDualChannelFlag());
co.setCalibrationReportUrl(entity.getCalibrationReportUrl()); co.setCalibrationReportUrl(entity.getCalibrationReportUrl());
co.setTenantId(entity.getTenantId()); co.setTenantId(entity.getTenantId());
co.setEquipmentValue(entity.getEquipmentValue());
return co; return co;
} }

1
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java
View File

@ -113,6 +113,7 @@ public class OrgEquipmentGatewayImpl implements OrgEquipmentGateway {
dataObject.setDualChannelFlag(entity.getDualChannelFlag()); dataObject.setDualChannelFlag(entity.getDualChannelFlag());
dataObject.setEnableFlag(entity.getEnableFlag()); dataObject.setEnableFlag(entity.getEnableFlag());
dataObject.setTenantId(entity.getTenantId()); dataObject.setTenantId(entity.getTenantId());
dataObject.setEquipmentValue(entity.getEquipmentValue());
return dataObject; return dataObject;
} }

2
safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml
View File

@ -62,7 +62,7 @@
<select id="qualificationMonitoringPage" resultMap="QualFilingCOResultMap"> <select id="qualificationMonitoringPage" resultMap="QualFilingCOResultMap">
select info.credit_code as orgInfoCreditCode, info.unit_name as unitName, filing.* from org_info as info 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 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
<if test="query.keyword != null"> <if test="query.keyword != null">
and (info.credit_code like concat('%',#{query.keyword},'%') or info.unit_name like concat('%',#{query.keyword},'%')) and (info.credit_code like concat('%',#{query.keyword},'%') or info.unit_name like concat('%',#{query.keyword},'%'))
</if> </if>