Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/MyPreemptQO.java

@@ -36,6 +36,9 @@ public class MyPreemptQO {
     @ApiModelProperty(hidden = true)
     private Integer userAccountId;
 
+    @ApiModelProperty(value = "描述",example = "1")
+    private String requireDescription;
+
     public void buildCurrentPage() {
         this.pageNo = (pageNo - 1) * pageSize;
     }

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/MyPublishQO.java

@@ -37,6 +37,9 @@ public class MyPublishQO {
     @ApiModelProperty(hidden = true)
     private Integer userAccountId;
 
+    @ApiModelProperty(value = "描述",example = "hh")
+    private String requireDescription;
+
     public void buildCurrentPage() {
         this.pageNo = (pageNo - 1) * pageSize;
     }

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 8e2c74f9ab42367c4683e5bb15ab799b5e3cb71a
+  newTag: 67da19414a5bc7ee95e8551e8e3382f3b3220bab

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -2766,7 +2766,6 @@ public class RequirementsServiceImpl implements RequirementsService {
         return ResultBody.success(payWalletDTO);
     }
 
-
     @Override
     public PageResult myPublish(Integer userAccountId, MyPublishQO param) {
         Integer pageNo = param.getPageNo();

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

@@ -703,16 +703,21 @@
     </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>
+        <if test="requireDescription!=null and requireDescription!='' ">
+            and  ri.require_description like CONCAT("%",#{requireDescription},"%")
+        </if>
     </select>
 
 
@@ -754,21 +759,30 @@
         <if test=" requirementsInfoId != null  ">
             and ri.id=#{requirementsInfoId}
         </if>
+        <if test="requireDescription!=null and requireDescription!='' ">
+            and  ri.require_description like CONCAT("%",#{requireDescription},"%")
+        </if>
         ORDER BY ri.id desc
         limit #{pageNo}, #{pageSize}
     </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>
+        <if test="requireDescription!=null and requireDescription!='' ">
+            and  ri.require_description like CONCAT("%",#{requireDescription},"%")
+        </if>
     </select>
 
     <select id="myPreempt" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
@@ -811,6 +825,9 @@
         <if test=" requirementsInfoId != null  ">
             and ri.id=#{requirementsInfoId}
         </if>
+        <if test="requireDescription!=null and requireDescription!='' ">
+            and  ri.require_description like CONCAT("%",#{requireDescription},"%")
+        </if>
         ORDER BY ri.id desc
         limit #{pageNo}, #{pageSize}
     </select>