开发更新

jiangping

2024-11-25 00b29076f9775ab69b02a6fe8290cdbdff932b59

开发更新

 server/system_service/src/main/java/com/doumee/cloud/NoticesCloudController.java

ÎļþÃû´Ó server/system_service/src/main/java/com/doumee/api/cloud/NoticesCloudController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.cloud;
package com.doumee.cloud;

import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;

 server/system_service/src/main/java/com/doumee/cloud/SystemCloudController.java

ÎļþÃû´Ó server/system_service/src/main/java/com/doumee/api/cloud/SystemCloudController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.cloud;
package com.doumee.cloud;

import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemUserBiz;

 server/system_service/src/main/java/com/doumee/cloud/SystemDataPermissionCloudController.java

ÎļþÃû´Ó server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.cloud;
package com.doumee.cloud;

import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDataPermissionBiz;

 server/system_service/src/main/java/com/doumee/cloud/SystemDepartmentCloudController.java

ÎļþÃû´Ó server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.cloud;
package com.doumee.cloud;

import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDepartmentBiz;

 server/system_service/src/main/java/com/doumee/cloud/SystemDictCloudController.java

ÎļþÃû´Ó server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.cloud;
package com.doumee.cloud;

import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictBiz;

 server/system_service/src/main/java/com/doumee/cloud/SystemDictDataCloudController.java

ÎļþÃû´Ó server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.cloud;
package com.doumee.cloud;

import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;

 server/system_service/src/main/java/com/doumee/cloud/SystemLoginLogCloudController.java

ÎļþÃû´Ó server/system_service/src/main/java/com/doumee/api/cloud/SystemLoginLogCloudController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.cloud;
package com.doumee.cloud;

import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;

 server/system_service/src/main/java/com/doumee/cloud/SystemMenuCloudController.java

ÎļþÃû´Ó server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.cloud;
package com.doumee.cloud;

import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemMenuBiz;

 server/system_service/src/main/java/com/doumee/cloud/SystemMonitorCloudController.java

ÎļþÃû´Ó server/system_service/src/main/java/com/doumee/api/cloud/SystemMonitorCloudController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.cloud;
package com.doumee.cloud;

import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;

 server/system_service/src/main/java/com/doumee/cloud/SystemPermissionCloudController.java

ÎļþÃû´Ó server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.cloud;
package com.doumee.cloud;

import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemPermissionBiz;

 server/system_service/src/main/java/com/doumee/cloud/SystemPositionCloudController.java

ÎļþÃû´Ó server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.cloud;
package com.doumee.cloud;

import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemPositionBiz;

 server/system_service/src/main/java/com/doumee/cloud/SystemRoleCloudController.java

ÎļþÃû´Ó server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.cloud;
package com.doumee.cloud;

import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemRoleBiz;

 server/system_service/src/main/java/com/doumee/cloud/SystemTraceLogCloudController.java

ÎļþÃû´Ó server/system_service/src/main/java/com/doumee/api/cloud/SystemTraceLogCloudController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.cloud;
package com.doumee.cloud;

import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;

 server/system_service/src/main/java/com/doumee/cloud/SystemUserCloudController.java

ÎļþÃû´Ó server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.api.cloud;
package com.doumee.cloud;

import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemUserBiz;

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

