Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-biz-common/pom.xml

@@ -15,7 +15,6 @@
         <dependency>
             <groupId>com.yeejoin</groupId>
             <artifactId>amos-component-security</artifactId>
-            <version>1.10.8-TZS</version>
         </dependency>
         <dependency>
             <groupId>org.typroject</groupId>

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -97,11 +97,11 @@ public class ControllerAop {
 		urls.add("/tcm/flc-unit-info/region/tree");
 		urls.add("/tcm/reg-unit-info/management-unit/tree");
 		urls.add("/tcm/reg-unit-info/unit-type/list");
-		urls.add("^/tcm/flc-unit-info/hasExistPhone/[0-9]+$");
-		urls.add("^/tcm/flc-unit-info/sendTelCode/[0-9]+$");
-		urls.add("^/tcm/reg-unit-info/[A-Za-z0-9]+/check$");
-		urls.add("^/tcm/flc-unit-info/verifyTelCode/[A-Za-z0-9]+/[A-Za-z0-9]+");
-		urls.add("^/tcm/flc-unit-info/hasExistUser/[A-Za-z0-9_-]+");
+		urls.add("/tcm/flc-unit-info/hasExistPhone/[0-9]+$");
+		urls.add("/tcm/flc-unit-info/sendTelCode/[0-9]+$");
+		urls.add("/tcm/reg-unit-info/[A-Za-z0-9]+/check$");
+		urls.add("/tcm/flc-unit-info/verifyTelCode/[A-Za-z0-9]+/[A-Za-z0-9]+");
+		urls.add("/tcm/flc-unit-info/hasExistUser/.+");
 		urls.add("/tcm/reg-unit-info/save");
 		urls.add("/tcm/reg-unit-info/child-list");
 		urls.add("/tcm/reg-unit-info/management-unit/tree");

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/feign/FeignAuthRequestInterceptor.java

@@ -35,6 +35,15 @@ public class FeignAuthRequestInterceptor implements RequestInterceptor {
             if (product == null) {
                 product = request.getParameter("product");
             }
+            if (authToken == null) {
+                authToken = RequestContext.getToken();
+            }
+            if (appKey == null) {
+                appKey = RequestContext.getAppKey();
+            }
+            if (product == null) {
+                product = RequestContext.getProduct();
+            }
             template.header("X-Access-Token", authToken);
             template.header("token", authToken);
             template.header("appKey", appKey);

amos-boot-biz-common/src/main/resources/template2/bean.java.ftl

@@ -6,6 +6,7 @@ import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import java.util.Date;
 
 /**
  * ${table.comment!}

amos-boot-biz-common/src/main/resources/template2/controller.java.ftl

@@ -19,7 +19,7 @@ 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 ${package.Xml}.${entity}Model;
+import ${package.Xml}.${entity};
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
@@ -55,9 +55,9 @@ public class ${table.controllerName} {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<${entity}Model> save(@RequestBody ${entity}Model model) {
-	    model = ${table.serviceImplName ?uncap_first}.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
+	public ResponseModel<${entity}> save(@RequestBody ${entity} ) {
+	    entity = ${table.serviceImplName ?uncap_first}.createWithModel(entity);
+	    return ResponseHelper.buildResponse(entity);
 	}
 
 	/**
@@ -69,9 +69,9 @@ public class ${table.controllerName} {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	public ResponseModel<${entity}Model> updateBySequenceNbr${entity}(@RequestBody ${entity}Model model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.updateWithModel(model));
+	public ResponseModel<${entity}> updateBySequenceNbr${entity}(@RequestBody ${entity} entity,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    entity.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.updateWithModel(entity));
 	}
 
 	/**
@@ -96,7 +96,7 @@ public class ${table.controllerName} {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<${entity}Model> selectOne(@PathVariable Long sequenceNbr) {
+	public ResponseModel<${entity}> selectOne(@PathVariable Long sequenceNbr) {
 	    return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.queryBySeq(sequenceNbr));
 	}
 
@@ -110,9 +110,9 @@ public class ${table.controllerName} {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<${entity}Model>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+	public ResponseModel<Page<${entity}>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
                     (value = "size") int size) {
-	    Page<${entity}Model> page = new Page<${entity}Model>();
+	    Page<${entity}> page = new Page<${entity}>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 	    return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.queryFor${entity}Page(page));
@@ -126,7 +126,7 @@ public class ${table.controllerName} {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
 	@GetMapping(value = "/list")
-	public ResponseModel<List<${entity}Model>> selectForList() {
+	public ResponseModel<List<${entity}>> selectForList() {
 	    return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.queryFor${entity}List());
 	}
 }

amos-boot-biz-common/src/main/resources/template2/serviceImpl.java.ftl

@@ -3,7 +3,7 @@ package ${package.ServiceImpl};
 import ${package.Entity}.${entity};
 import ${package.Mapper}.${table.mapperName};
 import ${package.Service}.${table.serviceName};
-import ${package.Xml}.${entity}Model;
+import ${package.Xml}.${entity};
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,18 +16,18 @@ import java.util.List;
  * @date ${date}
  */
 @Service
-public class ${table.serviceImplName} extends BaseService<${entity}Model,${entity},${table.mapperName}> implements ${table.serviceName} {
+public class ${table.serviceImplName} extends BaseService<${entity},${entity},${table.mapperName}> implements ${table.serviceName} {
     /**
      * 分页查询
      */
-    public Page<${entity}Model> queryFor${entity}Page(Page<${entity}Model> page)   {
+    public Page<${entity}> queryFor${entity}Page(Page<${entity}> page)   {
         return this.queryForPage(page, null, false);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<${entity}Model> queryFor${entity}List()   {
+    public List<${entity}> queryFor${entity}List()   {
         return this.queryForList("" , false);
     }
 }
\ No newline at end of file

amos-boot-data/amos-boot-data-accessapi/pom.xml

@@ -181,7 +181,6 @@
         <dependency>
             <groupId>com.yeejoin</groupId>
             <artifactId>amos-component-security</artifactId>
-            <version>${amos.version}</version>
         </dependency>
     </dependencies>
     <build>

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsTcmServiceFeignClient.java

@@ -29,7 +29,7 @@ public interface TzsTcmServiceFeignClient {
      * @param dictCode 字段类型
      * @return 列表
      */
-    @RequestMapping(value = "/getDataDictionary/{dictCode}", method = RequestMethod.GET)
+    @RequestMapping(value = "/data-dictionary/getDataDictionary/{dictCode}", method = RequestMethod.GET)
     ResponseModel<Object> getDataDictionary(@PathVariable String dictCode);
 
 }

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/event/OperateLogRestEventHandler.java

@@ -26,7 +26,7 @@ public class OperateLogRestEventHandler extends RestEventHandler {
     @Value("${spring.application.name}")
     private String applicationName;
 
-    private ESUserOperateLogDao esUserOperateLogDao;
+    private final ESUserOperateLogDao esUserOperateLogDao;
 
     public OperateLogRestEventHandler(ESUserOperateLogDao esUserOperateLogDao) {
         this.esUserOperateLogDao = esUserOperateLogDao;

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
@@ -26,6 +10,20 @@ import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IDynamicFormInstanceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * 动态表单实例表服务实现类
@@ -136,18 +134,18 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
         Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
         Page page = new Page();
-        if (current > 0){
-            page.setCurrent((long) (current - 1) *size);
+        if (current > 0) {
+            page.setCurrent((long) (current - 1) * size);
             page.setSize(size);
         }
-        if (!params.isEmpty()&&params !=null){
-           if (!params.get("sort").isEmpty() && params.get("sort") != null){
-               String[] sorts = params.get("sort").split(",");
-               params.put("date",sorts[0]);
-               params.put("lift",sorts[1]);
-         }
+        if (!params.isEmpty() && params != null) {
+            if (!ValidationUtil.isEmpty(params.get("sort")) && params.get("sort") != null) {
+                String[] sorts = params.get("sort").split(",");
+                params.put("date", sorts[0]);
+                params.put("lift", sorts[1]);
+            }
         }
-        return this.getBaseMapper().pageList(page, RequestContext.getAppKey(), fieldCodes, groupCode, params);
+        return this.getBaseMapper().pageList(page, null, fieldCodes, groupCode, params);
     }
     // 不存在值班数据则不查找 修改sql 方法去除 by kongfm 2021-09-14
     public IPage<Map<String, Object>> pageListNew(int current, int size, String groupCode, String beginDate, String endDate) {

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderUnitMapper.xml

@@ -93,7 +93,7 @@
         FROM
         tz_cylinder_unit u
         WHERE
-        NOT EXISTS (select 1 from  tzs_jg_use_registration r where r.use_unit_credit_code = u.credit_code and r.manage_type='unit' and r.status ='已完成')
+        NOT EXISTS (select 1 from  tzs_jg_use_registration r where r.use_unit_credit_code = u.credit_code and r.manage_type='unit' and r.status ='已完成' and r.is_delete = 0)
         and not EXISTS (select 1 from tz_cylinder_question_info q where u.sequence_nbr = q.question_object_id and q.question_type  = #{questionType} )
     </select>
     <insert id="saveOrUpdateBatch" parameterType="com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderUnit">

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

@@ -160,5 +160,7 @@ public class JgChangeRegistrationTransferDto extends BaseDto {
     @ApiModelProperty(value = " 转办后执行人的Id逗号分割")
     private String transferToUserIds;
 
+    @ApiModelProperty (value = "其他附件")
+    private String otherAccessories;
 
 }

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+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;
+
+/**
+ * 设备保险信息
+ *
+ * @author LiuLin
+ * @date 2024-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "JgEquipInsuranceDto", description = "设备保险信息")
+public class JgEquipInsuranceDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "设备id")
+    private String equId;
+
+    @ApiModelProperty(value = "承保单位名称")
+    private String underWriteName;
+
+    @ApiModelProperty(value = "承保单位统一信用代码")
+    private String underWriteCreditCode;
+
+    @ApiModelProperty(value = "保险服务单位")
+    private String insuranceServiceUnitName;
+
+    @ApiModelProperty(value = "保险服务单位统一社会信用代码")
+    private String insuranceServiceUnitCode;
+
+    @ApiModelProperty(value = "理赔电话")
+    private String claimTelephone;
+
+    @ApiModelProperty(value = "保险单号")
+    private String insuranceNumber;
+
+    @ApiModelProperty(value = "保险截止日期")
+    private Date insuranceExpirationDate;
+
+    @ApiModelProperty(value = "设备种类")
+    private String equList;
+
+    @ApiModelProperty(value = "设备类别")
+    private String equCategory;
+
+    @ApiModelProperty(value = "设备品种")
+    private String equDefine;
+
+    @ApiModelProperty(value = "登记机关")
+    private String receiveOrgName;
+
+    @ApiModelProperty(value = "使用单位")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "单位内编号")
+    private String useInnerCode;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String factoryNum;
+
+    @ApiModelProperty(value = "使用登记证编号")
+    private String useRegistrationCode;
+}

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

@@ -261,4 +261,10 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
      */
     @TableField("transfer_type")
     private String transferType;
+
+    /**
+     * 其他附件
+     */
+    @TableField(value = "other_accessories")
+    private String otherAccessories;
 }

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

+package com.yeejoin.amos.boot.module.jg.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 设备保险信息
+ *
+ * @author LiuLin
+ * @date 2024-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_equip_insurance")
+public class JgEquipInsurance extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备id
+     */
+	@TableField("equ_id")
+    private String equId;
+
+    /**
+     * 承保单位名称
+     */
+	@TableField("under_write_name")
+    private String underWriteName;
+
+    /**
+     * 承保单位统一信用代码
+     */
+	@TableField("under_write_credit_code")
+    private String underWriteCreditCode;
+
+    /**
+     * 保险服务单位
+     */
+	@TableField("insurance_service_unit_name")
+    private String insuranceServiceUnitName;
+
+    /**
+     * 保险服务单位统一社会信用代码
+     */
+	@TableField("insurance_service_unit_code")
+    private String insuranceServiceUnitCode;
+
+    /**
+     * 理赔电话
+     */
+	@TableField("claim_telephone")
+    private String claimTelephone;
+
+    /**
+     * 保险单号
+     */
+	@TableField("insurance_number")
+    private String insuranceNumber;
+
+    /**
+     * 保险截止日期
+     */
+	@TableField("insurance_expiration_date")
+    private Date insuranceExpirationDate;
+
+    /**
+     * 设备种类
+     */
+    @TableField("equ_list")
+    private String equList;
+
+    /**
+     * 设备类别
+     */
+    @TableField("equ_category")
+    private String equCategory;
+
+    /**
+     * 设备品种
+     */
+    @TableField("equ_define")
+    private String equDefine;
+}

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

@@ -59,13 +59,6 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
 
 
     /**
-     * 统计设备被引用的次数（只有存在就算引用）
-     * @param record 设备唯一标识
-     * @return 被引用次数 > 0 则设备不可删除
-     */
-    Integer countEquipInUseTimesForDel(String record);
-
-    /**
      * 统计设备被引用的次数（只有存在就算引用-作废除外）
      * @param record 设备唯一标识
      * @return 被引用次数 > 0 则设备不可删除
@@ -130,7 +123,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
      */
     Integer checkFactoryNumUnique(@Param("factoryNum") String factoryNum,
                                   @Param("sequenceNbr") String sequenceNbr,
-                                  @Param("useUnitCreditCode") String useUnitCreditCode);
+                                  @Param("produceUnitCreditCode") String produceUnitCreditCode);
 
     /**
      * 使用登记证编号全库唯一校验

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipInsuranceDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipInsurance;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *  Mapper 接口
+ *
+ * @author LiuLin
+ * @date 2024-10-17
+ */
+public interface JgEquipInsuranceMapper extends BaseMapper<JgEquipInsurance> {
+
+    Page<JgEquipInsuranceDto> getListPage(@Param("page") Page<JgEquipInsurance> page,
+                                          @Param("sort") SortVo sortMap,
+                                          @Param("dto") JgEquipInsuranceDto dto);
+
+    JgEquipInsuranceDto getDetailById(@Param("sequenceNbr") Long sequenceNbr);
+}

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

@@ -15,6 +15,6 @@ public interface JgRegistrationHistoryMapper extends BaseMapper<JgRegistrationHi
     @Select("select sequence_nbr from tzs_jg_registration_history where equ_id = #{equid} and current_document_id = #{documentId}")
     Long getSequenceNbrByEquidAndDocumentId(@Param("equid") String equid, @Param("documentId") String documentId);
 
-    @Select("select sequence_nbr from tzs_jg_registration_history where registration_class = #{registratioClass} and current_document_id = #{documentId}")
+    @Select("select sequence_nbr from tzs_jg_registration_history where registration_class = #{registratioClass} and current_document_id = #{documentId} and is_delete = 0")
     Long getSequenceNbrByRegistratioClassAndDocumentId(@Param("registratioClass") String registratioClass, @Param("documentId") String documentId);
 }

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

@@ -23,9 +23,10 @@ public interface IJgChangeRegistrationUnitService {
      * 根据sequenceNbr查询
      *
      * @param sequenceNbr 主键
+     * @param selectedOrgInfo
      * @return 安装告知
      */
-    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr);
+    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo);
 
     /**
      * 更新安装告知

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+/**
+ * 接口类
+ *
+ * @author LiuLin
+ * @date 2024-10-17
+ */
+public interface IJgEquipInsuranceService {}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgVehicleInformationVo.java

@@ -263,4 +263,10 @@ public class JgVehicleInformationVo implements Serializable {
     private String oRegDate;
 
     private CompanyBo companyInfo;
+
+    @ApiModelProperty(value = "主体类型")
+    private String companyType;
+
+    @ApiModelProperty(value = "是否有权限")
+    private Boolean havingPermission;
 }

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

@@ -148,6 +148,7 @@
             where
             a.sequence_nbr = b.equip_transfer_id
             and b.equ_id = #{record}
+            and a.is_delete = 0
             and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '一级受理已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回' and a.status <![CDATA[ <> ]]> '已作废')
             UNION
             select
@@ -193,16 +194,6 @@
             select
             count(1) as inUseNumber
             from
-            tzs_jg_equip_transfer a,
-            tzs_jg_equip_transfer_eq b
-            where
-            a.sequence_nbr = b.equip_transfer_id
-            and b.equ_id = #{record}
-            and (a.apply_status <![CDATA[ <> ]]> '6614' and a.apply_status <![CDATA[ <> ]]> '6615'  and a.apply_status <![CDATA[ <> ]]> '6610' and a.apply_status <![CDATA[ <> ]]> '6617')
-            UNION
-            select
-            count(1) as inUseNumber
-            from
             tzs_jg_installation_notice a,
             tzs_jg_installation_notice_eq b
             where
@@ -281,114 +272,11 @@
               and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '一级受理已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回'  and a.status <![CDATA[ <> ]]> '已作废')
         )
     </select>
-    <select id="countEquipInUseTimesForDel" resultType="java.lang.Integer">
-        select
-            sum(inUseNumber)
-        from (
-            select
-            count(1) as inUseNumber
-            from
-            tzs_jg_use_registration_eq b
-            where
-            b.equ_id = #{record}
-            UNION
-            select
-            count(1) as inUseNumber
-            from
-            tzs_jg_change_registration_reform_eq b
-            where
-            b.equ_id = #{record}
-            UNION
-            select
-            count(1) as inUseNumber
-            from
-            tzs_jg_change_registration_transfer_eq b
-            where
-            b.equ_id = #{record}
-            UNION
-            select
-            count(1) as inUseNumber
-            from
-            tzs_jg_change_registration_unit_eq b
-            where
-            b.equ_id = #{record}
-            UNION
-            select
-            count(1) as inUseNumber
-            from
-            tzs_jg_enable_disable_eq b
-            where
-            b.equ_id = #{record}
-            UNION
-            select
-            count(1) as inUseNumber
-            from
-            tzs_jg_equip_transfer_eq b
-            where
-            b.equ_id = #{record}
-            UNION
-            select
-            count(1) as inUseNumber
-            from
-            tzs_jg_installation_notice_eq b
-            where
-            b.equ_id = #{record}
-            UNION
-            select
-            count(1) as inUseNumber
-            from
-            tzs_jg_maintain_notice_eq b
-            where
-            b.equ_id = #{record}
-            UNION
-            select
-            count(1) as inUseNumber
-            from
-            tzs_jg_maintenance_contract_eq b
-            where
-            b.equ_id = #{record}
-            UNION
-            select
-            count(1) as inUseNumber
-            from
-            tzs_jg_reform_notice_eq b
-            where
-            b.equ_id = #{record}
-            UNION
-            select
-            count(1) as inUseNumber
-            from
-            tzs_jg_scrap_cancel_eq b
-            where
-            b.equ_id = #{record}
-            UNION
-            select
-            count(1) as inUseNumber
-            from
-            tzs_jg_transfer_notice_eq b
-            where
-            b.equ_id = #{record}
-            UNION
-            select
-            count(1) as inUseNumber
-            from
-            tzs_jg_vehicle_information_eq b
-            where
-            b.equ_id = #{record}
-            UNION
-            select
-                count(1) as inUseNumber
-            from
-                tzs_jg_change_vehicle_registration_unit_eq b
-            where
-                b.equ_id = #{record}
-        )
-    </select>
 
     <select id="refreshTheDetailsDataOfCompletedUsageRegistration" resultType="java.lang.String">
         SELECT sequence_nbr
         FROM "amos_tzs_biz"."tzs_jg_use_registration"
-        WHERE "status" =  '已完成'
+        WHERE "status" =  '已完成' and is_delete = 0
           AND "audit_pass_date" <![CDATA[<=]]> #{since}
     </select>
     <select id="selectCityCompanyCode" resultType="string">
@@ -712,6 +600,7 @@
         and n.status != '使用单位待提交'
         and n.status != '使用单位已撤回'
         and n.status != '已作废'
+        and n.is_delete = 0
         and (n.manage_type is null or n.manage_type = '' or n.manage_type = 'set')
         <if test="param.beginDate != null">
             and date_ge(CAST(n.reg_date as date), #{param.beginDate})
@@ -908,13 +797,13 @@
         count(1)
         FROM
         "idx_biz_jg_factory_info" ibjfi
-        JOIN idx_biz_jg_register_info ibjri ON ibjfi."RECORD" = ibjri."RECORD"
-        LEFT JOIN idx_biz_jg_use_info ibjui ON ibjri."RECORD" = ibjui."RECORD"
-        WHERE
-        ibjri."EQU_LIST" = '2000'
+        LEFT JOIN idx_biz_jg_register_info ibjri ON ibjfi."RECORD" = ibjri."RECORD"
+        LEFT JOIN idx_biz_jg_other_info joi ON joi."RECORD" = ibjfi."RECORD"
+        WHERE ibjri."EQU_LIST" = '2000'
         AND ibjri."EQU_CATEGORY" = '2300'
         AND ibjfi."FACTORY_NUM" = #{factoryNum}
-        AND ibjui."USE_UNIT_CREDIT_CODE" = #{useUnitCreditCode}
+        AND ibjfi."PRODUCE_UNIT_CREDIT_CODE" = #{produceUnitCreditCode}
+        AND joi.CLAIM_STATUS = '已认领'
     </select>
 
     <select id="useRegistrationCertificateAccountUnique" resultType="java.lang.Integer">
@@ -1033,7 +922,7 @@
                 </if>
         union all
             SELECT SUM(num) FROM (
-                   SELECT  count(1) AS num FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成'
+                   SELECT  count(1) AS num FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成' and is_delete = 0
                                                                         <if test="dto.beginDate != null and dto.beginDate != ''">
                                                                             and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
                                                                         </if>
@@ -1144,7 +1033,7 @@
 
         union all
             SELECT SUM(num) FROM (
-                  SELECT  count(1) as num FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成'
+                  SELECT  count(1) as num FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' and is_delete = 0
                   <if test="dto.beginDate != null and dto.beginDate != ''">
                     and date_ge(CAST(reg_date as date),#{dto.beginDate})
                   </if>
@@ -1324,7 +1213,7 @@
 
         union all
         SELECT * FROM (
-            SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成'
+            SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成' and is_delete = 0
             <if test="dto.beginDate != null and dto.beginDate != ''">
                 and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
             </if>
@@ -1355,7 +1244,7 @@
          )
         union all
         SELECT * FROM (
-        SELECT  sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成'
+        SELECT  sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' and is_delete = 0
         <if test="dto.beginDate != null and dto.beginDate != ''">
             and date_ge(CAST(reg_date as date),#{dto.beginDate})
         </if>
@@ -1640,7 +1529,7 @@
     </select>
     <select id="countBizFinishedNumForDPSYDJ" resultType="java.lang.Long">
         SELECT SUM(num) FROM (
-                                 SELECT  count(1) AS num FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成'
+                                 SELECT  count(1) AS num FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成' and is_delete = 0
                                                                                           <if test="dto.beginDate != null and dto.beginDate != ''">
                                                                                           and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
                                                                                           </if>
@@ -1756,7 +1645,7 @@
     </select>
     <select id="countAllInFlowingForDPNoFinishedBizDataSYDJ" resultType="java.lang.Long">
         SELECT SUM(num) FROM (
-                                 SELECT  count(1) as num FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成'
+                                 SELECT  count(1) as num FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' and is_delete = 0
                                  <if test="dto.beginDate != null and dto.beginDate != ''">
                                      and date_ge(CAST(reg_date as date),#{dto.beginDate})
                                  </if>
@@ -1939,7 +1828,7 @@
     </select>
     <select id="countBizFinishedNumForDPListSYDJ" resultType="java.util.Map">
         SELECT * FROM (
-        SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成'
+        SELECT sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成' and is_delete = 0
         <if test="dto.beginDate != null and dto.beginDate != ''">
             and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
         </if>
@@ -1970,7 +1859,7 @@
         )
         union all
         SELECT * FROM (
-        SELECT  sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成'
+        SELECT  sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,status FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' and is_delete = 0
         <if test="dto.beginDate != null and dto.beginDate != ''">
             and date_ge(CAST(reg_date as date),#{dto.beginDate})
         </if>
@@ -2281,6 +2170,7 @@
             where
             a.sequence_nbr = b.equip_transfer_id
             and b.equ_id = #{record}
+            and a.is_delete = 0
             and ( a.status <![CDATA[ <> ]]> '已作废')
             UNION
             select
@@ -2326,16 +2216,6 @@
             select
             count(1) as inUseNumber
             from
-            tzs_jg_equip_transfer a,
-            tzs_jg_equip_transfer_eq b
-            where
-            a.sequence_nbr = b.equip_transfer_id
-            and b.equ_id = #{record}
-            and (a.apply_status <![CDATA[ <> ]]> '6617')
-            UNION
-            select
-            count(1) as inUseNumber
-            from
             tzs_jg_installation_notice a,
             tzs_jg_installation_notice_eq b
             where

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipInsuranceMapper.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.JgEquipInsuranceMapper">
+
+    <sql id="page-list">
+        select
+            tjei.sequence_nbr as sequenceNbr,
+            tjei.equ_id as equId,
+            tjei.under_write_name as underWriteName,
+            tjei.under_write_credit_code as underWriteCreditCode,
+            tjei.insurance_service_unit_name as insuranceServiceUnitName,
+            tjei.insurance_service_unit_code as insuranceServiceUnitCode,
+            tjei.claim_telephone as claimTelephone,
+            tjei.insurance_number as insuranceNumber,
+            tjei.insurance_expiration_date as insuranceExpirationDate,
+            date_format(tjei.rec_date,'%Y-%m-%d') as recDate,
+            jri.ORGANIZATION_NAME as receiveOrgName,
+            jri.USE_ORG_CODE as useRegistrationCode,
+            ibjui.USE_UNIT_NAME  as useUnitName,
+            ibjui.USE_INNER_CODE  as useInnerCode,
+            ibjfi.FACTORY_NUM  as factoryNum,
+            GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_LIST)) AS equList,
+            GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY)) as equCategory,
+            GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_DEFINE)) as equDefine
+        from
+            tzs_jg_equip_insurance tjei
+            LEFT JOIN idx_biz_jg_register_info jri  on tjei.equ_id = jri.RECORD
+            LEFT JOIN idx_biz_jg_use_info ibjui  on tjei.equ_id = ibjui.RECORD
+            LEFT JOIN idx_biz_jg_factory_info ibjfi  on tjei.equ_id = ibjfi.RECORD
+    </sql>
+
+    <select id="getListPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgEquipInsuranceDto">
+        <include refid="page-list"/>
+        <where>
+            tjei.is_delete = 0
+            <if test="dto.factoryNum != null and dto.factoryNum != ''">
+                AND ibjfi.FACTORY_NUM = #{dto.factoryNum}
+            </if>
+            <if test="dto.useInnerCode != null and dto.useInnerCode != ''">
+                AND ibjui.USE_INNER_CODE = #{dto.useInnerCode}
+            </if>
+            <if test="dto.underWriteName != null and dto.underWriteName != ''">
+                AND tjei.under_write_name like concat('%',#{dto.underWriteName},'%')
+            </if>
+            <if test="dto.insuranceNumber != null and dto.insuranceNumber != ''">
+                AND tjei.insurance_number like concat('%',#{dto.insuranceNumber},'%')
+            </if>
+            <if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
+                AND jri.USE_ORG_CODE like concat('%',#{dto.useRegistrationCode},'%')
+            </if>
+            GROUP BY tjei.equ_id
+        </where>
+        order by
+        <if test="sort != null">
+            tjei.${sort.field} ${sort.sortType},
+        </if>
+        tjei.rec_date DESC
+    </select>
+
+    <select id="getDetailById" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgEquipInsuranceDto">
+        <include refid="page-list"/>
+        where tjei.sequence_nbr = #{sequenceNbr} and tjei.is_delete = 0
+    </select>
+</mapper>

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

@@ -224,6 +224,7 @@
         AND SUBSTR(t.use_registration_code, 1, 1) IN ('容', '锅', '管', '瓶', '梯', '起', '索', '游', '车')
         AND TRIM(t.use_registration_code) LIKE concat('%(',#{year},')')
         and tjur.reg_type is null
+        and tjur.is_delete = 0
         GROUP BY SUBSTR(t.use_registration_code, 1, 5)
         HAVING code <![CDATA[ <> ]]> '00000'
         ORDER BY prefix

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

@@ -6,49 +6,48 @@
         where sequence_nbr = #{id}
     </update>
     <sql id="page-list">
-        select ur.sequence_nbr as sequenceNbr,
-        ur.audit_status as auditStatus,
-        date_format(ur.reg_date,'%Y-%m-%d') as regDate,
-        ur.use_unit_name as useUnitName,
-        ur.status,
-        ur.receive_org_name as receiveOrgName,
-        ur.use_address as place,
-        ur.instance_id as instanceId,
-        ur.apply_no as applyNo,
-        ur.next_execute_ids as nextExecuteIds,
-        ur.promoter,
-        GROUP_CONCAT(DISTINCT other.supervisory_code)  as supervisoryCode,
-        ur.use_registration_code  as useRegistrationCode,
-        date_format(ur.audit_pass_date,'%Y-%m-%d')  as auditPassDate,
-        date_format(ur.create_date,'%Y-%m-%d')  as createDate,
-        ur.receive_org_name as receiveOrgName,
-        ur.next_execute_user_ids as nextExecuteUserIds,
-        ur.next_task_id as nextTaskId,
-        ur.create_user_id as createUserId,
-        ur.rec_date as recDate,
-        ur.manage_type as manageType,
-        ur.reg_type as regType,
-        GROUP_CONCAT(DISTINCT other.CODE96333) AS code96333,
-        GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY)) as equCategory,
-        GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_DEFINE)) as equDefine,
-        GROUP_CONCAT(DISTINCT jri.EQU_CATEGORY) AS equCategoryCode,
-        GROUP_CONCAT(DISTINCT jri.PRODUCT_NAME) AS productName,
-        GROUP_CONCAT(DISTINCT jri.EQU_CATEGORY) AS equCategoryCode,
-        GROUP_CONCAT(DISTINCT jri.EQU_CODE) AS equCode,
-        GROUP_CONCAT(DISTINCT jri.EQU_LIST) AS equList,
-        GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_LIST)) AS equListName,
-        GROUP_CONCAT(DISTINCT use.USE_INNER_CODE) AS innerCode,
-        GROUP_CONCAT(DISTINCT re.equ_id) AS equipId,
-        concat(use."PROVINCE_NAME", '', use."CITY_NAME", '', use."COUNTY_NAME", '', use."STREET_NAME") as fullAddress,
-        use."ADDRESS" as detailedAddress,
-        ibjsi.ORG_BRANCH_NAME as orgBranchName,
-        ur.cancel_reason as cancelReason
-        from tzs_jg_use_registration ur
-        LEFT JOIN tzs_jg_use_registration_eq re  on ur.sequence_nbr = re.equip_transfer_id
-        LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD
-        LEFT JOIN idx_biz_jg_use_info  use   on re.equ_id = use.RECORD
-        LEFT JOIN idx_biz_jg_other_info  other   on re.equ_id = other.RECORD
-        LEFT JOIN idx_biz_jg_supervision_info ibjsi  on re.equ_id = ibjsi.RECORD
+        select
+            ur.sequence_nbr as sequenceNbr,
+            ur.audit_status as auditStatus,
+            date_format(ur.reg_date,'%Y-%m-%d') as regDate,
+            ur.use_unit_name as useUnitName,
+            ur.status,
+            ur.receive_org_name as receiveOrgName,
+            ur.use_address as place,
+            ur.instance_id as instanceId,
+            ur.apply_no as applyNo,
+            ur.next_execute_ids as nextExecuteIds,
+            ur.promoter,
+            ur.use_registration_code  as useRegistrationCode,
+            date_format(ur.audit_pass_date,'%Y-%m-%d')  as auditPassDate,
+            date_format(ur.create_date,'%Y-%m-%d')  as createDate,
+            ur.receive_org_name as receiveOrgName,
+            ur.next_execute_user_ids as nextExecuteUserIds,
+            ur.next_task_id as nextTaskId,
+            ur.create_user_id as createUserId,
+            ur.rec_date as recDate,
+            ur.manage_type as manageType,
+            ur.reg_type as regType,
+            ur.use_address as fullAddress,
+            ur.cancel_reason as cancelReason,
+            GROUP_CONCAT(DISTINCT other.supervisory_code)  as supervisoryCode,
+            GROUP_CONCAT(DISTINCT other.CODE96333) AS code96333,
+            GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY)) as equCategory,
+            GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_DEFINE)) as equDefine,
+            GROUP_CONCAT(DISTINCT jri.EQU_CATEGORY) AS equCategoryCode,
+            GROUP_CONCAT(DISTINCT jri.PRODUCT_NAME) AS productName,
+            GROUP_CONCAT(DISTINCT jri.EQU_CATEGORY) AS equCategoryCode,
+            GROUP_CONCAT(DISTINCT jri.EQU_CODE) AS equCode,
+            GROUP_CONCAT(DISTINCT jri.EQU_LIST) AS equList,
+            GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_LIST)) AS equListName,
+            GROUP_CONCAT(DISTINCT re.equ_id) AS equipId,
+            GROUP_CONCAT(DISTINCT ibjsi.ORG_BRANCH_NAME) AS  orgBranchName
+        from
+            tzs_jg_use_registration ur
+            LEFT JOIN tzs_jg_use_registration_eq re  on ur.sequence_nbr = re.equip_transfer_id
+            LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD
+            LEFT JOIN idx_biz_jg_other_info  other   on re.equ_id = other.RECORD
+            LEFT JOIN idx_biz_jg_supervision_info ibjsi  on re.equ_id = ibjsi.RECORD
     </sql>
 
     <select id="getListPage" resultType="java.util.Map">
