1.新复制一个接口，设备列表，不再和监管公用

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java

@@ -7,6 +7,8 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEqui
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 import org.springframework.data.repository.query.Param;
 
+import java.util.Set;
+
 
 /**
  *  Mapper 接口
@@ -27,4 +29,10 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
    void updatePromoter(@org.apache.ibatis.annotations.Param ("id") Long id);
 
    Page<JyjcInspectionApplicationModel> selectForPage(@Param("page") Page<JyjcInspectionApplication> page,  @Param("jyjcInspectionApplicationModel") JyjcInspectionApplicationModel jyjcInspectionApplicationModel,  @Param("identity") String identity, @Param("currentApplicationUnitCode") String currentApplicationUnitCode, @Param("currentInspectionUnitCode") String currentInspectionUnitCode,@Param("currentUserId") String currentUserId);
+
+   /**
+    * 查询待受理流流程状态的设备
+    * @return Set<String>
+    */
+    Set<String> queryRecordInFlowing();
 }

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

@@ -193,6 +193,16 @@
         WHERE
             tzjia.sequence_nbr = #{sequenceNbr}
     </select>
+    <select id="queryRecordInFlowing" resultType="java.lang.String">
+        SELECT
+            DISTINCT ae.equip_unicode as records
+        FROM
+            tz_jyjc_inspection_application a,
+            tz_jyjc_inspection_application_equip ae
+        where
+            a.sequence_nbr = ae.application_seq
+            and  a.status='6611'
+    </select>
 
     <update id="updatePromoter">
         UPDATE tz_jyjc_inspection_application set promoter = null

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

@@ -206,7 +206,6 @@ public class JyjcInspectionApplicationController extends BaseController {
     }
 
     /**
-     *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -231,4 +230,12 @@ public class JyjcInspectionApplicationController extends BaseController {
         InspectionApplicationPushEvent event = new InspectionApplicationPushEvent(this, model);
         eventPublisher.publish(event);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "设备注册信息分页查询", notes = "设备注册信息分页查询")
+    @GetMapping(value = "/equip/list")
+    public ResponseModel<Page<JSONObject>> getEquipListWithOutFlowing(@RequestParam Map<String, Object> map) {
+        JSONObject jsonObject = new JSONObject(map);
+        return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForEquipmentRegisterPage(jsonObject));
+    }
 }