@@ -1293,6 +1293,74 @@
            return noteinfo;
        }

    }

    /**
     * è¿ç»´åˆåŒã€å·¥å•ä¿¡æ¯è®°å½•ç±»åž‹
     * æ“ä½œç±»åž‹ 0工单创建 1指派 2处理 3合同创建 4合同变更 5合同退租
     */
    public  enum YwLogType{
        WORKORDER_CREATE(0, "工单创建", "工单创建"),
        WORKORDER_DISPATCH(1, "工单指派", "工单指派"),
        WORKORDER_DEAL(2, "工单处理 ", "工单处理 "),
        CONTRACT_CREATE(3, "合同创建 ", "合同创建 "),
        CONTRACT_UPDATE(4, "合同变更 ", "合同变更 "),
        CONTRACT_BACK(5, "合同退租 ", "合同退租 "),

        ;
        // æˆå‘˜å˜é‡
        private String name;
        private int key;
        private String noteinfo;// æè¿°

        // æž„造方法
        YwLogType(int key, String name, String noteinfo) {
            this.name = name;
            this.key = key;
            this.noteinfo = noteinfo;
        }

        // æ™®é€šæ–¹æ³•
        public static String getName(int index) {
            for (MultiFile c : MultiFile.values()) {
                if (c.getKey() == index) {
                    return c.name;
                }
            }
            return null;
        }

        // æ™®é€šæ–¹æ³•
        public static String getInfo(int index) {
            for (YwLogType c : YwLogType.values()) {
                if (c.getKey() == index) {
                    return c.noteinfo;
                }
            }
            return null;
        }

        // get set æ–¹æ³•
        public String getName() {
            return name;
        }

        public void setName(String name) {
            this.name = name;
        }

        public int getKey() {
            return key;
        }

        public void setKey(int key) {
            this.key = key;
        }

        public String getNoteinfo() {
            return noteinfo;
        }



    }

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

@@ -40,6 +40,14 @@
        ywContract.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywContractService.create(ywContract));
    }
    @PreventRepeat
    @ApiOperation("退租")
    @PostMapping("/backRent")
    @CloudRequiredPermission("business:ywcontract:update")
    public ApiResponse backRent(@RequestBody YwContract ywContract,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywContract.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywContractService.backRent(ywContract));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")

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

@@ -79,6 +79,14 @@
        return ApiResponse.success(ywFloorService.findPage(pageWrap));
    }

    @ApiOperation("分页查询")
    @PostMapping("/list")
    @CloudRequiredPermission("business:ywfloor:query")
    public ApiResponse<List<YwFloor>> findList (@RequestBody  YwFloor pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap. setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywFloorService.findList(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywfloor:exportExcel")

 server/visits/dmvisit_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java

@@ -53,6 +53,7 @@
                .host(host)
                .select()
                .apis( basePackage("com.doumee.cloud"))
//                .apis( basePackage("com.doumee.api.cloud"))
//                .apis( basePackage("com.doumee.api.common"))

//                .apis( basePackage("com.doumee.cloud.openapi;com.doumee.api.common"))

 server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java

@@ -32,7 +32,7 @@
    @Autowired
    private InterfaceLogService interfaceLogService;

    @PostConstruct
//    @PostConstruct
    public  int  initHkConfig(){
        //获取根组织编码
        initHkParamConfig();

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

@@ -179,6 +179,12 @@
    @ApiModelProperty(value = "物业条款集合")
    @TableField(exist = false)
    private List<YwContractDetail> wyDetailList;
    @ApiModelProperty(value = "操作日志集合")
    @TableField(exist = false)
    private List<YwWorkorderLog> logList;
    @ApiModelProperty(value = "账单集合")
    @TableField(exist = false)
    private List<YwContractBill> billList;
    @ApiModelProperty(value = "重新开始时间")
    @TableField(exist = false)
    private Date queryStartTime;
@@ -186,4 +192,8 @@
    @ApiModelProperty(value = "查询结束时间")
    @TableField(exist = false)
    private Date queryEndTime;

    @ApiModelProperty(value = "退款时新增的收付款账单")
    @TableField(exist = false)
    private List<YwContractBill> addBillList;
}

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

@@ -158,6 +158,9 @@
    @ApiModelProperty(value = "房源名称")
    @TableField(exist = false)
    private String roomName;
    @ApiModelProperty(value = "楼层名称")
    @TableField(exist = false)
    private String floorName;
    @ApiModelProperty(value = "房号")
    @TableField(exist = false)
    private String roomNum;
@@ -167,6 +170,9 @@
    @ApiModelProperty(value = "处理人姓名")
    @TableField(exist = false)
    private String dealUserName;
    @ApiModelProperty(value = "类别名称")
    @TableField(exist = false)
    private String categoryName;
    @ApiModelProperty(value = "分配人姓名")
    @TableField(exist = false)
    private String dispatchUserName;
@@ -185,4 +191,11 @@
    @ApiModelProperty(value = "操作记录列表")
    @TableField(exist = false)
    private List<YwWorkorderLog> logList;
    @ApiModelProperty(value = "重新开始时间")
    @TableField(exist = false)
    private Date queryStartTime;

    @ApiModelProperty(value = "查询结束时间")
    @TableField(exist = false)
    private Date queryEndTime;
}

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

@@ -65,8 +65,8 @@
    @ExcelColumn(name="简介")
    private String content;

    @ApiModelProperty(value = "操作类型 0工单创建 1指派 2处理", example = "1")
    @ExcelColumn(name="操作类型 0工单创建 1指派 2处理")
    @ApiModelProperty(value = "操作类型 0工单创建 1指派 2处理 3合同创建 4合同变更 5合同退租 ", example = "1")
    @ExcelColumn(name="操作类型 0工单创建 1指派 2处理 3合同创建 4合同变更 5合同退租")
    private Integer objType;

    @ApiModelProperty(value = "关联对象编码")

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

@@ -95,4 +95,6 @@
     * @return long
     */
    long count(YwContract ywContract);

    Integer backRent(YwContract ywContract);
}

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

