Merge remote-tracking branch 'origin/dev' into dev

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));

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<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 -> {
             OrgPersonnelCO orgPersonnelCO = new OrgPersonnelCO();
             BeanUtils.copyProperties(item, orgPersonnelCO);

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;
     }
 

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;
 

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;
     }
 

safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml

@@ -70,7 +70,7 @@
 
     <!-- 资质备案人员分页查询，直接返回 CO -->
     <select id="filingPage" resultType="org.qinan.safetyeval.client.co.QualFilingPersonnelInfoCO">
-        SELECT p.id source_personnel_id, p.id, p.user_name personName, po.position_name, p.post_id, p.gender_code, p.gender_name
+        SELECT p.id source_personnel_id, p.id, p.user_name personName, d.dept_name, po.position_name, p.post_id, p.gender_code, p.gender_name
              , p.birth_date, p.register_engineer_flag, p.evaluator_cert_no, p.join_work_date
         FROM org_personnel p
         left join org_department d on p.dept_id = d.id and d.delete_enum = 'false'

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

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

safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml

@@ -50,7 +50,7 @@
 
     <select id="getFillingPersonInfo" resultType="org.qinan.safetyeval.client.co.QualFilingPersonnelInfoCO">
         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'