工单业务

k94314517

2025-04-08 11dbb234648cb136f29ddaf103b396dc43a5a591

工单业务

 server/src/main/java/com/doumee/api/web/WebCategoryController.java

@@ -38,7 +38,7 @@
    @LoginRequired
    @GetMapping("/categoryTree")
    @ApiOperation("获取分类类别获取分类树")
    public ApiResponse<List<CategoryVO>> categoryVOTree(Integer categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange){
    public ApiResponse<List<CategoryVO>> categoryVOTree(@RequestParam String categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange){
        try {
            ServerHttpRequest request = serverWebExchange.getRequest();
            jwtTokenUtil.getUserInfoByToken(token);

 server/src/main/java/com/doumee/api/web/WebWorkOrderController.java

@@ -5,6 +5,7 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.dao.business.model.Managers;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Workorder;
import com.doumee.dao.web.dto.UpdEmailDTO;
@@ -19,6 +20,7 @@
import org.springframework.web.server.ServerWebExchange;

import javax.annotation.Resource;
import java.util.List;

/**
 * Created by IntelliJ IDEA.
@@ -62,6 +64,22 @@
    }


    @LoginRequired
    @ApiOperation("通知人查询")
    @PostMapping("/managersList")
    public ApiResponse<List<Managers>> managersList (@RequestBody Managers model, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
        try {
            ServerHttpRequest request = serverWebExchange.getRequest();
            Member user =  jwtTokenUtil.getUserInfoByToken(token);
            return ApiResponse.success(managersService.findList(model));
        }catch (BusinessException e){
            return ApiResponse.failed(e.getCode(),e.getMessage());
        }catch (Exception e){
            e.printStackTrace();
            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
        }
    }


    @LoginRequired
    @ApiOperation("风险上报详情")

 server/src/main/java/com/doumee/core/constants/Constants.java

@@ -182,4 +182,20 @@
         */
        class IgnoreDate extends Date {}
    }


    /**
     * æ–‡ä»¶é™„件类型
     */
    public interface multiFileType{
        //0SHE上报 1跌绊滑上报 2跌绊滑处理 3跌绊滑分配物业主管 4跌绊滑分配处理人 5DCA风险上报 6DCA风险处理 7DCA工单图片
        int sheUpload = 0;
        int dbhUpload = 1;
        int dbhDeal = 2;
        int dbhAllocation = 3;
        int dbhDealUser = 4;
        int dcaUpload = 5;
        int dcaDeal = 6;
        int dcaWorkOrder= 7;
    }
}

 server/src/main/java/com/doumee/dao/business/model/Multifile.java

@@ -63,8 +63,8 @@
    @ExcelExportColumn(name="类型0图片 1视频 2其他")
    private Integer type;

    @ApiModelProperty(value = "关联对象类型 0SHE上报 1跌绊滑上报 2跌绊滑处理 3跌绊滑分配物业主管 4跌绊滑分配处理人 5DCA风险上报 6DCA风险处理", example = "1")
    @ExcelExportColumn(name="关联对象类型 0SHE上报 1跌绊滑上报 2跌绊滑处理 3跌绊滑分配物业主管 4跌绊滑分配处理人 5DCA风险上报 6DCA风险处理")
    @ApiModelProperty(value = "关联对象类型 0SHE上报 1跌绊滑上报 2跌绊滑处理 3跌绊滑分配物业主管 4跌绊滑分配处理人 5DCA风险上报 6DCA风险处理 7DCA工单图片", example = "1")
    @ExcelExportColumn(name="关联对象类型 0SHE上报 1跌绊滑上报 2跌绊滑处理 3跌绊滑分配物业主管 4跌绊滑分配处理人 5DCA风险上报 6DCA风险处理 7DCA工单图片")
    private Integer objType;

    @ApiModelProperty(value = "文件地址")

 server/src/main/java/com/doumee/dao/business/model/Workorder.java

@@ -2,13 +2,14 @@

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelExportColumn;
import com.doumee.dao.web.dto.DCANoProblemDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;

import java.util.Date;
import java.util.List;

@@ -129,14 +130,13 @@
    @ExcelExportColumn(name="发现时间")
    private String happenTime;

    @ApiModelProperty(value = "风险类型(关联category）")
    @ExcelExportColumn(name="风险类型(关联category）")

    private Date typeId;
    @ApiModelProperty(value = "风险、伤害、观察主题类型(关联category）")
    @ExcelExportColumn(name="风险、伤害、观察主题类型(关联category）")
    private Integer typeId;

    @ApiModelProperty(value = "风险描述", example = "1")
    @ExcelExportColumn(name="风险描述")
    private Integer riskInfo;
    private String riskInfo;

    @ApiModelProperty(value = "当前物业主管企业微信编码", example = "1")
    @ExcelExportColumn(name="当前物业主管企业微信编码")
@@ -227,14 +227,16 @@
    @TableField(exist = false)
    private String problemName;

    @ApiModelProperty("同事名称 å¤šä¸ª,分割")
    @TableField(exist = false)
    private String colleague;


    @ApiModelProperty(value = "上报人手机号")
    @TableField(exist = false)
    private String memberPhone;

    @ApiModelProperty(value = "不符合问题列表")
    @TableField(exist = false)
    private List<DCANoProblemDTO> dcaNoProblemDTOList;




}

 server/src/main/java/com/doumee/dao/web/dto/CloseDTO.java

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

