feat(jg):证的详情相关接口

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistrationManage.java

@@ -151,7 +151,7 @@ public class JgUseRegistrationManage extends BaseEntity {
     private String equUseAddress;
 
     /**
-     * 设备使用地址
+     * 使用单位地址
      */
     @TableField("use_unit_address")
     private String useUnitAddress;

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

@@ -6,6 +6,7 @@ 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.entity.JgUseRegistrationManage;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.component.robot.BadRequest;
 import io.swagger.annotations.ApiParam;
@@ -100,17 +101,43 @@ public class JgUseRegistrationManageController extends BaseController {
     }
 
     /**
-     * 根据sequenceNbr查询
+     * 根据sequenceNbr查询---使用登记证详情用
      *
      * @param sequenceNbr 主键
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/detail")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<Map<String,Object>> selectOne(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询---使用登记证详情用", notes = "根据sequenceNbr查询---使用登记证详情用")
+    public ResponseModel<JgUseRegistrationManage> detail(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
         return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryDetailBySeq(sequenceNbr));
     }
+    /**
+     * 根据sequenceNbr查询使用登记证操作流水---使用登记证详情用
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/detail/operationRecord")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询使用登记证操作流水---使用登记证详情用", notes = "根据sequenceNbr查询使用登记证操作流水---使用登记证详情用")
+    public ResponseModel<List<Map<String, String>>> operationRecord(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
+        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.operationRecord(sequenceNbr));
+    }
+    /**
+     * 根据sequenceNbr查询使用登记证对应设备列表---使用登记证详情用
+     * 分页接口
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/detail/equList")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询使用登记证对应设备列表---使用登记证详情用", notes = "根据sequenceNbr查询使用登记证对应设备列表---使用登记证详情用")
+    public ResponseModel<Page<JSONObject>> certificateEquList(@RequestParam(value = "current") int current,
+                                                                  @RequestParam(value = "size") int size,
+                                                                  @RequestParam(value = "sequenceNbr") String sequenceNbr) {
+        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.certificateEquList(current,size,sequenceNbr));
+    }
 
     /**
      * 列表分页查询

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

@@ -36,6 +36,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -202,28 +203,43 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     }
 
     /**
-     * 根据证sequenceNbr查询使用登记证详细信息
-     * @param sequenceNbr 使用登记证sequenceNbr
-     * @return 使用登记证详细信息
+     * 根据sequenceNbr查询---使用登记证详情用
+     *
+     * @param 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);
+    public JgUseRegistrationManage queryDetailBySeq(String sequenceNbr) {
+        return this.baseMapper.selectById(sequenceNbr);
+    }
 
-        // 证的操作流水
+    /**
+     * 根据sequenceNbr查询使用登记证 操作流水---使用登记证详情用
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    public List<Map<String, String>> operationRecord(String sequenceNbr) {
+        JgUseRegistrationManage jgUseRegistrationManage = this.baseMapper.selectById(sequenceNbr);
         List<JgCertificateChangeRecord> changeRecordList = jgCertificateChangeRecordService.list(new LambdaQueryWrapper<JgCertificateChangeRecord>()
                 .eq(JgCertificateChangeRecord::getUseRegistrationCode, jgUseRegistrationManage.getUseRegistrationCode()));
-        result.put("certificateOperationRecord",changeRecordList);
+        return changeRecordList.stream()
+                .map(x -> {
+                    Map<String, String> map = new HashMap<>();
+                    map.put("operatingTime", String.valueOf(x.getRecDate()));
+                    map.put("content", x.getChangeContent());
+                    return map;
+                })
+                .collect(Collectors.toList());
+    }
 
-        return result;
+    /**
+     * 根据sequenceNbr查询使用登记证对应设备列表---使用登记证详情用
+     * 分页接口
+     * @param sequenceNbr 主键
+     * @return
+     */
+    public Page<JSONObject> certificateEquList(int current,int size,String sequenceNbr) {
+        return queryEquForPageByCertificateSeqList(Collections.singletonList(Long.parseLong(sequenceNbr)), current, size);
     }
 
     /**