server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -53,6 +53,7 @@
    public static final String YW_PATROL ="YW_PATROL" ;
    public static final String YW_CONTRACT_BILL ="YW_CONTRACT_BILL" ;
    public static final String YW_MATERIAL ="YW_MATERIAL" ;
    public static final String YW_PROBLEM ="YW_PROBLEM" ;

    public static final String RESERVATION_TOTAL_NUM ="RESERVATION_TOTAL_NUM" ;
    public static final String SIGN_IN_PLACE_LAT ="SIGN_IN_PLACE_LAT" ;
@@ -1388,6 +1389,7 @@
        FN_PATROL_TASK_RECORD_FILE(11, "巡检任务点处理附件 ", "巡检任务点处理附件 "),
        MATERIAL_FILE(12, "资产附件 ", "资产附件 "),
        PROBLEM_FILE(13, "问题附件 ", "问题附件 "),
        FN_DEVICE_MAINTENANCE_FILE(14, "阜宁服务平台设备文件 ", "阜宁服务平台设备文件 "),

        ;
        // æˆå‘˜å˜é‡

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwDeviceCloudController.java

@@ -8,6 +8,8 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.YwDevice;
import com.doumee.dao.business.vo.YwDeviceCateDataVO;
import com.doumee.dao.business.vo.YwDeviceStatusDataVO;
import com.doumee.service.business.YwDeviceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,6 +20,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;

/**
 * @author æ±Ÿè¹„蹄
@@ -100,6 +103,17 @@
        return ApiResponse.success(ywDeviceService.findByCode(deviceCode));
    }

    @ApiOperation("设备数量分类统计")
    @PostMapping("/getDeviceCateData")
    @CloudRequiredPermission("business:ywdevice:query")
    public ApiResponse<Set<YwDeviceCateDataVO>> getDeviceCateData (@RequestBody YwDevice ywDevice,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(ywDeviceService.getDeviceCateData(ywDevice));
    }


    @ApiOperation("设备状态统计")
    @PostMapping("/getDeviceStatus")
    @CloudRequiredPermission("business:ywdevice:query")
    public ApiResponse<YwDeviceStatusDataVO> getDeviceStatus (@RequestBody YwDevice ywDevice,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(ywDeviceService.getDeviceStatus(ywDevice));
    }
}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwProblemController.java

@@ -10,7 +10,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.YwProblem;
import com.doumee.dao.business.model.YwWorkorder;
import com.doumee.service.business.YwProblemService;
import com.doumee.service.business.impl.YwWorkorderServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;    
@@ -33,6 +35,8 @@
    @Autowired
    private YwProblemService ywProblemService;

    @Autowired
    private YwWorkorderServiceImpl ywWorkorderService;
    @LoginNoRequired
    @PreventRepeat
    @ApiOperation("问题提报")
@@ -41,10 +45,23 @@
        return ApiResponse.success(ywProblemService.create(ywProblem));
    }




    @ApiOperation("根据ID修改")
    @PostMapping("/editProblem")
    @CloudRequiredPermission("business:ywproblem:update")
    public ApiResponse editProblem(@RequestBody YwProblem ywProblem,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywProblem.setLoginUserInfo(getLoginUser(token));
        ywProblemService.editProblem(ywProblem,ywWorkorderService);
        return ApiResponse.success(null);
    }


    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywproblem:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywProblemService.deleteById(id);
        return ApiResponse.success(null);
    }
@@ -52,7 +69,7 @@
    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @CloudRequiredPermission("business:ywproblem:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
    public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray) {
@@ -65,7 +82,7 @@
    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywproblem:update")
    public ApiResponse updateById(@RequestBody YwProblem ywProblem) {
    public ApiResponse updateById(@RequestBody YwProblem ywProblem,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywProblemService.updateById(ywProblem);
        return ApiResponse.success(null);
    }
@@ -73,21 +90,21 @@
    @ApiOperation("分页查询")
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywproblem:query")
    public ApiResponse<PageData<YwProblem>> findPage (@RequestBody PageWrap<YwProblem> pageWrap) {
    public ApiResponse<PageData<YwProblem>> findPage (@RequestBody PageWrap<YwProblem> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(ywProblemService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywproblem:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwProblem> pageWrap, HttpServletResponse response) {
    public void exportExcel (@RequestBody PageWrap<YwProblem> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ExcelExporter.build(YwProblem.class).export(ywProblemService.findPage(pageWrap).getRecords(), "运维问题上报信息表", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @CloudRequiredPermission("business:ywproblem:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(ywProblemService.findById(id));
    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(ywProblemService.getDetail(id));
    }
}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkorderCloudController.java

@@ -7,7 +7,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dto.YwWorkorderDataDTO;
import com.doumee.dao.business.model.YwWorkorder;
import com.doumee.dao.business.vo.YwWorkorderDataVO;
import com.doumee.service.business.YwWorkorderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -37,6 +39,7 @@
    @CloudRequiredPermission("business:ywworkorder:create")
    public ApiResponse create(@RequestBody YwWorkorder ywWorkorder,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywWorkorder.setLoginUserInfo(this.getLoginUser(token));
        ywWorkorder.setOrigin(Constants.ZERO);
        return ApiResponse.success(ywWorkorderService.create(ywWorkorder));
    }

@@ -86,6 +89,19 @@
        return ApiResponse.success(null);
    }


    @ApiOperation("获取工单数量信息")
    @PostMapping("/getDataVO")
    @CloudRequiredPermission("business:ywworkorder:update")
    public ApiResponse<YwWorkorderDataVO> getDataVO(@RequestBody YwWorkorderDataDTO dto,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        YwWorkorderDataVO ywWorkorderDataVO = ywWorkorderService.getDataVO(dto);
        return ApiResponse.success(ywWorkorderDataVO);
    }





    @ApiOperation("分页查询")
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywworkorder:query")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/YwProblemMapper.java

@@ -2,11 +2,12 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.YwProblem;
import com.github.yulichang.base.MPJBaseMapper;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2025/01/06 11:05
 */