import com.doumee.dao.business.model.Multifile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2025/4/8 17:41
 */
@Data
public class CloseDTO {

    @ApiModelProperty(value = "工单主键")
    private Integer workorderId;

    @ApiModelProperty(value = "说明")
    private String info;

    @ApiModelProperty(value = "工单关闭附件图片")
    private List<Multifile> multifileList;

    @ApiModelProperty(value = "用户主键",hidden = true)
    private Integer memberId;





}

 server/src/main/java/com/doumee/dao/web/dto/DCANoProblemDTO.java

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

import com.doumee.dao.business.model.Multifile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2025/4/8 14:25
 */
@Data
public class DCANoProblemDTO {

    @ApiModelProperty(value = "问题主键（category:id）")
    private Integer problemId;

    @ApiModelProperty(value = "描述 - ä¸ç¬¦åˆåŽŸå› ")
    private String eventInfo;

    @ApiModelProperty(value = "问题主键（category:id）")
    private List<Multifile> multifileList;









}

 server/src/main/java/com/doumee/job/UpdateQywxTokenJob.java

@@ -19,6 +19,7 @@

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Override
    public JobContext execute(JobParam param) {
        JobContext jobContext = new JobContext();

 server/src/main/java/com/doumee/job/WorkorderJob.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
package com.doumee.job;

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.job.BaseJob;
import com.doumee.core.job.JobContext;
import com.doumee.core.job.JobParam;
import com.doumee.service.business.WorkorderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

/**
 * æ›´æ–°ä¼ä¸šå¾®ä¿¡è‡ªå»ºåº”用token
 * @author  dm
 * @since 2025/03/31 16:44
 */
@Slf4j
@Component("workorderJob")
public class WorkorderJob extends BaseJob {

    @Autowired
    private WorkorderService workorderService;

    @Override
    public JobContext execute(JobParam param) {
        JobContext jobContext = new JobContext();
        try {
            workorderService.initializationCode();
            jobContext.setContext("初始化各类型订单编号");
        } catch (Exception e) {
            e.printStackTrace();
        }
        return jobContext;
    }
}

 server/src/main/java/com/doumee/service/business/CategoryService.java

@@ -102,7 +102,7 @@
     * @param categoryType
     * @return
     */
    List<CategoryVO>  getCategoryVOTree(Integer categoryType);
    List<CategoryVO>  getCategoryVOTree(String categoryType);

    List<CategoryVO>  getCategoryVOList(Integer categoryType);


 server/src/main/java/com/doumee/service/business/WorkorderService.java

@@ -102,4 +102,9 @@
     * @return
     */
    Workorder getDetail(Integer id);

    /**
     * åˆå§‹åŒ–code
     */
    void initializationCode();
}

 server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java

