1.非工业管道定期检验增加约束：装置下所有管道都完成检验信息录入后才能定检

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/OpenapiApplication.java

@@ -77,9 +77,4 @@ public class OpenapiApplication {
 				+ "Application Amos-Biz-Boot is running! Access URLs:\n\t" + "Swagger文档: \thttp://" + ip + ":" + port
 				+ path + "/doc.html\n" + "----------------------------------------------------------");
 	}
-
-	@Bean
-	public void init() {
-		startPlatformTokenService.getToken();
-	}
 }

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

@@ -184,36 +184,49 @@
     </select>
     <select id="queryJgProjectContraptionPage"
             resultType="com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption">
-         select
-             *
-         from
-             idx_biz_jg_project_contraption pc
-         where
-             1=1
-             <choose>
-                 <when test="inspectionType == 'AZJDJY'">
-                     and pc.usc_unit_credit_code=#{companyCode}
-                     and pc.is_into_management = true
-                     and (pc.use_registration_code is null or pc.use_registration_code  = '' )
-                 </when>
-                <otherwise>
-                    <choose>
-                        <when test="equCategory == '8300'">
-                            and pc.use_unit_credit_code=#{companyCode}
-                            and pc.is_into_management = true
-                            and pc.use_registration_code <![CDATA[<>]]> ''
-                        </when>
-                        <otherwise>
-                            and pc.use_unit_credit_code=#{companyCode}
-                            and pc.is_into_management = true
-                            and exists (select 1 from idx_biz_jg_use_info ibjui, idx_biz_jg_inspection_detection_info di where ibjui."RECORD" = di."RECORD" and ibjui.project_contraption_id=pc.sequence_nbr and  di."INSPECT_TYPE" <![CDATA[<>]]> '' )
-                        </otherwise>
-                    </choose>
-                </otherwise>
-             </choose>
-             and not EXISTS (SELECt 1 FROM tz_jyjc_inspection_application a where a.status='6611' and a.application_unit_code=#{companyCode} and a.project_contraption_id = pc.sequence_nbr)
-             and (pc.project_contraption_parent_id is null or pc.project_contraption_parent_id = '')
-             and pc.equ_category = #{equCategory}
+        select
+            *
+        from
+        (
+            select
+               pc.*,
+              (select count(distinct ibjui.record) from idx_biz_jg_use_info ibjui, idx_biz_jg_inspection_detection_info di where ibjui."RECORD" = di."RECORD"  and ibjui.project_contraption_id=pc.sequence_nbr and  di."INSPECT_TYPE" <![CDATA[<>]]> '') as inspectNum,
+              (select count(1) from idx_biz_jg_use_info ibjui where ibjui.project_contraption_id= pc.sequence_nbr) as totalNum
+             from
+                 idx_biz_jg_project_contraption pc
+             where
+                 1=1
+                 <choose>
+                     <when test="inspectionType == 'AZJDJY'">
+                         and pc.usc_unit_credit_code=#{companyCode}
+                         and pc.is_into_management = true
+                         and (pc.use_registration_code is null or pc.use_registration_code  = '' )
+                     </when>
+                    <otherwise>
+                        <choose>
+                            <when test="equCategory == '8300'">
+                                and pc.use_unit_credit_code=#{companyCode}
+                                and pc.is_into_management = true
+                                and pc.use_registration_code <![CDATA[<>]]> ''
+                            </when>
+                            <otherwise>
+                                and pc.use_unit_credit_code=#{companyCode}
+                                and pc.is_into_management = true
+                            </otherwise>
+                        </choose>
+                    </otherwise>
+                 </choose>
+                 and not EXISTS (SELECt 1 FROM tz_jyjc_inspection_application a where a.status='6611' and a.application_unit_code=#{companyCode} and a.project_contraption_id = pc.sequence_nbr)
+                 and (pc.project_contraption_parent_id is null or pc.project_contraption_parent_id = '')
+                 and pc.equ_category = #{equCategory}
+        ) s
+        <where>
+             <if test="inspectionType == 'DQJY' and equCategory != '8300'">
+                 s.inspectNum = s.totalNum
+                 and  s.inspectNum > 0
+             </if>
+        </where>
+
     </select>
 
     <select id="selectEquipListByExport" resultType="java.util.Map">