Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgCertificateChangeRecordDto.java

@@ -54,4 +54,12 @@ public class JgCertificateChangeRecordDto extends BaseModel {
     @ApiModelProperty(value = "登记证书唯一码")
     private String certificateNo;
 
+    @ApiModelProperty(value = "使用单位统一信用代码")
+    private String useUnitCreditCode;
+
+    @ApiModelProperty(value = "使用单位名称")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "设备类别")
+    private String equCategory;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgCertificateChangeRecordEqDto.java

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-07-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgCertificateChangeRecordEqDto", description="")
+public class JgCertificateChangeRecordEqDto extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "变更记录ID")
+    private String changeRecordId;
+
+    @ApiModelProperty(value = "设备ID")
+    private String equId;
+
+    @ApiModelProperty(value = "产品编号")
+    private String productCode;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationUnitDto.java

@@ -117,6 +117,10 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
     @ApiModelProperty(value = "告知设备列表")
     private List<Map<String, Object>> deviceList;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "使用登记证列表")
+    private List<Map<String, Object>> registrationList;
+
     @ApiModelProperty(value = "设备类别")
     private String equType;
 
@@ -146,7 +150,7 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
     @ApiModelProperty(value = "监管码")
     private String supervisoryCode;
 
-    @ApiModelProperty(value = "分类")
+    @ApiModelProperty(value = "设备种类")
     private String equList;
 
     @ApiModelProperty(value = "设备类别")
@@ -169,4 +173,16 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
 
     @ApiModelProperty(value = "公司类型")
     private String companyType;
+
+    @ApiModelProperty(value = "经办人")
+    private String agent;
+
+    @ApiModelProperty(value = "经办人联系电话")
+    private String agentPhone;
+
+    @ApiModelProperty(value = "设备种类编码")
+    private String equListCode;
+
+    @ApiModelProperty(value = "接收机构公司的org_code")
+    private String receiveCompanyOrgCode;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationUnitEqDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -15,11 +16,16 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgChangeRegistrationUnitEqDto", description="单位变更登记设备关系表")
+@ApiModel(value = "JgChangeRegistrationUnitEqDto", description = "单位变更登记设备关系表")
 public class JgChangeRegistrationUnitEqDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "使用登记证")
+    private String registrationCertificate;
+
+    @ApiModelProperty(value = "设备信息json")
+    private String deviceInfo;
 
     @ApiModelProperty(value = "单位变更登记申请id")
     private String unitChangeRegistrationId;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationManageDto.java

@@ -29,7 +29,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
     @ApiModelProperty(value = "使用登记证状态（已登记，已注销）")
     private String certificateStatus;
 
-    @ApiModelProperty(value = "接收机构")
+    @ApiModelProperty(value = "接收机构/登记机关")
     private String receiveOrgName;
 
     @ApiModelProperty(value = "办理日期")
@@ -68,7 +68,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
     @ApiModelProperty(value = "创建时间")
     private String createDate;
 
-    @ApiModelProperty(value = "使用登记编号")
+    @ApiModelProperty(value = "使用登记证编号")
     private String useRegistrationCode;
 
     @ApiModelProperty(value = "使用单位统一信用代码")
@@ -77,7 +77,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
     @ApiModelProperty(value = "接收机构公司代码")
     private String receiveCompanyCode;
 
-    @ApiModelProperty(value = "登记证书编号")
+    @ApiModelProperty(value = "登记证书编号/登记证书唯一码")
     private String certificateNo;
 
     @ApiModelProperty(value = "数据类型：监管/行政审批局，企业")
@@ -86,6 +86,9 @@ public class JgUseRegistrationManageDto extends BaseDto {
     @ApiModelProperty(value = "设备使用地址")
     private String equUseAddress;
 
+    @ApiModelProperty(value = "使用单位地址")
+    private String useUnitAddress;
+
     @ApiModelProperty(value = "使用单位统一信用代码-搜索使用")
     private String useUnitCreditCodeForSearch;
 

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

@@ -88,4 +88,22 @@ public class JgCertificateChangeRecord extends BaseEntity {
 	@TableField("certificate_no")
     private String certificateNo;
 
+    /**
+     * 使用单位统一信用代码
+     */
+    @TableField("use_unit_credit_code")
+    private String useUnitCreditCode;
+
+    /**
+     * 使用单位名称
+     */
+    @TableField("use_unit_name")
+    private String useUnitName;
+
+    /**
+     * 设备类别
+     */
+    @TableField("EQU_CATEGORY")
+    private String equCategory;
+
 }

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

+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-07-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_certificate_change_record_eq")
+public class JgCertificateChangeRecordEq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 变更记录ID
+     */
+	@TableField("change_record_id")
+    private String changeRecordId;
+
+    /**
+     * 设备ID
+     */
+	@TableField("equ_id")
+    private String equId;
+
+    /**
+     * 产品编号
+     */
+	@TableField("product_code")
+    private String productCode;
+
+}

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

