RequirementsDao.xml(update)

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -703,13 +703,15 @@
     </select>
 
     <select id="myPublishcount" resultType="java.lang.Integer">
-        SELECT count(*)
-        FROM requirements_info ri
-        LEFT JOIN requirements_type rt
-        ON rt.id = ri.requirement_type_id
+        SELECT
+        count(*)
+        FROM
+        requirements_info ri
+        LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id
         LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
-        left join requirements_amount ra on ra.requirements_info_id = ri.id
-        WHERE ri.user_account_id = #{userAccountId}
+        LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
+        LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
+        WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1
         <if test=" requirementsInfoId != null  ">
             and ri.id=#{requirementsInfoId}
         </if>
@@ -759,13 +761,16 @@
     </select>
 
     <select id="myPreemptCount" resultType="java.lang.Integer">
-        SELECT count(*)
-        FROM requirements_info ri
+        SELECT
+        count(*)
+        FROM
+        requirements_info ri
         LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id
         LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
-        left join requirements_amount ra on ra.requirements_info_id = ri.id
+        LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
+        LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
         INNER JOIN requirements_service rs ON ri.id = rs.requirements_info_id
-        WHERE rs.pilot_certification_user_id = #{userAccountId}
+        WHERE rs.pilot_certification_user_id = #{userAccountId} AND rs.is_deleted !=1
         <if test=" requirementsInfoId != null  ">
             and ri.id=#{requirementsInfoId}
         </if>