@@ -267,10 +267,10 @@


    @Override
    public List<CategoryVO>  getCategoryVOTree(Integer categoryType){
    public List<CategoryVO>  getCategoryVOTree(String categoryType){
        List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
                .eq(Category::getIsdeleted, Constants.ZERO)
                .eq(Objects.nonNull(categoryType),Category::getType,categoryType)
                .in(Objects.nonNull(categoryType),Category::getType,categoryType.split(","))
                .orderByAsc(Category::getSortnum,Category::getId)
        );
        List<CategoryVO>  categoryVOList = new ArrayList<>();

 server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java

@@ -124,7 +124,7 @@
    @Override
    public List<Managers> findList(Managers pageWrap) {
        MPJLambdaWrapper<Managers> queryWrapper = new MPJLambdaWrapper<>();
      pageWrap.setIsdeleted(Constants.ZERO);
        pageWrap.setIsdeleted(Constants.ZERO);
        queryWrapper.selectAll(Managers.class )
                .selectAs(Member::getPhone,Managers::getMemberPhone)
                .selectAs(Member::getName,Managers::getMemberName)

 server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java

@@ -7,9 +7,12 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.web.dto.CloseDTO;
import com.doumee.dao.web.dto.DCANoProblemDTO;
import com.doumee.service.business.WorkorderService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -18,14 +21,15 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.catalina.Manager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
@@ -54,6 +58,13 @@
    @Autowired
    private ManagersMapper managersMapper;

    @Autowired
    private CategoryMapper categoryMapper;

    @Resource(name="sessionRedisTemplate")
    private RedisTemplate<Object, Serializable> redisTemplate;


    @Override
    public Integer create(Workorder workorder) {
        this.isValidBaseParam(workorder);
@@ -62,34 +73,113 @@
        workorder.setMemberId(workorder.getMemberId());
        workorder.setIsdeleted(Constants.ZERO);
        workorder.setStatus(Constants.ZERO);
        //跌绊滑事件上报 æŸ¥è¯¢SHE负责人
        if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){
            List<Managers> managersList = managersMapper.selectList(new QueryWrapper<Managers>().lambda().eq(Managers::getIsdeleted,Constants.ZERO)
                    .eq(Managers::getType,Constants.ZERO).orderByAsc(Managers::getSortnum)
            );
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(managersList)){
                workorder.setQwnoticeMemberIds(managersList.stream().map(i->i.getMemberId().toString()).collect(Collectors.joining(",")));
            }
        }
        workorder.setCode(this.getNextCode(workorder.getType()));
        //处理人员类信息
        this.dealNoticeData(workorder);
        workorderMapper.insert(workorder);
        //存储DCA é—®é¢˜è®°å½•è¡¨
        this.saveProblemData(workorder);
        //存储附件信息
        this.saveMutiFile(workorder);
        //处理上报日志
        this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId());
        //TODO å‘送通知

        return workorder.getId();
    }


    /**
     * å­˜å‚¨é™„件信息
     * @param workorder
     */
    public void saveMutiFile(Workorder workorder){
        List<Multifile> multifileList = workorder.getMultifileList();
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
            for (Multifile multifile:multifileList) {
                multifile.setObjId(workorder.getId());
                multifile.setCreateDate(new Date());
                //TODO åŽç»­æ•´ç†å¤„理
                if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){//SHE事件上报图片
                    multifile.setObjType(Constants.ZERO);
                    multifile.setObjType(Constants.multiFileType.sheUpload);
                }else if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){//跌绊滑事件上报图片
                    multifile.setObjType(Constants.ONE);
                    multifile.setObjType(Constants.multiFileType.dbhUpload);
                }else if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){//DCA事件上报
                    multifile.setObjType(Constants.multiFileType.dcaUpload);
                }
            }
            multifileMapper.insert(multifileList);
        }
        //处理上报日志
        this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId());
        return workorder.getId();
    }


    /**
     * å¤„理 DCA ææŠ¥ é—®é¢˜æ•°æ®
     * @param workorder
     */
    public void saveProblemData(Workorder workorder){
        if(Constants.equalsInteger(workorder.getType(),Constants.TWO)){
            List<DCANoProblemDTO> dcaNoProblemDTOList = workorder.getDcaNoProblemDTOList();
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(dcaNoProblemDTOList)){
                for (DCANoProblemDTO dcaNoProblemDTO:dcaNoProblemDTOList) {
                    Category problem = categoryMapper.selectById(dcaNoProblemDTO.getProblemId());
                    Workorder dcaWorkOrder = new Workorder();
                    dcaWorkOrder.setCreateDate(new Date());
                    dcaWorkOrder.setEditDate(new Date());
                    dcaWorkOrder.setMemberId(workorder.getMemberId());
                    dcaWorkOrder.setTypeId(dcaNoProblemDTO.getProblemId());
                    dcaWorkOrder.setType(Constants.TWO);
                    dcaWorkOrder.setStatus(Constants.ZERO);
                    dcaWorkOrder.setIsdeleted(Constants.ZERO);
                    dcaWorkOrder.setProblemTitle(problem.getName());
                    dcaWorkOrder.setProblemId(problem.getId());
                    dcaWorkOrder.setProblemInfo(problem.getRemark());
                    dcaWorkOrder.setDcaRecordId(workorder.getId());
                    workorderMapper.insert(dcaWorkOrder);
                    List<Multifile> multifileList = dcaNoProblemDTO.getMultifileList();
                    if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
                        for (Multifile multifile:multifileList) {
                            multifile.setObjId(dcaWorkOrder.getId());
                            multifile.setCreateDate(new Date());
                            multifile.setObjType(Constants.multiFileType.dcaWorkOrder);
                        }
                        multifileMapper.insert(multifileList);
                    }
                }
            }
        }
    }



    /**
     * å¤„理通知类人员信息
     * @param workorder
     */
    public void dealNoticeData(Workorder workorder){
        //SHE上报 æäº¤ç±»åž‹ä¸ºåŒäº‹ å¤„理同事信息
        if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)&&Constants.equalsInteger(workorder.getMemberType(),Constants.ONE)){
            List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).in(Member::getQwId,workorder.getMemberQwids().split(",")));
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)){
                workorder.setMemberNames(memberList.stream().map(i->i.getName()).collect(Collectors.joining(",")));
            }
        }
        //跌绊滑事件上报 æŸ¥è¯¢SHE负责人
        if(Constants.equalsInteger(workorder.getType(),Constants.THREE) || Constants.equalsInteger(workorder.getType(),Constants.ONE)){
            List<Managers> managersList = managersMapper.selectJoinList(Managers.class,new MPJLambdaWrapper<Managers>().selectAll(Managers.class)
                    .selectAs(Member::getName,Managers::getMemberName)
                    .leftJoin(Member.class,Member::getId,Managers::getMemberId)
                    .eq(Managers::getIsdeleted,Constants.ZERO)
                    .eq(Managers::getType,Constants.ZERO).orderByAsc(Managers::getSortnum)
            );
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(managersList)){
                workorder.setQwnoticeMemberIds(managersList.stream().map(i->i.getMemberId().toString()).collect(Collectors.joining(",")));
                if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
                    workorder.setEmialMemberIds(managersList.stream().map(i->i.getMemberId().toString()).collect(Collectors.joining(",")));
                }
            }
        }


    }