@@ -135,6 +134,8 @@
                 </foreach>
             </if>
         </where>
+        GROUP BY
+        re.equip_transfer_id
         order by
         ur.create_date DESC, ur.apply_no DESC
     </select>
@@ -377,12 +378,14 @@
         LEFT JOIN "tzs_jg_use_registration" AS tjur ON tjure."equip_transfer_id" = tjur."sequence_nbr"
         WHERE tjure."equ_id" = #{id}
           AND tjur."status" = '已完成'
+          AND tjure.is_delete = 0
         ORDER BY tjure."rec_date" desc
         LIMIT 1
     </select>
 
     <select id="getMaintenanceDetail" resultType="java.util.Map">
-        SELECT tjmc."maintenance_unit_name"         as maintenanceUnitName,
+        SELECT
+               tjmc."maintenance_unit_name"         as maintenanceUnitName,
                tjmc."use_unit_name"                 as maintenanceUseUnitName,
                tjmc."maintenance_manager_name"      as maintenanceManagerName,
                tjmc."maintenance_manager_phone"     as maintenanceManagerPhone,
@@ -391,14 +394,17 @@
                tjmc."maintenance_manager_two_name"  as maintenanceManagerTwoName,
                tjmc."maintenance_manager_two_phone" as maintenanceManagerTwoPhone,
                tjmc."maintenance_contract"          as maintenanceContract,
-               tjmc."other_accessories"             as maintOtherAccessories
-        FROM "tzs_jg_maintenance_contract_eq" as tjmce
-                 LEFT JOIN "tzs_jg_maintenance_contract" as tjmc
-                           ON tjmce."equip_transfer_id" = tjmc."sequence_nbr"
-        WHERE tjmce."equ_id" = #{id}
+               tjmc."other_accessories"             as maintOtherAccessories,
+               tjmc."inform_start"         as informStart,
+               tjmc."inform_end"           as informEnd
+        FROM
+            "tzs_jg_maintenance_contract_eq" as tjmce
+             LEFT JOIN "tzs_jg_maintenance_contract" as tjmc ON tjmce."equip_transfer_id" = tjmc."sequence_nbr"
+        WHERE
+          tjmce."equ_id" = #{id}
           AND tjmc."status" = '已完成'
-        ORDER BY tjmce."rec_date" desc
-        LIMIT 1
+          ORDER BY tjmce."rec_date" desc
+          LIMIT 1
     </select>
 
     <select id="getMaintenanceDetailByIdx" resultType="java.util.Map">
@@ -439,6 +445,7 @@
                  LEFT JOIN idx_biz_jg_factory_info jfi on tjure.equ_id = jfi.RECORD
                  left JOIN idx_biz_jg_register_info jri on tjure.equ_id = jri.RECORD
         WHERE tjure.equip_transfer_id = #{id}
+          AND tjure.is_delete = 0
     </select>
     <sql id="page-list-pipeline">
         SELECT
@@ -508,7 +515,7 @@
         <if test="jsonObject.record == null">
             and not exists(SELECT 1 FROM tzs_jg_use_registration v, tzs_jg_use_registration_eq ve WHERE
             v.sequence_nbr = ve.equip_transfer_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and v.status
-            !='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' )
+            !='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' and v.is_delete = 0)
         </if>
         ORDER BY ui.REC_DATE DESC
         ) where uscUnitName is not null
@@ -654,6 +661,7 @@
         where
             a.sequence_nbr = b.equip_transfer_id
           and a.status not in('使用单位待提交','一级受理已驳回','使用单位已撤回','已作废')
+          and a.is_delete = 0
     </select>
     <select id="getEquTypeByUseRegSeq" resultType="java.util.Map">
         select ur.sequence_nbr                                                                                   as sequenceNbr,
