1.检验检测新需求开发

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcOpeningApplication.java

@@ -141,4 +141,10 @@ public class JyjcOpeningApplication extends BaseEntity {
      */
     @TableField(value = "docking_unit_code")
     private String dockingUnitCode;
+
+    /**
+     * 开通的业务类型:jc-检测；jy-检验
+     */
+    @TableField(value = "open_biz_type")
+    private String openBizType;
 }

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

+package com.yeejoin.amos.boot.module.jyjc.api.enums;
+
+import lombok.Getter;
+
+/**
+ * @author Administrator
+ */
+@Getter
+public enum OpenBizTypeEnum {
+
+    /**
+     * 业务类型
+     */
+    JY("jy","检验业务"),
+    JC("jc","检测业务");
+
+    private String code;
+
+    private String name;
+
+    private OpenBizTypeEnum(String code,String name){
+        this.code = code;
+        this.name = name;
+    }
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

@@ -132,4 +132,7 @@ public class JyjcOpeningApplicationModel extends BaseModel {
 
     @ApiModelProperty("对接单位code")
     private String dockingUnitCode;
+
+    @ApiModelProperty("开通的业务类型")
+    private String openBizType;
 }

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

@@ -6,8 +6,9 @@
     <select id="selectJyjcOpeningApplicationList"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel">
         select
-        a.*,cdd2.NAME as status_name
-        from tz_jyjc_opening_application a
+            a.*,cdd2.NAME as status_name
+        from
+            tz_jyjc_opening_application a
             LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = a.status and cdd2.type = 'JYLCSQ'
         <where>
             <if test="jyjcOpeningApplicationRequstDto.applicationSeq != '' and jyjcOpeningApplicationRequstDto.applicationSeq != null">
@@ -26,12 +27,11 @@
                 and a.apply_time &gt;=#{applyStartTime}
             </if>
             <if test="jyjcOpeningApplicationRequstDto.type == 'supervision'">
-                and a.status not in ('6610')
+                and (a.status not in ('6610') OR a.transfer_to_user_ids LIKE concat ('%', #{currentUserId}, '%' ))
             </if>
             <if test="jyjcOpeningApplicationRequstDto.unitCode != '' and jyjcOpeningApplicationRequstDto.unitCode != null">
-                and a.unit_code = #{jyjcOpeningApplicationRequstDto.unitCode}
+                and (a.unit_code = #{jyjcOpeningApplicationRequstDto.unitCode} OR a.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ) )
             </if>
-            OR (a.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ) )
 
         </where>
         order by sequence_nbr desc

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

@@ -71,7 +71,7 @@ public class InspectionOrgRefreshListener extends EmqxListener {
     @Value("${spring.application.name}")
     private String applicationName;
 
-    private static final int REPEAT_TIME = 2;
+    private static final int repeatTime = 2;
 
     @Autowired
     RedisUtils redisUtils;
@@ -100,10 +100,10 @@ public class InspectionOrgRefreshListener extends EmqxListener {
                 BizMessage bizMessage = BLOCKING_QUEUE.take();
                 // 解决前端组件在属性变化时重复发送两次问题
                 if(!redisUtils.hasKey(bizMessage.getTopic())){
-                    redisUtils.set(bizMessage.getTopic(),true, REPEAT_TIME);
+                    redisUtils.set(bizMessage.getTopic(),true, repeatTime);
                     processBizMessage(bizMessage);
                 } else {
-                    log.warn("消息在{}秒内重复，", REPEAT_TIME);
+                    log.warn("消息在{}秒内重复，", repeatTime);
                 }
             } catch (Exception e) {
                 log.error("数据处理失败", e);