@@ -123,22 +213,21 @@
        || Objects.isNull(workorder.getSubmitDate())
        || Objects.isNull(workorder.getHappenTime())
        || Objects.isNull(workorder.getType())
        || !( Constants.equalsInteger(workorder.getType(),Constants.ZERO) || Constants.equalsInteger(workorder.getType(),Constants.ONE)
            || Constants.equalsInteger(workorder.getType(),Constants.TWO) || Constants.equalsInteger(workorder.getType(),Constants.THREE)
        || Objects.isNull(workorder.getTypeId())
        || Objects.isNull(workorder.getLocaltionId())
        || !( Constants.equalsInteger(workorder.getType(),Constants.ZERO) || Constants.equalsInteger(workorder.getType(),Constants.ONE) ||Constants.equalsInteger(workorder.getType(),Constants.THREE)
        )){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        //SHE äº‹ä»¶ä¸ŠæŠ¥
        if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
            if(Objects.isNull(workorder.getMemberType())
                    || Objects.isNull(workorder.getLocaltionId())
                    || Objects.isNull(workorder.getOutJiuyi())
                    || (Constants.equalsInteger(workorder.getOutJiuyi(),Constants.ZERO) && Objects.isNull(workorder.getIsYiwushi()))
                    || (Constants.equalsInteger(workorder.getIsYiwushi(),Constants.ZERO) && Objects.isNull(workorder.getIsHurted()))
                    || Objects.isNull(workorder.getCategoryId())
                    || Objects.isNull(workorder.getWorkRelated())
                    || (Constants.equalsInteger(workorder.getMemberType(),Constants.TWO) && StringUtils.isEmpty(workorder.getMemberNames()))
                    || (Constants.equalsInteger(workorder.getMemberType(),Constants.ZERO) && StringUtils.isEmpty(workorder.getMemberQwids()))
                    || (Constants.equalsInteger(workorder.getMemberType(),Constants.ONE) && StringUtils.isEmpty(workorder.getMemberQwids()))
                    || org.apache.commons.lang3.StringUtils.isBlank(workorder.getEventInfo())
            ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -146,15 +235,30 @@
        }
        //跌绊滑 äº‹ä»¶ä¸ŠæŠ¥
        if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){
            if(Objects.isNull(workorder.getTypeId())
                || Objects.isNull(workorder.getLocaltionId())
                || org.apache.commons.lang3.StringUtils.isBlank(workorder.getEventInfo())
            if(org.apache.commons.lang3.StringUtils.isBlank(workorder.getRiskInfo())
            ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
        }
        //DCA äº‹ä»¶ä¸ŠæŠ¥
        if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){
            if(Objects.isNull(workorder.getDcaYesNum())
                || Objects.isNull(workorder.getDcaNoNum())
            ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
        }


        //数据库数据校验
        Category typeCategory = categoryMapper.selectById(workorder.getTypeId());
        if(Objects.isNull(typeCategory)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Category locationCategory = categoryMapper.selectById(workorder.getLocaltionId());
        if(Objects.isNull(locationCategory)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        workorder.setLocationName(locationCategory.getNamePath());
    }

    @Override
@@ -178,13 +282,6 @@
                        .last(" limit 1 ")
        );
        if(Objects.nonNull(workorder)){
            //如果是SHE事件上报 SHE涉及人员类型为同事信息 éœ€è¦æŸ¥è¯¢åŒäº‹åç§°
            if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)&&Constants.equalsInteger(workorder.getMemberType(),Constants.ONE)){
                List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).in(Member::getQwId, Arrays.asList(workorder.getMemberQwids().split(","))));
                if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)){
                    workorder.setColleague(memberList.stream().map(i->i.getName()).collect(Collectors.joining(",")));
                }
            }
            //查询附件信息
            List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO)
                    .eq(Multifile::getObjId,workorder).orderByAsc(Multifile::getId));
