业务类型

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectBusinessType/controller/CwProjectBusinessTypeController.java

@@ -134,33 +134,43 @@ public class CwProjectBusinessTypeController {
      */
     @ApiLog("查询业务类型树")
     @GetMapping("findList")
-    public ResponseEntity<List<CwProjectBusinessType>> findList(){
-        List<CwProjectBusinessType> cwProjectBusinessTypeList = cwProjectBusinessTypeService.list();
-        List<String> idList = new ArrayList<>();
-        cwProjectBusinessTypeList.stream().forEach(item->{
-            if (StringUtils.isNotBlank(item.getParentIds())){
-                String[] split = item.getParentIds().split(",");
-                for (String s : split) {
-                    idList.add(s);
+    public ResponseEntity<IPage<CwProjectBusinessTypeDTO>> findList(CwProjectBusinessTypeDTO cwProjectBusinessTypeDTO, Page<CwProjectBusinessTypeDTO> page){
+        page.setSize(-1);
+        IPage<CwProjectBusinessTypeDTO> result = new Page<CwProjectBusinessTypeDTO>();
+        if(ObjectUtil.isNotEmpty(cwProjectBusinessTypeDTO)){
+            if(StringUtils.isNotBlank(cwProjectBusinessTypeDTO.getName())){
+                //根据type模糊查询
+                List<CwProjectBusinessType> cwProjectBusinessTypeList = cwProjectBusinessTypeService.list(new QueryWrapper<CwProjectBusinessType>().lambda()
+                        .like(StringUtils.isNotBlank(cwProjectBusinessTypeDTO.getName()), CwProjectBusinessType::getName, cwProjectBusinessTypeDTO.getName())
+                );
+                List<String> idList = new ArrayList<>();
+                cwProjectBusinessTypeList.stream().forEach(item->{
+                    if (StringUtils.isNotBlank(item.getParentIds())){
+                        String[] split = item.getParentIds().split(",");
+                        for (String s : split) {
+                            idList.add(s);
+                        }
+                    }
+                    List<CwProjectBusinessType> list = cwProjectBusinessTypeService.list(new QueryWrapper<CwProjectBusinessType>().lambda().like(CwProjectBusinessType::getParentIds, "," + item.getId() + ","));
+                    idList.addAll(list.stream().map(CwProjectBusinessType::getId).collect(Collectors.toList()));
+                    idList.add(item.getId());
+                });
+                List<String> ids = idList.stream().distinct().filter(item->{
+                    if (!"0".equals(item)){
+                        return true;
+                    }
+                    return false;
+                }).collect(Collectors.toList());
+                if(CollectionUtil.isNotEmpty(ids)){
+                    QueryWrapper<CwProjectBusinessType> wrapper = new QueryWrapper<CwProjectBusinessType>()
+                            .in("cw_pbt.id",idList);
+                    result = cwProjectBusinessTypeService.findListByIsShow (page,wrapper);
                 }
+            }else{
+                result = cwProjectBusinessTypeService.findListByIsShow (page,new QueryWrapper<CwProjectBusinessType>());
             }
-            List<CwProjectBusinessType> list = cwProjectBusinessTypeService.list(new QueryWrapper<CwProjectBusinessType>().lambda().like(CwProjectBusinessType::getParentIds, "," + item.getId() + ","));
-            idList.addAll(list.stream().map(CwProjectBusinessType::getId).collect(Collectors.toList()));
-            idList.add(item.getId());
-        });
-        List<String> ids = idList.stream().distinct().filter(item->{
-            if (!"0".equals(item)){
-                return true;
-            }
-            return false;
-        }).collect(Collectors.toList());
-        if(CollectionUtil.isNotEmpty(ids)) {
-            QueryWrapper<CwProjectBusinessType> wrapper = new QueryWrapper<CwProjectBusinessType>()
-                    .in("cw_pbt.id", idList);
-            //List<CwProjectBusinessType> list = cwProjectBusinessTypeService.findList(wrapper);
-            //return  ResponseEntity.ok(list);
         }
-        return ResponseEntity.ok(cwProjectBusinessTypeList);
+        return ResponseEntity.ok (result);
     }
 
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectBusinessType/mapper/CwProjectBusinessTypeMapper.java

@@ -31,6 +31,8 @@ public interface CwProjectBusinessTypeMapper extends BaseMapper<CwProjectBusines
     List<CwProjectBusinessType> selectByParentIds(@Param("ids") List<String> ids);
 
     List<CwProjectBusinessTypeDTO> listTree(@Param(Constants.WRAPPER) QueryWrapper<CwProjectBusinessType> queryWrapper);
+
+    IPage<CwProjectBusinessTypeDTO> findListByIsShow(Page<CwProjectBusinessTypeDTO> page, @Param(Constants.WRAPPER)QueryWrapper<CwProjectBusinessType> queryWrapper);
 }
 
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectBusinessType/mapper/xml/CwManageLevelTypeMapper.xml

@@ -99,11 +99,11 @@
         </foreach>
     </select>
 
-    <select id="listTree" resultMap="map">
+    <select id="findListByIsShow" resultMap="map">
         select
         <include refid="Base_Column_List"></include>
         from cw_project_business_type cw_pbt
-        where cw_pbt.del_flag = '0'
+        ${ew.customSqlSegment}
     </select>
 
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectBusinessType/service/CwProjectBusinessTypeService.java

@@ -105,8 +105,12 @@ public class CwProjectBusinessTypeService extends ServiceImpl<CwProjectBusinessT
         return ResponseEntity.ok ("删除成功");
     }
 
-    public List<CwProjectBusinessTypeDTO> listTree(QueryWrapper<CwProjectBusinessType> queryWrapper) {
-        List<CwProjectBusinessTypeDTO> list=cwProjectBusinessTypeMapper.listTree(queryWrapper);
-        return list;
+
+
+    public IPage<CwProjectBusinessTypeDTO> findListByIsShow(Page<CwProjectBusinessTypeDTO> page, QueryWrapper<CwProjectBusinessType> queryWrapper) {
+        queryWrapper.eq("cw_pbt.is_show","1");
+        queryWrapper.eq("cw_pbt.del_flag","0").orderByAsc("cw_pbt.sort_mark");
+        IPage<CwProjectBusinessTypeDTO> list = cwProjectBusinessTypeMapper.findListByIsShow(page, queryWrapper);
+        return cwProjectBusinessTypeMapper.findListByIsShow(page,queryWrapper);
     }
 }