fix(jg):使用登记证详情

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

@@ -41,7 +41,7 @@
             <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 != ''">
+            <if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != '' ">
                 and tjurm.receive_company_code = #{dto.receiveCompanyCode}
             </if>
             <if test="dto.equListCode != null and dto.equListCode != ''">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 import cn.hutool.poi.excel.sax.SheetRidReader;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.api.R;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
@@ -105,10 +106,10 @@ public class JgUseRegistrationManageController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
+    @GetMapping(value = "/detail")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<JgUseRegistrationManageDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryBySeq(sequenceNbr));
+    public ResponseModel<Map<String,Object>> selectOne(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
+        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryDetailBySeq(sequenceNbr));
     }
 
     /**
@@ -150,9 +151,14 @@ public class JgUseRegistrationManageController extends BaseController {
     @GetMapping(value = "/list")
     @ApiOperation(httpMethod = "GET", value = "按照单位统一代码查询当前单位下的证", notes = "按照单位统一代码查询当前单位下的证")
     public ResponseModel<List<JgUseRegistrationManageDto>> queryByUseUnitCreditCode(JgUseRegistrationManageDto dto) {
+        CompanyBo company = getSelectedOrgInfo().getCompany();
+        if (company.getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
             if (ValidationUtil.isEmpty(dto.getUseUnitCreditCode())) {
                 // 不传的话取当前登录单位的统一信用代码
-            dto.setUseUnitCreditCode(getSelectedOrgInfo().getCompany().getCompanyCode());
+                dto.setUseUnitCreditCode(company.getCompanyCode());
+            }
+        } else {
+            dto.setReceiveCompanyCode(company.getCompanyCode());
         }
         return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryByUseUnitCreditCode(dto));
     }

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

@@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
+import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService;
@@ -75,7 +72,9 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
 
     @Autowired
     private JgVehicleInformationEqMapper jgVehicleInformationEqMapper;
-    private Systemctl systemctl;
+
+    @Autowired
+    private JgCertificateChangeRecordServiceImpl jgCertificateChangeRecordService;
 
     /**
      * 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中
@@ -203,6 +202,31 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     }
 
     /**
+     * 根据证sequenceNbr查询使用登记证详细信息
+     * @param sequenceNbr 使用登记证sequenceNbr
+     * @return 使用登记证详细信息
+     */
+    public Map<String,Object> queryDetailBySeq(String sequenceNbr) {
+        HashMap<String, Object> result = new HashMap<>();
+
+        // 使用登记证信息
+        JgUseRegistrationManage jgUseRegistrationManage = this.baseMapper.selectOne(new LambdaQueryWrapper<JgUseRegistrationManage>()
+                .eq(JgUseRegistrationManage::getSequenceNbr, sequenceNbr));
+        result.put("certificateDetail", jgUseRegistrationManage);
+
+        // 证对应设备的列表
+        List<JSONObject> equLists = queryEquByCertificateSeq(Long.parseLong(sequenceNbr));
+        result.put("certificateEquList", equLists);
+
+        // 证的操作流水
+        List<JgCertificateChangeRecord> changeRecordList = jgCertificateChangeRecordService.list(new LambdaQueryWrapper<JgCertificateChangeRecord>()
+                .eq(JgCertificateChangeRecord::getUseRegistrationCode, jgUseRegistrationManage.getUseRegistrationCode()));
+        result.put("certificateOperationRecord",changeRecordList);
+
+        return result;
+    }
+
+    /**
      * 列表查询
      */
     public List<JgUseRegistrationManageDto> queryByUseUnitCreditCode(JgUseRegistrationManageDto dto) {