Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

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

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

@@ -58,4 +58,15 @@ public class JgChangeRegistrationNameEq extends BaseEntity {
 	@TableField("create_user_name")
     private String createUserName;
 
+	/**
+     * 使用登记证id
+     */
+	@TableField("certificate_seq")
+    private String certificateSeq;
+
+    /**
+     * 使用登记证id
+     */
+    @TableField("equip_info")
+    private String equipInfo;
 }

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

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

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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
@@ -69,5 +70,9 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     List<CompanyEquipCountDto> queryForFlowingEquipList();
 
     Map<String,String> getEquTypeByUseRegSeq(@Param("sequenceNbr")String sequenceNbr);
+
     Map<String,String> getEquTypeByVehSeq(@Param("sequenceNbr")String sequenceNbr);
+
+    @Select("select name from tz_equipment_category where code=#{code}")
+    String getEquCategoryNameByCode(String code);
 }

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

@@ -7,6 +7,8 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
 import java.util.List;
 import java.util.Map;
 
@@ -34,4 +36,7 @@ public interface JgVehicleInformationMapper extends BaseMapper<JgVehicleInformat
     List<Map<String, Object>> queryForUnitVesselEquipment(@Param("sequenceNbr") Long sequenceNbr, @Param("records")List<String> records);
 
     Long countVesselCylinderIsUsedNumber(@Param("vehicleId") Long vehicleId, @Param("records") List<String> records);
+
+    @Select("select name from tz_equipment_category where code=#{code}")
+    String getEquCategoryNameByCode(String code);
 }

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

@@ -36,7 +36,9 @@
     ur.create_user_id as createUserId,
     ur.next_executor_ids as nextExecutorIds,
     ur.next_execute_user_ids as nextExecuteUserIds,
-    ur.next_task_id as nextTaskId
+    ur.next_task_id as nextTaskId,
+    (SELECT group_concat(use_registration_code) from  tzs_jg_use_registration_manage where sequence_nbr in (SELECT
+    certificate_seq	from tzs_jg_change_registration_name_eq where name_change_registration_id = ur.sequence_nbr)) as certificateCodes
     from tzs_jg_change_registration_name ur
     <where>
         and  ur.is_delete = 0

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

@@ -13,7 +13,9 @@
             tjurm.reg_type                                                      AS regType,
             DATE_FORMAT(tjurm.reg_date,'%Y-%m-%d')                              AS regDate,
             tjurm.equ_list                                                      AS equList,
+            tjurm.equ_list_code                                                 AS equListCode,
             tjurm.equ_define                                                    AS equDefine,
+            tjurm.equ_define_code                                               AS equDefineCode,
             tjurm.remark                                                        AS remark,
             tjurm.rec_user_id                                                   AS recUserId,
             DATE_FORMAT(tjurm.rec_date,'%Y-%m-%d')                              AS recDate,
@@ -25,6 +27,7 @@
             tjurm.receive_company_code                                          AS receiveCompanyCode,
             tjurm.certificate_no                                                AS certificateNo,
             tjurm.equ_category                                                  AS equCategory,
+            tjurm.equ_category_code                                             AS equCategoryCode,
             tjurm.equ_use_address                                               AS equUseAddress,
             tjurm.use_unit_address                                              AS useUnitAddress
     </sql>
@@ -38,6 +41,21 @@
             <if test="dto.useUnitCreditCode != null and dto.useUnitCreditCode != ''">
                 and tjurm.use_unit_credit_code = #{dto.useUnitCreditCode}
             </if>
+            <if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != '' ">
+                and tjurm.receive_company_code = #{dto.receiveCompanyCode}
+            </if>
+            <if test="dto.equListCode != null and dto.equListCode != ''">
+                and tjurm.equ_list_code = #{dto.equListCode}
+            </if>
+            <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
+                and tjurm.equ_category_code = #{dto.equCategoryCode}
+            </if>
+            <if test="dto.equDefineCode != null and dto.equDefineCode != ''">
+                and tjurm.equ_define_code = #{dto.equDefineCode}
+            </if>
+            <if test="dto.certificateStatus != null and dto.certificateStatus != ''">
+                and tjurm.certificate_status = #{dto.certificateStatus}
+            </if>
             ORDER BY tjurm.rec_date DESC
         </where>
     </select>
@@ -85,6 +103,9 @@
             <if test="dto.useUnitCreditCodeForSearch != null and dto.useUnitCreditCodeForSearch != ''">
                 and tjurm.use_unit_credit_code = #{dto.useUnitCreditCodeForSearch}
             </if>
+            <if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != ''">
+                and tjurm.receive_company_code = #{dto.receiveCompanyCode}
+            </if>
             -- 企业根据企业统一信用代码匹配
             <if test="dto.dataType == 'company' ">
                 AND tjurm.use_unit_credit_code = #{dto.useUnitCreditCode}

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.dto.JgChangeRegistrationNameDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationNameServiceImpl;
 import io.swagger.annotations.Api;
@@ -13,6 +14,7 @@ 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.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -95,7 +97,7 @@ public class JgChangeRegistrationNameController extends BaseController {
         jgChangeRegistrationNameService.flowExecute(Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())),
                 jgScrapCancelDto.getInstanceId(),
                 String.valueOf(map.get("operate")),
-                String.valueOf(map.get("operate")),
+                String.valueOf(map.get("remark")),
                 String.valueOf(map.get("nextTaskId")));
         return ResponseHelper.buildResponse("ok");
     }