@@ -707,6 +715,7 @@
             and u."RECORD" = ri."RECORD"
             and (a.audit_pass_date between #{beginDate} and #{endDate})
             and a.status='已完成'
+            and a.is_delete = 0
             and u."PROVINCE" <![CDATA[<>]]> ''
             and u."CITY"  <![CDATA[<>]]> ''
             and u."COUNTY"  <![CDATA[<>]]> ''
@@ -739,8 +748,8 @@
                   AND A.sequence_nbr = ae.equip_transfer_id
                   AND u."RECORD" = ri."RECORD"
                   and (a.audit_pass_date between #{dpFilterParamDto.beginDate} and #{dpFilterParamDto.endDate})
-
                   AND A.status = '已完成'
+                  AND A.is_delete = 0
             ) C
         WHERE
             C.areaCode LIKE concat ( '%', #{dpFilterParamDto.cityCode}, '%' )

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

@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IPdfService;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgRegistrationHistoryServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
+import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
@@ -150,12 +151,21 @@ public class CommonController extends BaseController {
         String companyType = selectedOrgInfo.getCompany().getCompanyType();
         if ("个人主体".equals(companyType)) {
             String[] code = selectedOrgInfo.getCompany().getCompanyCode().split("_");
-            map.put("useUnitCreditCode", code.length > 1 ? code[1] : code[0]);
+            String useUnitCode = code.length > 1 ? code[1] : code[0];
+            map.put("useUnitCreditCode", useUnitCode);
             String[] companyName = selectedOrgInfo.getCompany().getCompanyName().split("_");
             map.put("useUnitName", companyName.length > 1 ? companyName[1] : companyName[0]);
+            map.put("address", commonService.getEnterpriseInfo(useUnitCode).get("address"));
+            // 冗余兼容其他业务
+            map.put("useUnitAddress", map.get("address"));
+            map.put("companyType", "person");
         } else {
             map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
             map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
+            map.put("address", commonService.getEnterpriseInfo(selectedOrgInfo.getCompany().getCompanyCode()).get("address"));
+            // 冗余兼容其他业务
+            map.put("useUnitAddress", map.get("address"));
+            map.put("companyType", "company");
         }
         return ResponseHelper.buildResponse(map);
     }
@@ -182,7 +192,7 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/equipmentClassification")
     @ApiOperation(httpMethod = "GET", value = "设备分类", notes = "1，设备种类  2，设备类别  3，设备品种")
-    public ResponseModel<List<EquipmentCategory>> equipmentClassification(@RequestParam(value = "type") String type) {
+    public ResponseModel<List<EquipmentCategoryDto>> equipmentClassification(@RequestParam(value = "type") String type) {
         return ResponseHelper.buildResponse(commonService.equipmentClassification(type));
     }
 
@@ -550,6 +560,7 @@ public class CommonController extends BaseController {
         seqLists.forEach(sequenceNbr -> {
             LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
             lambda.eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr);
+            lambda.eq(JgRegistrationHistory::getIsDelete, false);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             String equipId = String.valueOf(jsonObject.get("equipId"));

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jg.api.vo.ElevatorModelVo;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
@@ -320,4 +319,43 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
 
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getCylinderInfo(equCode, startTime, endTime, pageParam));
     }
+
+    /**
+     * 初始化接口，调用一次，企业许可到期提醒
+     *
+     * @return 返回调用成功信息
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/initEnterpriseLicenseExpirationOnce", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "初始化接口，调用一次，企业许可到期提醒", notes = "初始化接口，调用一次，企业许可到期提醒")
+    public ResponseModel<String> initEnterpriseLicenseExpirationOnce() {
+        idxBizJgRegisterInfoService.initEnterpriseLicenseExpirationOnce();
+        return  ResponseHelper.buildResponse("ok");
+    }
+
+    /**
+     * 初始化接口，调用一次，人员资质过期提醒
+     *
+     * @return 返回调用成功信息
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/initUserExpirationReminderOnce", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "初始化接口，调用一次，人员资质过期提醒", notes = "初始化接口，调用一次，人员资质过期提醒")
+    public ResponseModel<String> initUserExpirationReminderOnce() {
+        idxBizJgRegisterInfoService.initUserExpirationReminderOnce();
+        return  ResponseHelper.buildResponse("ok");
+    }
+
+    /**
+     * 初始化接口，调用一次，检验有效期到期提醒
+     *
+     * @return 返回调用成功信息
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/inspectionExpirationReminderOnce", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "初始化接口，调用一次，检验有效期到期提醒", notes = "初始化接口，调用一次，检验有效期到期提醒")
+    public ResponseModel<String> inspectionExpirationReminderOnce() {
+        idxBizJgRegisterInfoService.inspectionExpirationReminderOnce();
+        return  ResponseHelper.buildResponse("ok");
+    }
 }

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

@@ -117,7 +117,7 @@ public class JgChangeRegistrationUnitController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个单位变更", notes = "根据sequenceNbr查询单个单位变更")
     public ResponseModel<Map<String,
             Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryBySequenceNbr(sequenceNbr));
+        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryBySequenceNbr(sequenceNbr, getSelectedOrgInfo()));
     }
 
 

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

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.component.event.RestEventTrigger;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -161,12 +162,13 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 	@GetMapping(value = "/details")
 	@ApiOperation(httpMethod = "GET", value = "获取详情", notes = "获取详情")
 	public ResponseModel<Map<String, Object>> getDetails(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
-		return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.getDetails(sequenceNbr));
+		return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.getDetails(sequenceNbr, getSelectedOrgInfo()));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/withdraw")
-	@ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
+	@ApiOperation(httpMethod = "POST", value = "车用气瓶单位变更登记撤回", notes = "撤回")
+	@RestEventTrigger(value = "operateLogRestEventHandler")
 	public ResponseModel<Object> withdraw(@RequestBody JSONObject map) {
 		jgChangeVehicleRegistrationUnitServiceImpl.withdraw(String.valueOf(map.get("instanceId")), String.valueOf(map.get("nextTaskId")));
 		return ResponseHelper.buildResponse("ok");
@@ -174,14 +176,16 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@DeleteMapping(value = "/delete")
-	@ApiOperation(httpMethod = "DELETE", value = "删除", notes = "删除")
+	@ApiOperation(httpMethod = "DELETE", value = "车用气瓶单位变更删除", notes = "删除")
+	@RestEventTrigger(value = "operateLogRestEventHandler")
 	public ResponseModel<Object> withdraw(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
 		jgChangeVehicleRegistrationUnitServiceImpl.deleteMessage(sequenceNbr);
 		return ResponseHelper.buildResponse("ok");
 	}
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/flowExecute")
-	@ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
+	@ApiOperation(httpMethod = "POST", value = "车用气瓶单位变更执行流程", notes = "执行流程")
+	@RestEventTrigger(value = "operateLogRestEventHandler")
 	public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
 		jgChangeVehicleRegistrationUnitServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),
 				String.valueOf(map.get("instanceId")),

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

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipInsuranceDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipInsurance;
+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 com.yeejoin.amos.boot.module.jg.biz.service.impl.JgEquipInsuranceServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 设备保险信息控制类
+ * @author LiuLin
+ * @date 2024-10-17
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jg-equip-insurance")
+public class JgEquipInsuranceController extends BaseController {
+
+    @Autowired
+    JgEquipInsuranceServiceImpl jgEquipInsuranceServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<Object> save(@RequestBody JSONObject map) {
+		return ResponseHelper.buildResponse(jgEquipInsuranceServiceImpl.save(map));
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/update")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<JgEquipInsurance> updateBySequenceNbrJgEquipInsurance(@RequestBody JgEquipInsurance entity,
+																			   @RequestParam(value = "sequenceNbr") Long sequenceNbr) {
+	    entity.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(jgEquipInsuranceServiceImpl.updateWithModel(entity));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/delete")
+    @ApiOperation(httpMethod = "POST", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(jgEquipInsuranceServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getDetail")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<JgEquipInsuranceDto> getDetail(@RequestParam Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(jgEquipInsuranceServiceImpl.getDetail(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<JgEquipInsuranceDto>> queryForPage(@RequestParam(value = "sort", required = false) String sort,
+															  @RequestParam(value = "current") int current,
+															  @RequestParam(value = "size") int size,
+															  JgEquipInsuranceDto dto){
+		Page<JgEquipInsurance> page = new Page<>(current, size);
+	    return ResponseHelper.buildResponse(jgEquipInsuranceServiceImpl.queryForJgEquipInsurancePage(page, sort, dto));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<JgEquipInsurance>> selectForList() {
+	    return ResponseHelper.buildResponse(jgEquipInsuranceServiceImpl.queryForJgEquipInsuranceList());
+	}
+}

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

@@ -156,6 +156,7 @@ public class JgInstallationNoticeController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "安装告知单个作废", notes = "安装告知单个作废")
     @PutMapping(value = "/cancel/application")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<JgInstallationNotice> cancelApplication(@RequestBody JgInstallationNoticeDto jgInstallationNoticeDto) {
         JgInstallationNotice result = iJgInstallationNoticeService.cancelApplication(jgInstallationNoticeDto.getSequenceNbr(), jgInstallationNoticeDto.getCancelReason());
         return ResponseHelper.buildResponse(result);

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

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.component.event.RestEventTrigger;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -49,6 +50,7 @@ public class JgMaintenanceContractController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/saveOrSubmit")
     @ApiOperation(httpMethod = "POST", value = "新增维保合同备案", notes = "新增维保合同备案")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Object> save(@RequestBody Map<String, Object> model,
                                       @RequestParam(value = "submit") String submit) {
         ReginParams reginParams = getSelectedOrgInfo();
@@ -64,6 +66,7 @@ public class JgMaintenanceContractController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/revocation")
     @ApiOperation(httpMethod = "POST", value = "维保合同撤回", notes = "维保合同撤回")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Object> revocation(@RequestBody JSONObject map) {
         jgMaintenanceContractServiceImpl.revocation(String.valueOf(map.get("instanceId")), String.valueOf(map.get("nextTaskId")));
         return ResponseHelper.buildResponse("ok");
@@ -110,7 +113,8 @@ public class JgMaintenanceContractController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/flowExecute")
-    @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
+    @ApiOperation(httpMethod = "POST", value = "维保备案执行流程", notes = "执行流程")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
         jgMaintenanceContractServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),
                 String.valueOf(map.get("instanceId")),
@@ -175,6 +179,7 @@ public class JgMaintenanceContractController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/cancelApplication")
     @ApiOperation(httpMethod = "POST", value = "维保备案作废", notes = "维保备案作废")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<JgMaintenanceContract> cancelApplication(@RequestBody JgMaintenanceContractDto dto) {
         JgMaintenanceContract result = jgMaintenanceContractServiceImpl.cancelApplication(dto.getSequenceNbr(), dto.getCancelReason());
         return ResponseHelper.buildResponse(result);

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

@@ -44,7 +44,7 @@ public class JgUseRegistrationController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+    @ApiOperation(httpMethod = "POST", value = "使用登记新增", notes = "新增")
     @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Object> save(@RequestBody JSONObject map) {
         return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.save(map));
@@ -52,7 +52,7 @@ public class JgUseRegistrationController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/flowExecute")
-    @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
+    @ApiOperation(httpMethod = "POST", value = "使用登记执行流程", notes = "执行流程")
     @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
         jgUseRegistrationServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),
@@ -68,7 +68,7 @@ public class JgUseRegistrationController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/withdraw")
-    @ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
+    @ApiOperation(httpMethod = "POST", value = "使用登记撤回", notes = "撤回")
     @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Object> withdraw(@RequestBody JSONObject map) {
         jgUseRegistrationServiceImpl.withdraw(String.valueOf(map.get("instanceId")), String.valueOf(map.get("nextTaskId")),
@@ -89,9 +89,7 @@ public class JgUseRegistrationController extends BaseController {
     @PostMapping(value = "/deleteMessage")
     @ApiOperation(httpMethod = "POST", value = "删除", notes = "删除")
     public ResponseModel<Object> deleteMessage(@RequestParam("id") Long id) {
-        ArrayList<Long> ids = new ArrayList<>();
-        ids.add(id);
-        jgUseRegistrationServiceImpl.deleteBatch(ids);
+        jgUseRegistrationServiceImpl.deleteBatch(Collections.singletonList(id));
         return ResponseHelper.buildResponse("ok");
     }
 
@@ -114,7 +112,10 @@ public class JgUseRegistrationController extends BaseController {
             dto.setReceiveCompanyCode(info.getCompany().getCompanyCode());
         }
         Page<Map<String, Object>> list = jgUseRegistrationServiceImpl.getList(dto, sort, page, dto.getRoleIds());
-        list.getRecords().forEach(x -> x.put("companyType", info.getCompany().getCompanyType()));
+        list.getRecords().forEach(x -> {
+            x.put("companyType", info.getCompany().getCompanyType());
+            x.put("regTypeDesc", "1".equals(x.get("regType")) ? "历史登记" : "新增登记");
+        });
         return ResponseHelper.buildResponse(list);
     }
 

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

@@ -13,6 +13,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgVehicleInformationServiceImpl;
+import org.typroject.tyboot.component.event.RestEventTrigger;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +58,8 @@ public class JgVehicleInformationController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/flowExecute")
-    @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
+    @ApiOperation(httpMethod = "POST", value = "车用气瓶登记执行流程", notes = "执行流程")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
         jgVehicleInformationServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),
                 String.valueOf(map.get("instanceId")),
@@ -76,6 +78,7 @@ public class JgVehicleInformationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/cancel")
     @ApiOperation(httpMethod = "POST", value = "车用气瓶撤回", notes = "车用气瓶撤回")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Object> cancel(@RequestBody JSONObject map) {
         jgVehicleInformationServiceImpl.cancel(String.valueOf(map.get("instanceId")), String.valueOf(map.get("nextTaskId")));
         return ResponseHelper.buildResponse("ok");
@@ -141,7 +144,10 @@ public class JgVehicleInformationController extends BaseController {
             dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
         }
         Page<Map<String, Object>> list = jgVehicleInformationServiceImpl.getPageList(dto,sort, page, dto.getRoleIds());
-        list.getRecords().forEach(x -> x.put("companyType", info.getCompany().getCompanyType()));
+        list.getRecords().forEach(x -> {
+            x.put("companyType", info.getCompany().getCompanyType());
+            x.put("regTypeDesc", "1".equals(x.get("regType")) ? "历史登记" : "新增登记");
+        });
         return ResponseHelper.buildResponse(list);
     }
 
@@ -168,7 +174,7 @@ public class JgVehicleInformationController extends BaseController {
     @GetMapping(value = "/details")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个车用气瓶控制类", notes = "根据sequenceNbr查询单个车用气瓶控制类")
     public ResponseModel<JgVehicleInformationVo> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgVehicleInformationServiceImpl.queryBySequenceNbr(sequenceNbr));
+        return ResponseHelper.buildResponse(jgVehicleInformationServiceImpl.queryBySequenceNbr(sequenceNbr, getSelectedOrgInfo()));
     }
 
 	/**
@@ -202,6 +208,7 @@ public class JgVehicleInformationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "车用气瓶使用登记单条作废", notes = "车用气瓶使用登记单条作废")
     @PutMapping(value = "/cancel/application")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<JgVehicleInformation> cancelApplication(@RequestBody JgVehicleInformationDto vehicleInformationDto) {
         JgVehicleInformation result = jgVehicleInformationServiceImpl.cancelApplication(vehicleInformationDto.getSequenceNbr(), vehicleInformationDto.getCancelReason());
         return ResponseHelper.buildResponse(result);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/listener/CancellationEventListener.java

@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
-import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
+import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -31,7 +31,7 @@ public class CancellationEventListener {
     @Value("${cancellation.deal.thread.number:1}")
     private int threadNumber;
 
-    private CommonMapper commonMapper;
+    private ICommonService commonService;
 
     private ESEquipmentCategory esEquipmentCategoryDao;
 
@@ -39,8 +39,8 @@ public class CancellationEventListener {
 
     private BlockingQueue<String> queue = new LinkedBlockingQueue<>();
 
-    public CancellationEventListener(CommonMapper commonMapper, ESEquipmentCategory esEquipmentCategoryDao, IdxBizJgUseInfoMapper idxBizJgUseInfoMapper) {
-        this.commonMapper = commonMapper;
+    public CancellationEventListener(ICommonService commonService, ESEquipmentCategory esEquipmentCategoryDao, IdxBizJgUseInfoMapper idxBizJgUseInfoMapper) {
+        this.commonService = commonService;
         this.esEquipmentCategoryDao = esEquipmentCategoryDao;
         this.idxBizJgUseInfoMapper = idxBizJgUseInfoMapper;
     }
@@ -52,11 +52,6 @@ public class CancellationEventListener {
         queue.addAll(records);
     }
 
-    private Boolean checkEquipIsUsed(String record) {
-        Integer useTime = commonMapper.countEquipInUseTimesWithOutZF(record);
-        return useTime > 0;
-    }
-
     @PostConstruct
     public void init() {
         ExecutorService executorService = Executors.newFixedThreadPool(threadNumber);
@@ -76,8 +71,8 @@ public class CancellationEventListener {
     }
 
     private void dealData(String record) {
-        // 所有业务单据（除去作废状态单据），有在引用设备的则不修改设备纳管状态
-        Boolean inUsed = this.checkEquipIsUsed(record);
+        // 所有业务单据（除去作废、删除状态单据），有在引用设备的则不修改设备纳管状态
+        Boolean inUsed = commonService.checkEquipIsUsed(record);
         // 无引用则进行修改纳管状态为未纳管
         if (!inUsed) {
             // 更新已纳管为未纳管-数据库

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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.InstanceRuntimeData;
 import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
+import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 
 import javax.servlet.http.HttpServletResponse;
@@ -171,12 +172,12 @@ public interface ICommonService {
 
 
     /**
-     * 统计设备被引用的次数（只有存在就算引用）
+     * 统计设备是否被引用（只有存在就算引用，作废及删除的单据除外）
      *
      * @param record 设备唯一标识
-     * @return 被引用次数 > 0 则设备不可删除
+     * @return 被引用次数
      */
-    Integer countEquipInUseTimesForDel(String record);
+    Boolean checkEquipIsUsed(String record);
 
     /**
      * 设备分类
@@ -184,7 +185,7 @@ public interface ICommonService {
      * @param type 1，设备种类  2，设备类别  3，设备品种
      * @return
      */
-    List<EquipmentCategory> equipmentClassification(String type);
+    List<EquipmentCategoryDto> equipmentClassification(String type);
 
     /**
      * 套打使用标志生成

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

@@ -12,5 +12,10 @@ public interface IIdxBizJgMaintenanceRecordInfoService {
 
     boolean saveOrUpdateData(IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo);
 
+    /**
+     * 按照创建日期倒叙排列，查询最新的一条维保信息
+     * @param record 设备唯一标识
+     * @return 查询最新的一条维保信息
+     */
     IdxBizJgMaintenanceRecordInfo queryNewestDetailByRecord(String record);
 }

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

@@ -67,4 +67,10 @@ public interface IIdxBizJgRegisterInfoService {
     List<Map<String, Object>> getVehicleCylinderInfo(String useCode);
 
     IPage<Map<String, Object>> getCylinderInfo(String equCode, Date startTime, Date endTime, PageParam pageParam);
+
+    void initUserExpirationReminderOnce();
+
+    void inspectionExpirationReminderOnce();
+
+    void initEnterpriseLicenseExpirationOnce();
 }

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

@@ -47,6 +47,7 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
+import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamPipeline;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
@@ -1487,8 +1488,8 @@ public class CommonServiceImpl implements ICommonService {
      **/
     public TaskV2Model updateTaskModel(Map<String, Object> params) {
         String exeUserId = RequestContext.getExeUserId();
-        List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult();
-        List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
+        // 平台接口已调整 按照创建时间倒叙排列
+        List<TaskV2Model> collect = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult();
 
         if (collect.isEmpty()) {
             return null;
@@ -1554,13 +1555,9 @@ public class CommonServiceImpl implements ICommonService {
      **/
     public TaskV2Model updateTaskModelNew(Map<String, Object> params) {
         String exeUserId = RequestContext.getExeUserId();
-        List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult();
-
-        // TaskV2Model model = result.stream().filter(e->e.getFlowCode().equals(params.get("flowCode").toString())).sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r2.getSequenceNbr())) // 按时间降序排序
-        //         .findFirst()
-        //         .orElse(null);
-        List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
-        if (null == collect || collect.size() == 0) {
+        // 平台接口已调整 按照创建时间倒叙排列
+        List<TaskV2Model> collect = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult();
+        if (null == collect || collect.isEmpty()) {
             TaskV2Model model = new TaskV2Model();
             model.setFlowStatus(Integer.valueOf(params.get("flowStatus").toString()));
             model.setFlowStatusLabel(params.get("flowStatusLabel").toString());
@@ -1881,6 +1878,7 @@ public class CommonServiceImpl implements ICommonService {
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
         if (integer > 0) {
             jgRegistrationHistory.setChangeData(JSON.toJSONString(json));
@@ -1899,6 +1897,7 @@ public class CommonServiceImpl implements ICommonService {
     public JSONObject queryHistoryData(Long currentDocumentId) {
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
         return jgRegistrationHistory != null ? JSONObject.parseObject(jgRegistrationHistory.getChangeData()) : null;
     }
@@ -1907,6 +1906,7 @@ public class CommonServiceImpl implements ICommonService {
     public JSONArray queryHistoryDataObj(Long currentDocumentId) {
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
         if (jgRegistrationHistory != null) {
             String changeData = jgRegistrationHistory.getChangeData();
@@ -1930,8 +1930,9 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public Integer countEquipInUseTimesForDel(String record) {
-        return commonMapper.countEquipInUseTimesForDel(record);
+    public Boolean checkEquipIsUsed(String record) {
+        Integer useTime = commonMapper.countEquipInUseTimesWithOutZF(record);
+        return useTime > 0;
     }
 
     /**
@@ -1968,9 +1969,9 @@ public class CommonServiceImpl implements ICommonService {
      *             .c@return
      */
     @Override
-    public List<EquipmentCategory> equipmentClassification(String type) {
-        List<EquipmentCategory> categoryList = equipmentCategoryMapper.selectList(new QueryWrapper<>());
-        List<EquipmentCategory> result = Collections.emptyList();
+    public List<EquipmentCategoryDto> equipmentClassification(String type) {
+        List<EquipmentCategoryDto> categoryList = equipmentCategoryMapper.selectClassifyNoStart7();
+        List<EquipmentCategoryDto> result = Collections.emptyList();
         switch (type) {
             case "1":
                 result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*000$").matcher(category.getCode()).matches()).collect(Collectors.toList());
@@ -2079,6 +2080,7 @@ public class CommonServiceImpl implements ICommonService {
         jgUseRegistrations.forEach(x -> {
             LambdaQueryWrapper<JgRegistrationHistory> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(JgRegistrationHistory::getCurrentDocumentId, x.getSequenceNbr());
+            wrapper.eq(JgRegistrationHistory::getIsDelete, false);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(wrapper);
             try {
                 if (jgRegistrationHistory.getChangeData().contains("8300")) {

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

@@ -25,16 +25,19 @@ public class IdxBizJgMaintenanceRecordInfoServiceImpl extends BaseService<IdxBiz
         return this.saveOrUpdate(maintenanceRecordInfo);
     }
 
-    //查询最新的记录
+    /**
+     * 查询最新的维保记录
+     */
+    @Override
     public IdxBizJgMaintenanceRecordInfo queryNewestDetailByRecord(String record) {
-        IdxBizJgMaintenanceRecordInfo result = new IdxBizJgMaintenanceRecordInfo();
         QueryWrapper<IdxBizJgMaintenanceRecordInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(IdxBizJgMaintenanceRecordInfo::getRecord,record).orderByDesc(IdxBizJgMaintenanceRecordInfo::getInformEnd);
-        List<IdxBizJgMaintenanceRecordInfo> maintenanceRecordInfoList = list(queryWrapper);
-        if(!ValidationUtil.isEmpty(maintenanceRecordInfoList)){
-            BeanUtils.copyProperties(maintenanceRecordInfoList.get(0),result);
+        queryWrapper.lambda().eq(IdxBizJgMaintenanceRecordInfo::getRecord,record).orderByDesc(IdxBizJgMaintenanceRecordInfo::getRecDate).last("limit 1");
+        IdxBizJgMaintenanceRecordInfo init = new IdxBizJgMaintenanceRecordInfo();
+        IdxBizJgMaintenanceRecordInfo last = getOne(queryWrapper);
+        if(last != null){
+            init = last;
         }
-        return result;
+        return init;
     }
 
 

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

@@ -38,17 +38,22 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
+import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
@@ -66,6 +71,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.http.HttpStatus;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -84,6 +90,7 @@ import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -234,6 +241,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private JgInstallationNoticeServiceImpl jgInstallationNoticeService;
     @Value("${add.equip.dict.code.suffix:CATEGORY_LIST_ADD}")
     private String equipAddDictCodeSuffix;
+    @Value("${task.licenseExpiration.enabled:false}")
+    private boolean licenseExpirationEnabled;
     @Autowired
     private IdxBizJgDesignInfoServiceImpl idxBizJgDesignInfoService;
     @Autowired
@@ -272,6 +281,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private RedisTemplate<String, String> redisTemplate;
     @Autowired
     private TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper;
+    @Autowired
+    private TzsUserInfoMapper tzsUserInfoMapper;
 
     /**
      * 将对象的属性由驼峰转为纯大写下划线格式
@@ -450,9 +461,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
     }
 
-    private void checkFactoryNumUnique(String factoryNum, String useUnitCreditCode, StringBuilder result) {
+    private void checkFactoryNumUnique(String factoryNum, String produceUnitCreditCode, StringBuilder result) {
         // 车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）
-        if (commonMapper.checkFactoryNumUnique(factoryNum, null, useUnitCreditCode) > 0) {
+        if (commonMapper.checkFactoryNumUnique(factoryNum, null, produceUnitCreditCode) > 0) {
             result.append("出厂编号/产品编码在该企业中已存在！");
         }
     }
@@ -521,8 +532,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
     private void checkForDelete(List<String> records) {
         for (String record : records) {
-            Integer useTime = commonService.countEquipInUseTimesForDel(record);
-            if (useTime > 0) {
+            Boolean isUsed = commonService.checkEquipIsUsed(record);
+            if (isUsed) {
                 String msg = getTipMsgString(record);
                 throw new BadRequest(msg);
             }
@@ -531,8 +542,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     private Boolean checkEquipIsCanDelete(String record) {
-        Integer useTime = commonService.countEquipInUseTimesForDel(record);
-        return useTime <= 0;
+        // 无使用（已作废也算未使用）则可删除
+        return !commonService.checkEquipIsUsed(record);
     }
 
     private String getTipMsgString(String record) {
@@ -1515,8 +1526,18 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                         .mustNot(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
             }
         } else if (ValidationUtil.equals(queryType, "WB")) {
-            // 对于xWB类型查询，排除jg_his
-            dBuilder.mustNot(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
+            // 既要控制电梯-历史设备新增后，只能走历史平台登记，不能走维保备案-新设备登记
+            // 又要控制电梯历史设备在历史登记完成后。可以做维保备案
+            // 历史设备且做过历史登记
+            BoolQueryBuilder hisBuilder = QueryBuilders.boolQuery();
+            hisBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
+            hisBuilder.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+            dBuilder.should(hisBuilder);
+            // 或新设备
+            BoolQueryBuilder jgBuilder = QueryBuilders.boolQuery();
+            jgBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg"));
+            jgBuilder.mustNot(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
+            dBuilder.should(jgBuilder);
         } else {
             // 查所有，前缀 jg
             dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg"));
@@ -2306,14 +2327,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         IdxBizJgConstructionInfo constructionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgConstructionInfo.class);
         // 注册登记信息
         IdxBizJgRegisterInfo registerInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgRegisterInfo.class);
-        // 维保备案
-        IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgMaintenanceRecordInfo.class);
         // 监督管理
         IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgSupervisionInfo.class);
         // 其他信息
         IdxBizJgOtherInfo otherInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgOtherInfo.class);
         // 检验检测 【新增时】 固定式压力容器（2100）和 气瓶（2300）可以添加检验检测信息
-        if ("add".equals(submitType)) {
+        if ("add".equals(submitType) || isCopy) {
             if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategory) || "2100".equals(equCategory)) {
                 IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
                 List<Map<String, Object>> inspectionAndTestingInstitutions = commonService.getUnitListByType("inspection", "gasCylindersForCars");
@@ -2432,12 +2451,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         registerInfo.setUseOrgCode(isCopy ? "" : registerInfo.getUseOrgCode());
         this.saveOrUpdate(registerInfo);
 
-        // 维保备案
-        maintenanceRecordInfo.setRecord(record);
-        maintenanceRecordInfo.setRecDate(date);
-        maintenanceRecordInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("MAINTENANCERECORDINFO_SEQ")));
-        iIdxBizJgMaintenanceRecordInfoService.saveOrUpdateData(maintenanceRecordInfo);
-
         // 监督管理
         supervisionInfo.setRecord(record);
         supervisionInfo.setRecDate(date);
@@ -2853,60 +2866,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             }
 
             if ("his".equals(equipInfoDto.getDataSource())) {
-                String useRegistrationCode = equipInfoDto.getUseOrgCode();
                 //使用登记证编号判断是否使用未来系统生成编号
-                String key = useRegistrationCode.length() >= 5 ? useRegistrationCode.substring(0, 5) : useRegistrationCode;
-                List<String> prefixes = Collections.unmodifiableList(Arrays.asList("容", "锅", "管", "瓶", "梯", "起", "索", "游", "车"));
-                //容15鲁G00302(12)
-                if (useRegistrationCode.length() == 14 && prefixes.stream().anyMatch(key::startsWith)) {
-                    // 如果 prefix 不等于 "瓶31" 或 "瓶32" 则继续执行逻辑
-                    ValueOperations<String, String> valueOps = redisTemplate.opsForValue();
-                    String currentSequenceStr = valueOps.get(key);
-                    String extractedValue = useRegistrationCode.substring(5, 10);
-                    String extractedYearStr = useRegistrationCode.substring(useRegistrationCode.indexOf('(') + 1, useRegistrationCode.indexOf(')'));
-                    int currentYearLastTwoDigits = LocalDate.now().getYear() % 100;
-                    // 提取年份
-                    int extractedYear = Integer.parseInt(extractedYearStr);
-                    if (currentYearLastTwoDigits == extractedYear) {
-                        if (redisUtils.hasKey(useRegistrationCode.substring(0, 5))) {
-                            String prefix = useRegistrationCode.substring(0, 3);
-                            if (Stream.of("瓶31", "瓶32").noneMatch(prefix::equals) && currentSequenceStr != null) {
-                                try {
-                                    if (Character.isLetter(extractedValue.charAt(0))) {
-                                        // 提取字母部分并比较
-                                        char extractedLetter = extractedValue.charAt(0);
-                                        int extractedNumber = Integer.parseInt(extractedValue.substring(1)); // 提取数字部分
-
-                                        // 提取 Redis 中的字母和数字部分
-                                        char redisLetter = currentSequenceStr.charAt(0);
-
-                                        //redis中不是字母开头，输入的是字母开头
-                                        if (!Character.isLetter(redisLetter)) {
-                                            throw new BadRequest("登记证编号不能使用系统还未生成编号!");
-                                        }
-                                        int redisNumber = Integer.parseInt(currentSequenceStr.substring(1));
-
-                                        // 比较字母和数字
-                                        if ((extractedLetter > redisLetter || (extractedLetter == redisLetter && extractedNumber > redisNumber))) {
-                                            throw new BadRequest("登记证编号不能使用系统还未生成编号!");
-                                        }
-                                    } else {
-                                        // 如果首字符不是字母，直接进行字符串比较
-                                        if (extractedValue.compareTo(currentSequenceStr) > 0) {
-                                            throw new BadRequest("登记证编号不能使用系统还未生成编号!");
-                                        }
-                                    }
-                                } catch (NumberFormatException e) {
-                                    throw new BadRequest("数据格式错误");
-                                }
-                            }
-                        } else {
-                            throw new BadRequest("登记证编号不能使用系统还未生成编号!");
-                        }
-                    }
-                }
+                this.checkUseRegistrationCode(equipInfoDto.getUseOrgCode(), "cylinder");
             }
-
             String record = UUID.randomUUID().toString();
             jgRelationEquip.setEquId(record);
             jgRelationEquip.setSequenceNbr(sequence.nextId());
@@ -3170,11 +3132,78 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         return String.format("导入完成，成功导入: %d 条数据！", useInfoList.size());
     }
 
+    /**
+     * 使用登记证编号判断是否使用未来系统生成编号
+     * @param useRegistrationCode 使用登记证编号
+     * @param regType 历史登记类别（台套set，车用vehicle，气瓶Cylinder）
+     */
+    public void checkUseRegistrationCode(String useRegistrationCode, String regType) {
+        // 使用登记证编号判断是否使用未来系统生成编号
+        String key = useRegistrationCode.length() >= 5 ? useRegistrationCode.substring(0, 5) : useRegistrationCode;
+        List<String> prefixes = Collections.unmodifiableList(Arrays.asList("容", "锅", "管", "瓶", "梯", "起", "索", "游", "车"));
+
+        if (useRegistrationCode.length() == 14 && prefixes.stream().anyMatch(key::startsWith)) {
+            // 如果 prefix 不等于 "瓶31" 或 "瓶32" 则继续执行逻辑
+            ValueOperations<String, String> valueOps = redisTemplate.opsForValue();
+            String currentSequenceStr = valueOps.get(key);
+            String extractedValue = useRegistrationCode.substring(5, 10);
+            String extractedYearStr = useRegistrationCode.substring(useRegistrationCode.indexOf('(') + 1, useRegistrationCode.indexOf(')'));
+            int currentYearLastTwoDigits = LocalDate.now().getYear() % 100;
+
+            // 提取年份
+            int extractedYear = Integer.parseInt(extractedYearStr);
+            if (currentYearLastTwoDigits == extractedYear) {
+                if (redisUtils.hasKey(useRegistrationCode.substring(0, 5))) {
+                    String prefix = useRegistrationCode.substring(0, 3);
+
+                    // 检查regType是否为Cylinder，如果是，才执行"瓶31" 和 "瓶32" 的条件判断
+                    if (!"cylinder".equals(regType) || Stream.of("瓶31", "瓶32").noneMatch(prefix::equals)) {
+                        if (currentSequenceStr != null) {
+                            try {
+                                if (Character.isLetter(extractedValue.charAt(0))) {
+                                    // 提取字母部分并比较
+                                    char extractedLetter = extractedValue.charAt(0);
+                                    int extractedNumber = Integer.parseInt(extractedValue.substring(1)); // 提取数字部分
+
+                                    // 提取 Redis 中的字母和数字部分
+                                    char redisLetter = currentSequenceStr.charAt(0);
+
+                                    // redis中不是字母开头，输入的是字母开头
+                                    if (!Character.isLetter(redisLetter)) {
+                                        throw new BadRequest("登记证编号不能使用系统还未生成编号!");
+                                    }
+                                    int redisNumber = Integer.parseInt(currentSequenceStr.substring(1));
+
+                                    // 比较字母和数字
+                                    if ((extractedLetter > redisLetter || (extractedLetter == redisLetter && extractedNumber > redisNumber))) {
+                                        throw new BadRequest("登记证编号不能使用系统还未生成编号!");
+                                    }
+                                } else {
+                                    // 如果首字符不是字母，直接进行字符串比较
+                                    if (extractedValue.compareTo(currentSequenceStr) > 0) {
+                                        throw new BadRequest("登记证编号不能使用系统还未生成编号!");
+                                    }
+                                }
+                            } catch (NumberFormatException e) {
+                                throw new BadRequest("数据格式错误");
+                            }
+                        }
+                    }
+                } else {
+                    throw new BadRequest("登记证编号不能使用系统还未生成编号!");
+                }
+            } else if (currentYearLastTwoDigits <= extractedYear){
+                throw new BadRequest("登记证编号不能使用超出当年年份编号!");
+            }
+        }
+    }
+
     public void updateHistory(JSONObject map, String currentDocumentId) {
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         // lambda.eq(JgRegistrationHistory::getEquId, equipId);
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         lambda.eq(JgRegistrationHistory::getRegistrationClass, "使用登记");
         Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
         jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
@@ -3349,7 +3378,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     result.append("出厂编号/产品编码不能重复；");
                 }
                 checkNotBlank(data.getCylinderCategory(), "气瓶分类不能为空；", result);
-                checkFactoryNumUnique(data.getFactoryNum(), company.getCompanyCode(), result);
+                checkFactoryNumUnique(data.getFactoryNum(), data.getProduceUnitCreditCode(), result);
             } else {
                 checkFactoryNumUniquenessForVehicleCylinder(data.getFactoryNum(), result);
             }
@@ -3700,4 +3729,205 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
         return result;
     }
+
+
+
+    /**
+     * 定时任务，每天9点执行一次
+     * 企业许可到期提醒
+     */
+    @Scheduled(cron = "0 0 9 * * ?")
+    @SchedulerLock(name="enterpriseLicenseExpirationTask",lockAtMostFor = "PT6H")
+    public void enterpriseLicenseExpirationTask() {
+        if (licenseExpirationEnabled) {
+            this.enterpriseLicenseExpiration("=");
+        }
+    }
+
+    /**
+     * 定时任务，每天9点执行一次
+     * 人员资质到期提醒
+     */
+    @Scheduled(cron = "0 0 9 * * ?")
+    @SchedulerLock(name="userExpirationReminderTask",lockAtMostFor = "PT6H")
+    public void userExpirationReminderTask() {
+        if (licenseExpirationEnabled) {
+            this.userExpirationReminder("=");
+        }
+    }
+
+    /**
+     * 定时任务，每天9点执行一次
+     * 检验有效期到期提醒
+     */
+    @Scheduled(cron = "0 0 9 * * ?")
+    @SchedulerLock(name="inspectionExpirationReminderTask",lockAtMostFor = "PT6H")
+    public void inspectionExpirationReminderTask() {
+        if (licenseExpirationEnabled) {
+            this.inspectionExpirationReminder("=");
+        }
+    }
+
+    /**
+     * 初始化接口，调用一次，企业许可到期提醒
+     */
+    public void initEnterpriseLicenseExpirationOnce() {
+        enterpriseLicenseExpiration("<");
+    }
+
+    /**
+     * 初始化接口，调用一次，人员资质过期提醒
+     */
+    public void initUserExpirationReminderOnce() {
+        this.userExpirationReminder("<");
+    }
+
+    /**
+     * 初始化接口，调用一次，检验有效期到期提醒
+     */
+    public void inspectionExpirationReminderOnce() {
+        this.inspectionExpirationReminder("<");
+    }
+
+    private void enterpriseLicenseExpiration(String operator) {
+        List<TzBaseEnterpriseInfoDto> enterpriseInfoDtoList = baseEnterpriseInfoMapper.selectExpiringUnits(operator);
+        if (enterpriseInfoDtoList != null && !enterpriseInfoDtoList.isEmpty()) {
+            for (TzBaseEnterpriseInfoDto dto : enterpriseInfoDtoList) {
+                // 获取当前日期并动态生成短信内容
+                String currentDate = getCurrentFormattedDate();
+                String content = generateSmsContent(currentDate, "企业许可");
+                // 构建发送短信的请求
+                HashMap<String, String> sendSmsMap = buildSmsMap(dto.getUseContact(), content);
+                // 发送短信
+                sendSms(sendSmsMap);
+            }
+        }
+    }
+
+    private void userExpirationReminder(String operator) {
+        //查询检验人员，检测人员，从业人员，资质到期时间
+        List<TzsUserInfoDto> tzsUserInfoDtoList = tzsUserInfoMapper.selectUserPermission(operator, Arrays.asList("66152", "6552", "66151"));
+        if (tzsUserInfoDtoList != null && !tzsUserInfoDtoList.isEmpty()) {
+            for (TzsUserInfoDto dto : tzsUserInfoDtoList) {
+                // 获取当前日期并动态生成短信内容
+                String currentDate = getCurrentFormattedDate();
+                String content = generateSmsContent(currentDate, "从业人员资质");
+                // 构建发送短信的请求
+                HashMap<String, String> sendSmsMap = buildSmsMap(dto.getPhone(), content);
+                // 发送短信
+                sendSms(sendSmsMap);
+            }
+        }
+    }
+
+    private void inspectionExpirationReminder(String operator) {
+        SearchRequest request = new SearchRequest();
+        request.indices("idx_biz_view_jg_all");
+        SearchSourceBuilder builder = new SearchSourceBuilder();
+        builder.trackTotalHits(true);
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+        String param = QueryParser.escape("true");
+        pBuilder.must(QueryBuilders.matchQuery("IS_INTO_MANAGEMENT", param));
+        boolMust.must(pBuilder);
+        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        // 获取今天的开始时间戳
+        LocalDate today = LocalDate.now();
+        LocalDateTime startOfDay = today.atStartOfDay();
+        long todayStartTimestamp = startOfDay.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+        // 获取明天的开始时间戳（用于不等于今天的其他数据范围）
+        LocalDateTime startOfNextDay = today.plusDays(1).atStartOfDay();
+        long nextDayStartTimestamp = startOfNextDay.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+        if ("=".equals(operator)){
+            boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE")
+                    .gte(todayStartTimestamp)  // 大于等于今天的开始时间戳
+                    .lt(nextDayStartTimestamp)); // 小于明天的开始时间戳
+        }else{
+            // 使用 range 查询来查找 `NEXT_INSPECT_DATE` 小于今天的数据
+            boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE")
+                    .lt(todayStartTimestamp));  // 小于今天的开始时间戳
+        }
+
+        builder.query(boolMust);
+        request.source(builder);
+
+        try {
+            SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
+
+            List<String> useUnitCreditCodeList = Arrays.stream(response.getHits().getHits())
+                    .map(hit -> ((JSONObject) JSONObject.toJSON(hit)).getJSONObject("sourceAsMap"))
+                    .map(dto2 -> dto2.getString("USE_UNIT_CREDIT_CODE"))
+                    .filter(Objects::nonNull)
+                    .distinct()  // 去除重复的 USE_UNIT_CREDIT_CODE
+                    .collect(Collectors.toList());
+
+            if (!useUnitCreditCodeList.isEmpty()) {
+                List<TzBaseEnterpriseInfoDto> enterpriseInfoDtoList = baseEnterpriseInfoMapper.queryByUseCode(useUnitCreditCodeList);
+                if (enterpriseInfoDtoList != null && !enterpriseInfoDtoList.isEmpty()) {
+                    for (TzBaseEnterpriseInfoDto dto : enterpriseInfoDtoList) {
+                        // 获取当前日期并动态生成短信内容
+                        String currentDate = getCurrentFormattedDate();
+                        String content = generateSmsContent(currentDate, "下次检验有效期");
+                        // 构建发送短信的请求
+                        HashMap<String, String> sendSmsMap = buildSmsMap("18629351226", content);
+                        // 发送短信
+                        sendSms(sendSmsMap);
+                    }
+                }
+            }
+
+        } catch (IOException e) {
+            log.error("Error executing search request: {}", e.getMessage(), e);
+            throw new RuntimeException("Failed to execute search request", e);
+        }
+    }
+
+    /**
+     * 获取当前日期并格式化为 "yyyy年MM月dd日"
+     */
+    private String getCurrentFormattedDate() {
+        LocalDate now = LocalDate.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
+        return now.format(formatter);
+    }
+
+    /**
+     * 动态生成短信内容
+     */
+    private String generateSmsContent(String expiryDate, String content) {
+        return String.format("尊敬的用户，截止【%s】，您的%s已经到期，请您登录系统查看或处理（电脑端地址：http://sxtzsb.sxsei.com）！", expiryDate, content);
+    }
+
+    /**
+     * 构建发送短信的参数Map
+     */
+    private HashMap<String, String> buildSmsMap(String mobile, String content) {
+        HashMap<String, String> sendSmsMap = new HashMap<>();
+        sendSmsMap.put("mobile", mobile);
+        sendSmsMap.put("smsCode", "SMS_TZS_0006");
+        sendSmsMap.put("content", content);
+        return sendSmsMap;
+    }
+
+    /**
+     * 发送短信并处理结果
+     */
+    private void sendSms(HashMap<String, String> sendSmsMap) {
+        FeignClientResult<SmsRecordModel> sendVerifyCodeResult = Systemctl.smsClient.sendCommonSms(sendSmsMap);
+        if (sendVerifyCodeResult.getStatus() != 200) {
+            logAndThrowSmsError(sendVerifyCodeResult);
+        }
+    }
+
+    /**
+     * 日志记录和异常处理
+     */
+    private void logAndThrowSmsError(FeignClientResult<SmsRecordModel> sendVerifyCodeResult) {
+        if (log.isErrorEnabled()) {
+            log.error("调用平台发短信失败:{}", sendVerifyCodeResult.getDevMessage());
+        }
+        throw new RuntimeException(sendVerifyCodeResult.getMessage());
+    }
 }
\ 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/JgChangeRegistrationNameServiceImpl.java

@@ -176,6 +176,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
         lambda.eq(JgRegistrationHistory::getRegistrationClass, CHANGE_NAME);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
         if (integer > 0) {
             jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
@@ -915,7 +916,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         }
 
         // 业务流水生成
-        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationName.getSequenceNbr()).one();
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationName.getSequenceNbr())
+                .eq(JgRegistrationHistory::getIsDelete, false)
+                .one();
         JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
         JSONObject dataList = JSONObject.parseObject(jsonObject.get("jgRegistrationInfo").toString());
         JSONArray objects = JSONObject.parseArray(dataList.get("dataList").toString());
@@ -1027,7 +1031,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         dtoMap.put("changeCertificate", JSON.parseArray(jgChangeRegistrationName.getChangeCertificate()));
         dtoMap.put("otherAccessories", JSON.parseArray(jgChangeRegistrationName.getOtherAccessories()));
         // 查询历史数据中选择的使用登记证信息
-        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr).one();
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr)
+                .eq(JgRegistrationHistory::getIsDelete, false)
+                .one();
         if (!ObjectUtils.isEmpty(jgRegistrationHistory)) {
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             JSONObject dataList = JSONObject.parseObject(jsonObject.get("jgRegistrationInfo").toString());

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

@@ -1239,7 +1239,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     private void restoreTechParams(JgChangeRegistrationReform jgChangeRegistrationReform) {
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(
                 new LambdaQueryWrapper<JgRegistrationHistory>()
-                        .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationReform.getApplyNo()));
+                        .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationReform.getApplyNo())
+                        .eq(JgRegistrationHistory::getIsDelete, false));
         if (jgRegistrationHistory == null) {
             return;
         }

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

@@ -325,6 +325,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             //设备移装详细地址
             oldTransfer.setFullAddress(fullAddress);
             oldTransfer.setTransferType((String) tableData.get("transferType"));
+            if (!ObjectUtils.isEmpty(tableData.get("otherAccessories"))) {
+                oldTransfer.setOtherAccessories(JSONObject.toJSONString(tableData.get("otherAccessories")));
+            }
 
             //保存【移装变更登记】基本信息
             if (!ValidationUtil.isEmpty(oldTransfer)) {
@@ -605,7 +608,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         this.doCompensate(transfer);
         //查询设备详情
         JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
-                .eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo()));
+                .eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo())
+                .eq(JgRegistrationHistory::getIsDelete, false));
         if (ValidationUtil.equals(FlowStatusEnum.TO_BE_FINISHED.getName(), transfer.getStatus())) {
             // 执行完成时查询历史表
             if (!ValidationUtil.isEmpty(historyData)) {
@@ -648,6 +652,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             resultDataMap.put("receiveCompanyCode", transfer.getReceiveCompanyCode() + "_" + transfer.getReceiveOrgName());
             resultDataMap.put("registrationList", newRegistrationList);
         }
+        if (!ObjectUtils.isEmpty(resultDataMap.get("otherAccessories"))) {
+            resultDataMap.put("otherAccessories", JSONObject.parse(resultDataMap.get("otherAccessories").toString()));
+        }
         String transferSafetyManager = Optional.ofNullable(resultDataMap.get("transferSafetyManager")).orElse("").toString();
         if (StringUtil.isNotEmpty(transferSafetyManager)) {
             String[] transferSafetyManagerList = transferSafetyManager.split("_");
@@ -673,7 +680,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     private void delRepeatUseEquipData(JgChangeRegistrationTransfer transfer) {
         if (NOT_FLOWING_STATE.contains(transfer.getAuditStatus())) {
             JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo()));
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo())
+                    .eq(JgRegistrationHistory::getIsDelete, false));
             JSONObject historyJson = JSON.parseObject(historyData.getChangeData());
             List<Map<String, Object>> registrationList = (List<Map<String, Object>>) historyJson.get("registrationList");
             List<String> ids = registrationList.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
@@ -791,7 +799,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             jgChangeRegistrationTransfer.setNextExecuteUserIds("");
             //流程执行完成后，更新设备使用信息
             JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationTransfer.getApplyNo()));
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationTransfer.getApplyNo())
+                    .eq(JgRegistrationHistory::getIsDelete, false));
             this.updateByFlowEnd(jgChangeRegistrationTransfer.getSequenceNbr().toString(), historyData);
             HashMap<String, Object> map = new HashMap<>();
             map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());

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

@@ -163,10 +163,11 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
      * 根据sequenceNbr查询：1、查询单位变更信息，2、查询使用登记证列表
      *
      * @param sequenceNbr 主键
+     * @param selectedOrgInfo
      * @return 单位变更
      */
     @Override
-    public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr) {
+    public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo) {
         // 单位变更信息
         JgChangeRegistrationUnit notice = JgChangeRegistrationUnitMapper.selectById(sequenceNbr);
         if (Objects.isNull(notice)) {
@@ -174,7 +175,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
         this.doCompensate(notice);
         Map<String, Object> changeInfo = BeanUtil.beanToMap(notice, false, true);
-
+        //回填新单位地址，台套办理的使用登记证打印时 需要，用来校验必输
+        if (!ObjectUtils.isEmpty(notice.getNewUseUnitCreditCode())) {
+            TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new LambdaQueryWrapper<TzBaseEnterpriseInfo>().eq(TzBaseEnterpriseInfo::getUseUnitCode, notice.getNewUseUnitCreditCode()));
+            if (useCodeResult != null) {
+                changeInfo.put("address",useCodeResult.getAddress());
+            }
+        }
         //组装下拉数据
         if (!ValidationUtil.isEmpty(notice.getReceiveOrgCode()) && !ValidationUtil.isEmpty(notice.getReceiveOrgName())) {
             changeInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
@@ -190,8 +197,17 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         changeInfo.put("otherAccessoriesList", JSON.parse(notice.getOtherAccessories()));
         //查询使用登记证列表
         JgRegistrationHistory historyServiceOne = registrationHistoryService.getOne(
-                new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo()));
+                new LambdaQueryWrapper<JgRegistrationHistory>()
+                        .eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo())
+                        .eq(JgRegistrationHistory::getIsDelete, false));
         changeInfo.put("registrationList", JSON.parse(historyServiceOne.getChangeData()));
+        changeInfo.put("havingPermission", notice.getNextExecuteUserIds() != null && notice.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
+        String companyType = selectedOrgInfo.getCompany().getCompanyType();
+        if ("个人主体".equals(companyType)) {
+            changeInfo.put("companyType", "person");
+        } else {
+            changeInfo.put("companyType", "company");
+        }
         return new HashMap<String, Map<String, Object>>() {{
 //            this.put("changeRegisInfo", fillEquipInfoWithRuntimeOrHistoryData(notice, changeInfo));
             this.put("changeRegisInfo", changeInfo);
@@ -312,6 +328,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 notice.setNextExecutorIds(String.join(",", roleListNext));
                 notice.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
                 notice.setNextExecuteUserIds(nextUserIds);
+                setNewUnitInfo(reginParams, notice);
                 JgChangeRegistrationUnitMapper.updateById(notice);
                 commonServiceImpl.deleteTasksByRelationId(notice.getSequenceNbr() + "");
                 createTaskModel(notice, taskname, "1", nextUserIds);
@@ -359,12 +376,14 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 bean.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
                 executeOneStep(bean, taskName1, nextUserIds, op);
                 bean.setNextExecuteUserIds(nextUserIds);
+                setNewUnitInfo(reginParams, bean);
                 JgChangeRegistrationUnitMapper.updateById(bean);
                 commonServiceImpl.saveExecuteFlowData2Redis(bean.getInstanceId(), buildInstanceRuntimeData(bean));
             }
         } else {
             JgChangeRegistrationUnit bean = new JgChangeRegistrationUnit();
             BeanUtils.copyProperties(noticeDto, bean);
+            setNewUnitInfo(reginParams, bean);
             JgChangeRegistrationUnitMapper.updateById(bean);
         }
         List<JgChangeRegistrationUnitEq> jgRelationEquipList = new ArrayList<>();
@@ -407,6 +426,14 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         return noticeDto;
     }
 
+    private void setNewUnitInfo(ReginParams reginParams, JgChangeRegistrationUnit notice) {
+        notice.setNewUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                reginParams.getCompany().getCompanyName().split("_")[1] : reginParams.getCompany().getCompanyName());
+        notice.setNewUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                reginParams.getCompany().getCompanyCode().split("_")[1] :
+                reginParams.getCompany().getCompanyCode());
+    }
+
 
     /**
      * 分页查询
@@ -611,10 +638,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             model.setPromoter(reginParams.getUserModel().getUserId());
             model.setStatus(taskName[0]);
         }
-        model.setNewUseUnitName(reginParams.getCompany().getCompanyName());
-        model.setNewUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
-                reginParams.getCompany().getCompanyCode().split("_")[1] :
-                reginParams.getCompany().getCompanyCode());
         if (!CollectionUtils.isEmpty(nextExecutorUserIds)) {
             model.setNextExecuteUserIds(nextExecutorUserIds.get(0));
         }
@@ -634,6 +657,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         model.setEquList(registrationList.get(0).get("equList").toString());
         JgChangeRegistrationUnit registrationUnit = new JgChangeRegistrationUnit();
         BeanUtils.copyProperties(model, registrationUnit);
+        setNewUnitInfo(reginParams, registrationUnit);
         JgChangeRegistrationUnitMapper.insert(registrationUnit);
 
         List<TaskModelDto> modelDtos = new ArrayList<>();
@@ -763,15 +787,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             }
         }
 
-        String newUseUnitId = model.getNewUseUnitCreditCode();
-        if (!ObjectUtils.isEmpty(newUseUnitId)) {
-            String[] newUseUnitList = newUseUnitId.split("_");
-            if (newUseUnitList.length > 1) {
-                model.setNewUseUnitCreditCode(newUseUnitList[0]);
-                model.setNewUseUnitName(newUseUnitList[1]);
-            }
-        }
-
         String receiveOrgCode = model.getReceiveOrgCode();
         if (!ObjectUtils.isEmpty(receiveOrgCode)) {
             String[] receiveOrgCodeList = receiveOrgCode.split("_");
@@ -976,7 +991,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                     updateTaskModel(registration, op);
                     //新增使用登记证和设备变更记录
                     this.saveRecord(registration);
-                    JgRegistrationHistory history = registrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, registration.getApplyNo()).one();
+                    JgRegistrationHistory history = registrationHistoryService.lambdaQuery()
+                            .eq(JgRegistrationHistory::getCurrentDocumentId, registration.getApplyNo())
+                            .eq(JgRegistrationHistory::getIsDelete, false)
+                            .one();
                     JSONArray historyJson = JSON.parseArray(history.getChangeData());
                     List<String> ids = historyJson.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
                     List<JgUseRegistrationManage> list = useRegistrationManageService.lambdaQuery().in(BaseEntity::getSequenceNbr, ids).list();
@@ -1035,7 +1053,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
      * 删除 redis校验重复引用设备的数据
      */
     private void delRepeatUseEquipData(String applyNo, String status, String companyCode) {
-        JgRegistrationHistory history = registrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, applyNo).one();
+        JgRegistrationHistory history = registrationHistoryService.lambdaQuery()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, applyNo)
+                .eq(JgRegistrationHistory::getIsDelete, false)
+                .one();
         // 获取使用登记证列表
         JSONArray registrationList = JSON.parseArray(history.getChangeData());
         if (CollectionUtils.isEmpty(registrationList)) {

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -27,9 +28,11 @@ import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
@@ -89,8 +92,6 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     @Autowired
     private JgUseRegistrationManageServiceImpl jgUseRegistrationManageService;
     @Autowired
-    private JgVehicleInformationServiceImpl jgVehicleInformationService;
-    @Autowired
     private JgChangeVehicleRegistrationUnitEqServiceImpl jgChangeVehicleRegistrationUnitEqService;
     @Autowired
     private RedissonClient redissonClient;
@@ -103,6 +104,9 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     @Autowired
     private IdxBizJgOtherInfoMapper otherInfoMapper;
 
+    @Autowired
+    private IdxBizJgUseInfoMapper jgUseInfoMapper;
+
     private volatile Map<String, Object> fillingMediumMap;
 
 
@@ -421,6 +425,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
 
             LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
             lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr));
