fix(jg):证书的分页接口添加筛选条件

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml

@@ -38,6 +38,9 @@
             <if test="dto.useUnitCreditCode != null and dto.useUnitCreditCode != ''">
                 and tjurm.use_unit_credit_code = #{dto.useUnitCreditCode}
             </if>
+            <if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != ''">
+                and tjurm.receive_company_code = #{dto.receiveCompanyCode}
+            </if>
             ORDER BY tjurm.rec_date DESC
         </where>
     </select>
@@ -85,6 +88,9 @@
             <if test="dto.useUnitCreditCodeForSearch != null and dto.useUnitCreditCodeForSearch != ''">
                 and tjurm.use_unit_credit_code = #{dto.useUnitCreditCodeForSearch}
             </if>
+            <if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != ''">
+                and tjurm.receive_company_code = #{dto.receiveCompanyCode}
+            </if>
             -- 企业根据企业统一信用代码匹配
             <if test="dto.dataType == 'company' ">
                 AND tjurm.use_unit_credit_code = #{dto.useUnitCreditCode}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationManageServiceImpl.java

@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
@@ -74,6 +75,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
 
     @Autowired
     private JgVehicleInformationEqMapper jgVehicleInformationEqMapper;
+    private Systemctl systemctl;
 
     /**
      * 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中
@@ -84,8 +86,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
 
         // 使用登记表中已经审批通过的单子
         List<JgUseRegistration> jgUseRegistrations = jgUseRegistrationMapper.selectList(new LambdaQueryWrapper<JgUseRegistration>()
-                .eq(JgUseRegistration::getStatus, "已完成"));
+                .eq(JgUseRegistration::getStatus, "已完成")
+                .eq(JgUseRegistration::getIsDelete, false));
         for (JgUseRegistration useRegistration : jgUseRegistrations) {
+            // 使用单位信息
+            Map<String, Object> enterpriseInfo = commonServiceImpl.getEnterpriseInfo(useRegistration.getUseUnitCreditCode());
             // 设备使用地址
             String fullAddress = "";
             // 设备种类/类别/品种
@@ -136,6 +141,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             jgUseRegistrationManage.setCreateUserId(useRegistration.getCreateUserId());
             jgUseRegistrationManage.setCreateDate(useRegistration.getRecDate());
             jgUseRegistrationManage.setEquUseAddress(fullAddress);
+            jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
             jgUseRegistrationManage.setUseRegistrationCode(useRegistration.getUseRegistrationCode());
             jgUseRegistrationManage.setUseUnitCreditCode(useRegistration.getUseUnitCreditCode());
             jgUseRegistrationManage.setReceiveCompanyCode(useRegistration.getReceiveCompanyCode());
@@ -146,8 +152,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
 
         // 车用气瓶使用登记表中已经审批通过的单子
         List<JgVehicleInformation> jgVehicleInformations = jgVehicleInformationMapper.selectList(new LambdaQueryWrapper<JgVehicleInformation>()
-                .eq(JgVehicleInformation::getStatus, "已完成"));
+                .eq(JgVehicleInformation::getStatus, "已完成")
+                .eq(JgVehicleInformation::getIsDelete, false));
         for (JgVehicleInformation vehicleInformation : jgVehicleInformations) {
+            // 使用单位信息
+            Map<String, Object> enterpriseInfo = commonServiceImpl.getEnterpriseInfo(vehicleInformation.getUseUnitCreditCode());
             // 设备种类/类别/品种
             Map<String, String> equType = jgUseRegistrationMapper.getEquTypeByVehSeq(String.valueOf(vehicleInformation.getSequenceNbr()));
             // 组装数据
@@ -172,13 +181,13 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             jgUseRegistrationManage.setCreateUserId(vehicleInformation.getCreateUserId());
             jgUseRegistrationManage.setCreateDate(vehicleInformation.getRecDate());
             jgUseRegistrationManage.setEquUseAddress("");
+            jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
             jgUseRegistrationManage.setUseRegistrationCode(vehicleInformation.getUseRegistrationCode());
             jgUseRegistrationManage.setUseUnitCreditCode(vehicleInformation.getUseUnitCreditCode());
             jgUseRegistrationManage.setReceiveCompanyCode(vehicleInformation.getReceiveCompanyCode());
             jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType,vehicleInformation.getAuditPassDate(),vehicleInformation.getReceiveCompanyCode()));
             this.baseMapper.insert(jgUseRegistrationManage);
         }
-
         return Boolean.TRUE;
     }