@@ -51,6 +51,8 @@
    @Autowired
    private MultifileMapper multifileMapper;
    @Autowired
    private YwWorkorderLogMapper  ywWorkorderLogMapper;
    @Autowired
    private CompanyMapper companyMapper;
    @Autowired
    private YwProjectMapper projectMapper;
@@ -80,6 +82,30 @@
        ywContractMapper.insert(model);
        dealDetailListBiz(model);//处理条款信息
        dealMultifileBiz(model);//处理附件信息
        dealLogBiz(model,Constants.YwLogType.CONTRACT_CREATE,null,null);//记录新建日志
        return model.getId();
    }
    /**
     * é€€ç§Ÿæäº¤
     * @param model
     * @return
     */
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public  Integer backRent(YwContract model){
        isParamValidCreated(model);

        model.setCreator(model.getLoginUserInfo().getId());
        model.setIsdeleted(Constants.ZERO);
        model.setCreateDate(new Date());
        model.setStatus(Constants.ZERO);
        model.setEditDate(model.getCreateDate());
        model.setEditor(model.getCreator());
        model.setStatus(Constants.ZERO);//待执行
        ywContractMapper.insert(model);
        dealDetailListBiz(model);//处理条款信息
        dealMultifileBiz(model);//处理附件信息
        dealLogBiz(model,Constants.YwLogType.CONTRACT_CREATE,null,null);//记录新建日志
        return model.getId();
    }