+            lambdaSelect.eq(JgRegistrationHistory::getIsDelete, false);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
             JSONObject historyData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             // 更新代办
@@ -442,6 +447,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             HashMap<String, Object> param = new HashMap<>();
             param.put("USE_UNIT_NAME", jgChangeVehicleRegistrationUnit.getNewUseUnitName());
             param.put("USE_UNIT_CREDIT_CODE", jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
+            // 更新车用气瓶变更登记后，修改气瓶的单位内部编号为车牌号 bug23732
+            param.put("USE_INNER_CODE", jgChangeVehicleRegistrationUnit.getNewCarNumber());
             if (!ObjectUtils.isEmpty(useRegistCode)) {
                 param.put("USE_ORG_CODE", useRegistCode);
                 LambdaQueryWrapper<IdxBizJgOtherInfo> eq = new QueryWrapper<IdxBizJgOtherInfo>().lambda().eq(IdxBizJgOtherInfo::getRecord, item);
@@ -462,7 +469,10 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
                 .eq(JgUseRegistrationManage::getIsDelete, 0)
                 .one();
         // 业务流水生成
-        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeVehicleRegistrationUnit.getSequenceNbr()).one();
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeVehicleRegistrationUnit.getSequenceNbr())
+                .eq(JgRegistrationHistory::getIsDelete, false)
+                .one();
         JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
         JSONArray dataList = JSONObject.parseArray(jsonObject.get("dataList").toString());
         ArrayList<JgCertificateChangeRecordEq> jgCertificateChangeRecordEqs = new ArrayList<>();
@@ -519,6 +529,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         if ("1".equals(jgChangeVehicleRegistrationUnit.getChangeType()) && !ObjectUtils.isEmpty(collect)) {
             updateEsData(collect, jgChangeVehicleRegistrationUnit, null);
         }
+        // 更新车用气瓶变更登记后，修改气瓶的单位内部编号为车牌号 bug23732
+        updateCarNumIntoUseInnerCode(jgChangeVehicleRegistrationUnit, collect);
         // 修改证管理信息
         manage.setUseUnitName(jgChangeVehicleRegistrationUnit.getNewUseUnitName());
         manage.setUseUnitCreditCode(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
@@ -547,6 +559,13 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
 
     }
 
+    private void updateCarNumIntoUseInnerCode(JgChangeVehicleRegistrationUnit jgChangeVehicleRegistrationUnit, List<String> collect) {
+        LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.in(IdxBizJgUseInfo::getRecord, collect);
+        updateWrapper.set(IdxBizJgUseInfo::getUseInnerCode, jgChangeVehicleRegistrationUnit.getNewCarNumber());
+        jgUseInfoMapper.update(null, updateWrapper);
+    }
+
     /**
      * 生成监管码
      */
@@ -646,6 +665,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, dto.getSequenceNbr());
         lambda.eq(JgRegistrationHistory::getRegistrationClass, BUSINESS_NAME);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
         if (integer > 0) {
             jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
@@ -767,10 +787,14 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         return Boolean.TRUE;
     }
 
-    public Map<String, Object> getDetails(String sequenceNbr) {
+    public Map<String, Object> getDetails(String sequenceNbr, ReginParams selectedOrgInfo) {
         JgChangeVehicleRegistrationUnit registrationUnit = this.getById(sequenceNbr);
         this.doCompensate(registrationUnit);
-        JgRegistrationHistory history = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr).eq(JgRegistrationHistory::getRegistrationClass, BUSINESS_NAME).one();
+        JgRegistrationHistory history = jgRegistrationHistoryService.lambdaQuery()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr)
+                .eq(JgRegistrationHistory::getRegistrationClass, BUSINESS_NAME)
+                .eq(JgRegistrationHistory::getIsDelete, false)
+                .one();
         if (!ObjectUtils.isEmpty(history) && !ObjectUtils.isEmpty(history.getChangeData())) {
             JSONObject object = JSONObject.parseObject(history.getChangeData());
             object.put("sequenceNbr", sequenceNbr);
@@ -782,6 +806,13 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             } else {
                 object.put("newCarNumber", registrationUnit.getCarNumber());
             }
+            String companyType = selectedOrgInfo.getCompany().getCompanyType();
+            if ("个人主体".equals(companyType)) {
+                object.put("companyType", "person");
+            } else {
+                object.put("companyType", "company");
+            }
+            object.put("havingPermission", registrationUnit.getNextExecuteUserIds() != null && registrationUnit.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
             return object;
         } else {
             return new HashMap<>();

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

@@ -783,7 +783,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         Map<String, Object> resultMap = new HashMap<>();
         JgEnableDisable enableDisable = this.getById(sequenceNbr);
         this.doCompensate(enableDisable);
-        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr));
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr)
+                .eq(JgRegistrationHistory::getIsDelete, false));
         if (jgRegistrationHistory != null) {
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             resultMap.putAll(jsonObject);

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipInsuranceDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipInsurance;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipInsuranceMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipInsuranceService;
+import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+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 java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 服务实现类
+ *
+ * @author LiuLin
+ * @date 2024-10-17
+ */
+@Service
+public class JgEquipInsuranceServiceImpl extends BaseService<JgEquipInsurance,JgEquipInsurance,JgEquipInsuranceMapper> implements IJgEquipInsuranceService {
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Autowired
+    private CommonServiceImpl commonServiceImpl;
+
+    private static final String SECOND = "second";
+
+    private static final String DEVICE_LIST = "deviceList";
+
+    /**
+     * 分页查询
+     */
+    public Page<JgEquipInsuranceDto> queryForJgEquipInsurancePage(Page<JgEquipInsurance> page,
+                                                               @ApiParam(value = "排序字段") @RequestParam(value = "sort", required = false) String sort,
+                                                               JgEquipInsuranceDto dto)   {
+        SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
+        return this.baseMapper.getListPage(page, sortMap, dto);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgEquipInsurance> queryForJgEquipInsuranceList()   {
+        return this.queryForList("" , false);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public Object save(JSONObject map) {
+        // 从 Redis 中获取 ReginParams 对象
+        ReginParams reginParams = JSONObject.parseObject(
+                redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
+                ReginParams.class
+        );
+
+        // 解析 secondMap 和设备保险信息
+        JSONObject secondMap = map.getJSONObject("second");
+        JgEquipInsurance equipInsurance = map.getObject(SECOND, JgEquipInsurance.class);
+
+        // 获取设备列表并进行校验
+        List<Map> deviceList = secondMap.getJSONArray(DEVICE_LIST).toJavaList(Map.class);
+        if (CollectionUtils.isEmpty(deviceList)) {
+            throw new BadRequest("请选择设备信息!");
+        }
+
+        // 使用流创建新的保险对象列表并保存
+        return this.saveBatch(
+                deviceList.stream()
+                        .map(x -> {
+                            JgEquipInsurance newInsurance = new JgEquipInsurance();
+                            BeanUtils.copyProperties(equipInsurance, newInsurance);
+                            newInsurance.setEquId(String.valueOf(x.get("record")));
+                            newInsurance.setEquList(String.valueOf(x.get("EQU_LIST_CODE")));
+                            newInsurance.setEquCategory(String.valueOf(x.get("EQU_CATEGORY_CODE")));
+                            newInsurance.setEquDefine(String.valueOf(x.get("EQU_DEFINE_CODE")));
+                            newInsurance.setRecUserId(reginParams.getUserModel().getUserId());
+                            newInsurance.setRecUserName(reginParams.getUserModel().getUserName());
+                            newInsurance.setRecDate(new Date());
+                            newInsurance.setIsDelete(false);
+                            return newInsurance;
+                        })
+                        .collect(Collectors.toList())
+        );
+    }
+
+    public JgEquipInsuranceDto getDetail(Long sequenceNbr) {
+        return this.getBaseMapper().getDetailById(sequenceNbr);
+    }
+}
\ 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/JgInstallationNoticeServiceImpl.java

@@ -1689,7 +1689,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         list.forEach(item -> {
             // 设备信息
             List<JgInstallationNoticeEq> equList = jgInstallationNoticeEqService.lambdaQuery().eq(JgInstallationNoticeEq::getEquipTransferId, item.getSequenceNbr()).list();
-            JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, item.getSequenceNbr()).one();
+            JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery()
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, item.getSequenceNbr())
+                    .eq(JgRegistrationHistory::getIsDelete, false)
+                    .one();
             if (!ObjectUtils.isEmpty(jgRegistrationHistory) && !ObjectUtils.isEmpty(jgRegistrationHistory.getChangeData())) {
                 List<String> ids = equList.stream().map(JgInstallationNoticeEq::getEquId).collect(Collectors.toList());
                 Iterable<ESEquipmentCategoryDto> equips = esEquipmentCategory.findAllById(ids);

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

@@ -697,27 +697,28 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
         lambda.eq(JgMaintenanceContractEq::getEquipTransferId, id);
         List<JgMaintenanceContractEq> list = jgMaintenanceContractEqService.getBaseMapper().selectList(lambda);
-        ArrayList<IdxBizJgMaintenanceRecordInfo> data = new ArrayList<>();
+        List<IdxBizJgMaintenanceRecordInfo> maintenanceRecordInfoList = new ArrayList<>();
         // 循环设备
         list.forEach(item -> {
-            IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(item.getEquId());
-            if (!ObjectUtils.isEmpty(info)) {
-                info.setMeUnitName(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitName()) ? null : jgMaintenanceContract.getMaintenanceUnitName());
-                info.setMeUnitCreditCode(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitCode()) ? null : jgMaintenanceContract.getMaintenanceUnitCode());
-                info.setMeMaster(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneName()) ? null : jgMaintenanceContract.getMaintenanceManagerOneName());
-                info.setMeMasterPhone(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOnePhone()) ? null : jgMaintenanceContract.getMaintenanceManagerOnePhone());
-                info.setMeMasterId(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneIdNum()) ? null : jgMaintenanceContract.getMaintenanceManagerOneIdNum());
-                info.setMeMaster1(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoName()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoName());
-                info.setMeMaster1Phone(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoPhone()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoPhone());
-                info.setMeMaster1Id(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoIdNum()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoIdNum());
-                info.setInformStart(ObjectUtils.isEmpty(jgMaintenanceContract.getInformStart()) ? null : jgMaintenanceContract.getInformStart());
-                info.setInformEnd(ObjectUtils.isEmpty(jgMaintenanceContract.getInformEnd()) ? null : jgMaintenanceContract.getInformEnd());
-                info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
-                data.add(info);
-            }
+            IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
+            info.setRecord(item.getEquId());
+            info.setRecDate(new Date());
+            info.setRecUserId(RequestContext.getExeUserId());
+            info.setMeUnitName(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitName()) ? null : jgMaintenanceContract.getMaintenanceUnitName());
+            info.setMeUnitCreditCode(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitCode()) ? null : jgMaintenanceContract.getMaintenanceUnitCode());
+            info.setMeMaster(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneName()) ? null : jgMaintenanceContract.getMaintenanceManagerOneName());
+            info.setMeMasterPhone(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOnePhone()) ? null : jgMaintenanceContract.getMaintenanceManagerOnePhone());
+            info.setMeMasterId(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneIdNum()) ? null : jgMaintenanceContract.getMaintenanceManagerOneIdNum());
+            info.setMeMaster1(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoName()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoName());
+            info.setMeMaster1Phone(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoPhone()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoPhone());
+            info.setMeMaster1Id(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoIdNum()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoIdNum());
+            info.setInformStart(ObjectUtils.isEmpty(jgMaintenanceContract.getInformStart()) ? null : jgMaintenanceContract.getInformStart());
+            info.setInformEnd(ObjectUtils.isEmpty(jgMaintenanceContract.getInformEnd()) ? null : jgMaintenanceContract.getInformEnd());
+            info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
+            maintenanceRecordInfoList.add(info);
         });
-        idxBizJgMaintenanceRecordInfoService.updateBatchById(data);
-        emqKeeper.getMqttClient().publish(SafetyProblemTypeEnum.WBBA.getTopic(), JSON.toJSONBytes(data), 2, false);
+        idxBizJgMaintenanceRecordInfoService.saveBatch(maintenanceRecordInfoList);
+        emqKeeper.getMqttClient().publish(SafetyProblemTypeEnum.WBBA.getTopic(), JSON.toJSONBytes(maintenanceRecordInfoList), 2, false);
     }
 
 

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

