Merge remote-tracking branch 'origin/main'

srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java

@@ -80,4 +80,5 @@ public interface CphAuditDetailsMapper
      */
     public int deleteCphAuditDetailsByIds(Long[] ids);
     public int cancelAudiByIds(Long[] ids);
+    public int cancelCphAudiDetailsByIds(Long[] ids);
 }

srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java

@@ -85,6 +85,12 @@ public interface ICphAuditDetailsService
      */
     public int auditOpera(CphAuditDetails cphAuditDetails);
 
+    /**
+     * 批量同意
+     * @param
+     * @return
+     */
+
     /**
      * 批量同意
      * @param

srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java

@@ -521,7 +521,10 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService {
     }
     @Override
     public int cancelAuditByIds(Long[] ids) {
-        return cphAuditDetailsMapper.cancelAudiByIds(ids);
+        int result=0;
+        result=cphAuditDetailsMapper.cancelAudiByIds(ids);
+        result+=cphAuditDetailsMapper.cancelCphAudiDetailsByIds(ids);
+        return  result;
     }
     /**
      * 删除审核明细信息

srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml

@@ -164,8 +164,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <update id="cancelCphAudiDetailsByIds">
+        update   cph_audit_details set status_code=1 where project_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
     <update id="cancelAudiByIds" parameterType="String">
-        update   cph_audit_details set status_code=1 where id in
+        update   cph_iam set audit_status=1 where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>