@@ -618,7 +644,19 @@
            this.updateById(ywContract);
        }
    }

    private void dealLogBiz(YwContract model,Constants.YwLogType type,String param1,String param2) {
        YwWorkorderLog log = new YwWorkorderLog();
        log.setCreateDate(model.getEditDate());
        log.setCreator(model.getCreator());
        log.setJobId(model.getId());
        log.setIsdeleted(Constants.ZERO);
        log.setObjId(model.getId()+"");
        log.setObjType(type.getKey());
        log.setParam1(param1);
        log.setParam2(param2);
        log.setTitle(type.getNoteinfo());
        ywWorkorderLogMapper.insert(log);
    }
    @Override
    public YwContract findById(Integer id) {
        MPJLambdaWrapper<YwContract> queryWrapper = new MPJLambdaWrapper<>();
@@ -635,7 +673,55 @@
                .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId);
        YwContract model = ywContractMapper.selectJoinOne(YwContract.class,queryWrapper);
        if(model != null){
            //合同附件
            initFiles(model);
            //查询房源信息数据
            MPJLambdaWrapper<YwRoom> rw = new MPJLambdaWrapper<>();
            rw.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::getIsdeleted,Constants.ZERO)
                    .exists("(select a.id from yw_contract_room a where a.isdeleted=1 and a.room_id=t.id and a.contract_id="+model.getId()+")");
            model.setRoomList(roomMapper.selectJoinList(YwRoom.class,rw));

            //查询租賃条款信息
            MPJLambdaWrapper<YwContractDetail> dw = new MPJLambdaWrapper<>();
            dw.selectAll(YwContractDetail.class )
                    .eq(YwContractDetail::getIsdeleted,Constants.ZERO)
                    .eq(YwContractDetail::getContractId,model.getId())
                    .in(YwContractDetail::getType,Constants.ZERO,Constants.TWO)
                    .orderByAsc(YwContractDetail::getSortnum);
            model.setZlDetailList(ywContractDetailMapper.selectJoinList(YwContractDetail.class,dw));
            //查询物業条款信息
            dw = new MPJLambdaWrapper<>();
            dw.selectAll(YwContractDetail.class )
                    .eq(YwContractDetail::getIsdeleted,Constants.ZERO)
                    .eq(YwContractDetail::getContractId,model.getId())
                    .in(YwContractDetail::getType,Constants.ONE,Constants.THREE)
                    .orderByAsc(YwContractDetail::getSortnum);
            model.setWyDetailList(ywContractDetailMapper.selectJoinList(YwContractDetail.class,dw));

            //查询操作日志记录
            YwWorkorderLog log = new YwWorkorderLog();
            log.setJobId(model.getId());
            log.setIsdeleted(Constants.ZERO);
            model.setLogList(ywWorkorderLogMapper.selectList(new QueryWrapper<YwWorkorderLog>(log)
                    .lambda()
                    .in(YwWorkorderLog::getObjType,Constants.YwLogType.CONTRACT_BACK.getKey()
                            ,Constants.YwLogType.CONTRACT_CREATE.getKey()
                            ,Constants.YwLogType.CONTRACT_UPDATE.getKey())
                    .orderByAsc(YwWorkorderLog::getCreateDate)));

            //查询账单集合
            model.setBillList(ywContractBillMapper.selectJoinList(YwContractBill.class,new MPJLambdaWrapper<YwContractBill>()
                            .selectAll(YwContractBill.class )
                            .eq(  YwContractBill::getContractId,model.getId())
                            .eq(YwContractBill::getIsdeleted,Constants.ZERO)
                            .orderByAsc(YwContractBill::getSortnum,YwContractBill::getCreateDate)));
        }

        return model;

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

@@ -121,6 +121,7 @@

    @Override
    public List<YwFloor> findList(YwFloor ywFloor) {
        ywFloor.setIsdeleted(Constants.ZERO);
        QueryWrapper<YwFloor> wrapper = new QueryWrapper<>(ywFloor);
        return ywFloorMapper.selectList(wrapper);
    }

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

