feat(jg):1.按照单位统一代码查询当前单位下的证；

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

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationManageMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 
 /**
  *  Mapper 接口
@@ -11,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface JgUseRegistrationManageMapper extends BaseMapper<JgUseRegistrationManage> {
 
+    List<JgUseRegistrationManageDto> queryByUseUnitCreditCode(@Param("dto") JgUseRegistrationManageDto dto);
+
 }

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

@@ -2,4 +2,40 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationManageMapper">
 
+
+    <select id="queryByUseUnitCreditCode"
+            resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
+        select
+        tjurm.sequence_nbr                                                  AS sequence_nbr,
+        tjurm.use_unit_name                                                 AS use_unit_name,
+        tjurm.apply_no                                                      AS apply_no,
+        tjurm.certificate_status                                            AS certificate_status,
+        tjurm.receive_org_name                                              AS receive_org_name,
+        tjurm.audit_pass_date                                               AS audit_pass_date,
+        tjurm.reg_type                                                      AS reg_type,
+        DATE_FORMAT(tjurm.reg_date,'%Y-%m-%d')                              AS reg_date,
+        tjurm.equ_list                                                      AS equ_list,
+        tjurm.equ_define                                                    AS equ_define,
+        tjurm.remark                                                        AS remark,
+        tjurm.rec_user_id                                                   AS rec_user_id,
+        DATE_FORMAT(tjurm.rec_date,'%Y-%m-%d')                              AS rec_date,
+        tjurm.create_user_id                                                AS create_user_id,
+        DATE_FORMAT(tjurm.create_date,'%Y-%m-%d')                           AS create_date,
+        tjurm.rec_user_name                                                 AS rec_user_name,
+        tjurm.use_registration_code                                         AS use_registration_code,
+        tjurm.use_unit_credit_code                                          AS use_unit_credit_code,
+        tjurm.receive_company_code                                          AS receive_company_code,
+        tjurm.use_registration_certificate_param                            AS use_registration_certificate_param,
+        tjurm.certificate_no                                                AS certificate_no,
+        tjurm.use_flag_certificate_param                                    AS use_flag_certificate_param,
+        tjurm.equ_category                                                  AS equ_category
+        from tzs_jg_use_registration_manage tjurm
+        <where>
+            tjurm.is_delete = 0
+            <if test="dto.useUnitCreditCode != null and dto.useUnitCreditCode != ''">
+                and tjurm.use_unit_credit_code = #{dto.useUnitCreditCode}
+            </if>
+            ORDER BY tjurm.rec_date DESC
+        </where>
+    </select>
 </mapper>

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import cn.hutool.poi.excel.sax.SheetRidReader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationManageServiceImpl;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -102,14 +106,30 @@ public class JgUseRegistrationManageController extends BaseController {
 	}
 
 	/**
-	 * 列表全部数据查询
-     *
-	 * @return
+	 * 按照单位统一代码查询当前单位下的证
+	 * @param dto  dto中的使用单位统一代码（useUnitCreditCode） 非必填，前端不传的话取当前登录单位的统一信用代码 ，有值的话查询该单位的所有证
+	 * @return 证的列表
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
 	@GetMapping(value = "/list")
-	public ResponseModel<List<JgUseRegistrationManageDto>> selectForList() {
-	    return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManageList());
+	@ApiOperation(httpMethod = "GET",value = "按照单位统一代码查询当前单位下的证",  notes = "按照单位统一代码查询当前单位下的证")
+	public ResponseModel<List<JgUseRegistrationManageDto>> queryByUseUnitCreditCode(JgUseRegistrationManageDto dto) {
+		if (ValidationUtil.isEmpty(dto.getUseRegistrationCode())){
+			// 不传的话取当前登录单位的统一信用代码
+			dto.setUseUnitCreditCode(getSelectedOrgInfo().getCompany().getCompanyCode());
+		}
+		return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryByUseUnitCreditCode(dto));
+	}
+
+	/**
+	 * 根据证的sequenceNbr 查询证下面的所有设备
+	 * @param sequenceNbr  证的sequenceNbr
+	 * @return 证下的所有设备
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/queryEquByCertificateSeq")
+	@ApiOperation(httpMethod = "GET",value = "根据证的sequenceNbr 查询证下面的所有设备",  notes = "根据证的sequenceNbr 查询证下面的所有设备")
+	public ResponseModel<List<Map<String, Object>>> queryEquByCertificateSeq(Long sequenceNbr) {
+		return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeq(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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.netflix.discovery.converters.Auto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationManageMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务实现类
@@ -17,17 +28,44 @@ import java.util.List;
  */
 @Service
 public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistrationManageDto,JgUseRegistrationManage,JgUseRegistrationManageMapper> implements IJgUseRegistrationManageService {
+
+    @Autowired
+    private JgUseRegistrationManageMapper jgUseRegistrationManageMapper;
+
+    @Autowired
+    private JgUseRegistrationMapper jgUseRegistrationMapper;
+
+    @Autowired
+    private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
+
     /**
      * 分页查询
      */
     public Page<JgUseRegistrationManageDto> queryForJgUseRegistrationManagePage(Page<JgUseRegistrationManageDto> page)   {
         return this.queryForPage(page, null, false);
     }
+    /**
+     * 列表查询
+     */
+    public List<JgUseRegistrationManageDto> queryByUseUnitCreditCode(JgUseRegistrationManageDto dto)   {
+        return jgUseRegistrationManageMapper.queryByUseUnitCreditCode(dto);
+    }
 
     /**
-     * 列表查询 示例
+     * 根据证的sequenceNbr 查询证下面的所有设备
      */
-    public List<JgUseRegistrationManageDto> queryForJgUseRegistrationManageList()   {
-        return this.queryForList("" , false);
+    public List<Map<String, Object>> queryEquByCertificateSeq(Long sequenceNbr)   {
+        // JgUseRegistrationManage jgUseRegistrationManage = this.baseMapper.selectOne(new LambdaQueryWrapper<JgUseRegistrationManage>()
+        //         .eq(JgUseRegistrationManage::getSequenceNbr, sequenceNbr)
+        //         .eq(JgUseRegistrationManage::getIsDelete, 0));
+        // if (ValidationUtil.isEmpty(jgUseRegistrationManage.getApplyNo())){
+        //     return new ArrayList<>();
+        // }
+        // JgUseRegistration useRegistration = jgUseRegistrationMapper.selectOne(new LambdaQueryWrapper<JgUseRegistration>()
+        //         .eq(JgUseRegistration::getApplyNo, jgUseRegistrationManage.getApplyNo()));
+        // JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
+        //         .eq(JgRegistrationHistory::getCurrentDocumentId, useRegistration.getSequenceNbr()));
+        // jgRegistrationHistory.
+        return new ArrayList<Map<String, Object>>();
     }
 }
\ No newline at end of file