Merge remote-tracking branch 'origin/main'

srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java

@@ -287,8 +287,8 @@ public class CphAuditDetailsController extends BaseController {
     /**
      * 撤销审核
      */
-    @PostMapping("/cancelAudit/{ids}")
+    @PostMapping("/cancelAudit/{id}")
-    public AjaxResult cancelAudit(@PathVariable Long[] ids) {
+    public AjaxResult cancelAudit(@PathVariable("id") Long id) {
-        return toAjax(cphAuditDetailsService.cancelAuditByIds(ids));
+        return toAjax(cphAuditDetailsService.cancelAuditById(id));
     }
 }

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

@@ -79,6 +79,6 @@ public interface CphAuditDetailsMapper
      * @return 结果
      */
     public int deleteCphAuditDetailsByIds(Long[] ids);
-    public int cancelAudiByIds(Long[] ids);
+    public int cancelAuditById(Long id);
-    public int cancelCphAudiDetailsByIds(Long[] ids);
+    public int cancelCphAudiDetailsById(Long id);
 }

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

@@ -106,7 +106,7 @@ public interface ICphAuditDetailsService
      */
     public int deleteCphAuditDetailsByIds(Long[] ids);
     //撤销
-    public int cancelAuditByIds(Long[] ids);
+    public int cancelAuditById(Long id);
 
     /**
      * 删除审核明细信息

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

@@ -435,8 +435,8 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService {
         temp.setId(cphAuditDetails.getProjectId());
         temp.setAuditStatus(cphAuditDetails.getStatusCode().toString());
         cphIamService.updateCphIam(temp);
-
+        Long statusCode=cphAuditDetailsMapper.selectCphAuditDetailsById(cphAuditDetails.getId()).getStatusCode();
-        if (cphAuditDetails.getStatusCode() == 6L)//判断审核状态是否完成
+        if (statusCode == 6L)//判断审核状态是否完成
         {
             SrsStudent stu = _stuService.selectSrsStudentByStuId(cphAuditDetails.getSubmitterId());
             SrsAddRecord srsAddRecord = new SrsAddRecord();//加分记录表
@@ -520,10 +520,10 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService {
         return cphAuditDetailsMapper.deleteCphAuditDetailsByIds(ids);
     }
     @Override
-    public int cancelAuditByIds(Long[] ids) {
+    public int cancelAuditById(Long id) {
         int result=0;
-        result=cphAuditDetailsMapper.cancelAudiByIds(ids);
+        result=cphAuditDetailsMapper.cancelAuditById(id);
-        result+=cphAuditDetailsMapper.cancelCphAudiDetailsByIds(ids);
+        result+= cphAuditDetailsMapper.cancelCphAudiDetailsById(id);
         return  result;
     }
     /**

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

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