@@ -231,7 +231,7 @@ public class JgChangeRegistrationUnit extends BaseEntity {
     @TableField(exist = false)
     private String code96333;
 
-    @TableField(exist = false)
+    @TableField(value = "equ_list")
     private String equList;
 
     /**
@@ -266,4 +266,22 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      */
     @TableField("receive_company_org_code")
     private String receiveCompanyOrgCode;
+
+    /**
+     * 经办人
+     */
+    @TableField("agent")
+    private String agent;
+
+    /**
+     * 经办人联系电话
+     */
+    @TableField("agent_phone")
+    private String agentPhone;
+
+    /**
+     * 设备种类编码
+     */
+    @TableField("equ_list_code")
+    private String equListCode;
 }

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

@@ -23,6 +23,18 @@ public class JgChangeRegistrationUnitEq extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 使用登记证
+     */
+    @TableField("registration_certificate")
+    private String registrationCertificate;
+
+    /**
+     * 设备信息json
+     */
+    @TableField("device_info")
+    private String deviceInfo;
+
+    /**
      * 单位变更登记申请id
      */
 	@TableField("unit_change_registration_id")

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

@@ -150,4 +150,10 @@ public class JgUseRegistrationManage extends BaseEntity {
     @TableField("equ_use_address")
     private String equUseAddress;
 
+    /**
+     * 设备使用地址
+     */
+    @TableField("use_unit_address")
+    private String useUnitAddress;
+
 }

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgCertificateChangeRecordEq;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-07-05
+ */
+public interface JgCertificateChangeRecordEqMapper extends BaseMapper<JgCertificateChangeRecordEq> {
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgCertificateChangeRecordEqService.java

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2024-07-05
+ */
+public interface IJgCertificateChangeRecordEqService {}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationUnitService.java

@@ -63,6 +63,6 @@ public interface IJgChangeRegistrationUnitService {
      * @param model      数据
      * @param submitType 保存类型
      */
-    JgChangeRegistrationUnitDto saveNotice(String submitType, JSONObject model, ReginParams reginParams);
+    List<JgChangeRegistrationUnitDto> saveNotice(String submitType, JSONObject model, ReginParams reginParams);
 
 }

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!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.JgCertificateChangeRecordEqMapper">
+
+</mapper>

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

@@ -4,38 +4,9 @@
 
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit">
         select
-        isn.sequence_nbr AS sequenceNbr,
-        isn.apply_no AS applyNo,
-        isn.apply_date AS applyDate,
-        isn.use_unit_name AS useUnitName,
-        isn.receive_org_name AS receiveOrgName,
-        isn.new_use_unit_name AS newUseUnitName,
-        isn.product_name_b AS productNameB,
-        isn.equ_code_b AS equCodeB,
-        isn.use_inner_code AS useInnerCode,
-        isn.use_regist_code AS useRegistCode,
-        isn.status AS status,
-        isn.instance_id AS instanceId,
-        isn.promoter,
-        isn.next_executor_ids AS nextExecutorIds,
-        isn.instance_status AS instanceStatus,
-        isn.audit_pass_date AS auditPassDate,
-        isn.equ_type AS equType,
-        isn.next_execute_user_ids as nextExecuteUserIds,
-        isn.next_task_id as nextTaskId,
-        isn.create_user_id as createUserId,
-        oi.SUPERVISORY_CODE AS supervisoryCode,
-        oi.CODE96333 as code96333,
-        ibjui."ADDRESS" as detailedAddress,
-        (SELECT name from tz_equipment_category ec WHERE ec.code = ri.EQU_LIST) AS equList,
-        (select name from tz_equipment_category ec WHERE ec.code = ri.EQU_DEFINE) AS equDefine,
-        concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME") AS equAddress
+        isn.*
         FROM
         tzs_jg_change_registration_unit isn
-        LEFT JOIN tzs_jg_change_registration_unit_eq re ON re.unit_change_registration_id = isn.sequence_nbr
-        LEFT JOIN idx_biz_jg_use_info ibjui ON ibjui.record = re.equ_id
-        LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
-        LEFT JOIN idx_biz_jg_other_info oi ON  oi.RECORD = re.equ_id
         <where>
             isn.is_delete = false
             <if test="param != null ">
@@ -69,29 +40,6 @@
                 <if test="param.useRegistCode != null and param.useRegistCode != ''">
                     AND isn.use_regist_code like concat('%',#{param.useRegistCode},'%')
                 </if>
-                <if test="param.equList != null and param.equList != ''">
-                    AND ri.EQU_LIST = #{param.equList}
-                </if>
-                <if test="param.equCategory != null and param.equCategory != ''">
-                    AND ri.EQU_CATEGORY = #{param.equCategory}
-                </if>
-                <if test="param.equDefine != null and param.equDefine != ''">
-                    AND ri.EQU_DEFINE = #{param.equDefine}
-                </if>
-                <if test="param.code96333 != null and param.code96333 != ''">
-                    AND oi.CODE96333 like concat('%',#{param.code96333},'%')
-                </if>
-                <if test="param.supervisoryCode != null and param.supervisoryCode != ''">
-                    AND oi.SUPERVISORY_CODE like concat('%',#{param.supervisoryCode},'%')
-                </if>
-                <if test="param.equAddress != null and param.equAddress != ''">
-                    AND (
-                    ibjui."PROVINCE_NAME" LIKE CONCAT('%', #{param.equAddress}, '%')
-                    OR ibjui."CITY_NAME" LIKE CONCAT('%', #{param.equAddress}, '%')
-                    OR ibjui."COUNTY_NAME" LIKE CONCAT('%', #{param.equAddress}, '%')
-                    OR ibjui."STREET_NAME" LIKE CONCAT('%', #{param.equAddress}, '%')
-                    )
-                </if>
             </if>
             <if test="type == 'supervision'">
                 AND (isn.receive_org_code = #{orgCode} or isn.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
@@ -102,7 +50,7 @@
             </if>
             <if test="roleIds != null and type == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
-                    instance_status like concat('%',#{role},'%')
+                    isn.instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
         </where>
@@ -111,7 +59,6 @@
             isn.${sort.field} ${sort.sortType},
         </if>
         isn.create_date DESC,  isn.apply_no DESC
-
     </select>
 
     <select id="queryEquipInformation" resultType="java.util.Map">

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

@@ -25,7 +25,8 @@
             tjurm.receive_company_code                                          AS receiveCompanyCode,
             tjurm.certificate_no                                                AS certificateNo,
             tjurm.equ_category                                                  AS equCategory,
-            tjurm.equ_use_address                                               AS equUseAddress
+            tjurm.equ_use_address                                               AS equUseAddress,
+            tjurm.use_unit_address                                              AS useUnitAddress
     </sql>
 
 
@@ -71,6 +72,10 @@
             <if test="dto.applyNo != null and dto.applyNo != ''">
                 and tjurm.apply_no like #{dto.applyNo}
             </if>
+            -- 登记证书唯一码
+            <if test="dto.certificateNo != null and dto.certificateNo != ''">
+                and tjurm.certificate_no = #{dto.certificateNo}
+            </if>
             <if test="dto.auditPassDate != null and dto.auditPassDate != ''">
                 and tjurm.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%')
             </if>

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

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+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 com.yeejoin.amos.boot.module.jg.biz.service.impl.JgCertificateChangeRecordEqServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgCertificateChangeRecordEqDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ *
+ * @author system_generator
+ * @date 2024-07-05
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jg-certificate-change-record-eq")
+public class JgCertificateChangeRecordEqController extends BaseController {
+
+    @Autowired
+    JgCertificateChangeRecordEqServiceImpl jgCertificateChangeRecordEqServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<JgCertificateChangeRecordEqDto> save(@RequestBody JgCertificateChangeRecordEqDto model) {
+	    model = jgCertificateChangeRecordEqServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<JgCertificateChangeRecordEqDto> updateBySequenceNbrJgCertificateChangeRecordEq(@RequestBody JgCertificateChangeRecordEqDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(jgCertificateChangeRecordEqServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(jgCertificateChangeRecordEqServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<JgCertificateChangeRecordEqDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(jgCertificateChangeRecordEqServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<JgCertificateChangeRecordEqDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<JgCertificateChangeRecordEqDto> page = new Page<JgCertificateChangeRecordEqDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(jgCertificateChangeRecordEqServiceImpl.queryForJgCertificateChangeRecordEqPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<JgCertificateChangeRecordEqDto>> selectForList() {
+	    return ResponseHelper.buildResponse(jgCertificateChangeRecordEqServiceImpl.queryForJgCertificateChangeRecordEqList());
+	}
+}

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,12 +6,14 @@ 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;
 import io.swagger.annotations.ApiParam;
+import org.springframework.util.MultiValueMap;
 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.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -177,4 +179,27 @@ public class JgUseRegistrationManageController extends BaseController {
 				.collect(Collectors.toList());
 		return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeqList(collect));
 	}
+
+	/**
+	 * 根据证的sequenceNbrs 批量查询证下面的所有设备
+	 * @param current 非必填，不填不分页，展示全部
+	 * @param size 非必填，不填不分页，展示全部
+	 * @param paramMap **仅仅支持** studio平台传参类似&certificateSeqs[0]=1809032149396975618&certificateSeqs[1]=1809032151141806081
+	 *                 如需其他需求使用上面的接口查询
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/queryEquByCertificateSeqs")
+	@ApiOperation(httpMethod = "GET",value = "根据证的sequenceNbr 批量查询证下面的所有设备",  notes = "根据证的sequenceNbr 批量查询证下面的所有设备")
+	public ResponseModel<Page<JSONObject>> queryEquByCertificateSeqList( @RequestParam(value = "current") int current,
+																		 @RequestParam(value = "size") int size,
+																		 @RequestParam MultiValueMap<String, String> paramMap) {
+		List<Long> certificateSeqs = new ArrayList<>();
+		paramMap.forEach((key, value) -> {
+			if (key.startsWith("certificateSeqs[")) {
+				value.forEach(val -> certificateSeqs.add(Long.parseLong(val)));
+			}
+		});
+		return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquForPageByCertificateSeqList(certificateSeqs,current,size));
+	}
 }

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/JgCertificateChangeRecordEqServiceImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgCertificateChangeRecordEqDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgCertificateChangeRecordEq;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgCertificateChangeRecordEqMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgCertificateChangeRecordEqService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2024-07-05
+ */
+@Service
+public class JgCertificateChangeRecordEqServiceImpl extends BaseService<JgCertificateChangeRecordEqDto,JgCertificateChangeRecordEq,JgCertificateChangeRecordEqMapper> implements IJgCertificateChangeRecordEqService {
+    /**
+     * 分页查询
+     */
+    public Page<JgCertificateChangeRecordEqDto> queryForJgCertificateChangeRecordEqPage(Page<JgCertificateChangeRecordEqDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgCertificateChangeRecordEqDto> queryForJgCertificateChangeRecordEqList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

@@ -32,6 +32,7 @@ import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -242,4 +243,54 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         }
         return result;
     }
+
+    /**
+     * 根据证的sequenceNbr集合，批量查询证下面的所有设备
+     * @param sequenceNbrList 证的sequenceNbr集合
+     * @param current 分页-当前页
+     * @param size 分页-分页数
+     * @return 查询结果
+     */
+    public Page<JSONObject> queryEquForPageByCertificateSeqList(List<Long> sequenceNbrList,int current,int size) {
+        List<JgUseRegistrationManage> jgUseRegistrationManageList = this.baseMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>()
+                .in(JgUseRegistrationManage::getSequenceNbr, sequenceNbrList)
+                .eq(JgUseRegistrationManage::getIsDelete, 0));
+        if (ValidationUtil.isEmpty(jgUseRegistrationManageList)){
+            return new Page<>();
+        }
+
+        List<JSONObject> list = new LinkedList<>();
+        long totle = 0;
+
+        Page<JSONObject> result = new Page<>(Optional.of(current).orElse(1), Optional.of(size).orElse(10));
+        Set<String> useOrgCodes = jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getUseRegistrationCode).collect(Collectors.toSet());
+
+        // es中通过查询【使用登记证编号】所有设备
+        SearchRequest request = new SearchRequest("idx_biz_view_jg_all");
+        SearchSourceBuilder builder = new SearchSourceBuilder();
+        builder.trackTotalHits(true);
+
+        BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+        TermsQueryBuilder termsQuery = QueryBuilders.termsQuery("USE_ORG_CODE", useOrgCodes);
+        boolQuery.must(termsQuery);
+        builder.query(boolQuery);
+        builder.from((current - 1) * size);
+        builder.size(size);
+        request.source(builder);
+
+        try {
+            SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
+            for (SearchHit hit : response.getHits().getHits()) {
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
+                JSONObject dto = jsonObject.getJSONObject("sourceAsMap");
+                list.add(dto);
+            }
+            totle = Objects.requireNonNull(response.getInternalResponse().hits().getTotalHits()).value;
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        result.setRecords(list);
+        result.setTotal(totle);
+        return result;
+    }
 }
\ No newline at end of file

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/JgUseRegistrationServiceImpl.java

@@ -2066,6 +2066,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         });
     }
 
+    /**
+     * 处理历史错误单子
+     * @param sequenceNbr
+     * @param instanceId
+     * @param nextTaskId
+     */
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class)
     public void handleErrorForm(Long sequenceNbr, String instanceId, String nextTaskId) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory.json

@@ -86,12 +86,12 @@
       "image": "upload/tzs/common/image/设备停用.png"
     },
     {
-      "name": "移装注销",
+      "name": "注销",
       "code": "BF_YZ",
       "image": "upload/tzs/common/image/移装报废.png"
     },
     {
-      "name": "报废注销",
+      "name": "报废",
       "code": "BF_ZX",
       "image": "upload/tzs/common/image/注销报废.png"
     }