盖章待办改为已办放在上方

sc-service/src/main/java/com/huyi/service/credit/controller/OwnMessageController.java

@@ -702,6 +702,17 @@ public class OwnMessageController extends BaseController {
         com.huyi.service.base.entity.SysUser sysUser = iSysUserService.getById(createId);
         //姓名
         String userName = sysUser.getNickName();
+
+        //把已办放在上面，不然之后生成的盖章待办都会改为已办
+        //盖章待办改为已办
+        LambdaQueryWrapper<SysNotice> queryWrapperA = new LambdaQueryWrapper<>();
+        queryWrapperA.eq(SysNotice::getTableId,zfiId);
+        queryWrapperA.eq(SysNotice::getType,"00");
+        queryWrapperA.eq(SysNotice::getWorkType,"03");
+        queryWrapperA.eq(SysNotice::getStatus,"0");
+        SysNotice noticeA = new SysNotice();
+        noticeA.setStatus("1");
+        sysNoticeService.update(noticeA,queryWrapperA);
         //核心开立
         if("1".equals(createType)){
             //核心企业
@@ -785,6 +796,7 @@ public class OwnMessageController extends BaseController {
                 if(CommonUtil.compare(CommonUtil.objToString(mmp.get("code")),"200") != 0){
                     throw  new Exception("查询审批流程失败");
                 }
+
                 List<Map<String,Object>>  openList = (List<Map<String, Object>>) mmp.get("data");
                 //未开启流程审批
                 if(openList.size() < 1){
@@ -959,15 +971,7 @@ public class OwnMessageController extends BaseController {
             }
 
         }
-        //盖章待办改为已办
-        LambdaQueryWrapper<SysNotice> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SysNotice::getTableId,zfiId);
-        queryWrapper.eq(SysNotice::getType,"00");
-        queryWrapper.eq(SysNotice::getWorkType,"03");
-        queryWrapper.eq(SysNotice::getStatus,"0");
-        SysNotice notice = new SysNotice();
-        notice.setStatus("1");
-        sysNoticeService.update(notice,queryWrapper);
+
         /**-------- 盖章完成修改融信状态并且发起审批 结束--------**/
         return AjaxResult.success();
     }