@@ -131,6 +133,23 @@ public class JgChangeRegistrationNameController extends BaseController {
         return ResponseHelper.buildResponse(jgChangeRegistrationNameService.queryBySequenceNbr(sequenceNbr));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getTableData")
+    @ApiOperation(httpMethod = "GET", value = "获取", notes = "根据sequenceNbr查询单个详情")
+    public ResponseModel<Map<String, Object>> getTableData(JgUseRegistrationManageDto dto) {
+        if (ValidationUtil.isEmpty(dto.getUseUnitCreditCode())) {
+            // 不传的话取当前登录单位的统一信用代码
+            dto.setUseUnitCreditCode(getSelectedOrgInfo().getCompany().getCompanyCode());
+        }
+        if (!ValidationUtil.isEmpty(dto.getReceiveCompanyCode())){
+            String[] codes = dto.getReceiveCompanyCode().split("_");
+            if (!ValidationUtil.isEmpty(codes)){
+                dto.setReceiveCompanyCode(codes[0]);
+            }
+        }
+        return ResponseHelper.buildResponse(jgChangeRegistrationNameService.getTableData(dto));
+    }
+
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -2049,7 +2049,7 @@ public class CommonServiceImpl implements ICommonService {
         } catch (ParseException e) {
             log.error("日期转换失败：", e);
         }
-        String equCode = Optional.ofNullable(equType.get("equDefine")).orElse(equType.get("equCategory"));
+        String equCode = Optional.ofNullable(equType.get("equCategoryCode")).orElse(equType.get("equDefineCode"));
         String registrationCode = equCode + receiveCompanyCode + ym;
         ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
         return responseModel.getResult();

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

@@ -7,6 +7,7 @@ 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.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.util.StringUtil;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
@@ -17,9 +18,7 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 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.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
+import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper;
@@ -76,6 +75,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
@@ -137,6 +137,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     @Autowired
     AmosRequestContext amosRequestContext;
     @Autowired
+    private Sequence sequence;
+    @Autowired
     CodeUtil codeUtil;
     @Autowired
     CommonServiceImpl commonServiceImpl;
@@ -166,6 +168,14 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
     @Autowired
     private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
+    @Autowired
+    JgCertificateChangeRecordServiceImpl certificateChangeRecordService;
+
+    @Autowired
+    JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
+
+    @Autowired
+    private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
 
     /**
      * 根据sequenceNbr查询
@@ -1058,6 +1068,36 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     taskMap.put("model", taskMessageDto);
                     TaskV2Model taskV2Model1 = commonService.updateTaskModel(taskMap);
 
+                    // 生成一条tzs_jg_certificate_change_record记录
+                    JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
+                    jgCertificateChangeRecord.setApplyNo(jgInstallationNotice.getApplyNo());
+                    jgCertificateChangeRecord.setReceiveOrgName(jgInstallationNotice.getReceiveOrgName());
+                    jgCertificateChangeRecord.setAuditPassDate(new Date());
+                    jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName());
+                    jgCertificateChangeRecord.setRegDate(jgInstallationNotice.getInstallStartDate());
+                    jgCertificateChangeRecord.setChangeContent(this.buildRecordContent(jgInstallationNotice));//变更内容
+                    jgCertificateChangeRecord.setUseRegistrationCode(registrationCode);//使用登记编号
+                    jgCertificateChangeRecord.setReceiveCompanyCode(jgInstallationNotice.getReceiveCompanyOrgCode());//接收机构公司代码
+                    jgCertificateChangeRecord.setCertificateNo("");//登记证书唯一码
+                    jgCertificateChangeRecord.setUseUnitCreditCode(jgInstallationNotice.getUseUnitCreditCode());//使用单位统一信用代码
+                    jgCertificateChangeRecord.setUseUnitName(jgInstallationNotice.getUseUnitName());//使用单位名称
+                    jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
+                    jgCertificateChangeRecord.setCreateDate(new Date());
+                    jgCertificateChangeRecord.setCreateUserId(jgInstallationNotice.getCreateUserId());
+                    jgCertificateChangeRecord.setSequenceNbr(sequence.nextId());
+                    certificateChangeRecordService.save(jgCertificateChangeRecord);
+                    // 查询设备制造信息
+                    LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
+                    factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId());
+                    IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoService.getOne(factoryInfoWrapper);
+
+                    // 生成tzs_jg_certificate_change_record_eq记录
+                    JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
+                    changeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());//登记证记录主键
+                    changeRecordEq.setEquId(jgRelationEquip.getEquId());//设备主键
+                    changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
+                    certificateChangeRecordEqService.save(changeRecordEq);
+
                     jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
                             .applyNo(jgInstallationNotice.getApplyNo())
                             .businessType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName())
@@ -1180,6 +1220,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
     }
 
+    private String buildRecordContent(JgInstallationNotice obj) {
+        //张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+        return obj.getCreateUserName() + "办理了【"+BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName()+"】，单号【"
+                + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getCreateDate());
+    }
 
     /**
      * 系统类型的code 自动生成设备代码

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

@@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
+import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService;
@@ -18,6 +15,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
@@ -38,7 +36,9 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -75,6 +75,9 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     @Autowired
     private JgVehicleInformationEqMapper jgVehicleInformationEqMapper;
 
+    @Autowired
+    private JgCertificateChangeRecordServiceImpl jgCertificateChangeRecordService;
+
     /**
      * 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中
      */
@@ -84,8 +87,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
 
         // 使用登记表中已经审批通过的单子
         List<JgUseRegistration> jgUseRegistrations = jgUseRegistrationMapper.selectList(new LambdaQueryWrapper<JgUseRegistration>()
-                .eq(JgUseRegistration::getStatus, "已完成"));
+                .eq(JgUseRegistration::getStatus, "已完成")
+                .eq(JgUseRegistration::getIsDelete, false));
         for (JgUseRegistration useRegistration : jgUseRegistrations) {
+            // 使用单位信息
+            Map<String, Object> enterpriseInfo = commonServiceImpl.getEnterpriseInfo(useRegistration.getUseUnitCreditCode());
             // 设备使用地址
             String fullAddress = "";
             // 设备种类/类别/品种
@@ -136,6 +142,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             jgUseRegistrationManage.setCreateUserId(useRegistration.getCreateUserId());
             jgUseRegistrationManage.setCreateDate(useRegistration.getRecDate());
             jgUseRegistrationManage.setEquUseAddress(fullAddress);
+            jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
             jgUseRegistrationManage.setUseRegistrationCode(useRegistration.getUseRegistrationCode());
             jgUseRegistrationManage.setUseUnitCreditCode(useRegistration.getUseUnitCreditCode());
             jgUseRegistrationManage.setReceiveCompanyCode(useRegistration.getReceiveCompanyCode());
@@ -146,8 +153,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
 
         // 车用气瓶使用登记表中已经审批通过的单子
         List<JgVehicleInformation> jgVehicleInformations = jgVehicleInformationMapper.selectList(new LambdaQueryWrapper<JgVehicleInformation>()
-                .eq(JgVehicleInformation::getStatus, "已完成"));
+                .eq(JgVehicleInformation::getStatus, "已完成")
+                .eq(JgVehicleInformation::getIsDelete, false));
         for (JgVehicleInformation vehicleInformation : jgVehicleInformations) {
+            // 使用单位信息
+            Map<String, Object> enterpriseInfo = commonServiceImpl.getEnterpriseInfo(vehicleInformation.getUseUnitCreditCode());
             // 设备种类/类别/品种
             Map<String, String> equType = jgUseRegistrationMapper.getEquTypeByVehSeq(String.valueOf(vehicleInformation.getSequenceNbr()));
             // 组装数据
@@ -172,13 +182,13 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             jgUseRegistrationManage.setCreateUserId(vehicleInformation.getCreateUserId());
             jgUseRegistrationManage.setCreateDate(vehicleInformation.getRecDate());
             jgUseRegistrationManage.setEquUseAddress("");
+            jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
             jgUseRegistrationManage.setUseRegistrationCode(vehicleInformation.getUseRegistrationCode());
             jgUseRegistrationManage.setUseUnitCreditCode(vehicleInformation.getUseUnitCreditCode());
             jgUseRegistrationManage.setReceiveCompanyCode(vehicleInformation.getReceiveCompanyCode());
             jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType,vehicleInformation.getAuditPassDate(),vehicleInformation.getReceiveCompanyCode()));
             this.baseMapper.insert(jgUseRegistrationManage);
         }