@@ -197,13 +294,8 @@
                workorder.setMultifileList(multifileList);
            }
        }


        return workorder;
    }





    @Override
@@ -291,8 +383,6 @@
                .eq(pageWrap.getModel().getEmialMemberIds() != null, Workorder::getEmialMemberIds, pageWrap.getModel().getEmialMemberIds())
                .eq(pageWrap.getModel().getQwnoticeMemberIds() != null, Workorder::getQwnoticeMemberIds, pageWrap.getModel().getQwnoticeMemberIds())
                .eq(pageWrap.getModel().getHappenTime() != null, Workorder::getHappenTime, pageWrap.getModel().getHappenTime())
                .ge(pageWrap.getModel().getTypeId() != null, Workorder::getTypeId, Utils.Date.getStart(pageWrap.getModel().getTypeId()))
                .le(pageWrap.getModel().getTypeId() != null, Workorder::getTypeId, Utils.Date.getEnd(pageWrap.getModel().getTypeId()))
                .eq(pageWrap.getModel().getRiskInfo() != null, Workorder::getRiskInfo, pageWrap.getModel().getRiskInfo())
                .eq(pageWrap.getModel().getManagerId() != null, Workorder::getManagerId, pageWrap.getModel().getManagerId())
                .eq(pageWrap.getModel().getDealerId() != null, Workorder::getDealerId, pageWrap.getModel().getDealerId())
@@ -328,6 +418,49 @@
        return workorderMapper.selectCount(wrapper);
    }

    public String getNextCode(Integer type){
        String date = DateUtil.getFomartDate(new Date(),"yyyyMMddHHmmss");
        String key = "S";
        if(Constants.equalsInteger(type,Constants.ONE)){
            key = "D";
        }else if(Constants.equalsInteger(type,Constants.THREE)){
            key = "A";
        }
        String code = redisTemplate.opsForValue().get(key+"_CODE").toString();
        if(StringUtils.isEmpty(code)){
            code = "01";
        }
        redisTemplate.opsForValue().set(key+"_CODE",Integer.valueOf(code)+1);
        return key + date + org.apache.commons.lang3.StringUtils.leftPad(code,2,"0");
    }



    @Override
    public void initializationCode(){
        redisTemplate.opsForValue().set("A_CODE",1);
        redisTemplate.opsForValue().set("S_CODE",1);
        redisTemplate.opsForValue().set("D_CODE",1);
    }



    public void  closeWorkOrder(CloseDTO closeDTO){
        if(Objects.isNull(closeDTO)
        || Objects.isNull(closeDTO.getWorkorderId())
        || org.apache.commons.lang3.StringUtils.isBlank(closeDTO.getInfo())
        || com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(closeDTO.getMultifileList())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Workorder workorder = workorderMapper.selectById(closeDTO.getWorkorderId());
        if(Objects.isNull(workorder)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到工单数据");
        }
        if(!(Constants.equalsInteger(workorder.getStatus(),Constants.ZERO)
            || Constants.equalsInteger(workorder.getStatus(),Constants.ONE)
            || Constants.equalsInteger(workorder.getStatus(),Constants.TWO))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"工单状态已流转无法进行操作");
        }



@@ -335,6 +468,9 @@



    }