@@ -132,7 +132,7 @@
    public PageData<YwRoom> findPage(PageWrap<YwRoom> pageWrap) {
        IPage<YwRoom> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         MPJLambdaWrapper<YwRoom> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(YwBuilding.class )
        queryWrapper.selectAll(YwRoom.class )
                .selectAs(YwProject::getName,YwRoom::getProjectName)
                .selectAs(YwFloor::getName,YwRoom::getFloorName)
                .selectAs(YwBuilding::getName,YwRoom::getBuildingName)

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

@@ -28,10 +28,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

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

/**
 * è¿ç»´å·¥å•ä¿¡æ¯è¡¨Service实现
@@ -94,27 +91,21 @@
        if(fileList.size()>0){
            multifileMapper.insert(fileList);
        }
        dealLogBiz(model,Constants.ZERO,model.getLoginUserInfo().getRealname(),null);//记录新建日志
        dealLogBiz(model,Constants.YwLogType.WORKORDER_CREATE,model.getLoginUserInfo().getRealname(),null);//记录新建日志
        return model.getId();
    }

    private void dealLogBiz(YwWorkorder model, int type,String param1,String param2) {
    private void dealLogBiz(YwWorkorder model,Constants.YwLogType type,String param1,String param2) {
        YwWorkorderLog log = new YwWorkorderLog();
        log.setCreateDate(model.getEditDate());
        log.setCreator(model.getCreator());
        log.setJobId(model.getId());
        log.setIsdeleted(Constants.ZERO);
        log.setObjId(model.getId()+"");
        log.setObjType(type);
        log.setObjType(type.getKey());
        log.setParam1(param1);
        log.setParam2(param2);
        if(type ==0){
            log.setTitle("创建工单");
        }else  if(type ==1){
            log.setTitle("分派工单");
        }else  if(type ==2){
            log.setTitle("处理工单");
        }
        log.setTitle(type.getNoteinfo());
        ywWorkorderLogMapper.insert(log);
    }

@@ -194,7 +185,7 @@
        update.setDispatchDate(update.getEditDate());
        update.setDispatchInfo(ywWorkorder.getDispatchInfo());
        ywWorkorderMapper.updateById(update);
        dealLogBiz(model,Constants.ONE,model.getLoginUserInfo().getRealname(),user.getRealname());//记录新建日志
        dealLogBiz(model,Constants.YwLogType.WORKORDER_DISPATCH,model.getLoginUserInfo().getRealname(),user.getRealname());//记录新建日志
    }
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -220,7 +211,7 @@
        update.setDealDate(update.getEditDate());
        update.setDealInfo(ywWorkorder.getDispatchInfo());
        ywWorkorderMapper.updateById(update);
        dealLogBiz(model,Constants.TWO,model.getLoginUserInfo().getRealname(),null);//记录新建日志
        dealLogBiz(model,Constants.YwLogType.WORKORDER_DEAL,model.getLoginUserInfo().getRealname(),null);//记录新建日志
    }
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -304,22 +295,27 @@
    public YwWorkorder findById(Integer id) {
        MPJLambdaWrapper<YwWorkorder> wrapper = new MPJLambdaWrapper<>();
        wrapper.selectAll(YwWorkorder.class )
                .select("t4.realname",YwWorkorder::getDealUserName)
                .select("t3.realname",YwWorkorder::getDispatchUserName)
                .selectAs(SystemUser::getRealname,YwWorkorder::getCreatorName)
                .selectAs(SystemUser::getRealname,YwWorkorder::getDispatchUserName)
                .select("t2.realname",YwWorkorder::getDealUserName)
                .select("t3.realname",YwWorkorder::getCreatorName)
                .selectAs(SystemUser::getMobile,YwWorkorder::getCreatorPhone)
                .selectAs(Company::getCompanyNamePath,YwWorkorder::getCreatorCompany)
                .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getCreator)
                .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getDispatchUserId)
                .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getDealUserId)
                .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getCreator)
                .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                .eq(YwWorkorder::getId,id);
        YwWorkorder model = ywWorkorderMapper.selectJoinOne(YwWorkorder.class,wrapper);
        initFiles(model);//读取附件信息
        YwWorkorderLog log = new YwWorkorderLog();
        log.setJobId(model.getId());
        log.setIsdeleted(Constants.ZERO);
        model.setLogList(ywWorkorderLogMapper.selectList(new QueryWrapper<YwWorkorderLog>(log).lambda().orderByAsc(YwWorkorderLog::getCreateDate)));
        model.setLogList(ywWorkorderLogMapper.selectList(new QueryWrapper<YwWorkorderLog>(log)
                 .lambda()
                 .in(YwWorkorderLog::getObjType,Constants.YwLogType.WORKORDER_DEAL.getKey()
                 ,Constants.YwLogType.WORKORDER_CREATE.getKey()
                   ,Constants.YwLogType.WORKORDER_DISPATCH.getKey())
                .orderByAsc(YwWorkorderLog::getCreateDate)));
        return model;
    }

@@ -339,101 +335,115 @@
    @Override
    public PageData<YwWorkorder> findPage(PageWrap<YwWorkorder> pageWrap) {
        IPage<YwWorkorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<YwWorkorder> queryWrapper = new QueryWrapper<>();
        MPJLambdaWrapper<YwWorkorder> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(YwWorkorder.class )
                .selectAs(SystemUser::getRealname,YwWorkorder::getDealUserName)
                .select("t3.realname",YwWorkorder::getCreatorName)
                .selectAs(Category::getName,YwWorkorder::getCategoryName)
                .selectAs(YwRoom::getName,YwWorkorder::getRoomName)
                .selectAs(YwRoom::getRoomNum,YwWorkorder::getRoomNum)
                .selectAs(YwFloor::getName,YwWorkorder::getFloorName)
                .selectAs(YwBuilding::getName,YwWorkorder::getBuildingName)
                .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getDealUserId)
                .leftJoin(Category.class,Category::getId,YwWorkorder::getCateId)
                .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getCreator)
                .leftJoin(YwRoom.class,YwRoom::getId,YwWorkorder::getRoomId)
                .leftJoin(YwFloor.class,YwFloor::getId,YwWorkorder::getFloorId)
                .leftJoin(YwBuilding.class,YwBuilding::getId,YwWorkorder::getBuildingId);
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getId, pageWrap.getModel().getId());
            queryWrapper.eq(YwWorkorder::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getCreator, pageWrap.getModel().getCreator());
            queryWrapper.eq(YwWorkorder::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
            queryWrapper.lambda().ge(YwWorkorder::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.lambda().le(YwWorkorder::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
            queryWrapper.ge(YwWorkorder::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.le(YwWorkorder::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getEditor, pageWrap.getModel().getEditor());
            queryWrapper.eq(YwWorkorder::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getEditDate() != null) {
            queryWrapper.lambda().ge(YwWorkorder::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.lambda().le(YwWorkorder::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
            queryWrapper.ge(YwWorkorder::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.le(YwWorkorder::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getIsdeleted, pageWrap.getModel().getIsdeleted());
            queryWrapper.eq(YwWorkorder::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getTitle() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getTitle, pageWrap.getModel().getTitle());
            queryWrapper.eq(YwWorkorder::getTitle, pageWrap.getModel().getTitle());
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getRemark, pageWrap.getModel().getRemark());
            queryWrapper.eq(YwWorkorder::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getStatus, pageWrap.getModel().getStatus());
            queryWrapper.eq(YwWorkorder::getStatus, pageWrap.getModel().getStatus());
        }
        if (pageWrap.getModel().getSortnum() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getSortnum, pageWrap.getModel().getSortnum());
            queryWrapper.eq(YwWorkorder::getSortnum, pageWrap.getModel().getSortnum());
        }
        if (pageWrap.getModel().getContent() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getContent, pageWrap.getModel().getContent());
            queryWrapper.eq(YwWorkorder::getContent, pageWrap.getModel().getContent());
        }
        if (pageWrap.getModel().getGetDate() != null) {
            queryWrapper.lambda().ge(YwWorkorder::getGetDate, Utils.Date.getStart(pageWrap.getModel().getGetDate()));
            queryWrapper.lambda().le(YwWorkorder::getGetDate, Utils.Date.getEnd(pageWrap.getModel().getGetDate()));
            queryWrapper.ge(YwWorkorder::getGetDate, Utils.Date.getStart(pageWrap.getModel().getGetDate()));
            queryWrapper.le(YwWorkorder::getGetDate, Utils.Date.getEnd(pageWrap.getModel().getGetDate()));
        }
        if (pageWrap.getModel().getProjectId() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getProjectId, pageWrap.getModel().getProjectId());
            queryWrapper.eq(YwWorkorder::getProjectId, pageWrap.getModel().getProjectId());
        }
        if (pageWrap.getModel().getBuildingId() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getBuildingId, pageWrap.getModel().getBuildingId());
            queryWrapper.eq(YwWorkorder::getBuildingId, pageWrap.getModel().getBuildingId());
        }
        if (pageWrap.getModel().getRoomId() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getRoomId, pageWrap.getModel().getRoomId());
            queryWrapper.eq(YwWorkorder::getRoomId, pageWrap.getModel().getRoomId());
        }
        if (pageWrap.getModel().getUserId() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getUserId, pageWrap.getModel().getUserId());
            queryWrapper.eq(YwWorkorder::getUserId, pageWrap.getModel().getUserId());
        }
        if (pageWrap.getModel().getPhone() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getPhone, pageWrap.getModel().getPhone());
            queryWrapper.eq(YwWorkorder::getPhone, pageWrap.getModel().getPhone());
        }
        if (pageWrap.getModel().getSubmitDate() != null) {
            queryWrapper.lambda().ge(YwWorkorder::getSubmitDate, Utils.Date.getStart(pageWrap.getModel().getSubmitDate()));
            queryWrapper.lambda().le(YwWorkorder::getSubmitDate, Utils.Date.getEnd(pageWrap.getModel().getSubmitDate()));
            queryWrapper.ge(YwWorkorder::getSubmitDate, Utils.Date.getStart(pageWrap.getModel().getSubmitDate()));
            queryWrapper.le(YwWorkorder::getSubmitDate, Utils.Date.getEnd(pageWrap.getModel().getSubmitDate()));
        }
        if (pageWrap.getModel().getCateId() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getCateId, pageWrap.getModel().getCateId());
            queryWrapper.eq(YwWorkorder::getCateId, pageWrap.getModel().getCateId());
        }
        if (pageWrap.getModel().getAreaType() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getAreaType, pageWrap.getModel().getAreaType());
            queryWrapper.eq(YwWorkorder::getAreaType, pageWrap.getModel().getAreaType());
        }
        if (pageWrap.getModel().getCode() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getCode, pageWrap.getModel().getCode());
            queryWrapper.eq(YwWorkorder::getCode, pageWrap.getModel().getCode());
        }
        if (pageWrap.getModel().getDealStatus() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getDealStatus, pageWrap.getModel().getDealStatus());
            queryWrapper.eq(YwWorkorder::getDealStatus, pageWrap.getModel().getDealStatus());
        }
        if (pageWrap.getModel().getDispatchUserId() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getDispatchUserId, pageWrap.getModel().getDispatchUserId());
            queryWrapper.eq(YwWorkorder::getDispatchUserId, pageWrap.getModel().getDispatchUserId());
        }
        if (pageWrap.getModel().getDispatchDate() != null) {
            queryWrapper.lambda().ge(YwWorkorder::getDispatchDate, Utils.Date.getStart(pageWrap.getModel().getDispatchDate()));
            queryWrapper.lambda().le(YwWorkorder::getDispatchDate, Utils.Date.getEnd(pageWrap.getModel().getDispatchDate()));
            queryWrapper.ge(YwWorkorder::getDispatchDate, Utils.Date.getStart(pageWrap.getModel().getDispatchDate()));
            queryWrapper.le(YwWorkorder::getDispatchDate, Utils.Date.getEnd(pageWrap.getModel().getDispatchDate()));
        }
        if (pageWrap.getModel().getDispatchInfo() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getDispatchInfo, pageWrap.getModel().getDispatchInfo());
            queryWrapper.eq(YwWorkorder::getDispatchInfo, pageWrap.getModel().getDispatchInfo());
        }
        if (pageWrap.getModel().getDealUserId() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getDealUserId, pageWrap.getModel().getDealUserId());
            queryWrapper.eq(YwWorkorder::getDealUserId, pageWrap.getModel().getDealUserId());
        }
        if (pageWrap.getModel().getDealDate() != null) {
            queryWrapper.lambda().ge(YwWorkorder::getDealDate, Utils.Date.getStart(pageWrap.getModel().getDealDate()));
            queryWrapper.lambda().le(YwWorkorder::getDealDate, Utils.Date.getEnd(pageWrap.getModel().getDealDate()));
            queryWrapper.ge(YwWorkorder::getDealDate, Utils.Date.getStart(pageWrap.getModel().getDealDate()));
            queryWrapper.le(YwWorkorder::getDealDate, Utils.Date.getEnd(pageWrap.getModel().getDealDate()));
        }
        if (pageWrap.getModel().getDealInfo() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getDealInfo, pageWrap.getModel().getDealInfo());
            queryWrapper.eq(YwWorkorder::getDealInfo, pageWrap.getModel().getDealInfo());
        }
        if (pageWrap.getModel().getDealType() != null) {
            queryWrapper.lambda().eq(YwWorkorder::getDealType, pageWrap.getModel().getDealType());
            queryWrapper.eq(YwWorkorder::getDealType, pageWrap.getModel().getDealType());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -442,6 +452,9 @@
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), YwWorkorder::getCreateDate, pageWrap.getModel().getQueryStartTime())
                .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()), YwWorkorder::getCreateDate, pageWrap.getModel().getQueryEndTime());
        queryWrapper.orderByDesc(YwContract::getCreateDate );
        return PageData.from(ywWorkorderMapper.selectPage(page, queryWrapper));
    }