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

@@ -16,6 +16,7 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RestController;
@@ -33,6 +34,8 @@
@AllArgsConstructor
@Slf4j
public class MdmInterJtClient implements IMdmInterJtClient {
   @Value("${docking.apply.partCoe:10}")
   public String partCoe;
   /**
    * 集团申请单服务
    */
@@ -89,9 +92,6 @@
         return R.fail("集团码数据修改失败："+e.getMessage());
      }
   }



   /*
    * 主数据业务服务
    */
@@ -106,7 +106,7 @@
   public R getApplyGroupCode(DockingReturnStoreVO dockingReturnStoreVO) {
      log.info("获取集团集团码，赋值到主数据 start");
      try {
         List<BaseModel> editObjectList = new ArrayList();
         Map<String,List<BaseModel>> editObjectMap = new HashMap<>();

         List<DockingPreApplyForm> dockingPreApplyFormList = new ArrayList();
         //String classId = javaObject.getClassId();
@@ -165,20 +165,26 @@
            String jdataid = dockingPreApplyForm.getDataOid();
            String jdatabtmname = dockingPreApplyForm.getDataBtmName();
            if (res) {

               //此处需要查询业务数据，去更改
               BaseModel baseModel = new BaseModel();
               baseModel.setId(customCoding);
               String classOid=baseModel.getData().getOrDefault("CODECLSFID","");
               if(partCoe.equals(classOid)){
                  baseModel.setId(10+customCoding);
               }
               String btmeName=baseModel.getBtmname();
               baseModel.getData().put("groupcode",customCoding);
               log.info("申请单:"+applyId+",集团码："+customCoding+"编码："+baseModel.getId());
               editObjectList.add(baseModel);
               editObjectMap.getOrDefault(btmeName,new ArrayList<>()).add(baseModel);

            }
            List<String> dataOidList=new ArrayList<>();
            dataOidList.add(jdataid);
         }
         if(!CollectionUtils.isEmpty(editObjectMap)) {
            //调用主数据服务批量保存接口
            mdmEngineClient.updateBatchByType(jdatabtmname,editObjectList);
            editObjectMap.forEach((btmName, modeList) -> {
               mdmEngineClient.updateBatchBtypeDatas(btmName, modeList);
            });
         }
         dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);

      }catch (Throwable e){
         e.printStackTrace();
         return R.fail("集团码集成赋值失败"+e);