Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java

@@ -135,7 +135,6 @@
      log.info("获取集团集团码，赋值到主数据 start");
      try {
         Map<String,List<BaseModel>> editObjectMap = new HashMap<>();

         List<DockingPreApplyForm> dockingPreApplyFormList = new ArrayList();
         //String classId = javaObject.getClassId();
         //String sysName = javaObject.getSysName();
@@ -172,7 +171,8 @@
            } else if ("9".equals(formState)) {
               msg = "审核中";
            }
            msg = Func.isNotBlank(mainData.getExamineOpinion()) ? mainData.getExamineOpinion():msg;
            // 如果返回了审查意见就用返回的
            msg = Func.isNotBlank(mainData.getExamineOpinion()) ? msg+"，意见："+mainData.getExamineOpinion():msg;
            jcontent.put("applyId", applyId);
            jcontent.put("formState", formState);
            jcontent.put("customCoding", customCoding);
@@ -185,6 +185,7 @@
            DockingPreApplyForm dockingPreApplyForm = oldDockingPreApplyFormList.get(0);
            dockingPreApplyForm.setMsg(msg);
            dockingPreApplyForm.setCode("1");
            dockingPreApplyForm.setLastModifyTime(new Date());
            if (res) {
               dockingPreApplyForm.setGroupCode(customCoding);
            }
@@ -223,7 +224,7 @@
         if(!CollectionUtils.isEmpty(dockingPreApplyFormList)){
            dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
         }
         saveLogUtil.operateLog("申请单结果返回",false,JSON.toJSONString(dockingReturnStoreVO.getMainData()));
         saveLogUtil.operateLog("申请单结果返回",false, JSON.toJSONString(dockingReturnStoreVO.getMainData()));
      }catch (Throwable e){
         e.printStackTrace();
         saveLogUtil.operateLog("申请单结果返回",true,"错误信息："+e.getMessage()+"\n"+ JSON.toJSONString(dockingReturnStoreVO.getMainData()));