Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java

ÎļþÃû´Ó Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java ÐÞ¸Ä
@@ -1,22 +1,17 @@
package com.vci.ubcs.code.controller;
package com.vci.ubcs.code.webservice.controller;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.entity.DockingPreApplyForm;
import com.vci.ubcs.code.feign.IMdmInterJtClient;
import com.vci.ubcs.code.service.IDockingPreApplyFormService;
import com.vci.ubcs.code.service.IDockingPreAttrMappingService;
import com.vci.ubcs.code.service.IDockingPreAttrRangeService;
import com.vci.ubcs.code.service.IDockingPreClassifyService;
import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import com.vci.ubcs.code.vo.pagemodel.DockingPreApplyFormVO;
import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
import com.vci.ubcs.code.wrapper.DockingPreApplyFormWrapper;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.code.webservice.service.*;
import com.vci.ubcs.code.webservice.wrapper.DockingPreApplyFormWrapper;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.Tree;
import com.vci.ubcs.code.webservice.entity.DockingPreApplyForm;
import com.vci.ubcs.code.webservice.vo.BaseModelVO;
import com.vci.ubcs.code.webservice.vo.DockingPreApplyFormVO;
import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -24,7 +19,6 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
@@ -44,6 +38,12 @@
    * é›†å›¢å±žæ€§æ˜ å°„配置属性
    */
   private final IDockingPreAttrMappingService dockingPreAttrMappingService;

/**
 * é›†å›¢å±žæ€§æ˜ å°„配置属性
 */
   private final IGroupMdmInterService groupMdmInterService;

   /***
    * å±žæ€§æžšä¸¾èŒƒå›´æœåŠ¡
    */
@@ -125,7 +125,7 @@
    * @return ä¸»é¢˜åº“分类显示树
    */
   @GetMapping("/referTree")
   public List<Tree> referTree(@RequestBody TreeQueryObject treeQueryObject)  {
   public List<Tree> referTree(TreeQueryObject treeQueryObject)  {
      return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject);
   }

@@ -139,7 +139,7 @@
   public R applyGroupCode(String oids,String btmName){
      List<BaseModelVO> BaseModelVOs=new ArrayList<>();
      try {
         return dockingPreAttrMappingService.applyGroupCode(oids,btmName);
         return groupMdmInterService.applyGroupCode(oids,btmName);
      }catch (Throwable e){
         return R.fail("集团码申请失败："+e.getMessage());
      }