xiejun
2023-09-14 4ed0e9d8ed0e785e62c0f9deb299445e5947c364
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
@@ -7,14 +7,15 @@
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;
import com.vci.ubcs.starter.web.constant.MdmEnumIdConstant;
import lombok.AllArgsConstructor;
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;
@@ -48,15 +49,47 @@
   private final IDockingPreMetaAttrService dockingPreMetaAttrService;
   /**
    * 集团申请单服务
    * 集团分类申请单服务
    */
   private final IDockingPreClassifyService dockingPreClassifyService;
   /**
    * 集团申请单服务
    * 集团取值范围申请单服务
    */
   private final IDockingPreAttrRangeService dockingPreAttrRangeService;
   /**
    * 集团属性映射配置属性
    */
   private final IGroupMdmInterService groupMdmInterService;
   @Autowired(required = false)
   private IMdmEngineClient mdmEngineClient;
   /***
    * 申请集团编码
    * @return
    */
   public R applyGroupCode(String oids,String btmName){
      try {
         return groupMdmInterService.applyGroupCode(oids,btmName);
      }catch (Throwable e){
         return R.fail("集团码申请失败:"+e.getMessage());
      }
   }
   /***
    * 申请集团编码数据维护
    * @return
    */
   @Override
   public R receiveEditApply(String oids, String btmName) {
      try {
         return groupMdmInterService.receiveEditApply(oids,btmName);
      }catch (Throwable e){
         return R.fail("集团码数据修改失败:"+e.getMessage());
      }
   }
   /*
@@ -129,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);