审查流程

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java

@@ -4,6 +4,7 @@ package com.adc.da.slrs.sarInstitution.controller;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.adc.da.slrs.sarInstitution.entity.TsUserVO;
 import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService;
 import com.adc.da.slrs.sarUser.dao.TsUserDao;
 import com.adc.da.slrs.sarUser.entity.TsUser;
@@ -105,7 +106,7 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
 
     @ApiOperation("获得下一级的部门和人员")
     @GetMapping("/getNextById")
-    public List<TsInstitution> getNextById(String ids){
+    public List<TsUserVO> getNextById(String ids){
         return tsInstitutionService.getNextById(ids);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarInstitution.service;
 
 import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.adc.da.slrs.sarInstitution.entity.TsUserVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -39,7 +40,7 @@ public interface ITsInstitutionService extends IService<TsInstitution> {
 
     public List<TsInstitution> getInstitutionIdToDept(String institutionIds,String userName);
 
-    public List<TsInstitution> getNextById(String ids);
+    public List<TsUserVO> getNextById(String ids);
 
     /**
      * 获得第一级的部门

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java

@@ -226,19 +226,19 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
         return tsInstitutions;
     }
 
-    public List<TsInstitution> getNextById(String ids){
+    public List<TsUserVO> getNextById(String ids){
         List<String> strings=new ArrayList<>(Arrays.asList(ids.split(",")));
         List<TsUserVO> tsUsers=tsInstitutionDao.selectNextUserByIds(strings);
-        List<TsInstitution> res=new ArrayList<>();
+        List<TsUserVO> res=new ArrayList<>();
         if (null!=tsUsers && tsUsers.size()>0){
             Map<String,TsUserVO> middle=new HashMap<>();
             for (TsUserVO u:tsUsers) {
                 middle.put(u.getId(),u);
             }
             strings.forEach(s -> {
-                TsInstitution ins=new TsInstitution();
-                BeanUtils.copyProperties(middle.get(s),ins);
-                res.add(ins);
+//                TsInstitution ins=new TsInstitution();
+//                BeanUtils.copyProperties(middle.get(s),ins);
+                res.add(middle.get(s));
             });
         }
         return res;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java

@@ -19,6 +19,7 @@ import java.util.Arrays;
 import java.util.List;
 
 @Controller
+@RestController
 @RequestMapping("/api/sarStandUnqualified/productDeptIssue")
 @Api(tags = "产品规划部重点问题项管控")
 public class ProductDeptIssueController {

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitMenuEODao.java

@@ -33,6 +33,8 @@ public interface SarFileSplitMenuEODao extends BaseMapper<SarFileSplitMenuEO> {
 
     List<String> getChild(@Param("id") String id);
 
+    List<String> getChildData(@Param("id") String id);
+
     int getMaxDisplayByid(@Param("id") String id);
 
     int getChildrenCountByParentId(@Param("id") String id);

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java

@@ -30,4 +30,6 @@ public interface SarFileSplitMenuEOService {
     int copyMenuNotChildren(SarFileSplitItemsEO sarFileSplitItemsEO);
 
     String addMenuForImport(SarFileSplitMenuEO sarFileSplitMenuEO);
+
+    List<String>  getChildData(String id);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java

@@ -273,7 +273,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
         if (getMenuList != null && !getMenuList.isEmpty()) {
             for(SarFileSplitItemsEO splitItemsEO : getMenuList){
                 menuIdList.add(splitItemsEO.getMenuId());
-                List<String> menuList = sarFileSplitMenuEODao.getChild(splitItemsEO.getMenuId());
+                List<String> menuList = sarFileSplitMenuEOService.getChildData(splitItemsEO.getMenuId());
                 menuIdList.addAll(menuList);
             }
             if(!menuIdList.isEmpty()){

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java

@@ -6,6 +6,7 @@ import com.adc.da.slrs.standardSplit.entity.*;
 import com.adc.da.slrs.standardSplit.service.SarFileSplitMenuEOService;
 import com.adc.da.sys.util.LoginUserUtil;
 import com.adc.da.sys.util.UUIDUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -451,4 +452,20 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService
         }*/
         return sarFileSplitMenuEO.getId();
     }
+
+    @Override
+    public List<String> getChildData(String id) {
+        List<String> res=new ArrayList<>();
+        return dealData(id,res);
+    }
+
+    private List<String> dealData(String id ,List<String> res){
+        List<String> strings = SarFileSplitMenuEODao.getChildData(id);
+        res.addAll(strings);
+        if (null!=strings && strings.size()>0){
+            return this.dealData(StringUtils.join(strings,","),res);
+        }else {
+            return res;
+        }
+    }
 }