保洁巡检本周代码

无关风月

1 天以前 52225bdefba7d99bc07952e461f2a841948e46b2

保洁巡检本周代码

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java

@@ -737,7 +737,7 @@
            query.setDeptIds(projectIds);
            if (StringUtils.hasLength(query.getPhonenumber())){
                List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
                        sysUser.getPhonenumber().equals(query.getPhonenumber())
                        sysUser.getPhonenumber().contains(query.getPhonenumber())
                                && projectIds.contains(sysUser.getDeptId())
                ).map(SysUser::getUserId).collect(Collectors.toList());
                if (patrolInspectorIds.isEmpty()){
@@ -758,7 +758,7 @@
        }
        if (StringUtils.hasLength(query.getPhonenumber())){
            List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
                    sysUser.getPhonenumber().equals(query.getPhonenumber())
                    sysUser.getPhonenumber().contains(query.getPhonenumber())
            ).map(SysUser::getUserId).collect(Collectors.toList());
            if (query.getPatrolInspectorIds()!=null&&!query.getPatrolInspectorIds().isEmpty()){
                // 取交集

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationTypeController.java

@@ -6,8 +6,10 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.dto.LocationTypeDTO;
import com.ruoyi.system.model.TLocation;
import com.ruoyi.system.model.TLocationType;
import com.ruoyi.system.query.LocationTypeListQuery;
import com.ruoyi.system.service.TLocationService;
import com.ruoyi.system.service.TLocationTypeService;
import com.ruoyi.system.vo.system.LocationTypeListVO;
import io.swagger.annotations.Api;
@@ -31,6 +33,8 @@
public class TLocationTypeController {
    @Resource
    private TLocationTypeService locationTypeService;
    @Resource
    private TLocationService locationService;
    @ApiOperation(value = "点位类型分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<LocationTypeListVO>> pageList(@RequestBody LocationTypeListQuery query) {
@@ -61,6 +65,10 @@
    @DeleteMapping(value = "/delete")
    public R<Boolean> edit(@RequestParam String ids) {
        String[] split = ids.split(",");
        Long count = locationService.lambdaQuery().in(TLocation::getLocationType, Arrays.asList(split)).count();
        if (count>0){
            return R.fail("请先删除该类型下的点位");
        }
        locationTypeService.removeBatchByIds(Arrays.asList(split));
        return R.ok();
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java

@@ -100,6 +100,7 @@
                        List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, tProjectDept.getId()).list()
                                .stream().map(TProjectDept::getId).collect(Collectors.toList());
                        listIds.addAll(collect);
                    listIds.add(tProjectDept.getId());
                }
            }
            List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()