-
         return Boolean.TRUE;
     }
 
@@ -194,6 +204,46 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     }
 
     /**
+     * 根据sequenceNbr查询---使用登记证详情用
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    public JgUseRegistrationManage queryDetailBySeq(String sequenceNbr) {
+        return this.baseMapper.selectById(sequenceNbr);
+    }
+
+    /**
+     * 根据sequenceNbr查询使用登记证 操作流水---使用登记证详情用
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    public List<Map<String, String>> operationRecord(String sequenceNbr) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        JgUseRegistrationManage jgUseRegistrationManage = this.baseMapper.selectById(sequenceNbr);
+        List<JgCertificateChangeRecord> changeRecordList = jgCertificateChangeRecordService.list(new LambdaQueryWrapper<JgCertificateChangeRecord>()
+                .eq(JgCertificateChangeRecord::getUseRegistrationCode, jgUseRegistrationManage.getUseRegistrationCode()));
+        return changeRecordList.stream()
+                .map(x -> {
+                    Map<String, String> map = new HashMap<>();
+                    map.put("operatingTime", simpleDateFormat.format(x.getRecDate()));
+                    map.put("content", x.getChangeContent());
+                    return map;
+                }).collect(Collectors.toList());
+    }
+
+    /**
+     * 根据sequenceNbr查询使用登记证对应设备列表---使用登记证详情用
+     * 分页接口
+     * @param sequenceNbr 主键
+     * @return
+     */
+    public Page<JSONObject> certificateEquList(int current,int size,String sequenceNbr) {
+        return queryEquForPageByCertificateSeqList(Collections.singletonList(Long.parseLong(sequenceNbr)), current, size);
+    }
+
+    /**
      * 列表查询
      */
     public List<JgUseRegistrationManageDto> queryByUseUnitCreditCode(JgUseRegistrationManageDto dto) {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/common/CommonConstants.java

@@ -15,4 +15,10 @@ public class CommonConstants {
     public static final String OPEN_APPLICATION_SEQ_KEY = "OPEN_APPLICATION_SEQ";
 
     public static final String APPLICATION_SEQ_PREFIX = "JY";
+
+    /**
+     * 无默认机构时字符串-规则必须
+     */
+    public static final String NONE_DEFAULT_CODE = "none";
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/JYJCTypeEnum.java

@@ -2,6 +2,11 @@ package com.yeejoin.amos.boot.module.jyjc.api.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author LiuLin
@@ -14,16 +19,18 @@ public enum JYJCTypeEnum {
     /**
      * 检验检测类型
      */
-    DTJC("DTJC", "电梯检测","jc"),
-    DQJY("DQJY", "定期检验", "jy"),
-    SCJY("SCJY", "首次检验", "jy"),
-    WXJDJY("WXJDJY", "维修监督检验", "jy"),
-    GZJDJY("GZJDJY", "改造监督检验", "jy"),
-    AZJDJY("AZJDJY", "安装监督检验", "jy");
+    DTJC("DTJC", "电梯检测", "jc", BizTypeEnum.DETECTION.getCode()),
+    DQJY("DQJY", "定期检验", "jy", BizTypeEnum.FIRST_INSPECTION.getCode()),
+    SCJY("SCJY", "首次检验", "jy", BizTypeEnum.FIRST_INSPECTION.getCode()),
+    WXJDJY("WXJDJY", "维修监督检验", "jy", BizTypeEnum.SUPERVISE.getCode()),
+    GZJDJY("GZJDJY", "改造监督检验", "jy", BizTypeEnum.SUPERVISE.getCode()),
+    AZJDJY("AZJDJY", "安装监督检验", "jy", BizTypeEnum.SUPERVISE.getCode());
 
     private final String code;
     private final String name;
 
+    private final String openBizType;
+
     private final String bizType;
 
     public static JYJCTypeEnum of(String code) {
@@ -34,4 +41,11 @@ public enum JYJCTypeEnum {
         }
         return null;
     }
+
+    public static List<JYJCTypeEnum> getListByBizType(String bizType) {
+        if (StringUtils.isEmpty(bizType)) {
+            return Arrays.asList(JYJCTypeEnum.values());
+        }
+        return Arrays.stream(JYJCTypeEnum.values()).filter(e -> e.getBizType().equals(bizType)).collect(Collectors.toList());
+    }
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -80,8 +80,8 @@
             <if test="jyjcInspectionApplicationModel.applicationNo != null and jyjcInspectionApplicationModel.applicationNo != ''">
                 and tzjia.application_no like concat('%',#{jyjcInspectionApplicationModel.applicationNo},'%')
             </if>
-            <if test="jyjcInspectionApplicationModel.inspectionClassify != null and jyjcInspectionApplicationModel.inspectionClassify != ''">
-                and tzjia.inspection_classify = #{jyjcInspectionApplicationModel.inspectionClassify}
+            <if test="jyjcInspectionApplicationModel.inspectionType != null and jyjcInspectionApplicationModel.inspectionType != ''">
+                and tzjia.inspection_type = #{jyjcInspectionApplicationModel.inspectionType}
             </if>
 
             <if test="jyjcInspectionApplicationModel.equipClassify != null and jyjcInspectionApplicationModel.equipClassify != ''">
@@ -107,10 +107,10 @@
             </if>
 
             <if test="jyjcInspectionApplicationModel.inspectionUnitName != null and jyjcInspectionApplicationModel.inspectionUnitName != ''">
-                and tzjia.inspection_unit_name like concat('%',#{jyjcInspectionApplicationModel.inspectionUnitName},'%'))
+                and tzjia.inspection_unit_name like concat('%',#{jyjcInspectionApplicationModel.inspectionUnitName},'%')
             </if>
             <if test="jyjcInspectionApplicationModel.applicationUnitName != null and jyjcInspectionApplicationModel.applicationUnitName != ''">
-                and tzjia.application_unit_name like concat('%',#{jyjcInspectionApplicationModel.applicationUnitName},'%'))
+                and tzjia.application_unit_name like concat('%',#{jyjcInspectionApplicationModel.applicationUnitName},'%')
             </if>
             <if test="jyjcInspectionApplicationModel.inspectionUnitCode != null and jyjcInspectionApplicationModel.inspectionUnitCode != ''">
                 and tzjia.inspection_unit_code = #{jyjcInspectionApplicationModel.inspectionUnitCode} and tzjia.status != '6610'

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -113,38 +113,32 @@
             <if test="jyjcInspectionResultModel.applicationNo != '' and jyjcInspectionResultModel.applicationNo != null">
                 and res.application_no like concat('%',#{jyjcInspectionResultModel.applicationNo},'%')
             </if>
-            <if test="jyjcInspectionResultModel.applicationUnitCode != '' and jyjcInspectionResultModel.applicationUnitCode != null">
-                and res.application_unit_code = #{jyjcInspectionResultModel.applicationUnitCode}
-            </if>
-            <if test="jyjcInspectionResultModel.useOrgCode != '' and jyjcInspectionResultModel.useOrgCode != null">
-                and ibjri.use_org_code like concat('%',#{jyjcInspectionResultModel.useOrgCode},'%')
-            </if>
-            <if test="jyjcInspectionResultModel.useInnerCode != '' and jyjcInspectionResultModel.useInnerCode != null">
-                and ibjui.use_inner_code like concat('%',#{jyjcInspectionResultModel.useInnerCode},'%')
+            <if test="jyjcInspectionResultModel.applicationDate!=null">
+                AND res.application_date = #{jyjcInspectionResultModel.applicationDate}
             </if>
-            <if test="jyjcInspectionResultModel.equCode != '' and jyjcInspectionResultModel.equCode != null">
-                and ibjri.equ_code like concat('%',#{jyjcInspectionResultModel.equCode},'%')
+            <if test="jyjcInspectionResultModel.inspectionType != '' and jyjcInspectionResultModel.inspectionType != null">
+                and res.inspection_type = #{jyjcInspectionResultModel.inspectionType}
             </if>
-            <if test="jyjcInspectionResultModel.equipUnicode != '' and jyjcInspectionResultModel.equipUnicode != null">
-                and res.equip_unicode like concat('%',#{jyjcInspectionResultModel.equipUnicode},'%')
+            <if test="jyjcInspectionResultModel.applicationUnitName != '' and jyjcInspectionResultModel.applicationUnitName != null">
+                and res.application_unit_name like concat('%',#{jyjcInspectionResultModel.applicationUnitName},'%')
             </if>
             <if test="jyjcInspectionResultModel.equList != '' and jyjcInspectionResultModel.equList != null">
                 and ibjri.equ_list = #{jyjcInspectionResultModel.equList}
             </if>
-            <if test="jyjcInspectionResultModel.inspectionType != '' and jyjcInspectionResultModel.inspectionType != null">
-                and res.inspection_type = #{jyjcInspectionResultModel.inspectionType}
+            <if test="jyjcInspectionResultModel.supervisoryCode != '' and jyjcInspectionResultModel.supervisoryCode != null">
+                and res.supervisory_code like concat('%',#{jyjcInspectionResultModel.supervisoryCode},'%')
             </if>
-            <if test="jyjcInspectionResultModel.applicationDate!=null">
-                AND res.application_date = #{jyjcInspectionResultModel.applicationDate}
+            <if test="jyjcInspectionResultModel.equCode != '' and jyjcInspectionResultModel.equCode != null">
+                and ibjri.equ_code like concat('%',#{jyjcInspectionResultModel.equCode},'%')
             </if>
-            <if test="jyjcInspectionResultModel.useUnitCreditCode != '' and jyjcInspectionResultModel.useUnitCreditCode != null">
-                and ibjui.use_unit_credit_code like concat('%',#{jyjcInspectionResultModel.useUnitCreditCode},'%')
+            <if test="jyjcInspectionResultModel.useOrgCode != '' and jyjcInspectionResultModel.useOrgCode != null">
+                and ibjri.use_org_code like concat('%',#{jyjcInspectionResultModel.useOrgCode},'%')
             </if>
-            <if test="jyjcInspectionResultModel.inspectionUnitCode != '' and jyjcInspectionResultModel.inspectionUnitCode != null">
-                and res.inspection_unit_code = #{jyjcInspectionResultModel.inspectionUnitCode}
+            <if test="jyjcInspectionResultModel.useInnerCode != '' and jyjcInspectionResultModel.useInnerCode != null">
+                and ibjui.use_inner_code like concat('%',#{jyjcInspectionResultModel.useInnerCode},'%')
             </if>
-            <if test="jyjcInspectionResultModel.applicationUnitName != '' and jyjcInspectionResultModel.applicationUnitName != null">
-                and bei1.use_unit like concat('%',#{jyjcInspectionResultModel.applicationUnitName},'%')
+            <if test="jyjcInspectionResultModel.inspectionUnitName != '' and jyjcInspectionResultModel.inspectionUnitName != null">
+                and res.inspection_unit_name like concat('%',#{jyjcInspectionResultModel.inspectionUnitName},'%')
             </if>
             <choose>
                 <when test="identity == 'apply'">

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/action/RuleActionHandler.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jyjc.biz.action;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jyjc.api.common.CommonConstants;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationNoAcceptLog;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.InspectionCompanyType;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.LicenceTypeEnum;
@@ -54,12 +55,13 @@ public class RuleActionHandler {
     public RuleActionHandler(TzBaseUnitLicenceMapper baseUnitLicenceMapper,
                              TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper,
                              RedissonClient redissonClient, RedisUtils redisUtils,
-                             RuleCommonServiceImpl ruleCommonService) {
+                             RuleCommonServiceImpl ruleCommonService, JyjcInspectionApplicationNoAcceptLogServiceImpl noAcceptLogService) {
         this.baseUnitLicenceMapper = baseUnitLicenceMapper;
         this.tzBaseEnterpriseInfoMapper = tzBaseEnterpriseInfoMapper;
         this.redissonClient = redissonClient;
         this.redisUtils = redisUtils;
         this.ruleCommonService = ruleCommonService;
+        this.noAcceptLogService = noAcceptLogService;
     }
 
     /**
@@ -158,22 +160,20 @@ public class RuleActionHandler {
 
     private List<TzBaseEnterpriseInfoDto> getInspectionUnitListForNoAccept2(List<TzBaseUnitLicence> unitLicenceList, Boolean isMatchArea, InspectionEquipInfo inspectionEquipInfo, String openBizType, String defaultInspectionCode, String legalInspectionCodes, String inspectionCompanyType, Boolean isCanNoAccept) {
         List<TzBaseEnterpriseInfoDto> matchEnterpriseInfos = new ArrayList<>();
-        if(inspectionCompanyType.equals(InspectionCompanyType.ALL.getCode())){
+        if (inspectionCompanyType.equals(InspectionCompanyType.ALL.getCode())) {
             // 是否进行属地过滤
             String areaCode = isMatchArea ? inspectionEquipInfo.getAreaCode() : "";
             // 所有符合资质的单位code
             Set<String> unitCodes = unitLicenceList.stream().map(TzBaseUnitLicence::getUnitCode).collect(Collectors.toSet());
-            // 1.按照资质 + 开通区域，进行单位的筛选
+            // 按照资质 + 开通区域，进行单位的筛选
             if (unitCodes.size() > 0) {
                 matchEnterpriseInfos = tzBaseEnterpriseInfoMapper.getInspectionUnitListByCode(new ArrayList<>(unitCodes), areaCode, openBizType);
                 // 返回下一步是否可不予返回，供下一节点审核时显示判断是否显示不予受理按钮，在提交时数据会写入到主表：true-必须处理，false-可不予受理
                 this.setIsCanNoAccept(matchEnterpriseInfos, isCanNoAccept);
             }
-            // 2.去掉已经不予受理的机构
-            List<String> unitCodesList = getNoAcceptHistoryUnit(inspectionEquipInfo);
-            matchEnterpriseInfos = matchEnterpriseInfos.stream().filter(u-> !unitCodesList.contains(u.getUseCode())).collect(Collectors.toList());
-            // 3.未空时显示默认机构(兜底机构)，只匹配开通的业务类型（检验还是检测）且不匹配开通区域且不可不予受理操作
-            if(matchEnterpriseInfos.isEmpty()){
+            // 未空时显示默认机构(兜底机构)，只匹配开通的业务类型（检验还是检测）且不匹配开通区域且不可不予受理操作, 预留功能
+            if (matchEnterpriseInfos.isEmpty() && StringUtils.isNotEmpty(defaultInspectionCode) && !defaultInspectionCode.equals(CommonConstants.NONE_DEFAULT_CODE)) {
+                log.info("将匹配兜底机构:{}", defaultInspectionCode);
                 matchEnterpriseInfos = tzBaseEnterpriseInfoMapper.getInspectionUnitListByCode(new ArrayList<>(Arrays.asList(defaultInspectionCode.split(","))), "", openBizType);
                 // 返回下一步是否可不予返回，供下一节点审核时显示判断是否显示不予受理按钮，在提交时数据会写入到主表：true-必须处理，false-可不予受理
                 this.setIsCanNoAccept(matchEnterpriseInfos, true);
@@ -231,14 +231,15 @@ public class RuleActionHandler {
 
     private List<TzBaseEnterpriseInfoDto> getInspectionUnitListForFirstCommit2(List<TzBaseUnitLicence> unitLicenceList, Boolean isMatchArea, InspectionEquipInfo inspectionEquipInfo, String openBizType, String defaultInspectionCode, String legalInspectionCodes, Boolean isMustAccept, String inspectionCompanyType) {
         List<TzBaseEnterpriseInfoDto> matchEnterpriseInfos = new ArrayList<>();
-        if(inspectionCompanyType.equals(InspectionCompanyType.ALL.getCode())){
+        if (inspectionCompanyType.equals(InspectionCompanyType.ALL.getCode())) {
             matchEnterpriseInfos = getInspectionUnitListForAll(unitLicenceList, isMatchArea, inspectionEquipInfo, openBizType, defaultInspectionCode, legalInspectionCodes, isMustAccept);
-        }if(inspectionCompanyType.equals(InspectionCompanyType.LEGAL.getCode())){
+        }
+        if (inspectionCompanyType.equals(InspectionCompanyType.LEGAL.getCode())) {
             // 目前未使用到可替换 firstInspectionOrgMatchAction 业务
             matchEnterpriseInfos = getInspectionUnitListForLegal(unitLicenceList, isMatchArea, inspectionEquipInfo, openBizType, defaultInspectionCode, legalInspectionCodes, isMustAccept);
-        } else if(inspectionCompanyType.equals(InspectionCompanyType.THIRD.getCode())){
+        } else if (inspectionCompanyType.equals(InspectionCompanyType.THIRD.getCode())) {
             // TODO 待实现
-            log.warn("{}类型:未实现",InspectionCompanyType.THIRD.getName());
+            log.warn("{}类型:未实现", InspectionCompanyType.THIRD.getName());
         }
         return matchEnterpriseInfos;
     }
@@ -275,9 +276,12 @@ public class RuleActionHandler {
         String areaCode = isMatchArea ? inspectionEquipInfo.getAreaCode() : "";
         // 所有符合单位的code
         Set<String> unitCodes = unitLicenceList.stream().map(TzBaseUnitLicence::getUnitCode).collect(Collectors.toSet());
-        List<TzBaseEnterpriseInfoDto> matchEnterpriseInfos = tzBaseEnterpriseInfoMapper.getInspectionUnitListByCode(new ArrayList<>(unitCodes), areaCode, openBizType);
+        List<TzBaseEnterpriseInfoDto> matchEnterpriseInfos = new ArrayList<>();
+        if (unitCodes.size() > 0) {
+            matchEnterpriseInfos = tzBaseEnterpriseInfoMapper.getInspectionUnitListByCode(new ArrayList<>(unitCodes), areaCode, openBizType);
             // 返回下一步是否可不予返回，供下一节点审核时显示判断是否显示不予受理按钮，在提交时数据会写入到主表：true-必须处理，false-可不予受理
             this.setIsCanNoAccept(matchEnterpriseInfos, isCanNoAccept);
+        }
         return matchEnterpriseInfos;
     }
 
@@ -357,6 +361,5 @@ public class RuleActionHandler {
     }
 
 
-
 }
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.module.jyjc.biz.event.InspectionApplicationPushEven
 import com.yeejoin.amos.boot.module.jyjc.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -274,4 +275,11 @@ public class JyjcInspectionApplicationController extends BaseController {
     public ResponseModel<List<TzBaseEnterpriseInfoDto>> getInspectionUnitListForWorkbench(@RequestParam String openBizType) {
         return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.getInspectionUnitListForWorkbench(openBizType));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "检验类型-按照业务查询", notes = "检验类型-按照业务查询")
+    @GetMapping(value = "/{bizType}/inspectType/list")
+    public ResponseModel<List<DictionarieModel>> inspectTypeListByBizType(@PathVariable String bizType){
+        return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.inspectTypeListByBizType(bizType));
+    }
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionResultController.java

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultDataModel;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionResultServiceImpl;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -187,4 +188,11 @@ public class JyjcInspectionResultController extends BaseController {
     public ResponseModel<List<JyjcInspectionResultDataModel>> saveResultDataBatch(@RequestBody List<JyjcInspectionResultDataModel> resultDataModels){
         return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.receivePushResultData(resultDataModels));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "检验类型-按照身份查询", notes = "\"检验类型-按照身份查询")
+    @GetMapping(value = "/inspectType/list")
+    public ResponseModel<List<DictionarieModel>> inspectTypeListByPerson(){
+        return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.inspectTypeListByPerson(getSelectedOrgInfo()));
+    }
 }

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

@@ -86,7 +86,7 @@ public class DisableRuleDataPreparationListener implements ApplicationListener<I
     private String getBizTypeByInspectionType(String inspectionType) {
         JYJCTypeEnum jyjcTypeEnum = JYJCTypeEnum.of(inspectionType);
         if (jyjcTypeEnum != null) {
-            return jyjcTypeEnum.getBizType();
+            return jyjcTypeEnum.getOpenBizType();
         }
         return OpenBizTypeEnum.JY.getCode();
     }

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

@@ -40,9 +40,6 @@ public class TouchRuleEventListener implements ApplicationListener<TouchRuleEven
     }
 
     private void touchRuleWithApi(InspectionEquipInfo inspectionEquipInfo) {
-        if (log.isInfoEnabled()) {
-            log.info("发送规则的消息对象:{}", toJSONString(inspectionEquipInfo));
-        }
         try {
             RequestContext.setToken(amosRequestContext.getToken());
             RequestContext.setAppKey(amosRequestContext.getAppKey());

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/job/OpenApplicationTimingDiscardJob.java

@@ -39,7 +39,7 @@ public class OpenApplicationTimingDiscardJob {
 
         if (CollectionUtils.isNotEmpty(longs)) {
             for (Long aLong : longs) {
-                String remark = "到期作废";
+                String remark = "许可到期，系统自动作废";
                 jyjcOpeningApplicationServiceImpl.doDiscard(aLong, remark);
 
             }

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

@@ -16,7 +16,9 @@ import com.yeejoin.amos.boot.module.jyjc.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultParam;
+import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.EquipCategoryEnum;
+import com.yeejoin.amos.boot.module.jyjc.api.enums.JYJCTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.ResultStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionResultMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultDataModel;
@@ -33,6 +35,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieModel;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -187,6 +190,16 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         return "no";
     }
 
+    static String getPersonIdentityByType(String companyType) {
+        if ("使用单位".equals(companyType)) {
+            return BizTypeEnum.FIRST_INSPECTION.getCode();
+        } else if ("安装改造维修单位".equals(companyType)) {
+            return BizTypeEnum.SUPERVISE.getCode();
+        } else {
+            return "";
+        }
+    }
+
 
     @Transactional(rollbackFor = Exception.class)
     public JyjcInspectionResultModel updateJyjcInspectionResult(Map<String, Map<String, Object>> tableModel) {
@@ -291,7 +304,8 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         info.setInspectStaffCode(model.getInspector());
         info.setInspectReport(jybgFile.getAttachmentUrl());
         info.setInspectConclusion(model.getInspectionConclusion());
-        info.setProblemRemark(model.getNonConformance());
+        // json字段暂时注释
+//        info.setProblemRemark(model.getNonConformance());
         info.setNextInspectDate(model.getNextInspectionDate());
         info.setSequenceCode(model.getEquipUnicode());
         info.setInspectOrgCode(model.getInspectionUnitCode());
@@ -408,11 +422,11 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     private void deleteAndCreateSubTable(Map<String, JyjcInspectionResult> resultListMap, List<JyjcInspectionResultAttachment> resultAttachments, List<JyjcInspectionResultParam> resultParams) {
         List<JyjcInspectionResult> resultList = new ArrayList<>(resultListMap.values());
         List<Long> resultIds = resultList.stream().map(BaseEntity::getSequenceNbr).collect(Collectors.toList());
-        if(resultAttachments.size() > 0){
-            attachmentService.remove(new LambdaQueryWrapper<JyjcInspectionResultAttachment>().in(JyjcInspectionResultAttachment::getResultSeq,resultIds));
+        if (resultAttachments.size() > 0) {
+            attachmentService.remove(new LambdaQueryWrapper<JyjcInspectionResultAttachment>().in(JyjcInspectionResultAttachment::getResultSeq, resultIds));
             attachmentService.saveBatch(resultAttachments);
         }
-        if(resultParams.size() >0){
+        if (resultParams.size() > 0) {
             resultParamService.remove(new LambdaQueryWrapper<JyjcInspectionResultParam>().in(JyjcInspectionResultParam::getResultSeq, resultIds));
             resultParamService.saveBatch(resultParams);
         }
@@ -469,7 +483,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     }
 
     private String getUserSeqByPersonCode(String innerPersonCode) {
-        if(StrUtil.isNotEmpty(innerPersonCode)){
+        if (StrUtil.isNotEmpty(innerPersonCode)) {
             List<TzsUserInfo> tzsUserInfos = tzsUserInfoMapper.selectList(new LambdaQueryWrapper<TzsUserInfo>().in(TzsUserInfo::getInnerPersonCode, Arrays.asList(innerPersonCode.split(","))));
             return tzsUserInfos.stream().map(u -> u.getSequenceNbr() + "").collect(Collectors.joining(","));
         }
@@ -484,6 +498,11 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         wrapper.in(JyjcInspectionResult::getApplicationNo, applicationNos);
         wrapper.in(JyjcInspectionResult::getSupervisoryCode, supervisoryCodes);
         List<JyjcInspectionResult> resultList = this.list(wrapper);
-        return resultList.stream().collect(Collectors.toMap((c)-> c.getApplicationNo() + ":" + c.getSupervisoryCode(), Function.identity()));
+        return resultList.stream().collect(Collectors.toMap((c) -> c.getApplicationNo() + ":" + c.getSupervisoryCode(), Function.identity()));
+    }
+
+    public List<DictionarieModel> inspectTypeListByPerson(ReginParams selectedOrgInfo) {
+        String group = getPersonIdentityByType(selectedOrgInfo.getCompany().getCompanyType());
+        return JyjcInspectionApplicationServiceImpl.getDictionarieModels(group);
     }
 }
\ No newline at end of file

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

@@ -316,7 +316,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         LambdaUpdateWrapper<JyjcOpeningApplication> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_DISCARD.getCode())
                 .set(JyjcOpeningApplication::getStatusName, FlowStatusEnum.TO_BE_DISCARD.getName())
-                .set(JyjcOpeningApplication::getRemark, "到期作废")
+                .set(JyjcOpeningApplication::getRemark, "新开通申请生效，原有开通申请自动作废")
                 .in(org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity::getSequenceNbr, ids);
         this.update(updateWrapper);
     }
@@ -453,18 +453,21 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     }
 
     private void setBaseUnitLicences(String unitCode, JyjcOpeningApplicationModel jyjcOpeningApplicationModel, boolean isNeedFilter) {
-        List<BaseUnitLicence> baseUnitLicences = baseUnitLicenceMapper.selectList(new LambdaQueryWrapper<BaseUnitLicence>().eq(BaseUnitLicence::getUnitCode, unitCode).in(BaseUnitLicence::getCertTypeCode, Arrays.asList(jyCertTypeCode, jcCertTypeCode)));
-        List<TzBaseUnitLicenceDto> baseUnitLicencesDtos = baseUnitLicences.stream().map(l -> {
+        List<BaseUnitLicence> baseUnitLicences = baseUnitLicenceMapper.selectList(new LambdaQueryWrapper<BaseUnitLicence>()
+                .eq(BaseUnitLicence::getUnitCode, unitCode)
+                .gt(BaseUnitLicence::getExpiryDate , new Date())
+                .in(BaseUnitLicence::getCertTypeCode, Arrays.asList(jyCertTypeCode, jcCertTypeCode)));
+        List<TzBaseUnitLicenceDto> licences = baseUnitLicences.stream().map(l -> {
             TzBaseUnitLicenceDto licenceDto = new TzBaseUnitLicenceDto();
             BeanUtil.copyProperties(l, licenceDto);
             licenceDto.setCertTypeCode(this.castCode2Str(l.getCertTypeCode()));
             return licenceDto;
         }).collect(Collectors.toList());
         if (isNeedFilter) {
-            baseUnitLicencesDtos = baseUnitLicencesDtos.stream().filter(u -> u.getCertTypeCode().equals(jyjcOpeningApplicationModel.getOpenBizType())).collect(Collectors.toList());
-            jyjcOpeningApplicationModel.setBaseUnitLicences(baseUnitLicencesDtos);
+            licences = licences.stream().filter(u -> u.getCertTypeCode().equals(jyjcOpeningApplicationModel.getOpenBizType())).collect(Collectors.toList());
+            jyjcOpeningApplicationModel.setBaseUnitLicences(licences);
         } else {
-            jyjcOpeningApplicationModel.setBaseUnitLicences(baseUnitLicencesDtos);
+            jyjcOpeningApplicationModel.setBaseUnitLicences(licences);
         }
     }
 
@@ -486,6 +489,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         LambdaQueryWrapper<TzsUserInfo> userInfoQueryWrapper = new LambdaQueryWrapper<>();
         userInfoQueryWrapper.eq(TzsUserInfo::getUnitCode, unitCode);
         userInfoQueryWrapper.eq(BaseEntity::getIsDelete, false);
+        this.castPersonType2Post(userInfoQueryWrapper, openBizType);
         List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
         if (!ValidationUtil.isEmpty(userInfos)) {
             List<TzsUserInfoVo> tzsUserInfoVos = userInfos.stream().map(userInfo -> {
@@ -674,6 +678,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 taskParams.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
                 taskParams.put("model", jyjcOpeningApplication);
                 taskModelService.updateTaskModel(taskParams);
+                List<String> detectionRegion = (List<String>)params.get("detectionRegion");
+                jyjcOpeningApplication.setDetectionRegion(detectionRegion);
                 jyjcOpeningApplication.setPromoter("");
                 jyjcOpeningApplication.setNextTaskId("");
                 jyjcOpeningApplication.setNextExecuteUserIds("");

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application-dev.properties

@@ -68,3 +68,5 @@ inspection.rule.enabled.AZJDJY=true
 inspection.rule.enabled.GZJDJY=true
 #维修监督检验是否启用规则：true-启用，false-不启用
 inspection.rule.enabled.WXJDJY=true
+#电梯检测是否启用规则：true-启用，false-不启用
+inspection.rule.enabled.DTJC=true
\ No newline at end of file