public interface YwProblemMapper extends BaseMapper<YwProblem> {
public interface YwProblemMapper extends MPJBaseMapper<YwProblem> {

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/YwWorkorderDataDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package com.doumee.dao.business.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2025/1/8 15:37
 */
@Data
public class YwWorkorderDataDTO {


    @ApiModelProperty(value = "查询类型：1=项目；2=楼层；3=房间", example = "1")
    private Integer queryType;

    @ApiModelProperty(value = "业务主键", example = "1")
    private Integer queryId;




}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java

@@ -202,6 +202,9 @@
    @ExcelColumn(name="物业费总金额")
    private BigDecimal wyTotalFee;

    @ApiModelProperty(value = "房间主键 æŸ¥è¯¢ä½¿ç”¨")
    @TableField(exist = false)
    private Integer roomId;
    @ApiModelProperty(value = "附件集合")
    @TableField(exist = false)
    private List<Multifile> fileList;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java

@@ -12,6 +12,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.util.List;

/**
 * è¿ç»´è®¾å¤‡ä¿¡æ¯è¡¨
@@ -94,9 +95,46 @@
    @ExcelColumn(name="所在位置")
    private String addr;

    @ApiModelProperty(value = "所属项目编码（关联yw_project)", example = "1")
    private Integer projectId;

    @ApiModelProperty(value = "所属楼层编码（关联yw_floor)", example = "1")
    private Integer floorId;

    @ApiModelProperty(value = "所属楼宇编码（关联yw_building)", example = "1")
    private Integer buildingId;

    @ApiModelProperty(value = "所属房间编码（关联yw_room)", example = "1")
    private Integer roomId;


    @ApiModelProperty(value = "供应商联系人")
    private String supplierLinker;

    @ApiModelProperty(value = "供应商联系电话")
    private String supplierPhone;

    @ApiModelProperty(value = "维保人员主键（关联system_user）")
    private Integer maintenanceUserId;

    @ApiModelProperty(value = "维保到期日")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date maintenanceOverDate;

    @ApiModelProperty(value = "维保说明")
    private String maintenanceContent;

    @ApiModelProperty(value = "分类名称")
    @TableField(exist = false)
    private String categoryName;

    @ApiModelProperty(value = "父级分类名称")
    @TableField(exist = false)
    private String categoryParentName;

    @ApiModelProperty(value = "所属父级分类编码（关联category）", example = "1")
    @TableField(exist = false)
    private Integer cateParentId;

    @ApiModelProperty(value = "管理员名称")
    @TableField(exist = false)
@@ -110,6 +148,12 @@
    @TableField(exist = false)
    private String fileFullUrl;

    @ApiModelProperty(value = "附件信息")
    @TableField(exist = false)
    private List<Multifile> multifileList;




//    @ApiModelProperty(value = "附件信息")
//    @TableField(exist = false)

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwMaterial.java

@@ -119,5 +119,13 @@
    @TableField(exist = false)
    private Integer projectId;

    @ApiModelProperty(value = "楼宇主键", example = "1")
    @TableField(exist = false)
    private Integer buildingId;

    @ApiModelProperty(value = "楼层主键", example = "1")
    @TableField(exist = false)
    private Integer floorId;


}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java

@@ -119,4 +119,26 @@
    @TableField(exist = false)
    private List<Multifile> multifileList;


    @ApiModelProperty(value = "巡检计划名称")
    @TableField(exist = false)
    private String schemeTitle;

    @ApiModelProperty(value = "巡检任务编号")
    @TableField(exist = false)
    private String taskCode;

    @ApiModelProperty(value = "开始日期")
    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date startDate;

    @ApiModelProperty(value = "结束日期")
    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date endDate;




}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProblem.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import com.doumee.dao.system.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,7 +22,7 @@
@Data
@ApiModel("运维问题上报信息表")
@TableName("`yw_problem`")
public class YwProblem {
public class YwProblem extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
@@ -93,7 +94,7 @@

    @ApiModelProperty(value = "处理时间")
    @ExcelColumn(name="处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date dealDate;

    @ApiModelProperty(value = "处理备注")
@@ -111,4 +112,51 @@
    @ApiModelProperty(value = "附件信息")
    @TableField(exist = false)
    private List<Multifile> fileList;

    @ApiModelProperty(value = "处理人名称")
    @TableField(exist = false)
    private String dealUserName;

    @ApiModelProperty(value = "处理人组织名称")
    @TableField(exist = false)
    private String dealUserCompanyName;

    @ApiModelProperty(value = "处理开始时间 æŸ¥è¯¢ä½¿ç”¨")
    @TableField(exist = false)
    private Date dealDateStart;

    @ApiModelProperty(value = "处理结束时间 æŸ¥è¯¢ä½¿ç”¨")
    @TableField(exist = false)
    private Date dealDateEnd;


    @ApiModelProperty(value = "保修区域类型 0室内维修 1公共区域", example = "1")
    @TableField(exist = false)
    private Integer workOrderAreaType;

    @ApiModelProperty(value = "所属房间编码（关联yw_room)", example = "1")
    @TableField(exist = false)
    private Integer workOrderRoomId;

    @ApiModelProperty(value = "所属楼层编码（关联yw_floor)", example = "1")
    @TableField(exist = false)
    private Integer workOrderFloorId;

    @ApiModelProperty(value = "工单分类编码(关联category）", example = "1")
    @TableField(exist = false)
    private Integer workOrderCateId;

    @ApiModelProperty(value = "上门时间")
    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date workOrderGetDate;

    @ApiModelProperty(value = "情况说明")
    @TableField(exist = false)
    private String workOrderContent;

    @ApiModelProperty(value = "转工单附件信息")
    @TableField(exist = false)
    private List<Multifile> workOrderFileList;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java

@@ -73,6 +73,7 @@

    @ApiModelProperty(value = "所属房间编码（关联yw_room)", example = "1")
    private Integer roomId;

    @ApiModelProperty(value = "所属楼层编码（关联yw_floor)", example = "1")
    private Integer floorId;

@@ -123,6 +124,10 @@
    @ApiModelProperty(value = "处理方式 0指派后处理 1直接回复", example = "1")
    private Integer dealType;


    @ApiModelProperty(value = "来源 0自建 1问题转工单", example = "1")
    private Integer origin;

    @ApiModelProperty(value = "项目名称")
    @TableField(exist = false)
    private String projectName;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/YwDeviceCateDataVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.doumee.dao.business.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2024/12/2 10:02
 */
@Data
public class YwDeviceCateDataVO {

