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

@@ -7,6 +7,7 @@
import com.vci.ubcs.code.applyjtcodeservice.feign.IMdmInterJtClient;
import com.vci.ubcs.code.applyjtcodeservice.service.*;
import com.vci.ubcs.code.applyjtcodeservice.vo.*;
import com.vci.ubcs.code.feign.IMdmEngineClient;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
@@ -14,6 +15,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RestController;
@@ -62,7 +64,8 @@
    */
   private final IGroupMdmInterService groupMdmInterService;


   @Autowired(required = false)
   private IMdmEngineClient mdmEngineClient;
   /***
    * 申请集团编码
    * @return
@@ -81,7 +84,7 @@
   @Override
   public R receiveEditApply(String oids, String btmName) {
      try {
         return groupMdmInterService.applyGroupCode(oids,btmName);
         return groupMdmInterService.receiveEditApply(oids,btmName);
      }catch (Throwable e){
         return R.fail("集团码数据修改失败："+e.getMessage());
      }
@@ -159,18 +162,23 @@
            //返回结果信息
            dockingPreApplyForm.setContent(jcontent.toJSONString());
            dockingPreApplyFormList.add(dockingPreApplyForm);
            String jdataid = dockingPreApplyForm.getDataOid();
            String jdatabtmname = dockingPreApplyForm.getDataBtmName();
            if (res) {
               String jdataid = dockingPreApplyForm.getDataOid();
               String jdatabtmname = dockingPreApplyForm.getDataBtmName();

               //此处需要查询业务数据，去更改
               BaseModel baseModel = new BaseModel();
               baseModel.setId(customCoding);
               log.info("申请单:"+applyId+",集团码："+customCoding+"编码："+baseModel.getId());
               editObjectList.add(baseModel);
            }
            List<String> dataOidList=new ArrayList<>();
            dataOidList.add(jdataid);
            //调用主数据服务批量保存接口
            mdmEngineClient.updateBatchByType(jdatabtmname,editObjectList);
         }
         dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
         //调用主数据服务批量保存接口

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