研究生流程加入预警

sop-api/src/main/java/com/qmth/sop/server/api/TBSopInfoController.java

@@ -9,7 +9,6 @@ import com.qmth.sop.business.bean.params.SopSaveParam;
 import com.qmth.sop.business.bean.result.FlowResult;
 import com.qmth.sop.business.bean.result.FormWidgetMetadataResult;
 import com.qmth.sop.business.entity.SysUser;
-import com.qmth.sop.business.entity.TBSopInfo;
 import com.qmth.sop.business.entity.TDFormWidgetMetadata;
 import com.qmth.sop.business.service.TBSopInfoService;
 import com.qmth.sop.business.service.TDFormWidgetMetadataService;
@@ -117,9 +116,10 @@ public class TBSopInfoController {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
-        Boolean result = tbSopInfoService.sopAllocation(sopAllocationParam);
-        tbSopInfoService.sopProxySystemApprove(sopAllocationParam.getFlowId(), null);
-        return ResultUtil.ok(result);
+//        Boolean result = tbSopInfoService.sopAllocation(sopAllocationParam);
+//        tbSopInfoService.sopProxySystemApprove(sopAllocationParam.getFlowId(), null);
+//        return ResultUtil.ok(result);
+        return ResultUtil.ok(tbSopInfoService.sopAllocation(sopAllocationParam));
     }
 
     @ApiOperation(value = "sop删除")
@@ -161,10 +161,11 @@ public class TBSopInfoController {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
-        Boolean result = tbSopInfoService.sopSave(sopSaveParam);
-        TBSopInfo tbSopInfo = tbSopInfoService.getById(sopSaveParam.getId());
-        tbSopInfoService.sopProxySystemApprove(null, tbSopInfo.getSopNo());
-        return ResultUtil.ok(result);
+//        Boolean result = tbSopInfoService.sopSave(sopSaveParam);
+//        TBSopInfo tbSopInfo = tbSopInfoService.getById(sopSaveParam.getId());
+//        tbSopInfoService.sopProxySystemApprove(null, tbSopInfo.getSopNo());
+//        return ResultUtil.ok(result);
+        return ResultUtil.ok(tbSopInfoService.sopSave(sopSaveParam));
     }
 
     @ApiOperation(value = "sopUsers")

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

@@ -530,6 +530,7 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
         tbSopInfoService.updateFlowInfo(sopAllocationParam.getAllocationParams(), tfCustomFlow, tfCustomFlowEntity,
                 tfFlowApprove, tbCrmDetail);
         tbUserArchivesAllocationService.editCrmAllocation(new UserArchivesAllocationParam(sopAllocationParam));
+        tbSopInfoService.sopProxySystemApprove(tfCustomFlowEntity.getFlowId(), tfCustomFlowEntity.getCode());
         return true;
     }
 
@@ -1662,7 +1663,9 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
         tbCrmDetail.updateInfo(sysUser.getId());
         tbCrmDetailService.updateById(tbCrmDetail);
         tbDingService.resetDingExceptionBySopNo(tbSopInfo.getSopNo());
-        return tfCustomFlowEntityService.updateById(tfCustomFlowEntity);
+        tfCustomFlowEntityService.updateById(tfCustomFlowEntity);
+        tbSopInfoService.sopProxySystemApprove(tfCustomFlowEntity.getFlowId(), tbSopInfo.getSopNo());
+        return true;
     }
 
     /**