    @ApiModelProperty(value = "分类主键", example = "1")
    private Integer cateId;

    @ApiModelProperty(value = "分类名称", example = "1")
    private String cateName;

    @ApiModelProperty(value = "父级分类主键", example = "1")
    private Integer cateParentId;

    @ApiModelProperty(value = "数量", example = "1")
    private Integer deviceAmount ;


}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/YwDeviceParentCateDataVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
package com.doumee.dao.business.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2024/12/2 10:02
 */
@Data
public class YwDeviceParentCateDataVO {

    @ApiModelProperty(value = "分类主键", example = "1")
    private Integer cateId;

    @ApiModelProperty(value = "分类名称", example = "1")
    private String cateName;

    @ApiModelProperty(value = "数量", example = "1")
    private Integer deviceAmount ;

    @ApiModelProperty(value = "子分类数据", example = "1")
    private List<YwDeviceCateDataVO> ywDeviceCateDataVOList;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/YwDeviceStatusDataVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.doumee.dao.business.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2025/1/8 15:32
 */
@Data
public class YwDeviceStatusDataVO {


    @ApiModelProperty(value = "正常数量", example = "1")
    private Integer workAmount;

    @ApiModelProperty(value = "异常数量", example = "1")
    private Integer exceptionAmount;

    @ApiModelProperty(value = "报废数量", example = "1")
    private Integer errAmount;

    @ApiModelProperty(value = "累计总数", example = "1")
    private Integer amount;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/YwWorkorderDataVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
package com.doumee.dao.business.vo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2025/1/8 15:32
 */
@Data
public class YwWorkorderDataVO {


    @ApiModelProperty(value = "待指派数量", example = "1")
    private Integer waitAssignAmount;

    @ApiModelProperty(value = "待处理数量", example = "1")
    private Integer waitDealAmount;

    @ApiModelProperty(value = "本月总数", example = "1")
    private Integer monthAmount;

    @ApiModelProperty(value = "累计总数", example = "1")
    private Integer amount;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwDeviceService.java

@@ -4,9 +4,12 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwDevice;
import com.doumee.dao.business.vo.YwDeviceCateDataVO;
import com.doumee.dao.business.vo.YwDeviceDataVO;
import com.doumee.dao.business.vo.YwDeviceStatusDataVO;

import java.util.List;
import java.util.Set;

/**
 * è¿ç»´è®¾å¤‡ä¿¡æ¯è¡¨Service定义
@@ -105,5 +108,7 @@

    YwDevice findByCode(String deviceCode);

    Set<YwDeviceCateDataVO> getDeviceCateData(YwDevice model);

    YwDeviceStatusDataVO getDeviceStatus(YwDevice model);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwProblemService.java

@@ -3,6 +3,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwProblem;
import com.doumee.service.business.impl.YwWorkorderServiceImpl;

import java.util.List;

/**
@@ -63,6 +65,9 @@
     */
    YwProblem findById(Integer id);

    YwProblem getDetail(Integer id);


    /**
     * æ¡ä»¶æŸ¥è¯¢å•æ¡è®°å½•
     *
@@ -94,4 +99,7 @@
     * @return long
     */
    long count(YwProblem ywProblem);


