优化

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -84,7 +84,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             if(appOrderPriceInfoVo != null){
                 solutionsDetailsVo.setFinalPrice(appOrderPriceInfoVo.getTransactionPrice());
                 solutionsDetailsVo.setGcPrice(appOrderPriceInfoVo.getGcPrice());
-                solutionsDetailsVo.setSzPrice(appOrderPriceInfoVo.getSzPrice());
+                if(StringUtils.isNotBlank(appOrderPriceInfoVo.getSzPrice())){
+                    solutionsDetailsVo.setSzPrice(appOrderPriceInfoVo.getSzPrice());
+                }
             }
         }
         if (loanSolutions == null) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -978,7 +978,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if ("已办结".equals(scmApplyInbound.getNodeState())) {
             return rb.setMsg("该数据已审批通过，不允许终止");
         }
-        if (StringUtils.isNotBlank(scmApplyInbound.getTaskId())) {
+      /*  if (StringUtils.isNotBlank(scmApplyInbound.getTaskId())) {
             com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
             flowTaskVo.setTaskId(scmApplyInbound.getTaskId());
             flowTaskVo.setInstanceId(scmApplyInbound.getProcInsId());
@@ -997,7 +997,11 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             scmApplyInbound.setTaskDefKey("Event_end");
             scmApplyInbound.setCancalRemarks(cancalRemarks);
             baseMapper.updateById(scmApplyInbound);
-        }
+        }*/
+        scmApplyInbound.setNodeState("终止");
+        scmApplyInbound.setTaskDefKey("Event_end");
+        scmApplyInbound.setCancalRemarks(cancalRemarks);
+        baseMapper.updateById(scmApplyInbound);
         return rb.success();
     }