@@ -774,7 +774,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         Map<String, Object> beanMap = BeanUtil.beanToMap(scrapCancel, false, true);
         beanMap.put("cancelCertificateList", JSON.parse(scrapCancel.getCancelCertificate()));
         beanMap.put("otherAccessories", JSON.parse(scrapCancel.getOtherAccessories()));
-        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr));
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr)
+                .eq(JgRegistrationHistory::getIsDelete, false));
         // 根据不同类型返回不同的字段、用于台套设备、气瓶、车用气瓶
         if (jgRegistrationHistory != null) {
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());

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

@@ -1011,6 +1011,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, seq);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
         if (integer > 0) {
             jgRegistrationHistory.setChangeData(JSON.toJSONString(json));

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

@@ -600,13 +600,13 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         return useFlagParamDto;
     }
 
-    public void setInspectField(String record, UseFlagParamDto useFlagParamDto) {
+    private void setInspectField(String record, UseFlagParamDto useFlagParamDto) {
         Map<String, Object> inspectDetail = jgUseRegistrationMapper.getInspectDetail(record, null);
         useFlagParamDto.setInspectionUnitName(inspectDetail.get("inspectOrgName") == null ? "" : inspectDetail.get("inspectOrgName").toString());
         useFlagParamDto.setNextInspectionDate(inspectDetail.get("nextInspectDate") == null ? null : (Date) inspectDetail.get("nextInspectDate"));
     }
 
-    public void setMainInfoField(String record, UseFlagParamDto useFlagParamDto) {
+    private void setMainInfoField(String record, UseFlagParamDto useFlagParamDto) {
         IdxBizJgMaintenanceRecordInfo idxBizJgMaintenanceRecordInfo = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(record);
 
         useFlagParamDto.setEmergencyTel(this.buildEmergencyTel(idxBizJgMaintenanceRecordInfo));

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

@@ -414,6 +414,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // lambda.eq(JgRegistrationHistory::getEquId, equipId);
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
         lambda.eq(JgRegistrationHistory::getRegistrationClass, "使用登记");
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
         Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
         if (integer > 0) {
             jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
@@ -934,7 +935,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
             // 查询历史暂存表
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getOne(Wrappers.<JgRegistrationHistory>lambdaQuery()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr)));
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr))
+                    .eq(JgRegistrationHistory::getIsDelete, false));
             // 登记证记录主键
             Long changeRecordId = sequence.nextId();
 
@@ -1143,7 +1145,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             taskCode = workflowResultDto.getNextTaskCode();
         }
         JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
-        LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda().eq(JgUseRegistrationEq::getEquipTransferId, sequenceNbr);
+        LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda()
+                .eq(JgUseRegistrationEq::getEquipTransferId, sequenceNbr)
+                .eq(JgUseRegistrationEq::getIsDelete, false);
         JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
         jgUseRegistration.setEquipId(jgUseRegistrationEq.getEquId());
         jgUseRegistration.setNextTaskId(workflowResultDto.getNextTaskId());
@@ -1218,6 +1222,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
             LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
             lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr));
+            lambdaSelect.eq(JgRegistrationHistory::getIsDelete, false);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
             JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             // 设备ID
@@ -1540,7 +1545,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(id);
             if (!ObjectUtils.isEmpty(carNumber)) {
                 LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda()
-                        .eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
+                        .eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr())
+                        .eq(JgUseRegistrationEq::getIsDelete, false);
                 JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
                 // 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
                 LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new LambdaQueryWrapper<>();
@@ -1635,6 +1641,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             this.update(jgUseRegistration, lambda);
             LambdaQueryWrapper<JgUseRegistration> queryWrapper = new QueryWrapper<JgUseRegistration>().lambda();
             queryWrapper.eq(JgUseRegistration::getInstanceId, instanceId);
+            queryWrapper.eq(JgUseRegistration::getIsDelete, false);
             JgUseRegistration data = this.baseMapper.selectOne(queryWrapper);
             // 设备信息
             JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(data));
@@ -1647,6 +1654,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (!"unit".equals(manageType)) {
                 LambdaQueryWrapper<JgUseRegistrationEq> lambda1 = new QueryWrapper<JgUseRegistrationEq>().lambda();
                 lambda1.eq(JgUseRegistrationEq::getEquipTransferId, String.valueOf(data.getSequenceNbr()));
+                lambda1.eq(JgUseRegistrationEq::getIsDelete, false);
                 JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(lambda1);
                 jsonObject.put("equipId", jgUseRegistrationEq.getEquId());
             }
@@ -1675,13 +1683,22 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 删除代办 + 中止流程
             commonServiceImpl.deleteTaskModel(String.valueOf(id), useRegistration.getInstanceId());
             // 删除单子
-            this.baseMapper.deleteById(id);
-            // 删除对应eq
-            jgUseRegistrationEqService.getBaseMapper().delete(new LambdaQueryWrapper<JgUseRegistrationEq>()
-                    .eq(JgUseRegistrationEq::getEquipTransferId, id));
+            //this.baseMapper.deleteById(id);
+            LambdaUpdateWrapper<JgUseRegistration> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(JgUseRegistration::getSequenceNbr, id).set(JgUseRegistration::getIsDelete, true);
+            this.update(updateWrapper);
+
+            // 更新 eq 对应数据的 isDelete 字段为true（逻辑删除）
+            jgUseRegistrationEqService.getBaseMapper().update(null, new LambdaUpdateWrapper<JgUseRegistrationEq>()
+                            .eq(JgUseRegistrationEq::getEquipTransferId, id)
+                            .set(JgUseRegistrationEq::getIsDelete, true)
+            );
             // 删除单子对应历史表数据
-            jgRegistrationHistoryService.getBaseMapper().delete(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, useRegistration.getSequenceNbr()));
+            jgRegistrationHistoryService.getBaseMapper().update(null,
+                    new LambdaUpdateWrapper<JgRegistrationHistory>()
+                            .eq(JgRegistrationHistory::getCurrentDocumentId, useRegistration.getSequenceNbr())
+                            .set(JgRegistrationHistory::getIsDelete, true)
+            );
         });
     }
 
@@ -1689,8 +1706,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!ObjectUtils.isEmpty(sequenceNbr)) {
             JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
             this.doCompensate(jgUseRegistration);
+
             LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
             lambda.eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr);
+            lambda.eq(JgRegistrationHistory::getIsDelete, false);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode() + "_" + jgUseRegistration.getReceiveOrgName());
@@ -1731,6 +1750,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     }
                 }
             }
+            jsonObject.put("useRegistrationCode", jgUseRegistration.getUseRegistrationCode());
             // 转化 附件 字段
             commonServiceImpl.convertStringToJsonobject(jsonObject, jsonFields);
             return jsonObject;
@@ -2066,7 +2086,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         total = allEquipment.size();
         AgencyUserModel result = new AgencyUserModel();
         JgUseRegistration jgUseRegistration = jgUseRegistrationMapper.selectOne(new QueryWrapper<JgUseRegistration>().lambda()
-                .eq(JgUseRegistration::getSequenceNbr, useRegistrationSeqs.get(0)));
+                .eq(JgUseRegistration::getSequenceNbr, useRegistrationSeqs.get(0)).eq(JgUseRegistration::getIsDelete, false));
         // 暂时拿第一条的 监管部门和安全管理人员
         JSONObject jsonObjectFirst = new JSONObject();
         if (!ValidationUtil.isEmpty(registrationHistoryList.get(0))) {
@@ -2331,13 +2351,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return useFlagParamDto;
     }
 
-    public void setInspectField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
+    private void setInspectField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
         Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(registerInfo.getRecord(), null);
         useFlagParamDto.setInspectionUnitName(inspectDetail.get("inspectOrgName") == null ? "" : inspectDetail.get("inspectOrgName").toString());
         useFlagParamDto.setNextInspectionDate(inspectDetail.get("nextInspectDate") == null ? null : (Date) inspectDetail.get("nextInspectDate"));
     }
 
-    public void setMainInfoField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
+    private void setMainInfoField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
         IdxBizJgMaintenanceRecordInfo idxBizJgMaintenanceRecordInfo = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(registerInfo.getRecord());
 
         useFlagParamDto.setEmergencyTel(this.buildEmergencyTel(idxBizJgMaintenanceRecordInfo));