    void editProblem(YwProblem ywProblem, YwWorkorderServiceImpl ywWorkorderService);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwWorkorderService.java

@@ -3,7 +3,10 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.dto.YwWorkorderDataDTO;
import com.doumee.dao.business.model.YwWorkorder;
import com.doumee.dao.business.vo.YwWorkorderDataVO;

import java.util.List;

/**
@@ -98,4 +101,6 @@

    void dispatchOrder(YwWorkorder ywWorkorder);
    void dealOrder(YwWorkorder ywWorkorder);

    YwWorkorderDataVO getDataVO(YwWorkorderDataDTO dto);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java

@@ -1525,10 +1525,6 @@
            queryWrapper.le(YwContract::getWyFreeEndDate, Utils.Date.getEnd(pageWrap.getModel().getWyFreeEndDate()));
        }





        if (pageWrap.getModel().getZlTotalFee() != null) {
            queryWrapper.eq(YwContract::getZlTotalFee, pageWrap.getModel().getZlTotalFee());
        }
@@ -1538,6 +1534,9 @@
        if (pageWrap.getModel().getCompanyName() != null) {
            queryWrapper.like(Company::getName, pageWrap.getModel().getCompanyName());
        }
        if (pageWrap.getModel().getRoomId() != null) {
            queryWrapper.apply(" t.id in ( select ycr.CONTRACT_ID from yw_contract_room ycr where ycr.type = 0 and  ycr.ROOM_ID = "+pageWrap.getModel().getRoomId()+" )  ");
        }
        queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), YwContract::getStartDate, pageWrap.getModel().getQueryStartTime())
                        .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()), YwContract::getEndDate, pageWrap.getModel().getQueryEndTime());
        queryWrapper.orderByDesc(YwContract::getCreateDate );

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceRecordServiceImpl.java

@@ -178,6 +178,7 @@
                        .and(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getDeviceName()),i->i.like(YwDevice::getName,model.getDeviceName()).or().like(YwDevice::getCode,model.getDeviceName()))
                        .ge(Objects.nonNull(model.getStartDate()),YwDeviceRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()))
                        .le(Objects.nonNull(model.getEndDate()),YwDeviceRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()))
                        .eq(Objects.nonNull(model.getDeviceId()),YwDeviceRecord::getDeviceId,model.getDeviceId())
                        .eq(YwDeviceRecord::getIsdeleted,Constants.ZERO)
                        .orderByDesc(YwDeviceRecord::getCreateDate)
        );

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceServiceImpl.java

@@ -15,7 +15,10 @@
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.YwDevice;
import com.doumee.dao.business.model.YwDeviceRecord;
import com.doumee.dao.business.vo.YwDeviceCateDataVO;
import com.doumee.dao.business.vo.YwDeviceDataVO;
import com.doumee.dao.business.vo.YwDeviceParentCateDataVO;
import com.doumee.dao.business.vo.YwDeviceStatusDataVO;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.model.Multifile;
import com.doumee.dao.system.model.SystemUser;
@@ -33,9 +36,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -66,6 +67,10 @@
            || StringUtils.isBlank(ywDevice.getName())
            || StringUtils.isBlank(ywDevice.getCode())
            || Objects.isNull(ywDevice.getStatus())
            || Objects.isNull(ywDevice.getProjectId())
            || Objects.isNull(ywDevice.getFloorId())
            || Objects.isNull(ywDevice.getBuildingId())
            || Objects.isNull(ywDevice.getRoomId())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
@@ -87,6 +92,28 @@
            multifile.setObjId(ywDevice.getId());
            multifile.setFileurl(ywDevice.getFileUrl());
            multifileMapper.insert(multifile);
        }

        List<Multifile> fileList = new ArrayList<>();
        if(ywDevice.getMultifileList()!=null && ywDevice.getMultifileList().size()>0){
            for (int i = 0; i <  ywDevice.getMultifileList().size(); i++) {
                Multifile multifile =  ywDevice.getMultifileList().get(i);
                if(StringUtils.isBlank(multifile.getFileurl())){
                    continue;
                }
                multifile.setCreateDate(ywDevice.getCreateDate());
                multifile.setEditDate(ywDevice.getCreateDate());
                multifile.setCreator(ywDevice.getEditor());
                multifile.setIsdeleted(Constants.ZERO);
                multifile.setObjId(ywDevice.getId());
                multifile.setEditor(ywDevice.getCreator());
                multifile.setObjType(Constants.MultiFile.FN_DEVICE_MAINTENANCE_FILE.getKey());
                multifile.setSortnum(i+1);
                fileList.add(multifile);
            }
        }
        if(fileList.size()>0){
            multifileMapper.insert(fileList);
        }

        return ywDevice.getId();
@@ -126,6 +153,10 @@
                || StringUtils.isBlank(ywDevice.getName())
                || StringUtils.isBlank(ywDevice.getCode())
                || Objects.isNull(ywDevice.getStatus())
                || Objects.isNull(ywDevice.getProjectId())
                || Objects.isNull(ywDevice.getFloorId())
                || Objects.isNull(ywDevice.getBuildingId())
                || Objects.isNull(ywDevice.getRoomId())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
@@ -140,7 +171,7 @@
        ywDeviceMapper.updateById(ywDevice);
        multifileMapper.delete(new QueryWrapper<Multifile>().lambda()
                .eq(Multifile::getObjId,ywDevice.getId())
                .eq(Multifile::getObjType,Constants.MultiFile.FN_DEVICE_FILE.getKey())
                .in(Multifile::getObjType,Constants.MultiFile.FN_DEVICE_FILE.getKey(),Constants.MultiFile.FN_DEVICE_MAINTENANCE_FILE.getKey())
        );
        if(Objects.nonNull(ywDevice.getFileUrl())){
            Multifile multifile = new Multifile();
@@ -151,6 +182,28 @@
            multifile.setObjId(ywDevice.getId());
            multifile.setFileurl(ywDevice.getFileUrl());
            multifileMapper.insert(multifile);
        }

        List<Multifile> fileList = new ArrayList<>();
        if(ywDevice.getMultifileList()!=null && ywDevice.getMultifileList().size()>0){
            for (int i = 0; i <  ywDevice.getMultifileList().size(); i++) {
                Multifile multifile =  ywDevice.getMultifileList().get(i);
                if(StringUtils.isBlank(multifile.getFileurl())){
                    continue;
                }
                multifile.setCreateDate(ywDevice.getCreateDate());
                multifile.setEditDate(ywDevice.getCreateDate());
                multifile.setCreator(ywDevice.getEditor());
                multifile.setIsdeleted(Constants.ZERO);
                multifile.setObjId(ywDevice.getId());
                multifile.setEditor(ywDevice.getCreator());
                multifile.setObjType(Constants.MultiFile.FN_DEVICE_MAINTENANCE_FILE.getKey());
                multifile.setSortnum(i+1);
                fileList.add(multifile);
            }
        }
        if(fileList.size()>0){
            multifileMapper.insert(fileList);
        }


@@ -181,6 +234,26 @@
                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_DEVICE).getCode();
            ywDevice.setFileFullUrl(path + multifile.getFileurl());
        }

        //附件数据
        List<Multifile> multifileList = multifileMapper.selectJoinList(Multifile.class,new MPJLambdaWrapper<Multifile>()
                .selectAll(Multifile.class)
                .selectAs(SystemUser::getRealname,Multifile::getUserName)
                .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
                .eq(Multifile::getObjId,ywDevice.getId())
                .eq(Multifile::getIsdeleted,Constants.ZERO)
                .eq(Multifile::getObjType,Constants.MultiFile.FN_DEVICE_MAINTENANCE_FILE.getKey()));
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PATROL).getCode();
            for (Multifile m:multifileList) {
                if(StringUtils.isNotBlank(m.getFileurl())){
                    m.setFileurlFull(path + m.getFileurl());
                }
            }
            ywDevice.setMultifileList(multifileList);
        }

        return ywDevice;
    }

@@ -228,12 +301,18 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        YwDevice model = pageWrap.getModel();
        queryWrapper.selectAll(YwDevice.class)
                .selectAs(Category::getName,YwDevice::getCategoryName)
                .select("c.name",YwDevice::getCategoryName)
                .select("c1.name",YwDevice::getCategoryParentName)
                .selectAs(SystemUser::getRealname,YwDevice::getRealName)
                .leftJoin(Category.class,Category::getId,YwDevice::getCateId)
                .leftJoin(SystemUser.class,SystemUser::getId,YwDevice::getUserId)
                .leftJoin("category c on t.CATE_ID = c.id")
                .leftJoin("category c1 on c.PARENT_ID = c1.id")
                .and(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getName()),i->i.like(YwDevice::getName,model.getName()).or().like(YwDevice::getCode,model.getName()))
                .eq(Objects.nonNull(model.getStatus()),YwDevice::getStatus,model.getStatus())
                .eq(Objects.nonNull(model.getRoomId()),YwDevice::getRoomId,model.getRoomId())
                .eq(Objects.nonNull(model.getFloorId()),YwDevice::getFloorId,model.getFloorId())
                .eq(Objects.nonNull(model.getProjectId()),YwDevice::getProjectId,model.getProjectId())
                .eq(Objects.nonNull(model.getBuildingId()),YwDevice::getBuildingId,model.getBuildingId())
                .eq(YwDevice::getIsdeleted,Constants.ZERO)
                .orderByDesc(YwDevice::getCreateDate)
        ;
@@ -263,6 +342,80 @@
        return ywDeviceDataVO;
    }

    @Override
    public Set<YwDeviceCateDataVO> getDeviceCateData(YwDevice model){
        MPJLambdaWrapper<YwDevice> queryWrapper = new MPJLambdaWrapper<YwDevice>();
        queryWrapper.selectAll(YwDevice.class)
                .select("c.name",YwDevice::getCategoryName)
                .select("c1.name",YwDevice::getCategoryParentName)
                .select("c1.id",YwDevice::getCateParentId)
                .selectAs(SystemUser::getRealname,YwDevice::getRealName)
                .leftJoin(SystemUser.class,SystemUser::getId,YwDevice::getUserId)
                .leftJoin("category c on t.CATE_ID = c.id")
                .leftJoin("category c1 on c.PARENT_ID = c1.id")
                .eq(Objects.nonNull(model.getRoomId()),YwDevice::getRoomId,model.getRoomId())
                .eq(Objects.nonNull(model.getFloorId()),YwDevice::getFloorId,model.getFloorId())
                .eq(Objects.nonNull(model.getProjectId()),YwDevice::getProjectId,model.getProjectId())
                .eq(Objects.nonNull(model.getBuildingId()),YwDevice::getBuildingId,model.getBuildingId())
                .eq(YwDevice::getIsdeleted,Constants.ZERO)
                .isNotNull(YwDevice::getCateId)
                .orderByDesc(YwDevice::getCreateDate)
        ;
        List<YwDevice> ywDeviceList = ywDeviceMapper.selectJoinList(YwDevice.class,queryWrapper);
        Set<YwDeviceCateDataVO> ywDeviceCateDataVOSet = new HashSet<>();
        Set<YwDeviceParentCateDataVO> ywDeviceParentCateDataVOSet = new HashSet<>();
        for (YwDevice y: ywDeviceList) {
            YwDeviceCateDataVO ywDeviceCateDataVO = new YwDeviceCateDataVO();
            ywDeviceCateDataVO.setCateId(y.getCateId());
            ywDeviceCateDataVO.setCateName(y.getCategoryName());
            ywDeviceCateDataVO.setCateParentId(y.getCateParentId());
            ywDeviceCateDataVOSet.add(ywDeviceCateDataVO);
            YwDeviceParentCateDataVO ywDeviceParentCateDataVO = new YwDeviceParentCateDataVO();
            ywDeviceParentCateDataVO.setCateId(y.getCateParentId());
            ywDeviceParentCateDataVO.setCateName(y.getCategoryParentName());
            ywDeviceParentCateDataVOSet.add(ywDeviceParentCateDataVO);
        }

        for (YwDeviceCateDataVO ywDeviceCateDataVO:ywDeviceCateDataVOSet) {
            ywDeviceCateDataVO.setDeviceAmount(
                    ywDeviceList.stream().filter(i->Objects.nonNull(i.getCateId()) && Constants.equalsInteger(i.getCateId(),ywDeviceCateDataVO.getCateId())).collect(Collectors.toList()).size()
            );
        }

        for (YwDeviceParentCateDataVO ywDeviceParentCateDataVO:ywDeviceParentCateDataVOSet) {
            ywDeviceParentCateDataVO.setDeviceAmount(
                    ywDeviceList.stream().filter(i->Objects.nonNull(i.getCateParentId()) && Constants.equalsInteger(i.getCateParentId(),ywDeviceParentCateDataVO.getCateId())).collect(Collectors.toList()).size()
            );
            ywDeviceParentCateDataVO.setYwDeviceCateDataVOList(
                    ywDeviceCateDataVOSet.stream().filter(i->Constants.equalsInteger(i.getCateParentId(),ywDeviceParentCateDataVO.getCateId())).collect(Collectors.toList())
            );
        }
        return ywDeviceCateDataVOSet;
    }


    @Override
    public YwDeviceStatusDataVO getDeviceStatus(YwDevice model){
        YwDeviceStatusDataVO ywDeviceStatusDataVO = new YwDeviceStatusDataVO();
        MPJLambdaWrapper<YwDevice> queryWrapper = new MPJLambdaWrapper<YwDevice>();
        queryWrapper.selectAll(YwDevice.class)
                .eq(Objects.nonNull(model.getRoomId()),YwDevice::getRoomId,model.getRoomId())
                .eq(Objects.nonNull(model.getFloorId()),YwDevice::getFloorId,model.getFloorId())
                .eq(Objects.nonNull(model.getProjectId()),YwDevice::getProjectId,model.getProjectId())
                .eq(Objects.nonNull(model.getBuildingId()),YwDevice::getBuildingId,model.getBuildingId())
                .eq(YwDevice::getIsdeleted,Constants.ZERO)
        ;
        List<YwDevice> ywDeviceList = ywDeviceMapper.selectJoinList(YwDevice.class,queryWrapper);
        ywDeviceStatusDataVO.setAmount(ywDeviceList.size());
        ywDeviceStatusDataVO.setWorkAmount(ywDeviceList.stream().filter(i->Objects.nonNull(i.getStatus())&&Constants.equalsInteger(i.getStatus(),Constants.ZERO)).collect(Collectors.toList()).size());
        ywDeviceStatusDataVO.setExceptionAmount(ywDeviceList.stream().filter(i->Objects.nonNull(i.getStatus())&&Constants.equalsInteger(i.getStatus(),Constants.ONE)).collect(Collectors.toList()).size());
        ywDeviceStatusDataVO.setErrAmount(ywDeviceList.stream().filter(i->Objects.nonNull(i.getStatus())&&Constants.equalsInteger(i.getStatus(),Constants.THREE)).collect(Collectors.toList()).size());
        return ywDeviceStatusDataVO;

    }





}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java

@@ -221,6 +221,8 @@
                .like(StringUtils.isNotBlank(model.getAttr()),YwMaterial::getAttr,model.getAttr())
                .eq(Objects.nonNull(model.getProjectId()),YwRoom::getProjectId,model.getProjectId())
                .eq(Objects.nonNull(model.getRoomId()),YwMaterial::getRoomId,model.getRoomId())
                .eq(Objects.nonNull(model.getFloorId()),YwRoom::getFloor,model.getFloorId())
                .eq(Objects.nonNull(model.getBuildingId()),YwRoom::getBuildingId,model.getBuildingId())
                .eq(YwMaterial::getIsdeleted,Constants.ZERO)
                .orderByAsc(YwMaterial::getCode)
        ;

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java

@@ -127,13 +127,22 @@
                .selectAs(YwPatrolPoint::getName,YwPatrolTaskRecord::getPointName)
                .selectAs(YwPatrolPoint::getContent,YwPatrolTaskRecord::getContent)
                .selectAs(SystemUser::getRealname,YwPatrolTaskRecord::getRealname)

                .selectAs(YwPatrolScheme::getTitle,YwPatrolTaskRecord::getSchemeTitle)
                .selectAs(YwPatrolTask::getTitle,YwPatrolTaskRecord::getTaskCode)
                .selectAs(YwPatrolTask::getStartDate,YwPatrolTaskRecord::getStartDate)
                .selectAs(YwPatrolTask::getEndDate,YwPatrolTaskRecord::getEndDate)

                .leftJoin(YwPatrolPoint.class,YwPatrolPoint::getId,YwPatrolTaskRecord::getPointId)
                .leftJoin(SystemUser.class,SystemUser::getId,YwPatrolTaskRecord::getDealUserId)
                .leftJoin(YwPatrolTask.class,YwPatrolTask::getId,YwPatrolTaskRecord::getTaskId)
                .leftJoin(YwPatrolScheme.class,YwPatrolScheme::getId,YwPatrolTask::getSchemeId)
                .eq(YwPatrolScheme::getIsdeleted, Constants.ZERO)
                .eq(Objects.nonNull(model) && Objects.nonNull(model.getTaskId()),YwPatrolTaskRecord::getTaskId, model.getTaskId())
                .eq(Objects.nonNull(model) && Objects.nonNull(model.getDealUserId()),YwPatrolTaskRecord::getDealUserId, model.getDealUserId())
                .like(StringUtils.isNotBlank(model.getPointName()),YwPatrolPoint::getName,model.getPointName())
                .eq(Objects.nonNull(model) && Objects.nonNull(model.getStatus()) , YwPatrolTaskRecord::getStatus,model.getStatus())
                .eq(Objects.nonNull(model) && Objects.nonNull(model.getDeviceId()) , YwPatrolPoint::getDeviceId,model.getDeviceId())
                .orderByDesc(YwPatrolScheme::getCreateDate)
        ;
        IPage<YwPatrolTaskRecord> iPage = ywPatrolTaskRecordMapper.selectJoinPage(page,YwPatrolTaskRecord.class,queryWrapper); 

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProblemServiceImpl.java

@@ -1,29 +1,33 @@
package com.doumee.service.business.impl;

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwProblemMapper;
import com.doumee.dao.business.model.YwProblem;
import com.doumee.dao.business.YwRoomMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.model.Multifile;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.YwProblemService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;

/**
 * è¿ç»´é—®é¢˜ä¸ŠæŠ¥ä¿¡æ¯è¡¨Service实现
@@ -37,9 +41,16 @@
    private YwProblemMapper ywProblemMapper;

    @Autowired
    private YwRoomMapper ywRoomMapper;

    @Autowired
    private MultifileMapper multifileMapper;

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public Integer create(YwProblem ywProblem) {
        if(Objects.isNull(ywProblem)
            || Objects.isNull(ywProblem.getSubmitDate())
@@ -116,6 +127,110 @@
        return ywProblemMapper.selectById(id);
    }



    @Override
    public YwProblem getDetail(Integer id) {
        MPJLambdaWrapper<YwProblem> queryWrapper = new MPJLambdaWrapper<YwProblem>();
        queryWrapper.selectAll(YwProblem.class)
                .selectAs(SystemUser::getRealname,YwProblem::getDealUserName)
                .selectAs(Company::getName,YwProblem::getDealUserCompanyName)
                .leftJoin(SystemUser.class,SystemUser::getId,YwProblem::getDealUserId)
                .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                .eq(YwProblem::getId,id)
        ;
        YwProblem ywProblem = ywProblemMapper.selectJoinOne(YwProblem.class,queryWrapper);
        if(Objects.isNull(ywProblem)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
                .eq(Multifile::getObjId, ywProblem.getId() )
                .in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.PROBLEM_FILE.getKey() }))
                .eq(Multifile::getIsdeleted,Constants.ZERO));
        if(multifiles!=null){
            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PROBLEM).getCode();
            for(Multifile f : multifiles){
                if(StringUtils.isBlank(f.getFileurl())){
                    continue;
                }
                f.setFileurlFull(path+f.getFileurl());
            }
            ywProblem.setFileList(multifiles);
        }
        return ywProblem;
    }



    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void editProblem(YwProblem ywProblem,YwWorkorderServiceImpl ywWorkorderService){
        if(Objects.isNull(ywProblem)
            || Objects.isNull(ywProblem.getId())
            || Objects.isNull(ywProblem.getDealStatus())
            || !(Constants.equalsInteger(ywProblem.getDealStatus(),Constants.ONE)||Constants.equalsInteger(ywProblem.getDealStatus(),Constants.TWO))
            || (Constants.equalsInteger(ywProblem.getDealStatus(),Constants.TWO)&&StringUtils.isBlank(ywProblem.getDealInfo()))
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo loginUserInfo = ywProblem.getLoginUserInfo();
        //关闭问题
        if(Constants.equalsInteger(ywProblem.getDealStatus(),Constants.TWO)){
            ywProblemMapper.update(new UpdateWrapper<YwProblem>().lambda()
                    .set(YwProblem::getDealDate, DateUtil.getCurrDateTime())
                    .set(YwProblem::getDealInfo,ywProblem.getDealInfo())
                    .set(YwProblem::getDealType,Constants.ONE)
                    .set(YwProblem::getDealStatus,ywProblem.getDealStatus())
                    .set(YwProblem::getDealUserId,loginUserInfo.getId())
                    .set(YwProblem::getEditor,loginUserInfo.getId())
                    .set(YwProblem::getEditDate, DateUtil.getCurrDateTime())
                    .eq(YwProblem::getId,ywProblem.getId())
            );
        }else{
            if(Objects.isNull(ywProblem.getWorkOrderAreaType())
                    ||Objects.isNull(ywProblem.getWorkOrderCateId())
                    ||StringUtils.isBlank(ywProblem.getWorkOrderContent())
            ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            YwWorkorder ywWorkorder = new YwWorkorder();
            ywWorkorder.setAreaType(ywProblem.getWorkOrderAreaType());
            ywWorkorder.setCateId(ywProblem.getWorkOrderCateId());
            ywWorkorder.setContent(ywProblem.getWorkOrderContent());
            ywWorkorder.setRoomId(ywProblem.getWorkOrderRoomId());
            ywWorkorder.setFloorId(ywProblem.getWorkOrderFloorId());
            ywWorkorder.setGetDate(ywProblem.getWorkOrderGetDate());
            ywWorkorder.setOrigin(Constants.ONE);
            ywWorkorder.setLoginUserInfo(loginUserInfo);
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywProblem.getWorkOrderFileList())){
                ywWorkorder.setFileList(ywProblem.getWorkOrderFileList());
            }
            Integer workOrderId = ywWorkorderService.create(ywWorkorder);
            ywProblemMapper.update(new UpdateWrapper<YwProblem>().lambda()
                    .set(YwProblem::getDealDate, DateUtil.getCurrDateTime())
                    .set(YwProblem::getDealInfo,ywProblem.getDealInfo())
                    .set(YwProblem::getDealType,Constants.ZERO)
                    .set(YwProblem::getDealStatus,ywProblem.getDealStatus())
                    .set(YwProblem::getDealUserId,loginUserInfo.getId())
                    .set(YwProblem::getEditor,loginUserInfo.getId())
                    .set(YwProblem::getEditDate, DateUtil.getCurrDateTime())
                    .set(YwProblem::getWorkorderId,workOrderId)
                    .eq(YwProblem::getId,ywProblem.getId())
            );

        }

    }









    @Override
    public YwProblem findOne(YwProblem ywProblem) {
        QueryWrapper<YwProblem> wrapper = new QueryWrapper<>(ywProblem);
@@ -131,77 +246,19 @@
    @Override
    public PageData<YwProblem> findPage(PageWrap<YwProblem> pageWrap) {
        IPage<YwProblem> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<YwProblem> queryWrapper = new QueryWrapper<>();
        MPJLambdaWrapper<YwProblem> queryWrapper = new MPJLambdaWrapper<YwProblem>();
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(YwProblem::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.lambda().eq(YwProblem::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
            queryWrapper.lambda().ge(YwProblem::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.lambda().le(YwProblem::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
            queryWrapper.lambda().eq(YwProblem::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getEditDate() != null) {
            queryWrapper.lambda().ge(YwProblem::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.lambda().le(YwProblem::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.lambda().eq(YwProblem::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getPosition() != null) {
            queryWrapper.lambda().eq(YwProblem::getPosition, pageWrap.getModel().getPosition());
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.lambda().eq(YwProblem::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(YwProblem::getStatus, pageWrap.getModel().getStatus());
        }
        if (pageWrap.getModel().getContent() != null) {
            queryWrapper.lambda().eq(YwProblem::getContent, pageWrap.getModel().getContent());
        }
        if (pageWrap.getModel().getPhone() != null) {
            queryWrapper.lambda().eq(YwProblem::getPhone, pageWrap.getModel().getPhone());
        }
        if (pageWrap.getModel().getSubmitDate() != null) {
            queryWrapper.lambda().ge(YwProblem::getSubmitDate, Utils.Date.getStart(pageWrap.getModel().getSubmitDate()));
            queryWrapper.lambda().le(YwProblem::getSubmitDate, Utils.Date.getEnd(pageWrap.getModel().getSubmitDate()));
        }
        if (pageWrap.getModel().getCode() != null) {
            queryWrapper.lambda().eq(YwProblem::getCode, pageWrap.getModel().getCode());
        }
        if (pageWrap.getModel().getDealStatus() != null) {
            queryWrapper.lambda().eq(YwProblem::getDealStatus, pageWrap.getModel().getDealStatus());
        }
        if (pageWrap.getModel().getDealUserId() != null) {
            queryWrapper.lambda().eq(YwProblem::getDealUserId, pageWrap.getModel().getDealUserId());
        }
        if (pageWrap.getModel().getDealDate() != null) {
            queryWrapper.lambda().ge(YwProblem::getDealDate, Utils.Date.getStart(pageWrap.getModel().getDealDate()));
            queryWrapper.lambda().le(YwProblem::getDealDate, Utils.Date.getEnd(pageWrap.getModel().getDealDate()));
        }
        if (pageWrap.getModel().getDealInfo() != null) {
            queryWrapper.lambda().eq(YwProblem::getDealInfo, pageWrap.getModel().getDealInfo());
        }
        if (pageWrap.getModel().getDealType() != null) {
            queryWrapper.lambda().eq(YwProblem::getDealType, pageWrap.getModel().getDealType());
        }
        if (pageWrap.getModel().getWorkorderId() != null) {
            queryWrapper.lambda().eq(YwProblem::getWorkorderId, pageWrap.getModel().getWorkorderId());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(ywProblemMapper.selectPage(page, queryWrapper));
        YwProblem model = pageWrap.getModel();
        queryWrapper.selectAll(YwProblem.class)
                .selectAs(SystemUser::getRealname,YwProblem::getDealUserName)
                .leftJoin(SystemUser.class,SystemUser::getId,YwProblem::getDealUserId)
                .like(StringUtils.isNotBlank(model.getContent()),YwProblem::getContent,model.getContent())
                .ge(Objects.nonNull(model.getDealDateStart()),YwProblem::getDealDate, Utils.Date.getStart(model.getDealDateStart()))
                .le(Objects.nonNull(model.getDealDateEnd()),YwProblem::getDealDate, Utils.Date.getEnd(model.getDealDateEnd()))
                .eq(Objects.nonNull(model.getDealStatus()),YwProblem::getDealStatus,model.getDealStatus())
        ;
        IPage iPage = ywProblemMapper.selectJoinPage(page,YwProblem.class,queryWrapper);
        return PageData.from(iPage);
    }

    @Override

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwRoomServiceImpl.java

@@ -126,7 +126,19 @@

    @Override
    public YwRoom findById(Integer id) {
        return ywRoomMapper.selectById(id);
        MPJLambdaWrapper<YwRoom> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(YwRoom.class )
                .selectAs(YwProject::getName,YwRoom::getProjectName)
                .selectAs(YwFloor::getName,YwRoom::getFloorName)
                .selectAs(YwBuilding::getName,YwRoom::getBuildingName)
                .leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId)
                .leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)
                .leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor)
                .eq(YwRoom::getId,id)
                .last(" limit 1 ")
        ;
        YwRoom ywRoom = ywRoomMapper.selectJoinOne(YwRoom.class,queryWrapper);
        return ywRoom;
    }

    @Override

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java

@@ -8,9 +8,12 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dto.YwWorkorderDataDTO;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.YwWorkorderDataVO;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.Multifile;
@@ -29,6 +32,7 @@
import org.springframework.util.CollectionUtils;

import java.util.*;
import java.util.stream.Collectors;

/**
 * è¿ç»´å·¥å•ä¿¡æ¯è¡¨Service实现
@@ -528,4 +532,27 @@
        QueryWrapper<YwWorkorder> wrapper = new QueryWrapper<>(ywWorkorder);
        return ywWorkorderMapper.selectCount(wrapper);
    }



    @Override
    public YwWorkorderDataVO getDataVO(YwWorkorderDataDTO dto){
        YwWorkorderDataVO ywWorkorderDataVO = new YwWorkorderDataVO();

        List<YwWorkorder> list = ywWorkorderMapper.selectList(new QueryWrapper<YwWorkorder>().lambda()
                .eq(YwWorkorder::getIsdeleted,Constants.ZERO)
                .eq(Constants.equalsInteger(dto.getQueryType(),Constants.ONE),YwWorkorder::getProjectId,dto.getQueryId())
                .eq(Constants.equalsInteger(dto.getQueryType(),Constants.TWO),YwWorkorder::getFloorId,dto.getQueryId())
                .eq(Constants.equalsInteger(dto.getQueryType(),Constants.THREE),YwWorkorder::getRoomId,dto.getQueryId()));
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
            ywWorkorderDataVO.setAmount(list.size());
            ywWorkorderDataVO.setMonthAmount(list.stream().filter(i-> DateUtil.formatDate(i.getSubmitDate(),"yyyy-MM").equals(DateUtil.formatDate(new Date(),"yyyy-MM"))).collect(Collectors.toList()).size());
            ywWorkorderDataVO.setWaitDealAmount(list.stream().filter(i-> Constants.equalsInteger(i.getDealStatus(),Constants.ONE)).collect(Collectors.toList()).size());
            ywWorkorderDataVO.setWaitAssignAmount(list.stream().filter(i-> Constants.equalsInteger(i.getDealStatus(),Constants.ZERO)).collect(Collectors.toList()).size());
        }
        return ywWorkorderDataVO;
    }



}