@@ -2517,10 +2537,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     private void clearMainInfo(String record) {
         maintenanceRecordInfoMapper.delete(new LambdaQueryWrapper<IdxBizJgMaintenanceRecordInfo>().eq(IdxBizJgMaintenanceRecordInfo::getRecord, record));
-        IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = new IdxBizJgMaintenanceRecordInfo();
-        maintenanceRecordInfo.setRecord(record);
-        maintenanceRecordInfo.setRecDate(new Date());
-        maintenanceRecordInfoMapper.insert(maintenanceRecordInfo);
     }
 
     private void clearConstructionInfo(String record) {
@@ -2569,7 +2585,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      */
     private void invalidUseRegistrationCertificate(JgUseRegistration jgUseRegistration) {
         Integer count = jgUseRegistrationMapper.selectCount(new LambdaQueryWrapper<JgUseRegistration>()
-                .eq(JgUseRegistration::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode()));
+                .eq(JgUseRegistration::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode())
+                .eq(JgUseRegistration::getIsDelete, false));
         // 一证对应多条使用登记单时，不作废证
         if (count > 1) {
             return;
@@ -2688,6 +2705,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     public void handleErrorForm(String applyNo) {
         LambdaQueryWrapper<JgUseRegistration> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(JgUseRegistration::getApplyNo, applyNo);
+        queryWrapper.eq(JgUseRegistration::getIsDelete, false);
         JgUseRegistration jgUseRegistration = this.baseMapper.selectOne(queryWrapper);
         LambdaQueryWrapper<JgUseRegistrationManage> wrapper = new LambdaQueryWrapper<JgUseRegistrationManage>()
                 .eq(JgUseRegistrationManage::getApplyNo, applyNo);
@@ -2807,6 +2825,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (used){
                 throw new BadRequest("使用登记证编号已存在！");
             }
+            //使用登记证编号判断是否使用未来系统生成编号
+            idxBizJgRegisterInfoService.checkUseRegistrationCode(useRegistrationCode, "set");
 
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
             CompanyBo company = reginParams.getCompany();
@@ -3050,7 +3070,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 this.historyEquUpdateInstallInfo(map);
 
                 // 设备维保信息更新,只有电梯
-                if ("3000".equals(map.get("equList"))){
+                if ("3000".equals(map.get("equList")) || "3000".equals(map.get("equListCode"))){
                     this.historyEquUpdateMaintenanceInfo(map);
                 }
 
@@ -3076,28 +3096,28 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      * 历史设备登记-》更新维保信息
      */
     private void historyEquUpdateMaintenanceInfo(JSONObject map) {
-        SimpleDateFormat format = new SimpleDateFormat();
-        IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
-        if (!ValidationUtil.isEmpty(info.getSequenceNbr())) {
-            String meUnitName = String.valueOf(map.get("meUnitName"));
-            info.setMeUnitName(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[1] : null);
-            info.setMeUnitCreditCode(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[0] : null);
-            info.setMeMaster(ValidationUtil.isEmpty(map.get("maintenanceManagerOneName")) ? null : String.valueOf(map.get("maintenanceManagerOneName")));
-            info.setMeMasterPhone(ValidationUtil.isEmpty(map.get("maintenanceManagerOnePhone")) ? null : String.valueOf(map.get("maintenanceManagerOnePhone")));
-            info.setMeMasterId(ValidationUtil.isEmpty(map.get("maintenanceManagerOneID")) ? null : String.valueOf(map.get("maintenanceManagerOneID")));
-            info.setMeMaster1(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoName")) ? null : String.valueOf(map.get("maintenanceManagerTwoName")));
-            info.setMeMaster1Phone(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoPhone")) ? null : String.valueOf(map.get("maintenanceManagerTwoPhone")));
-            info.setMeMaster1Id(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoID")) ? null : String.valueOf(map.get("maintenanceManagerTwoID")));
-            try {
-                info.setInformStart(ValidationUtil.isEmpty(map.get("informStart")) ? null : format.parse(String.valueOf(map.get("informStart"))));
-                info.setInformEnd(ValidationUtil.isEmpty(map.get("informEnd")) ? null : format.parse(String.valueOf(map.get("informEnd"))));
-            } catch (Exception exception) {
-                exception.printStackTrace();
-                log.info("date转化失败");
-            }
-            info.setRepairInform(ValidationUtil.isEmpty(map.get("maintenanceContract")) ? null : JSONObject.toJSONString(map.get("maintenanceContract")));
-            idxBizJgMaintenanceRecordInfoService.getBaseMapper().updateById(info);
-        }
+        IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
+        info.setRecord(String.valueOf(map.get("equipId")));
+        String meUnitName = String.valueOf(map.get("meUnitName"));
+        info.setRecDate(new Date());
+        info.setRecUserId(RequestContext.getExeUserId());
+        info.setMeUnitName(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[1] : null);
+        info.setMeUnitCreditCode(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[0] : null);
+        info.setMeMaster(ValidationUtil.isEmpty(map.get("maintenanceManagerOneName")) ? null : String.valueOf(map.get("maintenanceManagerOneName")));
+        info.setMeMasterPhone(ValidationUtil.isEmpty(map.get("maintenanceManagerOnePhone")) ? null : String.valueOf(map.get("maintenanceManagerOnePhone")));
+        info.setMeMasterId(ValidationUtil.isEmpty(map.get("maintenanceManagerOneID")) ? null : String.valueOf(map.get("maintenanceManagerOneID")));
+        info.setMeMaster1(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoName")) ? null : String.valueOf(map.get("maintenanceManagerTwoName")));
+        info.setMeMaster1Phone(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoPhone")) ? null : String.valueOf(map.get("maintenanceManagerTwoPhone")));
+        info.setMeMaster1Id(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoID")) ? null : String.valueOf(map.get("maintenanceManagerTwoID")));
+        try {
+            info.setInformStart(ValidationUtil.isEmpty(map.get("informStart")) ? null : DateUtil.parse(String.valueOf(map.get("informStart"))));
+            info.setInformEnd(ValidationUtil.isEmpty(map.get("informEnd")) ? null : DateUtil.parse(String.valueOf(map.get("informEnd"))));
+        } catch (Exception exception) {
+            exception.printStackTrace();
+            log.info("date转化失败");
+        }
+        info.setRepairInform(ValidationUtil.isEmpty(map.get("maintenanceContract")) ? null : JSONObject.toJSONString(map.get("maintenanceContract")));
+        idxBizJgMaintenanceRecordInfoService.save(info);
     }
 
     /**

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

@@ -573,9 +573,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
      * 查看详情
      *
      * @param sequenceNbr sequenceNbr
+     * @param selectedOrgInfo
      * @return JgVehicleInformationModel
      */
-    public JgVehicleInformationVo queryBySequenceNbr(Long sequenceNbr) {
+    public JgVehicleInformationVo queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
         JgVehicleInformationVo vo = new JgVehicleInformationVo();
         JgVehicleInformationDto dto = this.baseMapper.queryBySequenceNbr(sequenceNbr);
@@ -680,6 +681,13 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             vo.setOldUseRegistrationTable(JSONArray.parseArray(useInfo.getOldUseRegistrationTable()));
             vo.setOldUseRegistrationCertificate(JSONArray.parseArray(useInfo.getOldUseRegistrationCertificate()));
         }
+        String companyType = selectedOrgInfo.getCompany().getCompanyType();
+        if ("个人主体".equals(companyType)) {
+            vo.setCompanyType("person");
+        } else {
+            vo.setCompanyType("company");
+        }
+        vo.setHavingPermission(dto.getNextExecuteUserIds() != null && dto.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
         return vo;
     }
 
@@ -837,6 +845,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
 
             LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
             lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr));
+            lambdaSelect.eq(JgRegistrationHistory::getIsDelete, false);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
             String jsonData = jgRegistrationHistory.getChangeData();
             JSONArray jsonArray = JSONArray.parseArray(jsonData);
@@ -1596,9 +1605,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     }
 
     private void generateRegistrationManage(JgVehicleInformation jgVehicleInformation, IdxBizJgRegisterInfo registerInfo) {
-        // 使用单位信息
-        Map<String, Object> enterpriseInfo = commonService.getEnterpriseInfo(jgVehicleInformation.getUseUnitCreditCode());
-        //
         Map<String, String> equType = new HashMap<>();
         equType.put("equList", this.baseMapper.getEquCategoryNameByCode(registerInfo.getEquList()));
         equType.put("equListCode", registerInfo.getEquList());
@@ -1628,7 +1634,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         jgUseRegistrationManage.setCreateDate(jgVehicleInformation.getRecDate());
         jgUseRegistrationManage.setEquUseAddress("");
         jgUseRegistrationManage.setManageType("unit");
-        jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
+        jgUseRegistrationManage.setUseUnitAddress(jgVehicleInformation.getUseUnitAddress());
         jgUseRegistrationManage.setUseRegistrationCode(jgVehicleInformation.getUseRegistrationCode());
         jgUseRegistrationManage.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode());
         jgUseRegistrationManage.setReceiveCompanyCode(jgVehicleInformation.getReceiveCompanyCode());
@@ -1744,6 +1750,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         if (used){
             throw new BadRequest("使用登记证编号已存在！");
         }
+        //使用登记证编号判断是否使用未来系统生成编号
+        idxBizJgRegisterInfoService.checkUseRegistrationCode(useRegistrationCode1,"vehicle");
 
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
         JgVehicleInformationDto vehicleInfoDto = JSON.parseObject(JSON.toJSONString(map), JgVehicleInformationDto.class);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/TouchRuleEventListener.java

@@ -41,9 +41,9 @@ public class TouchRuleEventListener implements ApplicationListener<TouchRuleEven
 
     private void touchRuleWithApi(InspectionEquipInfo inspectionEquipInfo) {
         try {
-            RequestContext.setToken(amosRequestContext.getToken());
             RequestContext.setAppKey(amosRequestContext.getAppKey());
             RequestContext.setProduct(amosRequestContext.getProduct());
+            RequestContext.setToken(amosRequestContext.getToken());
             HashMap<String, byte[]> factMap = new HashMap<>();
             List<Object> factList = new ArrayList<>();
             factList.add(inspectionEquipInfo);

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

@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
+import com.yeejoin.amos.boot.module.common.api.enums.JYJCBusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.*;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.*;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
@@ -1242,7 +1243,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             String test = QueryParser.escape(map.getString("USE_INNER_CODE"));
             boolMust.must(QueryBuilders.matchPhraseQuery("USE_INNER_CODE", test));
         }
-        this.setFilterOfInFlowing(boolMust);
+        this.setFilterOfInFlowing(boolMust, map.getString("EQU_LIST_CODE"), map.getString("inspectionType"));
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
         builder.from((pageNumber - 1) * size);
@@ -1282,14 +1283,17 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
      *
      * @param boolMust 条件
      */
-    private void setFilterOfInFlowing(BoolQueryBuilder boolMust) {
+    private void setFilterOfInFlowing(BoolQueryBuilder boolMust,String equListCode, String inspectionType) {
         Set<String> records = this.getEquipInFlowing();
         if (records != null && !records.isEmpty()) {
             boolMust.mustNot(QueryBuilders.termsQuery("SEQUENCE_NBR.keyword", records));
         }
-        // 只有纳管的设备才能做业务 TODO
+        if ("5000".equals(equListCode) && JYJCBusinessTypeEnum.SCJY.getCode().equals(inspectionType)) {
+            boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", false));
+        } else {
+            boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
+        }
         boolMust.must(QueryBuilders.existsQuery("IS_INTO_MANAGEMENT"));
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
     }
 
     private Set<String> getEquipInFlowing() {

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/JGStatisticsMapper.xml

@@ -323,7 +323,7 @@
         FROM
             tzs_jg_use_registration T
         WHERE
-            T.status = '已完成'
+            T.status = '已完成' and T.is_delete = 0
             AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
     </select>
     <select id="over15yearsCount" resultType="java.lang.Long">
@@ -337,6 +337,8 @@
             thur.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
             AND thur.audit_pass_date &lt; #{time}
             AND ibjri."EQU_LIST" = '3000'
+            AND ibjri.is_delete = 0
+            AND thur.is_delete = 0
     </select>
     <select id="constructionNoticeCount" resultType="java.lang.Long">
         SELECT SUM
@@ -666,7 +668,7 @@
         FROM
             tzs_jg_use_registration T
         WHERE
-            T.audit_status = '已完成'
+            T.audit_status = '已完成' and T.is_delete = 0
             and T.receive_company_org_code like concat(#{orgCode}, '%')
             <if test="dto.beginDate !=null and dto.beginDate !=''">
                 and date_ge(CAST(T.reg_date as date),#{dto.beginDate})
@@ -1138,7 +1140,7 @@
             LEFT JOIN idx_biz_jg_register_info ri ON tne.equ_id = ri.RECORD
             WHERE
             receive_company_org_code like CONCAT(#{orgCode}, '%')
-            and tjur.status != '已作废'
+            and tjur.status != '已作废' and tjur.is_delete = 0
             <if test="dto.beginDate != null and dto.beginDate != ''">
                 and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
             </if>
@@ -1850,7 +1852,7 @@
             LEFT JOIN idx_biz_jg_register_info ri ON tne.equ_id = ri.RECORD
             WHERE
             receive_company_org_code like CONCAT(#{orgCode}, '%')
-            and tjur.status != '已作废'
+            and tjur.status != '已作废' and tjur.is_delete = 0
             <if test="dto.beginDate != null and dto.beginDate != ''">
                 and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
             </if>

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java

@@ -658,7 +658,7 @@ public class YJDPStatisticsServiceImpl {
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         request.source(builder);
-        List<JSONObject> list;
+        List<JSONObject> list = null;
         Set<String> useUnitCreditCodeSet = Sets.newHashSet();
         try {
             SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
@@ -667,7 +667,9 @@ public class YJDPStatisticsServiceImpl {
                 JSONObject source = jsonObject.getJSONObject("sourceAsMap");
                 useUnitCreditCodeSet.add(source.getString("USE_UNIT_CREDIT_CODE"));
             }
-            list = alertStatisticsMapper.getUseUnitByCreditCode(useUnitCreditCodeSet);
+            if (!ValidationUtil.isEmpty(useUnitCreditCodeSet)) {
+                list = alertStatisticsMapper.getUseUnitByCreditCode(useUnitCreditCodeSet);
+            }
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BasePersonRegisterDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -29,11 +27,9 @@ public class BasePersonRegisterDto extends BaseDto {
     @ApiModelProperty(value = "真实姓名")
     private String realName;
 
-    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty(value = "有效期开始")
-    private Date expirationDateStart;
+    private String expirationDateStart;
 
-    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty(value = "有效期结束")
     private String expirationDateEnd;
 
@@ -41,7 +37,6 @@ public class BasePersonRegisterDto extends BaseDto {
     private String expirationDateType;
 
 
-
     @ApiModelProperty(value = "单位名称")
     private String name;
 
@@ -85,8 +80,6 @@ public class BasePersonRegisterDto extends BaseDto {
     @ApiModelProperty(value = "管理员身份证号")
     private String adminIdNumber;
 
-//    @ApiModelProperty(value = "个人基本信息")
-//    private TzsBaseIndividualityDto baseIndividualityDto;
 
     @ApiModelProperty(value = "平台公司id,平台创建公司后更新")
     private String amosCompanySeq;
@@ -94,4 +87,7 @@ public class BasePersonRegisterDto extends BaseDto {
     @ApiModelProperty(value = "平台用户id,平台创建用户后更新")
     private String adminUserId;
 
+    @ApiModelProperty(value = "住所")
+    private String address;
+
 }

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

@@ -305,7 +305,7 @@ public class ThreeSystemsServiceImpl extends BaseService<ThreeSystemsDto, ThreeS
             }
 
             nowDayThreeSystemsDto.setRecDate(new Date());
-            nowDayThreeSystemsDto.setRecUserId(amosRequestContext.getUserId());
+//            nowDayThreeSystemsDto.setRecUserId(amosRequestContext.getUserId());
             nowDayThreeSystemsDto.setRecUserName(amosRequestContext.getUserName());
             nowDayThreeSystemsDto.setIsDelete(false);
 

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

@@ -75,6 +75,7 @@ public class TzsBaseIndividualityServiceImpl extends BaseService<TzsBaseIndividu
         companyInfo.setCompanyName(dto.getCredentialsNum() + "_" + dto.getRealName());
         companyInfo.setCompanyCode(dto.getUnitCode());
         companyInfo.setCompanyType(unitType);
+        companyInfo.setAddress(dto.getAddress());
         try {
             FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.create(companyInfo);
             if (companyResult == null || companyResult.getResult() == null) {

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/controller/UnitInfoController.java

@@ -10,7 +10,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
-import com.yeejoin.amos.boot.module.tcm.biz.service.impl.TzsAuthServiceImpl;
+import com.yeejoin.amos.boot.module.tcm.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.boot.module.tcm.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.tcm.flc.api.dto.UnitInfoApproveDto;
 import com.yeejoin.amos.boot.module.tcm.flc.api.dto.UnitInfoDto;
@@ -30,13 +30,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -45,12 +39,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 
 /**
  * 企业信息表
@@ -63,235 +52,231 @@ import java.util.Random;
 @RequestMapping(value = "/flc-unit-info")
 public class UnitInfoController extends BaseController {
 
-	@Autowired
-	RedisUtils redisUtils;
+    @Autowired
+    RedisUtils redisUtils;
 
-	/**
-	 * token 过期时间，wechat 系统为7200 ，tzs 系统小于7200 防止获取到无效token
-	 */
-	private long time = 600l;
+    /**
+     * token 过期时间，wechat 系统为7200 ，tzs 系统小于7200 防止获取到无效token
+     */
+    private long time = 600l;
 
-	/**
-	 * 企业管理员变更缓存key前缀
-	 */
-	private final  String adminChange = "ADMIN_CHANGE_";
+    /**
+     * 企业管理员变更缓存key前缀
+     */
+    private final String adminChange = "ADMIN_CHANGE_";
 
     @Autowired
     UnitInfoServiceImpl unitInfoServiceImpl;
 
-	@Value("${flc.sms.tempCode}")
-	private String smsTempCode;
+    @Value("${flc.sms.tempCode}")
+    private String smsTempCode;
 
 
-	@Autowired
-	private TzsAuthServiceImpl tzsAuthServiceImpl;
+    @Autowired
+    private StartPlatformTokenService platformTokenService;
 
     @Autowired
     OrgUsrServiceImpl iOrgUsrService;
 
-	@Autowired
+    @Autowired
     UnitInfoChangeServiceImpl unitInfoChangeServiceImpl;
 
-	/**
-	 * 获取组织机构树
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.ANONYMOUS, needAuth = false)
-	@GetMapping(value = "/region/tree")
-	@ApiOperation(httpMethod = "GET", value = "获取组织机构树", notes = "获取组织机构树")
-	public ResponseModel<Collection<RegionModel>> getRegionTree(@RequestParam(value = "parentId",required = false) Long parentId) {
-		return ResponseHelper.buildResponse(unitInfoServiceImpl.getRegionTree(parentId, null));
-	}
-
-	/**
-	 * 获取提级后组织机构树
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.ANONYMOUS, needAuth = false)
-	@GetMapping(value = "/region/step/tree")
-	@ApiOperation(httpMethod = "GET", value = "获取提级后组织机构树", notes = "获取提级后组织机构树")
-	public ResponseModel<Collection<RegionModel>> getRegionStepTree() {
-		return ResponseHelper.buildResponse(unitInfoServiceImpl.getRegionStepTree());
-	}
-
-	/**
-	 * 获取全国行政区划树
-	 *
+    /**
+     * 获取组织机构树
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.ANONYMOUS, needAuth = false)
+    @GetMapping(value = "/region/tree")
+    @ApiOperation(httpMethod = "GET", value = "获取组织机构树", notes = "获取组织机构树")
+    public ResponseModel<Collection<RegionModel>> getRegionTree(@RequestParam(value = "parentId", required = false) Long parentId) {
+        return ResponseHelper.buildResponse(unitInfoServiceImpl.getRegionTree(parentId, null));
+    }
+
+    /**
+     * 获取提级后组织机构树
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.ANONYMOUS, needAuth = false)
+    @GetMapping(value = "/region/step/tree")
+    @ApiOperation(httpMethod = "GET", value = "获取提级后组织机构树", notes = "获取提级后组织机构树")
+    public ResponseModel<Collection<RegionModel>> getRegionStepTree() {
+        return ResponseHelper.buildResponse(unitInfoServiceImpl.getRegionStepTree());
+    }
+
+    /**
+     * 获取全国行政区划树
+     */
+    @TycloudOperation(ApiLevel = UserType.ANONYMOUS, needAuth = false)
+    @GetMapping(value = "/national/region/tree")
+    @ApiOperation(httpMethod = "GET", value = "获取全国行政区划树", notes = "获取全国行政区划树")
+    public ResponseModel<Collection<RegionModel>> getNationalRegionTree(@RequestParam(value = "parentId", required = false) Long parentId, @RequestParam(value = "isNationwide", required = false) String isNationwide) {
+        return ResponseHelper.buildResponse(unitInfoServiceImpl.getRegionTree(parentId, isNationwide));
+    }
+
+    /**
+     * 获取管辖单位树
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/managerment/tree")
+    @ApiOperation(httpMethod = "GET", value = "获取管辖单位树", notes = "获取管辖单位树")
+    public ResponseModel<Collection<CompanyModel>> getManagermentTree() {
+        Collection<CompanyModel> result = null;
+        result = Privilege.companyClient.companyTreeWithoutAuth().getResult();
+        // 隐藏company 数据
+        Iterator<CompanyModel> it = result.iterator();
+        while (it.hasNext()) {
+            CompanyModel temp = it.next();
+            if ("emergencyCenter".equals(temp.getLevel()) || "company".equals(temp.getLevel())) {
+                it.remove();
+            } else {
+                this.dealCompanyTree(temp);
+            }
+        }
+        return ResponseHelper.buildResponse(result);
+    }
+
+
+    /**
+     * 企业信息图片上传 无token
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/uploadFile")
+    @ApiOperation(httpMethod = "POST", value = "企业信息图片上传 无token", notes = "企业信息图片上传 无token")
+    public ResponseModel<String> uploadFile(@ApiParam(value = "文件", required = true) @RequestParam MultipartFile file) {
+        if (ValidationUtil.isEmpty(file)) {
+            throw new BadRequest("参数校验失败.");
+        }
+        platformTokenService.setRequestContext();
+        FeignClientResult<Map<String, String>> date = Systemctl.fileStorageClient.updateCommonFile(file);
+        String urlString = "";
+        if (date != null) {
+            Map<String, String> map = date.getResult();
+            Iterator<String> it = map.keySet().iterator();
+            while (it.hasNext()) {
+                urlString = it.next();
+            }
+        }
+        return ResponseHelper.buildResponse(urlString);
+    }
+
+    /**
+     * 判断组织机构是否存在
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/hasExistUnit/{organizationCode}")
+    @ApiOperation(httpMethod = "GET", value = "判断组织机构是否存在", notes = "判断组织机构是否存在")
+    public ResponseModel<Boolean> hasExistUnit(@PathVariable(value = "organizationCode") String organizationCode) {
+        Boolean flag = false;
+        UnitInfo temp = unitInfoServiceImpl.getOne(new LambdaQueryWrapper<UnitInfo>().eq(UnitInfo::getIsDelete, false).eq(UnitInfo::getOrganizationCode, organizationCode).eq(UnitInfo::getUnitStatus, "1").
+                or().eq(UnitInfo::getIsChange, true).eq(UnitInfo::getOrganizationCode, organizationCode));
+        if (temp != null) {
+            flag = true;
+        }
+        return ResponseHelper.buildResponse(flag);
+    }
+
+    /**
+     * 判断组织机构是否存在
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/hasExistUnit/{unitId}/{organizationCode}")
+    @ApiOperation(httpMethod = "GET", value = "判断组织机构是否存在-更新", notes = "判断组织机构是否存在-更新")
+    public ResponseModel<Boolean> hasExistUnitWithId(@PathVariable(value = "unitId") Long unitId, @PathVariable(value = "organizationCode") String organizationCode) {
+        Boolean flag = false;
+        UnitInfo temp = unitInfoServiceImpl.getOne(new LambdaQueryWrapper<UnitInfo>().eq(UnitInfo::getIsDelete, false).eq(UnitInfo::getOrganizationCode, organizationCode).ne(UnitInfo::getSequenceNbr, unitId).eq(UnitInfo::getUnitStatus, "1").or().eq(UnitInfo::getIsChange, true));
+        if (temp != null) {
+            flag = true;
+        }
+        return ResponseHelper.buildResponse(flag);
+    }
+
+
+    /**
+     * 判断用户是否存在
+     *
+     * @return
      */
-	@TycloudOperation(ApiLevel = UserType.ANONYMOUS, needAuth = false)
-	@GetMapping(value = "/national/region/tree")
-	@ApiOperation(httpMethod = "GET", value = "获取全国行政区划树", notes = "获取全国行政区划树")
-	public ResponseModel<Collection<RegionModel>> getNationalRegionTree(@RequestParam(value = "parentId",required = false) Long parentId, @RequestParam(value = "isNationwide",required = false) String isNationwide) {
-		return ResponseHelper.buildResponse(unitInfoServiceImpl.getRegionTree(parentId, isNationwide));
-	}
-
-	/**
-	 * 获取管辖单位树
-	 *
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/managerment/tree")
-	@ApiOperation(httpMethod = "GET", value = "获取管辖单位树", notes = "获取管辖单位树")
-	public ResponseModel<Collection<CompanyModel>> getManagermentTree() {
-		Collection<CompanyModel> result = null;
-		result = Privilege.companyClient.companyTreeWithoutAuth().getResult();
-		// 隐藏company 数据
-		Iterator<CompanyModel> it = result.iterator();
-		while(it.hasNext()) {
-			CompanyModel temp = it.next();
-			if("emergencyCenter".equals(temp.getLevel())  || "company".equals(temp.getLevel())) {
-				it.remove();
-			} else {
-				this.dealCompanyTree(temp);
-			}
-		}
-		return ResponseHelper.buildResponse(result);
-	}
-
-
-
-	/**
-	 * 企业信息图片上传 无token
-	 *
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/uploadFile")
-	@ApiOperation(httpMethod = "POST", value = "企业信息图片上传 无token", notes = "企业信息图片上传 无token")
-	public ResponseModel<String> uploadFile(@ApiParam(value = "文件", required = true)@RequestParam MultipartFile file) {
-		if (ValidationUtil.isEmpty(file)){
-			throw new BadRequest("参数校验失败.");
-		}
-		tzsAuthServiceImpl.setRequestContext();
-		FeignClientResult<Map<String, String>> date = Systemctl.fileStorageClient.updateCommonFile(file);
-		String urlString="";
-		if (date != null) {
-			Map<String, String> map = date.getResult();
-			Iterator<String> it = map.keySet().iterator();
-			while (it.hasNext()) {
-				urlString=it.next();
-			}
-		}
-		return ResponseHelper.buildResponse(urlString);
-	}
-
-	/**
-	 * 判断组织机构是否存在
-	 *
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/hasExistUnit/{organizationCode}")
-	@ApiOperation(httpMethod = "GET", value = "判断组织机构是否存在", notes = "判断组织机构是否存在")
-	public ResponseModel<Boolean> hasExistUnit( @PathVariable(value = "organizationCode") String organizationCode) {
-		Boolean flag = false;
-		UnitInfo temp = unitInfoServiceImpl.getOne(new LambdaQueryWrapper<UnitInfo>().eq(UnitInfo::getIsDelete,false).eq(UnitInfo::getOrganizationCode,organizationCode).eq(UnitInfo::getUnitStatus,"1").
-				or().eq(UnitInfo::getIsChange,true).eq(UnitInfo::getOrganizationCode,organizationCode));
-		if(temp != null) {
-			flag = true;
-		}
-		return ResponseHelper.buildResponse(flag);
-	}
-
-	/**
-	 * 判断组织机构是否存在
-	 *
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/hasExistUnit/{unitId}/{organizationCode}")
-	@ApiOperation(httpMethod = "GET", value = "判断组织机构是否存在-更新", notes = "判断组织机构是否存在-更新")
-	public ResponseModel<Boolean> hasExistUnitWithId( @PathVariable(value = "unitId") Long unitId,@PathVariable(value = "organizationCode") String organizationCode) {
-		Boolean flag = false;
-		UnitInfo temp = unitInfoServiceImpl.getOne(new LambdaQueryWrapper<UnitInfo>().eq(UnitInfo::getIsDelete,false).eq(UnitInfo::getOrganizationCode,organizationCode).ne(UnitInfo::getSequenceNbr,unitId).eq(UnitInfo::getUnitStatus,"1").or().eq(UnitInfo::getIsChange,true));
-		if(temp != null) {
-			flag = true;
-		}
-		return ResponseHelper.buildResponse(flag);
-	}
-
-
-
-	/**
-	 * 判断用户是否存在
-	 *
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/hasExistUser/{userName}")
-	@ApiOperation(httpMethod = "GET", value = "判断用户是否存在", notes = "判断用户是否存在")
-	public ResponseModel<Boolean> hasExistUser( @PathVariable(value = "userName") String userName) {
-		Boolean flag = false;
-		AgencyUserModel user = Privilege.agencyUserClient.queryByUserName(userName).getResult();
-		if(user != null ) {
-			flag = true;
-		}
-		return ResponseHelper.buildResponse(flag);
-	}
-
-	/**
-	 * 发送手机号验证码
-	 *
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/sendTelCode/{tel}")
-	@ApiOperation(httpMethod = "GET", value = "发送手机号验证码", notes = "发送手机号验证码")
-	public ResponseModel<Boolean> sendTelCode( @PathVariable(value = "tel") String tel,
-											   @RequestParam(value = "type", required = false) String type) {
-		if (ValidationUtil.isEmpty(tel)) {
-			throw new BadRequest("参数校验失败.");
-		}
-		Boolean flag = false;
-		HashMap<String, String> params = new HashMap<>();
-		String code = this.getRandomCode();
-		params.put("code",code);
-		params.put("mobile",tel);
-		params.put("smsCode", smsTempCode);
-		try {
-			Systemctl.smsClient.sendCommonSms(params).getResult();
-			flag = true;
-   		} catch (Exception e) {
-			throw new BadRequest("发送短信失败：" + e.getMessage());
-		}
-		String Key = ObjectUtils.isEmpty(type) ? RedisKey.FLC_USER_TEL : adminChange;
-		// code 保存到缓存中
-		redisUtils.set(Key + tel, code,time);
-		return ResponseHelper.buildResponse(flag);
-	}
-
-	/**
-	 * 验证手机号验证码是否成功
-	 *
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/verifyTelCode/{tel}/{code}")
-	@ApiOperation(httpMethod = "GET", value = "验证手机号验证码是否成功", notes = "验证手机号验证码是否成功")
-	public ResponseModel<Boolean> verifyTelCode(@PathVariable(value = "tel") String tel,
-												@PathVariable(value = "code") String code,
-												@RequestParam(value = "type", required = false) String type) {
-		Boolean flag = false;
-		if (ValidationUtil.isEmpty(tel) || ValidationUtil.isEmpty(code)) {
-			throw new BadRequest("参数校验失败.");
-		}
-		String Key = ObjectUtils.isEmpty(type) ? RedisKey.FLC_USER_TEL : adminChange;
-		if(redisUtils.hasKey(Key + tel)) {
-			String redisCode = redisUtils.get(Key + tel).toString();
-			if(code.equals(redisCode)) {
-				flag = true;
-			}
-		}
-		// “超级验证码",压测使用
-		if ("88888888".equals(code)) {
-			flag = true;
-		}
-		return ResponseHelper.buildResponse(flag);
-	}
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/hasExistUser/{userName}")
+    @ApiOperation(httpMethod = "GET", value = "判断用户是否存在", notes = "判断用户是否存在")
+    public ResponseModel<Boolean> hasExistUser(@PathVariable(value = "userName") String userName) {
+        Boolean flag = false;
+        AgencyUserModel user = Privilege.agencyUserClient.queryByUserName(userName).getResult();
+        if (user != null) {
+            flag = true;
+        }
+        return ResponseHelper.buildResponse(flag);
+    }
+
+    /**
+     * 发送手机号验证码
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/sendTelCode/{tel}")
+    @ApiOperation(httpMethod = "GET", value = "发送手机号验证码", notes = "发送手机号验证码")
+    public ResponseModel<Boolean> sendTelCode(@PathVariable(value = "tel") String tel,
+                                              @RequestParam(value = "type", required = false) String type) {
+        if (ValidationUtil.isEmpty(tel)) {
+            throw new BadRequest("参数校验失败.");
+        }
+        Boolean flag = false;
+        HashMap<String, String> params = new HashMap<>();
+        String code = this.getRandomCode();
+        params.put("code", code);
+        params.put("mobile", tel);
+        params.put("smsCode", smsTempCode);
+        try {
+            Systemctl.smsClient.sendCommonSms(params).getResult();
+            flag = true;
+        } catch (Exception e) {
+            throw new BadRequest("发送短信失败：" + e.getMessage());
+        }
+        String Key = ObjectUtils.isEmpty(type) ? RedisKey.FLC_USER_TEL : adminChange;
+        // code 保存到缓存中
+        redisUtils.set(Key + tel, code, time);
+        return ResponseHelper.buildResponse(flag);
+    }
 
+    /**
+     * 验证手机号验证码是否成功
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/verifyTelCode/{tel}/{code}")
+    @ApiOperation(httpMethod = "GET", value = "验证手机号验证码是否成功", notes = "验证手机号验证码是否成功")
+    public ResponseModel<Boolean> verifyTelCode(@PathVariable(value = "tel") String tel,
+                                                @PathVariable(value = "code") String code,
+                                                @RequestParam(value = "type", required = false) String type) {
+        Boolean flag = false;
+        if (ValidationUtil.isEmpty(tel) || ValidationUtil.isEmpty(code)) {
+            throw new BadRequest("参数校验失败.");
+        }
+        String Key = ObjectUtils.isEmpty(type) ? RedisKey.FLC_USER_TEL : adminChange;
+        if (redisUtils.hasKey(Key + tel)) {
+            String redisCode = redisUtils.get(Key + tel).toString();
+            if (code.equals(redisCode)) {
+                flag = true;
+            }
+        }
+        // “超级验证码",压测使用
+        if ("88888888".equals(code)) {
+            flag = true;
+        }
+        return ResponseHelper.buildResponse(flag);
+    }
 
 
     /**
@@ -300,191 +285,191 @@ public class UnitInfoController extends BaseController {
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增企业信息表", notes = "新增企业信息表")
-	public ResponseModel<UnitInfoDto> save(@RequestBody UnitInfoDto model) {
-	    model = unitInfoServiceImpl.saveUnitInfo(model);
-	    return ResponseHelper.buildResponse(model);
-	}
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增企业信息表", notes = "新增企业信息表")
+    public ResponseModel<UnitInfoDto> save(@RequestBody UnitInfoDto model) {
+        model = unitInfoServiceImpl.saveUnitInfo(model);
+        return ResponseHelper.buildResponse(model);
+    }
 
     /**
      * 根据sequenceNbr查询
      *
-	 * @param sequenceNbr  主键
+     * @param sequenceNbr 主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个企业信息表",  notes = "根据sequenceNbr查询单个企业信息表")
-	public ResponseModel<UnitInfoDto> selectOne(@PathVariable Long sequenceNbr) {
-		if (ValidationUtil.isEmpty(sequenceNbr) ) {
-			throw new BadRequest("参数校验失败.");
-		}
-	    return ResponseHelper.buildResponse(unitInfoServiceImpl.getUnitDtoById(sequenceNbr));
-	}
-
-
-	/**
-	 * 列表分页查询
-	 *
-	 * @param pageNum  当前页
-	 * @param pageSize 每页大小
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/list")
-	@ApiOperation(httpMethod = "GET", value = "企业审核列表查询", notes = "企业审核列表查询")
-	public ResponseModel<IPage<UnitInfoDto>> queryForPage(String pageNum, String pageSize, String sort, UnitInfoDto unitInfoDto) {
-		// UnitInfo unitInfo = BeanDtoVoUtils.convert(unitInfoDto, UnitInfo.class);
-		Page<UnitInfo> pageBean;
-		IPage<UnitInfo> page;
-		QueryWrapper<UnitInfo> unitInfoQueryWrapper = new QueryWrapper<UnitInfo>();
-
-		setQueryWrapper(unitInfoQueryWrapper, unitInfoDto, sort);
-
-		if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
-			pageBean = new Page<>(0, Long.MAX_VALUE);
-		} else {
-			pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-		}
-		page = unitInfoServiceImpl.page(pageBean, unitInfoQueryWrapper);
-		int num= unitInfoServiceImpl.count(unitInfoQueryWrapper);
-		pageBean.setTotal(num);
-		IPage<UnitInfoDto> unitInfoVoIPage = BeanDtoVoUtils.unitInfoIPageDto(page);
-		return ResponseHelper.buildResponse(unitInfoVoIPage);
-	}
-
-	/**
-	 * 根据企业名称查询详情
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/queryByOrgName")
-	@ApiOperation(httpMethod = "GET", value = "根据企业名称查询详情", notes = "根据企业名称查询详情")
-	public ResponseModel<UnitInfoDto> queryForPage(@RequestParam(value = "orgName") String orgName) {
-		UnitInfoDto unitInfoDto = new UnitInfoDto();
-		QueryWrapper<UnitInfo> unitInfoQueryWrapper = new QueryWrapper<UnitInfo>();
-		unitInfoDto.setOrgName(orgName);
-		setQueryWrapper(unitInfoQueryWrapper, unitInfoDto, null);
-		List<UnitInfo> list = unitInfoServiceImpl.list(unitInfoQueryWrapper);
-		unitInfoDto = BeanDtoVoUtils.convert(list.get(0), UnitInfoDto.class);
-		return ResponseHelper.buildResponse(ValidationUtil.isEmpty(orgName) ? null : unitInfoDto);
-	}
-
-	private QueryWrapper<UnitInfo> setQueryWrapper(QueryWrapper<UnitInfo> queryWrapper, UnitInfoDto unitInfoDto,String sort) {
-		queryWrapper.eq("is_delete", false);
-		if(sort!=null) {  // 排序失效
-			String[] date=  sort.split(",");
-			if(date[1].equals("ascend")) {
-				queryWrapper.orderByAsc(RedisKey.humpToLine(date[0]));
-			}else {
-				queryWrapper.orderByDesc(RedisKey.humpToLine(date[0]));
-			}
-		}else {
-			queryWrapper.orderByDesc("submit_time");
-		}
-
-		if (!ValidationUtil.isEmpty(unitInfoDto.getIsChange())) { // 分类 注册 /  信息变更 0 注册 1 变更
-			queryWrapper.eq("is_change",unitInfoDto.getIsChange());
-
-		}
-
-		if(!ValidationUtil.isEmpty(unitInfoDto.getSubmitTimeStart())) { // 提交时间
-			queryWrapper.ge("submit_time",unitInfoDto.getSubmitTimeStart());
-		}
-
-		if(!ValidationUtil.isEmpty(unitInfoDto.getSubmitTimeEnd())) {  // 提交时间
-			queryWrapper.le("submit_time",unitInfoDto.getSubmitTimeEnd());
-		}
-
-		if(!ValidationUtil.isEmpty(unitInfoDto.getUnitTypeCode())) {  // 单位类型
-			queryWrapper.like("unit_type_code",unitInfoDto.getUnitTypeCode());
-		}
-		if(!ValidationUtil.isEmpty(unitInfoDto.getOrgName())) {  // 单位名称
-			queryWrapper.like("org_name",unitInfoDto.getOrgName());
-		}
-		if(!ValidationUtil.isEmpty(unitInfoDto.getOrganizationCode())) {  // 组织机构代码/统一信用代码
-			queryWrapper.like("organization_code",unitInfoDto.getOrganizationCode());
-		}
-		if(!ValidationUtil.isEmpty(unitInfoDto.getAdminName())) {  // 管理员
-			queryWrapper.like("admin_name",unitInfoDto.getAdminName());
-		}
-		if(!ValidationUtil.isEmpty(unitInfoDto.getAdminTel())) {  // 管理员电话
-			queryWrapper.like("admin_tel",unitInfoDto.getAdminTel());
-		}
-
-		if(!ValidationUtil.isEmpty(unitInfoDto.getUnitStatus())) {  // 审核状态
-			queryWrapper.eq("unit_status",unitInfoDto.getUnitStatus());
-		}
-
-		if(!ValidationUtil.isEmpty(unitInfoDto.getLegalPerson())) {  // 法人
-			queryWrapper.like("legal_person",unitInfoDto.getLegalPerson());
-		}
-
-
-		if(!ValidationUtil.isEmpty(unitInfoDto.getLegalPersonTel())) {  // 法人电话
-			queryWrapper.like("legal_person_tel",unitInfoDto.getLegalPersonTel());
-		}
-
-		return queryWrapper;
-	}
-
-
-
-	private String getRandomCode(){
-		String code = "";
-		Random random = new Random();
-		for (int i = 0; i < 6; i++) {
-			int r = random.nextInt(10); //每次随机出一个数字（0-9）
-			code = code + r;  //把每次随机出的数字拼在一起
-		}
-		return code;
-
-	}
-
-
-	/**
-	 * 审批企业注册
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/approve")
-	@ApiOperation(httpMethod = "POST", value = "审批企业注册", notes = "审批企业注册")
-	public ResponseModel approve(@RequestBody UnitInfoApproveDto approveDto) {
-		if (ValidationUtil.isEmpty(approveDto.getUnitId()) || ValidationUtil.isEmpty(approveDto.getApproveStatus())) {
-			throw new BadRequest("参数校验失败.");
-		}
-		try {
-			UnitInfoDto model = unitInfoServiceImpl.approve(approveDto);
-			return CommonResponseUtil.success(model);
-		} catch (Exception e) {
-			return CommonResponseUtil.failure(e.getMessage());
-		}
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个企业信息表", notes = "根据sequenceNbr查询单个企业信息表")
+    public ResponseModel<UnitInfoDto> selectOne(@PathVariable Long sequenceNbr) {
+        if (ValidationUtil.isEmpty(sequenceNbr)) {
+            throw new BadRequest("参数校验失败.");
+        }
+        return ResponseHelper.buildResponse(unitInfoServiceImpl.getUnitDtoById(sequenceNbr));
+    }
+
+
+    /**
+     * 列表分页查询
+     *
+     * @param pageNum  当前页
+     * @param pageSize 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/list")
+    @ApiOperation(httpMethod = "GET", value = "企业审核列表查询", notes = "企业审核列表查询")
+    public ResponseModel<IPage<UnitInfoDto>> queryForPage(String pageNum, String pageSize, String sort, UnitInfoDto unitInfoDto) {
+        // UnitInfo unitInfo = BeanDtoVoUtils.convert(unitInfoDto, UnitInfo.class);
+        Page<UnitInfo> pageBean;
+        IPage<UnitInfo> page;
+        QueryWrapper<UnitInfo> unitInfoQueryWrapper = new QueryWrapper<UnitInfo>();
+
+        setQueryWrapper(unitInfoQueryWrapper, unitInfoDto, sort);
+
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        page = unitInfoServiceImpl.page(pageBean, unitInfoQueryWrapper);
+        int num = unitInfoServiceImpl.count(unitInfoQueryWrapper);
+        pageBean.setTotal(num);
+        IPage<UnitInfoDto> unitInfoVoIPage = BeanDtoVoUtils.unitInfoIPageDto(page);
+        return ResponseHelper.buildResponse(unitInfoVoIPage);
+    }
+
+    /**
+     * 根据企业名称查询详情
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/queryByOrgName")
+    @ApiOperation(httpMethod = "GET", value = "根据企业名称查询详情", notes = "根据企业名称查询详情")
+    public ResponseModel<UnitInfoDto> queryForPage(@RequestParam(value = "orgName") String orgName) {
+        UnitInfoDto unitInfoDto = new UnitInfoDto();
+        QueryWrapper<UnitInfo> unitInfoQueryWrapper = new QueryWrapper<UnitInfo>();
+        unitInfoDto.setOrgName(orgName);
+        setQueryWrapper(unitInfoQueryWrapper, unitInfoDto, null);
+        List<UnitInfo> list = unitInfoServiceImpl.list(unitInfoQueryWrapper);
+        unitInfoDto = BeanDtoVoUtils.convert(list.get(0), UnitInfoDto.class);
+        return ResponseHelper.buildResponse(ValidationUtil.isEmpty(orgName) ? null : unitInfoDto);
+    }
+
+    private QueryWrapper<UnitInfo> setQueryWrapper(QueryWrapper<UnitInfo> queryWrapper, UnitInfoDto unitInfoDto, String sort) {
+        queryWrapper.eq("is_delete", false);
+        if (sort != null) {  // 排序失效
+            String[] date = sort.split(",");
+            if (date[1].equals("ascend")) {
+                queryWrapper.orderByAsc(RedisKey.humpToLine(date[0]));
+            } else {
+                queryWrapper.orderByDesc(RedisKey.humpToLine(date[0]));
+            }
+        } else {
+            queryWrapper.orderByDesc("submit_time");
+        }
+
+        if (!ValidationUtil.isEmpty(unitInfoDto.getIsChange())) { // 分类 注册 /  信息变更 0 注册 1 变更
+            queryWrapper.eq("is_change", unitInfoDto.getIsChange());
+
+        }
+
+        if (!ValidationUtil.isEmpty(unitInfoDto.getSubmitTimeStart())) { // 提交时间
+            queryWrapper.ge("submit_time", unitInfoDto.getSubmitTimeStart());
+        }
+
+        if (!ValidationUtil.isEmpty(unitInfoDto.getSubmitTimeEnd())) {  // 提交时间
+            queryWrapper.le("submit_time", unitInfoDto.getSubmitTimeEnd());
+        }
+
+        if (!ValidationUtil.isEmpty(unitInfoDto.getUnitTypeCode())) {  // 单位类型
+            queryWrapper.like("unit_type_code", unitInfoDto.getUnitTypeCode());
+        }
+        if (!ValidationUtil.isEmpty(unitInfoDto.getOrgName())) {  // 单位名称
+            queryWrapper.like("org_name", unitInfoDto.getOrgName());
+        }
+        if (!ValidationUtil.isEmpty(unitInfoDto.getOrganizationCode())) {  // 组织机构代码/统一信用代码
+            queryWrapper.like("organization_code", unitInfoDto.getOrganizationCode());
+        }
+        if (!ValidationUtil.isEmpty(unitInfoDto.getAdminName())) {  // 管理员
+            queryWrapper.like("admin_name", unitInfoDto.getAdminName());
+        }
+        if (!ValidationUtil.isEmpty(unitInfoDto.getAdminTel())) {  // 管理员电话
+            queryWrapper.like("admin_tel", unitInfoDto.getAdminTel());
+        }
+
+        if (!ValidationUtil.isEmpty(unitInfoDto.getUnitStatus())) {  // 审核状态
+            queryWrapper.eq("unit_status", unitInfoDto.getUnitStatus());
+        }
+
+        if (!ValidationUtil.isEmpty(unitInfoDto.getLegalPerson())) {  // 法人
+            queryWrapper.like("legal_person", unitInfoDto.getLegalPerson());
+        }
+
+
+        if (!ValidationUtil.isEmpty(unitInfoDto.getLegalPersonTel())) {  // 法人电话
+            queryWrapper.like("legal_person_tel", unitInfoDto.getLegalPersonTel());
+        }
+
+        return queryWrapper;
+    }
+
+
+    private String getRandomCode() {
+        String code = "";
+        Random random = new Random();
+        for (int i = 0; i < 6; i++) {
+            int r = random.nextInt(10); //每次随机出一个数字（0-9）
+            code = code + r;  //把每次随机出的数字拼在一起
+        }
+        return code;
+
+    }
+
+
+    /**
+     * 审批企业注册
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/approve")
+    @ApiOperation(httpMethod = "POST", value = "审批企业注册", notes = "审批企业注册")
+    public ResponseModel approve(@RequestBody UnitInfoApproveDto approveDto) {
+        if (ValidationUtil.isEmpty(approveDto.getUnitId()) || ValidationUtil.isEmpty(approveDto.getApproveStatus())) {
+            throw new BadRequest("参数校验失败.");
+        }
+        try {
+            UnitInfoDto model = unitInfoServiceImpl.approve(approveDto);
+            return CommonResponseUtil.success(model);
+        } catch (Exception e) {
+            return CommonResponseUtil.failure(e.getMessage());
+        }
+    }
 
 
     /**
      * 根据当前登录人获取企业信息
+     *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getUserUnit")
-    @ApiOperation(httpMethod = "GET",value = "根据当前登录人获取企业信息",  notes = "根据当前登录人获取企业信息")
+    @ApiOperation(httpMethod = "GET", value = "根据当前登录人获取企业信息", notes = "根据当前登录人获取企业信息")
     public ResponseModel<UnitInfoDto> getUserUnit() {
         AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
         List<CompanyModel> companys = user.getCompanys();
         UnitInfoDto result = new UnitInfoDto();
-        for(CompanyModel c : companys) {
-            OrgUsr temp = iOrgUsrService.getOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete,false).eq(OrgUsr::getAmosOrgId,c.getSequenceNbr()));
-            if(temp != null) {
-            	// 企业信息查看判断是否变更 如果变更信息则返回变更中信息
-				result = unitInfoServiceImpl.getDtoByOrgId(temp.getSequenceNbr());
+        for (CompanyModel c : companys) {
+            OrgUsr temp = iOrgUsrService.getOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete, false).eq(OrgUsr::getAmosOrgId, c.getSequenceNbr()));
+            if (temp != null) {
+                // 企业信息查看判断是否变更 如果变更信息则返回变更中信息
+                result = unitInfoServiceImpl.getDtoByOrgId(temp.getSequenceNbr());
 
-            	if(result.getIsChange() && result.getUnitStatus() == 0) {
-            		result = unitInfoChangeServiceImpl.findLastChangInfo(result.getSequenceNbr());
-				}
+                if (result.getIsChange() && result.getUnitStatus() == 0) {
+                    result = unitInfoChangeServiceImpl.findLastChangInfo(result.getSequenceNbr());
+                }
 
                 return ResponseHelper.buildResponse(result);
             }
@@ -492,208 +477,208 @@ public class UnitInfoController extends BaseController {
         return ResponseHelper.buildResponse(result);
     }
 
-	/**
-	 * 变更企业表
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/change")
-	@ApiOperation(httpMethod = "POST", value = "变更企业表", notes = "变更企业表")
-	public ResponseModel<UnitInfoDto> change(@RequestBody UnitInfoDto model) {
-		try {
-			model = unitInfoServiceImpl.changeUnInfo(model);
-			return CommonResponseUtil.success(model);
-		} catch (Exception e) {
-			return CommonResponseUtil.failure(e.getMessage());
-		}
-	}
-
-	/**
-	 * 查询审批数据
-	 *
-	 * @param sequenceNbr  主键
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/approve/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "查询审批数据",  notes = "查询审批数据")
-	public ResponseModel<UnitInfoDto> getApproveInfo(@PathVariable Long sequenceNbr) {
-		if (ValidationUtil.isEmpty(sequenceNbr) ) {
-			throw new BadRequest("参数校验失败.");
-		}
-		return ResponseHelper.buildResponse(unitInfoServiceImpl.getDtoById(sequenceNbr));
-	}
-
-
-	/**
-	 * 获取检验机构列表
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/getInspectionUnit")
-	@ApiOperation(httpMethod = "GET", value = "获取检验机构列表", notes = "获取检验机构列表")
-	public ResponseModel<List<UnitInfoDto>> getInspectionUnit() {
-		List<UnitInfoDto> result = unitInfoServiceImpl.getInspectionUnit();
-		return ResponseHelper.buildResponse(result);
-	}
-
-	/**
-	 * 获取使用单位列表
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/getUseUnit")
-	@ApiOperation(httpMethod = "POST", value = "获取使用单位列表", notes = "获取使用单位列表")
-	public ResponseModel<List<UnitInfoDto>> getUseUnit(@RequestBody UnitInfoDto model) {
-
-		List<UnitInfoDto> result = unitInfoServiceImpl.getUseUnit(model.getUnitType(),model.getAddress(),model.getOrgName(),model.getOrganizationCode());
-		return ResponseHelper.buildResponse(result);
-	}
-
-	/**
-	 * 获取所有单位列表
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/getAllUnit")
-	@ApiOperation(httpMethod = "GET", value = "获取所有单位列表", notes = "获取所有单位列表")
-	public ResponseModel<List<UnitInfoDto>> getAllUnit() {
-		List<UnitInfoDto> result = unitInfoServiceImpl.getAllUnit();
-		return ResponseHelper.buildResponse(result);
-	}
-
-
-
-	/**
-	 * 列表分页查询
-	 *
-	 * @param pageNum  当前页
-	 * @param pageSize 每页大小
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/listPassed")
-	@ApiOperation(httpMethod = "GET", value = "企业审核列表查询-通过审核", notes = "企业审核列表查询-通过审核")
-	public ResponseModel<IPage<UnitInfoDto>> queryForPagePassed(String pageNum, String pageSize, String sort, UnitInfoDto unitInfoDto) {
-		unitInfoDto.setUnitStatus(1);
-		Page<UnitInfo> pageBean;
-		IPage<UnitInfo> page;
-		QueryWrapper<UnitInfo> unitInfoQueryWrapper = new QueryWrapper<UnitInfo>();
-
-		setQueryWrapper(unitInfoQueryWrapper, unitInfoDto, sort);
-
-		if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
-			pageBean = new Page<>(0, Long.MAX_VALUE);
-		} else {
-			pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-		}
-		page = unitInfoServiceImpl.page(pageBean, unitInfoQueryWrapper);
-		int num= unitInfoServiceImpl.count(unitInfoQueryWrapper);
-		pageBean.setTotal(num);
-		IPage<UnitInfoDto> unitInfoVoIPage = BeanDtoVoUtils.unitInfoIPageDto(page);
-		return ResponseHelper.buildResponse(unitInfoVoIPage);
-	}
-
-	/**
-	 * 判断用户号码是否存在
-	 *
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/hasExistPhone/{phone}")
-	@ApiOperation(httpMethod = "GET", value = "判断用户号码是否存在", notes = "判断用户号码是否存在")
-	public ResponseModel hasExistPhone( @PathVariable(value = "phone") String phone) {
-		try {
-			return CommonResponseUtil.success(Privilege.agencyUserClient.checkLoginId(phone).getResult());
-		} catch (Exception e) {
-			return CommonResponseUtil.failure("该手机号已经注册");
-		}
-	}
-
-
-	/**
-	 * 手动生成已通过企业的二维码
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/addQRcode")
-	@ApiOperation(httpMethod = "GET", value = "手动生成已通过企业的二维码", notes = "手动生成已通过企业的二维码")
-	public ResponseModel<Boolean> addQRcode() {
-		Boolean flag = unitInfoServiceImpl.addQRcode();
-		return ResponseHelper.buildResponse(flag);
-	}
-
-
-
-	/**
-	 * 根据当前登录人获取企业信息--编辑
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/getUserUnitEdit")
-	@ApiOperation(httpMethod = "GET",value = "根据当前登录人获取企业信息--编辑",  notes = "根据当前登录人获取企业信息--编辑")
-	public ResponseModel<UnitInfoDto> getUserUnitEdit() {
-		AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
-		List<CompanyModel> companys = user.getCompanys();
-		UnitInfoDto result = new UnitInfoDto();
-		for(CompanyModel c : companys) {
-			OrgUsr temp = iOrgUsrService.getOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete,false).eq(OrgUsr::getAmosOrgId,c.getSequenceNbr()));
-			if(temp != null) {
-				// 企业信息查看判断是否变更 如果变更信息则返回变更中信息
-				result = unitInfoServiceImpl.getDtoByOrgId(temp.getSequenceNbr());
-				return ResponseHelper.buildResponse(result);
-			}
-		}
-		return ResponseHelper.buildResponse(result);
-	}
-
-	/**
-	 * 根据uuid 获取 注册信息
-	 *
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/getUnitInfo/{uuid}")
-	@ApiOperation(httpMethod = "GET", value = "根据uuid 获取注册信息", notes = "根据uuid 获取注册信息")
-	public ResponseModel hasExistUnitWithId( @PathVariable String uuid) {
-		UnitInfo temp = unitInfoServiceImpl.getOne(new LambdaQueryWrapper<UnitInfo>().eq(UnitInfo::getIsDelete,false).eq(UnitInfo::getCallbackId,uuid).eq(UnitInfo::getUnitStatus,"2"));
-		if(temp != null) {
-			return CommonResponseUtil.success(temp);
-		} else {
-			return CommonResponseUtil.failure("未找到该企业信息单，请确认链接地址或该单据已重新提交");
-		}
-	}
-
-
-	private void dealCompanyTree(CompanyModel company) {
-		if(!"emergencyCenter".equals(company.getLevel()) && !"company".equals(company.getLevel())) {
-			// 判断子节点是否是headquarter
-			Collection children = company.getChildren();
-			if (!ValidationUtil.isEmpty(children)) {
-				Iterator<Map> it = children.iterator();
-				while(it.hasNext()) {
-					Map temp =  it.next();
-					if("emergencyCenter".equals(company.getLevel())  || "company".equals(company.getLevel())) {
-						it.remove();
-					} else {
-						this.dealCompanyTree(temp);
-					}
-				}
-			}
-		}
-	}
-	private void dealCompanyTree(Map company) {
-		// 判断子节点是否是headquarter
-		Collection children = (Collection) company.get("children");
-		if (!ValidationUtil.isEmpty(children)) {
-			Iterator<Map> it = children.iterator();
-			while(it.hasNext()) {
-				Map temp = it.next();
-				if("emergencyCenter".equals(temp.get("level")) || "company".equals(temp.get("level"))) {
-					it.remove();
-				} else {
-					this.dealCompanyTree(temp);
-				}
-			}
-		}
-	}
+    /**
+     * 变更企业表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/change")
+    @ApiOperation(httpMethod = "POST", value = "变更企业表", notes = "变更企业表")
+    public ResponseModel<UnitInfoDto> change(@RequestBody UnitInfoDto model) {
+        try {
+            model = unitInfoServiceImpl.changeUnInfo(model);
+            return CommonResponseUtil.success(model);
+        } catch (Exception e) {
+            return CommonResponseUtil.failure(e.getMessage());
+        }
+    }
+
+    /**
+     * 查询审批数据
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/approve/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "查询审批数据", notes = "查询审批数据")
+    public ResponseModel<UnitInfoDto> getApproveInfo(@PathVariable Long sequenceNbr) {
+        if (ValidationUtil.isEmpty(sequenceNbr)) {
+            throw new BadRequest("参数校验失败.");
+        }
+        return ResponseHelper.buildResponse(unitInfoServiceImpl.getDtoById(sequenceNbr));
+    }
+
+
+    /**
+     * 获取检验机构列表
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getInspectionUnit")
+    @ApiOperation(httpMethod = "GET", value = "获取检验机构列表", notes = "获取检验机构列表")
+    public ResponseModel<List<UnitInfoDto>> getInspectionUnit() {
+        List<UnitInfoDto> result = unitInfoServiceImpl.getInspectionUnit();
+        return ResponseHelper.buildResponse(result);
+    }
+
+    /**
+     * 获取使用单位列表
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/getUseUnit")
+    @ApiOperation(httpMethod = "POST", value = "获取使用单位列表", notes = "获取使用单位列表")
+    public ResponseModel<List<UnitInfoDto>> getUseUnit(@RequestBody UnitInfoDto model) {
+
+        List<UnitInfoDto> result = unitInfoServiceImpl.getUseUnit(model.getUnitType(), model.getAddress(), model.getOrgName(), model.getOrganizationCode());
+        return ResponseHelper.buildResponse(result);
+    }
+
+    /**
+     * 获取所有单位列表
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getAllUnit")
+    @ApiOperation(httpMethod = "GET", value = "获取所有单位列表", notes = "获取所有单位列表")
+    public ResponseModel<List<UnitInfoDto>> getAllUnit() {
+        List<UnitInfoDto> result = unitInfoServiceImpl.getAllUnit();
+        return ResponseHelper.buildResponse(result);
+    }
+
+
+    /**
+     * 列表分页查询
+     *
+     * @param pageNum  当前页
+     * @param pageSize 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/listPassed")
+    @ApiOperation(httpMethod = "GET", value = "企业审核列表查询-通过审核", notes = "企业审核列表查询-通过审核")
+    public ResponseModel<IPage<UnitInfoDto>> queryForPagePassed(String pageNum, String pageSize, String sort, UnitInfoDto unitInfoDto) {
+        unitInfoDto.setUnitStatus(1);
+        Page<UnitInfo> pageBean;
+        IPage<UnitInfo> page;
+        QueryWrapper<UnitInfo> unitInfoQueryWrapper = new QueryWrapper<UnitInfo>();
+
+        setQueryWrapper(unitInfoQueryWrapper, unitInfoDto, sort);
+
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        page = unitInfoServiceImpl.page(pageBean, unitInfoQueryWrapper);
+        int num = unitInfoServiceImpl.count(unitInfoQueryWrapper);
+        pageBean.setTotal(num);
+        IPage<UnitInfoDto> unitInfoVoIPage = BeanDtoVoUtils.unitInfoIPageDto(page);
+        return ResponseHelper.buildResponse(unitInfoVoIPage);
+    }
+
+    /**
+     * 判断用户号码是否存在
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/hasExistPhone/{phone}")
+    @ApiOperation(httpMethod = "GET", value = "判断用户号码是否存在", notes = "判断用户号码是否存在")
+    public ResponseModel hasExistPhone(@PathVariable(value = "phone") String phone) {
+        try {
+            return CommonResponseUtil.success(Privilege.agencyUserClient.checkLoginId(phone).getResult());
+        } catch (Exception e) {
+            return CommonResponseUtil.failure("该手机号已经注册");
+        }
+    }
+
+
+    /**
+     * 手动生成已通过企业的二维码
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/addQRcode")
+    @ApiOperation(httpMethod = "GET", value = "手动生成已通过企业的二维码", notes = "手动生成已通过企业的二维码")
+    public ResponseModel<Boolean> addQRcode() {
+        Boolean flag = unitInfoServiceImpl.addQRcode();
+        return ResponseHelper.buildResponse(flag);
+    }
+
+
+    /**
+     * 根据当前登录人获取企业信息--编辑
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getUserUnitEdit")
+    @ApiOperation(httpMethod = "GET", value = "根据当前登录人获取企业信息--编辑", notes = "根据当前登录人获取企业信息--编辑")
+    public ResponseModel<UnitInfoDto> getUserUnitEdit() {
+        AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
+        List<CompanyModel> companys = user.getCompanys();
+        UnitInfoDto result = new UnitInfoDto();
+        for (CompanyModel c : companys) {
+            OrgUsr temp = iOrgUsrService.getOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete, false).eq(OrgUsr::getAmosOrgId, c.getSequenceNbr()));
+            if (temp != null) {
+                // 企业信息查看判断是否变更 如果变更信息则返回变更中信息
+                result = unitInfoServiceImpl.getDtoByOrgId(temp.getSequenceNbr());
+                return ResponseHelper.buildResponse(result);
+            }
+        }
+        return ResponseHelper.buildResponse(result);
+    }
+
+    /**
+     * 根据uuid 获取 注册信息
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getUnitInfo/{uuid}")
+    @ApiOperation(httpMethod = "GET", value = "根据uuid 获取注册信息", notes = "根据uuid 获取注册信息")
+    public ResponseModel hasExistUnitWithId(@PathVariable String uuid) {
+        UnitInfo temp = unitInfoServiceImpl.getOne(new LambdaQueryWrapper<UnitInfo>().eq(UnitInfo::getIsDelete, false).eq(UnitInfo::getCallbackId, uuid).eq(UnitInfo::getUnitStatus, "2"));
+        if (temp != null) {
+            return CommonResponseUtil.success(temp);
+        } else {
+            return CommonResponseUtil.failure("未找到该企业信息单，请确认链接地址或该单据已重新提交");
+        }
+    }
+
+
+    private void dealCompanyTree(CompanyModel company) {
+        if (!"emergencyCenter".equals(company.getLevel()) && !"company".equals(company.getLevel())) {
+            // 判断子节点是否是headquarter
+            Collection children = company.getChildren();
+            if (!ValidationUtil.isEmpty(children)) {
+                Iterator<Map> it = children.iterator();
+                while (it.hasNext()) {
+                    Map temp = it.next();
+                    if ("emergencyCenter".equals(company.getLevel()) || "company".equals(company.getLevel())) {
+                        it.remove();
+                    } else {
+                        this.dealCompanyTree(temp);
+                    }
+                }
+            }
+        }
+    }
+
+    private void dealCompanyTree(Map company) {
+        // 判断子节点是否是headquarter
+        Collection children = (Collection) company.get("children");
+        if (!ValidationUtil.isEmpty(children)) {
+            Iterator<Map> it = children.iterator();
+            while (it.hasNext()) {
+                Map temp = it.next();
+                if ("emergencyCenter".equals(temp.get("level")) || "company".equals(temp.get("level"))) {
+                    it.remove();
+                } else {
+                    this.dealCompanyTree(temp);
+                }
+            }
+        }
+    }
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/service/impl/RegUnitInfoServiceImpl.java

@@ -399,6 +399,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 
         if (type.equals(EnterpriseEnums.GR_ZT.getType())) {
             baseEnterpriseInfo.setUseUnitCode(regUnitInfo.getUnitCode().split("_")[1]);
+            baseEnterpriseInfo.setAddress(regUnitInfo.getAddress());
         } else {
             baseEnterpriseInfo.setOfficeRegion(regUnitInfo.getOfficeRegion());
             baseEnterpriseInfo.setOfficeAddress(regUnitInfo.getOfficeAddress());

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/service/impl/UnitInfoServiceImpl.java

@@ -19,7 +19,7 @@ import com.yeejoin.amos.boot.module.tcm.api.common.BizCommonConstant;
 import com.yeejoin.amos.boot.module.tcm.api.dto.WechatMessageDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.WechatRelation;
 import com.yeejoin.amos.boot.module.tcm.api.enums.TzsCommonParam;
-import com.yeejoin.amos.boot.module.tcm.biz.service.impl.TzsAuthServiceImpl;
+import com.yeejoin.amos.boot.module.tcm.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.boot.module.tcm.biz.service.impl.WechatRelationServiceImpl;
 import com.yeejoin.amos.boot.module.tcm.biz.service.impl.WechatServiceImpl;
 import com.yeejoin.amos.boot.module.tcm.biz.utils.JsonUtils;
@@ -73,7 +73,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
     private Resource stepRegin;
 
     @Autowired
-    private TzsAuthServiceImpl tzsAuthServiceImpl;
+    private StartPlatformTokenService platformTokenService;
 
     @Autowired
     ISourceFileService ISourceFileService;
@@ -115,7 +115,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
 
     @Transactional
     public UnitInfoDto saveUnitInfo(UnitInfoDto model) {
-        tzsAuthServiceImpl.setRequestContext();
+        platformTokenService.setRequestContext();
         model.setUnitStatus(0);// 设置为待审核状态
         model.setSubmitTime(new Date()); // 提交时间
         model.setIsChange(false);// 新增状态不是变更状态
@@ -650,7 +650,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
 
     @Override
     public Collection<RegionModel> getRegionTree(Long parentId, String isNationwide) {
-        tzsAuthServiceImpl.setRequestContext();
+        platformTokenService.setRequestContext();
         Collection<RegionModel> result = null;
         if(parentId == null) {
             result = this.getAllRegionTree(isNationwide);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipmentCategoryMapper.java

@@ -23,6 +23,10 @@ import java.util.Map;
 @Mapper
 public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
 
+    @Select("SELECT * FROM tz_equipment_category WHERE code NOT LIKE '7%' ORDER BY parent_id")
+    List<EquipmentCategoryDto> selectClassifyNoStart7();
+
+
     @Select("select * from tz_equipment_category where code in('1000','2000','3000','4000','5000','6000','8000','9000')")
     List<EquipmentCategoryDto> selectClassify();
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzBaseEnterpriseInfoMapper.java

@@ -94,4 +94,6 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
 
 
     List<TzBaseEnterpriseInfoDto> queryByUseCode(@Param("useCodes") List<String> useCode);
+
+    List<TzBaseEnterpriseInfoDto> selectExpiringUnits(@Param("operator")String operator);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzsUserInfoMapper.java

@@ -7,7 +7,6 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 @Mapper
@@ -17,4 +16,6 @@ public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
     Long countUserByPostAndAreaCode(@Param("orgCode") String orgCode, @Param("post") String post, @Param("regionCode") String regionCode);
 
     List<TzsUserPermissionDto> queryPermissionByUserSeq(@Param("userSeq") Long userSeq, @Param("permissionPost") String permissionPost);
+
+    List<TzsUserInfoDto> selectUserPermission(@Param("operator") String operator, @Param("posts") List<String> posts);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -325,4 +325,14 @@
 			</foreach>
 		</if>
 	</select>
+
+	<select id="selectExpiringUnits" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto">
+		SELECT tbei.*
+		FROM tz_base_unit_licence tbul
+	    JOIN tz_base_enterprise_info tbei ON tbul.unit_Code = tbei.use_unit_code
+		WHERE 1 = 1
+		<if test="operator != null and operator !='' ">
+			AND tbul.expiry_date ${operator} CURRENT_DATE
+		</if>
+	</select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzsUserInfoMapper.xml

@@ -71,4 +71,19 @@
             user_seq = #{userSeq}
             and permission_post like concat(#{permissionPost}, '%')
     </select>
+
+    <select id="selectUserPermission" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto">
+        SELECT tup.expiry_date, tui.phone, tui.rec_user_name
+        FROM tzs_user_permission tup
+        JOIN tzs_user_info tui ON tup.user_seq = tui.sequence_nbr
+        WHERE 1 = 1
+        <if test="operator != null and operator !='' ">
+            AND tup.expiry_date ${operator} CURRENT_DATE
+        </if>
+        AND (
+        <foreach collection="posts" item="post" separator=" OR ">
+            tui.new_post LIKE CONCAT('%', #{post}, '%')
+        </foreach>
+        )
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -175,6 +175,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     private static final String LEVEL = "company";
     private static final String EQUSTATE = "EQU_STATE";
     private static final String USEPLACE = "USE_PLACE";
+    private static final String REC_DATE = "REC_DATE";
     @Autowired
     ESEquipmentCategory esEquipmentCategory;
     @Autowired
@@ -2159,13 +2160,20 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             boolMust.must(meBuilder);
         }
         builder.query(boolMust);
-        builder.sort("REC_DATE", SortOrder.DESC);
+
+        builder.sort("REC_DATE", Optional.ofNullable(map.getString("sort"))
+                .map(s -> s.split(","))
+                .filter(sortParams -> "ascend".equals(sortParams[1]))
+                .map(s -> SortOrder.ASC)
+                .orElse(SortOrder.DESC));
+
         builder.from((map.getInteger("number") - 1) * map.getInteger("size"));
         builder.size(map.getInteger("size"));
         request.source(builder);
         List<JSONObject> list = new LinkedList<>();
         long totle = 0;
         try {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
             for (org.elasticsearch.search.SearchHit hit : response.getHits().getHits()) {
                 System.out.println(hit);
@@ -2176,6 +2184,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                     String status = EquimentEnum.getName.get(integer);
                     dto2.put(EQUSTATE, status);
                 }
+                dto2.put(REC_DATE, dateFormat.format(dto2.get(REC_DATE)));
                 list.add(dto2);
             }
             totle = response.getInternalResponse().hits().getTotalHits().value;

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/enums/MaintenanceExpiredEarlyWarningEnum.java

+package com.yeejoin.amos.boot.module.ys.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Optional;
+
+/**
+ * <pre>
+ * 维保到期预警枚举
+ * </pre>
+ */
+
+@Getter
+@AllArgsConstructor
+public enum MaintenanceExpiredEarlyWarningEnum {
+    // 设备
+    QP("2300", "气瓶", "cylinderMaintenanceExpiredEarlyWarning"),
+    QZJX("4000", "起重机械", "liftingMachineryMaintenanceExpiredEarlyWarning"),
+    KYSD("9000", "客运索道", "passengerRopeWayMaintenanceExpiredEarlyWarning"),
+    YLSS("6000", "游乐设施", "amusementFacilitiesMaintenanceExpiredEarlyWarning"),
+    GL("1000", "锅炉", "boilerMaintenanceExpiredEarlyWarning"),
+    YLGD("8000", "压力管道", "pressurePipeMaintenanceExpiredEarlyWarning"),
+    CNJDCL("5000", "场内机动车辆", "yardMotorVehicleMaintenanceExpiredEarlyWarning"),
+    // 体系建设统计
+    TXJS("0001", "体系建设", "systemConstructionStatistics"),
+    // 教育培训统计
+    JYPX("0002", "教育培训", "educationAndTrainingStatistics");
+
+    private String typeCode; // 设备类型代码 || 业务类型代码
+    private String typeName; // 设备类型名称
+    private String groupCode; // 分组代码
+
+    /**
+     * 根据设备类型代码获取对应的枚举实例。
+     *
+     * @param equTypeCode 设备类型代码
+     * @return 对应的枚举实例，如果不存在则返回 Optional.empty()
+     */
+    public static Optional<MaintenanceExpiredEarlyWarningEnum> getEnum(String equTypeCode) {
+        for (MaintenanceExpiredEarlyWarningEnum status : MaintenanceExpiredEarlyWarningEnum.values()) {
+            if (status.getTypeCode().equals(equTypeCode)) {
+                return Optional.of(status);
+            }
+        }
+        return Optional.empty();
+    }
+
+    @Override
+    public String toString() {
+        return String.format("MaintenanceExpiredEarlyWarningEnum{equTypeCode='%s', equTypeName='%s', groupCode='%s'}",
+                typeCode, typeName, groupCode);
+    }
+}
+
+

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/CommonController.java

@@ -3,12 +3,19 @@ package com.yeejoin.amos.boot.module.ys.biz.controller;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.ys.biz.service.CommonService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 /**
- *
  * @author system_generator
  * @date 2024-09-24
  */
@@ -17,13 +24,17 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(value = "/common")
 public class CommonController extends BaseController {
 
-	@Autowired
-	private CommonService commonService;
+    @Autowired
+    private CommonService commonService;
 
-//	@TycloudOperation(ApiLevel = UserType.AGENCY)
-//	@ApiOperation(httpMethod = "GET",value = "模板下载",  notes = "模板下载")
-//	@RequestMapping(value = "/templateDownload", method = RequestMethod.GET)
-//	public void queryForPage(HttpServletResponse response, @RequestParam(value = "path") String path) {
-//		commonService.templateDownload(response,path);
-//	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "应急保障四项统计", notes = "应急保障四项统计")
+    @RequestMapping(value = "/emergencySupportStatistics/{businessType}/{componentType}", method = RequestMethod.GET)
+    public ResponseModel<Object> queryForPage(
+            @ApiParam(value = "业务类型（教育培训：education、体系建设：construct、应急演练：rehearsal、应急预案：prePlan）", required = true)
+            @PathVariable(value = "businessType") String businessType,
+            @ApiParam(value = "组件类型（饼图：pieChart、富文本：richText）", required = true)
+            @PathVariable(value = "componentType") String componentType) {
+        return ResponseHelper.buildResponse(commonService.emergencySupportStatistics(businessType, componentType));
+    }
 }

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/MaintenanceEarlyWarningController.java

+package com.yeejoin.amos.boot.module.ys.biz.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormInstanceServiceImpl;
+import com.yeejoin.amos.boot.module.ys.api.enums.MaintenanceExpiredEarlyWarningEnum;
+import com.yeejoin.amos.boot.module.ys.biz.service.impl.CommonServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author system_generator
+ * @date 2024-09-24
+ */
+@RestController
+@Api(tags = "维保过期预警分析")
+@RequestMapping(value = "/maintenanceEarlyWarningWarning/{equTypeCode}")
+public class MaintenanceEarlyWarningController extends BaseController {
+
+    private static final String SXCode = "50";
+    private static final HashMap<String, String> unitTypeMap = new HashMap<>();
+
+    @Autowired
+    private DynamicFormInstanceServiceImpl dynamicFormInstanceService;
+
+    @Autowired
+    private CommonServiceImpl commonService;
+
+    static {
+        unitTypeMap.put("useUnit", "使用单位");
+    }
+
+    /**
+     * 从URL中获取对应的 MaintenanceExpiredEarlyWarningEnum 枚举
+     *
+     * @param equTypeCode 设备类型代码
+     * @return 对应的 MaintenanceExpiredEarlyWarningEnum 枚举
+     * @throws BadRequest 如果设备类型代码无效
+     */
+    public MaintenanceExpiredEarlyWarningEnum getWaringEnumsForPath(String equTypeCode) {
+        return MaintenanceExpiredEarlyWarningEnum.getEnum(equTypeCode)
+                .orElseThrow(() -> new BadRequest("Invalid equipment type code: " + equTypeCode));
+    }
+
+
+    /**
+     * 新增或者更新接口
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/saveOrUpdate")
+    @ApiOperation(httpMethod = "POST", value = "新增或者更新接口", notes = "新增或者更新接口")
+    public ResponseModel<Object> saveOrUpdate(
+            @PathVariable(value = "equTypeCode") String equTypeCode,
+            @RequestBody Map<String, Object> model) {
+        String groupCode = getWaringEnumsForPath(equTypeCode).getGroupCode();
+        String instanceId = (String) model.get("instanceId");
+        try {
+            // 判断是更新还是新增操作
+            if (!ValidationUtil.isEmpty(instanceId)) {
+                // 更新操作：先删除再保存
+                LambdaQueryWrapper<DynamicFormInstance> lambda =
+                        new QueryWrapper<DynamicFormInstance>().lambda();
+                lambda.eq(DynamicFormInstance::getInstanceId, instanceId);
+                dynamicFormInstanceService.getBaseMapper().delete(lambda);
+            }
+
+            // 保存新实例或更新后的实例
+
+            // 兼容附件格式新
+            model.keySet().stream()
+                    .filter(key -> key.endsWith("file") || key.endsWith("File"))
+                    .forEach(key -> model.put(key, JSONObject.toJSONString(model.get(key))));
+
+            dynamicFormInstanceService.commonSave(groupCode, model);
+            return ResponseHelper.buildResponse(instanceId != null
+                    ? Long.parseLong(instanceId)
+                    : Long.MIN_VALUE);
+        } catch (Exception e) {
+            return ResponseHelper.buildResponse("Error saving or updating instance: " + e.getMessage());
+        }
+    }
+
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param instanceId 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/deleteBySeq")
+    @ApiOperation(httpMethod = "DELETE", value = "根据instanceId删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Integer> deleteBySeq(@RequestParam(value = "instanceId") String instanceId) {
+        LambdaQueryWrapper<DynamicFormInstance> lambda = new QueryWrapper<DynamicFormInstance>().lambda();
+        lambda.eq(DynamicFormInstance::getInstanceId, instanceId);
+        return ResponseHelper.buildResponse(dynamicFormInstanceService.getBaseMapper().delete(lambda));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param instanceId 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/detailBySeq")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
+    public ResponseModel<Map<String, Object>> detailBySeq(@PathVariable(value = "equTypeCode") String equTypeCode,
+                                                          @RequestParam(value = "instanceId") Long instanceId) {
+        String groupCode = getWaringEnumsForPath(equTypeCode).getGroupCode();
+        Map<String, Object> oneMap = dynamicFormInstanceService.getOneMap(instanceId, groupCode);
+        // 兼容附件格式返回
+        oneMap.keySet().stream()
+                .filter(key -> key.endsWith("file") || key.endsWith("File"))
+                .forEach(key -> oneMap.put(key, JSONObject.parseArray((String) oneMap.get(key))));
+        return ResponseHelper.buildResponse(oneMap);
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
+    public ResponseModel<IPage<Map<String, Object>>> queryForPage(@RequestParam(value = "current") int current,
+                                                                  @RequestParam(value = "size") int size,
+                                                                  @PathVariable(value = "equTypeCode") String equTypeCode) {
+        MaintenanceExpiredEarlyWarningEnum enums = getWaringEnumsForPath(equTypeCode);
+        IPage<Map<String, Object>> mapIPage = dynamicFormInstanceService.pageList(current, size, enums.getGroupCode());
+        List<Map<String, Object>> records = mapIPage.getRecords();
+        List<Map<String, Object>> collect = records.stream().peek(item -> {
+            String useCompany = (String) item.get("useCompany");
+            String unitType = (String) item.get("unitType");
+            if (!ValidationUtil.isEmpty(useCompany)){
+                item.put("useCompany", useCompany.split("_")[1]);
+            }
+            if (!ValidationUtil.isEmpty(unitType)){
+                item.put("equType", enums.getTypeName());
+            }
+            item.put("unitType", unitTypeMap.get(unitType));
+        }).collect(Collectors.toList());
+        mapIPage.setRecords(collect);
+        return ResponseHelper.buildResponse(mapIPage);
+    }
+
+    /**
+     * 图标统计数量
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/statistics")
+    @ApiOperation(httpMethod = "GET", value = "图标统计数量", notes = "图标统计数量")
+    public ResponseModel<JSONObject> statistics(@PathVariable(value = "equTypeCode") String equTypeCode) {
+        MaintenanceExpiredEarlyWarningEnum enums = getWaringEnumsForPath(equTypeCode);
+        // 问题设备数
+        long numberOfProblemEqu = dynamicFormInstanceService.pageList(1, 2, enums.getGroupCode()).getTotal();
+        // 气瓶总设备数
+        long numberOfCylinder = commonService.staticsCenterMapCountDataForCylinder(SXCode);
+        // 各类型设备总数
+        long totalNumberOfEqu;
+
+        if (enums.getTypeCode().equals("2300")) {
+            totalNumberOfEqu = numberOfCylinder;
+        } else {
+            totalNumberOfEqu = commonService.staticsCenterMapCountDataForEquip(enums.getTypeCode(), numberOfCylinder, SXCode);
+        }
+
+        return ResponseHelper.buildResponse(new JSONObject()
+                .fluentPut("numberOfProblemEqu", numberOfProblemEqu)
+                .fluentPut("totalNumberOfEqu", totalNumberOfEqu));
+    }
+}

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/TreeToListController.java

+package com.yeejoin.amos.boot.module.ys.biz.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.ys.biz.feign.PrivilegeFeginService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.*;
+import java.util.stream.Collectors;
+/**
+ * @author chang xiangyu
+ * @date 2024-09-24
+ */
+@RestController
+@Api(tags = "TreeToList")
+@RequestMapping(value = "/tree-to-list")
+public class TreeToListController extends BaseController {
+    private static final String REGULATOR_UNIT_TREE = "REGULATOR_UNIT_TREE";
+    @Autowired
+    RedisUtils redisUtils;
+    @Autowired
+    private PrivilegeFeginService privilegeFeginService;
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getTreeToList")
+    @ApiOperation(httpMethod = "GET", value = "根据当前登录人获取监管机构平铺列表数据", notes = "根据当前登录人获取监管机构平铺列表数据")
+    public ResponseModel<Object> getTreeChildList(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size) {
+        //   获取结果数据
+        ArrayList<LinkedHashMap> resultLinkedHashMapList = getResultList();
+        //   分页
+        int start = (current - 1) * size;
+        int end = Math.min(start + size, resultLinkedHashMapList.size());
+        List<LinkedHashMap> pageData = resultLinkedHashMapList.subList(start, end);
+        Page page = new Page(resultLinkedHashMapList.size(), current, (int) Math.ceil((double) resultLinkedHashMapList.size() / size), size, pageData, true);
+        return ResponseHelper.buildResponse(page);
+    }
+
+
+    /**
+     * 过滤数据
+     *
+     * @param resultList
+     * @param linkedHashMap
+     */
+    private static void clearSafeMap(ArrayList<LinkedHashMap> resultList, LinkedHashMap linkedHashMap,String regionName) {
+        LinkedHashMap<String, String> safeLinkedHashMap = new LinkedHashMap<>();
+        safeLinkedHashMap.put("companyName", (String) linkedHashMap.get("companyName"));
+        safeLinkedHashMap.put("agencyCode", (String) linkedHashMap.get("agencyCode"));
+        safeLinkedHashMap.put("companyCode", (String) linkedHashMap.get("companyCode"));
+        safeLinkedHashMap.put("sequenceNbr", (String) linkedHashMap.get("sequenceNbr"));
+        safeLinkedHashMap.put("parentId", (String) linkedHashMap.get("parentId"));
+        safeLinkedHashMap.put("regionName",regionName);
+        resultList.add(safeLinkedHashMap);
+    }
+
+
+
+    /**
+     * @return 返回最终数据对象
+     */
+    private ArrayList<LinkedHashMap> getResultList() {
+        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        if (ObjectUtils.isEmpty(reginParams)) {
+            return null;
+        }
+        Long id = reginParams.getCompany().getSequenceNbr();
+        List<LinkedHashMap> data = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE);
+        ArrayList<LinkedHashMap> result = new ArrayList<>();
+        List<LinkedHashMap> linkedHashMaps = screenData(result, data, id.toString());
+        //getFinallyResult
+        ArrayList<LinkedHashMap> resultLinkedHashMapList = mapToDeepList(linkedHashMaps);
+        return resultLinkedHashMapList;
+    }
+
+    public List<LinkedHashMap> screenData(List<LinkedHashMap> result, List<LinkedHashMap> data, String id) {
+        if (!ObjectUtils.isEmpty(result)) {
+            return result;
+        }
+        List<LinkedHashMap> list = data.stream().filter(item -> item.get("sequenceNbr").toString().equals(id)).collect(Collectors.toList());
+        if (!ObjectUtils.isEmpty(list)) {
+            return list;
+        }
+        for (LinkedHashMap item : data) {
+            if (!ObjectUtils.isEmpty(item.get("children"))) {
+                List<LinkedHashMap> children = screenData(result, (List<LinkedHashMap>) item.get("children"), id);
+                if (!ObjectUtils.isEmpty(children)) {
+                    result = children;
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 将树平铺为列表并返回
+     *
+     * @return
+     */
+    public ArrayList<LinkedHashMap> mapToDeepList(List<LinkedHashMap> linkedHashMapList) {
+        ArrayList<LinkedHashMap> resultList = new ArrayList<>();
+
+        FeignClientResult tree = privilegeFeginService.getTree();
+        //获取机构数据Map(region,regionObjectMap)对象
+        HashMap<String, HashMap> regionTreeToHashMapByRegionCode = regionTreeToHashMapByRegionCode((ArrayList<LinkedHashMap>) tree.getResult());
+
+        insertToResultList(linkedHashMapList, resultList, regionTreeToHashMapByRegionCode,"");
+        return resultList;
+
+    }
+
+
+    /**
+     * doDepth 深度优先搜索平铺linkedHashMapList并塞入,resultList
+     *
+     * @param linkedHashMapList
+     * @param resultList
+     * @return
+     */
+    public ArrayList<LinkedHashMap> insertToResultList
+    (List<LinkedHashMap> linkedHashMapList, ArrayList<LinkedHashMap> resultList, HashMap<String, HashMap> regionTreeToHashMapByRegionCode, String regionNamePrefix) {
+
+        for (LinkedHashMap linkedHashMap : linkedHashMapList) {
+            HashMap companyCodeHashMap = regionTreeToHashMapByRegionCode.get(linkedHashMap.get("companyCode"));
+            String regionNameSuffix ="";
+            if(companyCodeHashMap!=null){
+                regionNameSuffix += (String) companyCodeHashMap.get("regionName");
+            }
+
+            if (linkedHashMap.get("children") != null) {
+                clearSafeMap(resultList, linkedHashMap,regionNamePrefix+regionNameSuffix);
+                insertToResultList((ArrayList<LinkedHashMap>) linkedHashMap.get("children"), resultList, regionTreeToHashMapByRegionCode, regionNamePrefix+regionNameSuffix);
+            } else {
+                clearSafeMap(resultList, linkedHashMap,regionNamePrefix+regionNameSuffix);
+            }
+
+        }
+        return resultList;
+    }
+
+    /**
+     * 广度优先遍历将区划树平铺并加入HashMap<regionCode,regionName>
+     *
+     * @param list
+     * @return 返回区划数据HashMap<regionCode, 区划数据map>
+     */
+    public HashMap<String, HashMap> regionTreeToHashMapByRegionCode(ArrayList<LinkedHashMap> list) {
+        Queue tempQueue = new LinkedList();
+        HashMap<String, HashMap> hashMap = new HashMap();
+        for (LinkedHashMap linkedHashMap : list) {
+            tempQueue.offer(linkedHashMap);
+        }
+        while (tempQueue.size() != 0) {
+            LinkedHashMap poll = (LinkedHashMap) tempQueue.poll();
+            //过滤数据,只加入所需数据
+            HashMap<String, String> objectHashMap = new HashMap<>();
+            objectHashMap.put("sequenceNbr", (String) poll.get("sequenceNbr"));
+            objectHashMap.put("regionCode", String.valueOf(poll.get("regionCode")));
+            objectHashMap.put("regionName", (String) poll.get("regionName"));
+
+            objectHashMap.put("parentId", (String) poll.get("parentId"));
+            hashMap.put(String.valueOf(poll.get("regionCode")), objectHashMap);
+            if (poll.get("children") != null) {
+                ArrayList<LinkedHashMap> children = (ArrayList<LinkedHashMap>) poll.get("children");
+                for (LinkedHashMap child : children) {
+                    tempQueue.offer(child);
+                }
+            }
+        }
+        return hashMap;
+    }
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    class Page {
+        //总条数
+        private Integer total;
+        //当前页码
+        private Integer current;
+        //总页数
+        private Integer pages;
+        //显示条数
+        private Integer size;
+        //用来存放查询出来的数据
+        private Object records;
+        private boolean searchCount;
+
+    }
+}

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/service/CommonService.java

@@ -2,5 +2,6 @@ package com.yeejoin.amos.boot.module.ys.biz.service;
 
 public interface CommonService {
 
+    Object emergencySupportStatistics(String businessType, String componentType);
 
 }

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

 package com.yeejoin.amos.boot.module.ys.biz.service.impl;
 
+import cn.hutool.core.util.NumberUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormInstanceServiceImpl;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
+import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyPlan;
+import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyRehearsal;
+import com.yeejoin.amos.boot.module.ys.api.enums.MaintenanceExpiredEarlyWarningEnum;
 import com.yeejoin.amos.boot.module.ys.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.ys.biz.service.CommonService;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.client.core.CountRequest;
+import org.elasticsearch.client.core.CountResponse;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * 公共服务实现类
@@ -16,6 +44,52 @@ import java.util.Optional;
 public class CommonServiceImpl implements CommonService {
 
     /**
+     * 气瓶设备类别
+     */
+    public final static String EQU_CATEGORY_CYLINDER = "2300";
+
+    /**
+     * 应急保障四项统计使用 - 饼图
+     */
+    public final static String PIECHART = "pieChart";
+    /**
+     * 应急保障四项统计使用 - 饼图模板
+     */
+    public final static String PIECHART_TEMPLATE = "[{\"name\": \"%s\",\"value\": %s},{\"name\": \"其他\",\"value\": %s}]";
+    /**
+     * 应急保障四项统计使用 - 富文本
+     */
+    public final static String RICHTEXT = "richText";
+    /**
+     * 应急保障四项统计使用 - 富文本模板
+     */
+    public final static String RICHTEXT_TEMPLATE = "{\"total\": %s,\"%s\": %s}";
+
+    /**
+     * 应急保障四项统计使用 - 业务类型
+     */
+    public final static JSONObject businessTypeJSON = new JSONObject();
+    private static final Logger log = LoggerFactory.getLogger(CommonServiceImpl.class);
+
+    @Autowired
+    private RestHighLevelClient restHighLevelClient;
+
+    @Autowired
+    private DynamicFormInstanceServiceImpl dynamicFormInstanceService;
+
+    @Autowired
+    private YsEmergencyRehearsalServiceImpl ysEmergencyRehearsalService;
+
+    @Autowired
+    private YsEmergencyPlanServiceImpl ysEmergencyPlanService;
+
+    static {
+        businessTypeJSON
+                .fluentPut("education", "教育培训数").fluentPut("construct", "体系建设数")
+                .fluentPut("rehearsal", "应急演练数").fluentPut("prePlan", "应急预案数");
+    }
+
+    /**
      * 排序  ：页面列表排序功能支持，将 "字段,ascend" 或 "字段,descend" 转化为对应JSONObject
      *
      * @param sort "字段,ascend" 或 "字段,descend"
@@ -58,4 +132,134 @@ public class CommonServiceImpl implements CommonService {
         return sb.toString();
     }
 
+    /**
+     * 气瓶数量统计
+     *
+     * @param orgCode 区域code
+     * @return
+     */
+    public long staticsCenterMapCountDataForCylinder(String orgCode) {
+        long num = 0;
+        CountRequest request = new CountRequest();
+        request.indices("idx_biz_view_jg_all");
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        // 按照管辖机构区域信息模糊查询
+        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        // 设备类别精确查询气瓶
+        boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", EQU_CATEGORY_CYLINDER));
+        // 只统计已纳管设备
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        // 只统计有监管码的、状态不是草稿且不是已拒领的
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("STATUS", "草稿"));
+        boolMust.mustNot(QueryBuilders.termQuery("STATUS", "已拒领"));
+        request.query(boolMust);
+        try {
+            CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
+            num = response.getCount();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return num;
+    }
+
+    /**
+     * 八大类设备数量统计
+     *
+     * @param equTypeCode
+     * @param cylinderNum
+     * @param orgCode
+     * @return
+     */
+    public long staticsCenterMapCountDataForEquip(String equTypeCode, long cylinderNum, String orgCode) {
+        AtomicLong result = new AtomicLong(0L);
+        SearchRequest request = new SearchRequest();
+        request.indices("idx_biz_view_jg_all");
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        // 按照管辖机构区域信息模糊查询
+        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        // 只统计已纳管设备
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        // 只统计有监管码的、状态不是草稿且不是已拒领的
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("STATUS", "草稿"));
+        boolMust.mustNot(QueryBuilders.termQuery("STATUS", "已拒领"));
+        boolMust.must(QueryBuilders.termQuery("EQU_LIST_CODE", equTypeCode));
+        SearchSourceBuilder builder = new SearchSourceBuilder();
+        builder.query(boolMust);
+        // 默认size为10 ，数据库有脏数据，所以需要多查询一些
+        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE").size(20);
+        builder.aggregation(aggregationBuilder);
+        request.source(builder);
+        try {
+            SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
+            Terms terms = response.getAggregations().get("count_by_equ_list_code");
+
+            for (Terms.Bucket bucket : terms.getBuckets()) {
+                if (equTypeCode.equals(bucket.getKeyAsString())) {
+                    // 压力容器里包括气瓶，所以需要特殊处理
+                    long count = bucket.getDocCount();
+                    result.set(bucket.getKeyAsString().equals(EquipmentClassifityEnum.YLRQ.getCode())
+                            ? count - cylinderNum
+                            : count);
+                    break;
+                }
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return result.get();
+    }
+
+    /**
+     * 应急保障四项统计
+     *
+     * @param businessType  业务类型（教育培训：education、体系建设：construct、应急演练：rehearsal、应急预案：prePlan）
+     * @param componentType 组件类型（饼图：pieChart、富文本：richText）
+     * @return 模板数据
+     */
+    @Override
+    public Object emergencySupportStatistics(String businessType, String componentType) {
+        // 教育培训数
+        long educationNum = dynamicFormInstanceService.pageList(1, 1, MaintenanceExpiredEarlyWarningEnum.JYPX.getGroupCode()).getTotal();
+        // 体系建设数
+        long constructNum = dynamicFormInstanceService.pageList(1, 1, MaintenanceExpiredEarlyWarningEnum.TXJS.getGroupCode()).getTotal();
+        // 应急演练数
+        int rehearsalNum = ysEmergencyRehearsalService.getBaseMapper().selectCount(new LambdaQueryWrapper<YsEmergencyRehearsal>().eq(YsEmergencyRehearsal::getIsDelete, Boolean.FALSE));
+        // 应急预案数
+        int prePlanNum = ysEmergencyPlanService.getBaseMapper().selectCount(new LambdaQueryWrapper<YsEmergencyPlan>().eq(YsEmergencyPlan::getIsDelete, Boolean.FALSE));
+        // 四项总数
+        BigDecimal totalNum = NumberUtil.add(educationNum, constructNum, rehearsalNum, prePlanNum);
+        // 其他数量
+        BigDecimal otherNum = new BigDecimal(0);
+        // 请求类型数量
+        BigDecimal valueNum = new BigDecimal(0);
+        switch (businessType) {
+            case "education":
+                valueNum = BigDecimal.valueOf(educationNum);
+                otherNum = NumberUtil.sub(totalNum, educationNum);
+                break;
+            case "construct":
+                valueNum = BigDecimal.valueOf(constructNum);
+                otherNum = NumberUtil.sub(totalNum, constructNum);
+                break;
+            case "rehearsal":
+                valueNum = BigDecimal.valueOf(rehearsalNum);
+                otherNum = NumberUtil.sub(totalNum, rehearsalNum);
+                break;
+            case "prePlan":
+                valueNum = BigDecimal.valueOf(prePlanNum);
+                otherNum = NumberUtil.sub(totalNum, prePlanNum);
+                break;
+        }
+        if (PIECHART.equals(componentType)) {
+            // 组装 饼图 模板数据
+            return JSONArray.parseArray(String.format(PIECHART_TEMPLATE, businessTypeJSON.get(businessType).toString(), valueNum, otherNum));
+        }
+        if (RICHTEXT.equals(componentType)) {
+            // 组装 富文本 模板数据
+            return JSONObject.parseObject(String.format(RICHTEXT_TEMPLATE, totalNum, businessType, valueNum));
+        }
+        return null;
+    }
 }
\ No newline at end of file

amos-boot-system-tzs/pom.xml

@@ -76,7 +76,6 @@
         <dependency>
             <groupId>com.yeejoin</groupId>
             <artifactId>amos-component-security</artifactId>
-            <version>${amos.version.tzs}</version>
         </dependency>
         <dependency>
             <groupId>org.redisson</groupId>

pom.xml

@@ -251,7 +251,7 @@
 			<dependency>
 				<groupId>com.yeejoin</groupId>
 				<artifactId>amos-feign-workflow</artifactId>
-				<version>1.10.8</version>
+				<version>${amos.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.yeejoin</groupId>