Merge remote-tracking branch 'origin/master'

k94314517

2025-04-11 4d4394311a96e15ea204e2cae03dda00750d0fdd

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

@@ -14,9 +14,7 @@
import com.doumee.core.utils.qiyeweixin.model.request.QywxTextCardMsgRequest;
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.dao.web.dto.PassOnDTO;
import com.doumee.dao.web.dto.*;
import com.doumee.dao.web.vo.WorkOrderDataVO;
import com.doumee.service.business.WorkorderService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -67,6 +65,9 @@
    @Autowired
    private CategoryMapper categoryMapper;

    @Autowired
    private NoticesMapper noticesMapper;

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

@@ -85,84 +86,96 @@
        Constants.WorkOrderStatus  workOrderStatus = Constants.equalsInteger(workorder.getType(),Constants.ZERO)?Constants.WorkOrderStatus.close:Constants.WorkOrderStatus.waitConfirm;
        workorder.setStatus(workOrderStatus.getKey());
        workorderMapper.insert(workorder);

        //存储DCA 问题记录表
        this.saveProblemData(workorder);
        //存储附件信息
        this.saveMutiFile(workorder);
        //存储日志
        this.dealLogData(workorder,workOrderStatus);
        // 发送企微通知
        QywxSendMsgRequest qywxSendMsgRequest = new QywxSendMsgRequest();
        qywxSendMsgRequest.setTouser(workorder.getQwnoticeMemberIds().replace(",","|"));
        qywxSendMsgRequest.setMsgtype("text");
        qywxSendMsgRequest.setAgentid(null);
        QywxTextCardMsgRequest textCard = new QywxTextCardMsgRequest();
        textCard.setTitle(workOrderStatus.getLogTitle());

        qywxSendMsgRequest.setTextcard(textCard);
        QywxUtil.sendMsg(systemDictDataBiz.queryByCode(Constants.QYWX,Constants.QYWX_TOKEN).getCode(),
                qywxSendMsgRequest);

        Member member = memberMapper.selectById(workorder.getMemberId());
        Category category = categoryMapper.selectById(workorder.getTypeId());
        if(Objects.nonNull(member)&&Objects.nonNull(category)){
            // 发送企微通知
            this.sendQwMsg(workorder,workorder.getQwnoticeMemberIds(),member,category.getName(),Constants.ZERO,null);
        }
        //存储待办人员信息
        this.saveNotice(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")),workorder.getId(),Constants.ZERO,Constants.ZERO);
        return workorder.getId();
    }


    public void sendQwMsg(Workorder workorder){
    /**
     * 发送通知
     * @param workorder
     * @param qwIds 消息接收人
     * @param member 操作人名称
     * @param categoryName
     * @param contentType 0=正常通知；1=催促；2=抄送 3=已处理一项/任务已处理
     * @param csInfo 抄送信息
     */
    public void sendQwMsg(Workorder workorder,String qwIds,Member member,String categoryName,Integer contentType,String csInfo){
        QywxSendMsgRequest qywxSendMsgRequest = new QywxSendMsgRequest();
        QywxTextCardMsgRequest textCard = new QywxTextCardMsgRequest();
        qywxSendMsgRequest.setMsgtype("text");
        qywxSendMsgRequest.setAgentid(null);
        textCard.setBtntxt("详情");
        //新提交
        if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitConfirm.getKey())){
            qywxSendMsgRequest.setTouser(workorder.getQwnoticeMemberIds().replace(",","|"));
            textCard.setUrl(null);
            //SHE 提交
            if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
                Category category = categoryMapper.selectById(workorder.getType());
                textCard.setTitle("【SHE事件上报】");
                String message  = "";
                if(Constants.equalsInteger(workorder.getMemberType(),Constants.ZERO)){
                    message = "本人";
                }else {
                    message = Constants.equalsInteger(workorder.getMemberType(),Constants.ONE)?"同事":"供应商";
                }
                message = message + "-" + workorder.getMemberNames() + " " + DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") + workorder.getLocationName() + category.getName();
                textCard.setDescription(" <div class=\"normal\">"+message+"</div>");
            }else{

        qywxSendMsgRequest.setTouser(qwIds.replace(",","|"));
        qywxSendMsgRequest.setAgentid(systemDictDataBiz.queryByCode(Constants.QYWX,Constants.QYWX_AGENTID).getCode());
        String sendUser = "";
        if(Objects.nonNull(member)){
            if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getName())){
                sendUser =  member.getName();
            }
            if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getCompanyName())){
                sendUser =  member.getCompanyName()+"/" + sendUser ;
            }
        }
        QywxTextCardMsgRequest textCard = this.dealMessageContent(workorder,sendUser,categoryName,contentType,csInfo);
        qywxSendMsgRequest.setTextcard(textCard);
        QywxUtil.sendMsg(systemDictDataBiz.queryByCode(Constants.QYWX,Constants.QYWX_TOKEN).getCode(),
                qywxSendMsgRequest);
    }


//    public QywxTextCardMsgRequest dealMessageContent(Workorder workorder,Integer type){
//        QywxTextCardMsgRequest textCard = new QywxTextCardMsgRequest();
//        String message = "";
//        if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
//            Category category = categoryMapper.selectById(workorder.getType());
//            textCard.setTitle("【SHE事件上报】");
//            if(Constants.equalsInteger(workorder.getMemberType(),Constants.ZERO)){
//                message = "本人";
//            }else {
//                message = Constants.equalsInteger(workorder.getMemberType(),Constants.ONE)?"同事":"供应商";
//            }
//            message = message + "-" + workorder.getMemberNames() + " " + DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") + workorder.getLocationName() + category.getName();
//            textCard.setDescription(" <div class=\"normal\">"+message+"</div>");
//        }else{
//            textCard.setTitle(Constants.equalsInteger(workorder.getType(),Constants.ONE)?"【DCA上报】":"跌绊滑风险上报");
//            if(Constants.equalsInteger(workorder.getType(),Con)){
//
//            }
//
//
//
//        }
//
//    }
    private static final String []  qwDetailUrls = {"/pages/details_she/details_she","/pages/workOrder_dca/workOrder_dca","","/pages/workOrder_she/workOrder_she"};

    /**
     * 通知文案整理
     * @param workorder
     * @param userName 操作人名称  部门+名称
     * @param categoryName
     * @param contentType 0=正常通知；1=催促（跌绊滑/DCA）；2=抄送（DCA） 3=已处理一项/任务已处理
     * @param csInfo 抄送信息
     * @return
     */
    public QywxTextCardMsgRequest dealMessageContent(Workorder workorder,String userName ,String categoryName,Integer contentType,String csInfo){
        QywxTextCardMsgRequest textCard = new QywxTextCardMsgRequest();
        String message = "";
        textCard.setUrl(qwDetailUrls[workorder.getType()]+"?id="+workorder.getId());
        if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
            textCard.setTitle("【SHE事件上报】");
            if(Constants.equalsInteger(workorder.getMemberType(),Constants.ZERO)){
                message = "本人";
            }else {
                message = Constants.equalsInteger(workorder.getMemberType(),Constants.ONE)?"同事":"供应商";
            }
            message = message + "-" + workorder.getMemberNames() + " " + DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") + workorder.getLocationName() + categoryName;
            textCard.setDescription(" <div class=\"normal\">"+message+"</div>");
        }else{
            textCard.setTitle(Constants.equalsInteger(workorder.getType(),Constants.ONE)?"【DCA上报】":"跌绊滑风险上报");
            if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){
                message = message + " <div class=\"normal\">"+ (org.apache.commons.lang3.StringUtils.isNotBlank(userName)?userName:"系统") + (Constants.equalsInteger(contentType,Constants.ZERO)?"任务分配给你":(Constants.equalsInteger(contentType,Constants.ONE)?"对该工单进行了催促，请尽快处理":"任务已处理")) +"</div>";
                message = message + " <div class=\"normal\">"+  DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") +"/"+ workorder.getLocationName() +"/"+  categoryName+"</div>";
            }else{
                message = message + " <div class=\"normal\">"+ (org.apache.commons.lang3.StringUtils.isNotBlank(userName)?userName:"系统") + (Constants.equalsInteger(contentType,Constants.ZERO)?"任务分配给你":(Constants.equalsInteger(contentType,Constants.ONE)?"对该工单进行了催促，请尽快处理":((Constants.equalsInteger(contentType,Constants.TWO)?"抄送给你":"已处理一项")))) +"</div>";
                message = message + " <div class=\"normal\">观察主题"+  categoryName +"</div>";
                message = message + " <div class=\"normal\">符合："+ workorder.getDcaYesNum()  +" 不符合："+workorder.getDcaNoNum()+"</div>";
                if(Constants.equalsInteger(contentType,Constants.TWO)){
                    message = message + " <div class=\"normal\">说明："+ csInfo +"</div>";
                }
            }
            textCard.setDescription(message);
        }
        return textCard;
    }



@@ -207,7 +220,8 @@
                    dcaWorkOrder.setCreateDate(new Date());
                    dcaWorkOrder.setEditDate(new Date());
                    dcaWorkOrder.setMemberId(workorder.getMemberId());
                    dcaWorkOrder.setTypeId(dcaNoProblemDTO.getProblemId());
                    dcaWorkOrder.setTypeId(workorder.getTypeId());
                    dcaWorkOrder.setCategoryId(Integer.toString(problem.getParentId()));
                    dcaWorkOrder.setType(Constants.TWO);
                    dcaWorkOrder.setStatus(workOrderStatus.getKey());
                    dcaWorkOrder.setIsdeleted(Constants.ZERO);
@@ -256,6 +270,9 @@
                    .eq(Managers::getIsdeleted,Constants.ZERO)
                    .eq(Managers::getType,Constants.ZERO).orderByAsc(Managers::getSortnum)
            );
            if(Objects.isNull(managersList)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"未查询到SHE处理抄送人员");
            }
            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)){
@@ -332,6 +349,7 @@
        if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){
            if(Objects.isNull(workorder.getDcaYesNum())
                || Objects.isNull(workorder.getDcaNoNum())
                    || Objects.isNull(workorder.getCategoryId())
            ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
@@ -350,7 +368,7 @@
    }

    @Override
    public Workorder getDetail(Integer id){
    public Workorder getDetail(Integer id,Member member){
        Workorder workorder = workorderMapper.selectJoinOne(Workorder.class,
                new MPJLambdaWrapper<Workorder>()
                        .selectAll(Workorder.class)
@@ -358,14 +376,15 @@
                        .selectAs(Member::getName,Workorder::getMemberName)
                        .selectAs(Member::getCompanyName,Workorder::getCompanyName)
                        .select(" c3.name ",Workorder::getTypeName)
                        .select(" c4.name ",Workorder::getProblemName)
                        .select(" c4.name ",Workorder::getCategoryName)
                        .leftJoin(Member.class,Member::getId,Workorder::getMemberId)
                        .leftJoin(" category c3 on  t.TYPE_ID = c3.id   ") //风险类型
                        .leftJoin(" category c4 on  t.PROBLEM_ID = c4.id   ") //DCA问题编码
                        .leftJoin(" category c4 on  t.CATEGORY_ID = c4.id   ") //DCA问题编码
                        .eq(Workorder::getId,id)
                        .last(" limit 1 ")
        );
        if(Objects.nonNull(workorder)){
            this.dealButton(workorder,member);
            //查询附件信息
            List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO)
                    .eq(Multifile::getObjId,workorder.getId()).orderByAsc(Multifile::getId));
@@ -380,7 +399,37 @@
        }
        //查询日志信息
        workorder.setLogList(this.getLogList(workorder.getId()));
        if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){
            //如果是DCA提交记录，查询子工单集合
            Workorder param = new Workorder();
            param.setIsdeleted(Constants.ZERO);
            param.setDcaRecordId(workorder.getId());
            workorder.setDcaChildList(findList(param));
        }
        return workorder;
    }

    public void dealButton(Workorder workorder,Member member){
        workorder.setPassOnButton(Constants.ZERO);
        workorder.setCloseButton(Constants.ZERO);
        if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())){
            List<String> closeUserList = new ArrayList<>();
            closeUserList.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
            closeUserList.add(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getManagerId())?workorder.getManagerId():null);
            closeUserList.add(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getDealerId())?workorder.getDealerId():null);
            workorder.setCloseButton(closeUserList.stream().filter(i->i.equals(member.getQwId())).collect(Collectors.toList()).size()>Constants.ZERO?Constants.ONE:Constants.ZERO);
            List<String> passOnUserList = new ArrayList<>();
            //待分配状态 处理转交按钮
            if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitConfirm.getKey())){
                passOnUserList.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
            }else if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitAllocation.getKey())){
                closeUserList.add(workorder.getManagerId());
            }
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(passOnUserList)){
                workorder.setPassOnButton(passOnUserList.stream().filter(i->i.equals(member.getQwId())).collect(Collectors.toList()).size()>Constants.ZERO?Constants.ONE:Constants.ZERO);
            }
        }

    }


@@ -396,7 +445,7 @@
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(logList)){
            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.WORKORDER_FILE_PATH).getCode();
                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.WORKORDER_LOG_FILE_PATH).getCode();
            for (WorkorderLog workorderLog:logList) {
                //查询附件信息
                List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
@@ -464,27 +513,100 @@
    }

    @Override
    public List<Workorder> findList(Workorder workorder) {
        QueryWrapper<Workorder> wrapper = new QueryWrapper<>(workorder);
        return workorderMapper.selectList(wrapper);
    public List<Workorder> findList(Workorder pageWrap) {

        return workorderMapper.selectJoinList(Workorder.class,getJoinQueryMapper(pageWrap));
    }
  
    @Override
    public PageData<Workorder> findPage(PageWrap<Workorder> pageWrap) {
        IPage<Workorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        Utils.MP.blankToNull(pageWrap.getModel());

    private    MPJLambdaWrapper<Workorder>  getJoinQueryMapper(Workorder pageWrap) {
        MPJLambdaWrapper<Workorder> queryWrapper = new MPJLambdaWrapper<>();
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        pageWrap.setIsdeleted(Constants.ZERO);
        queryWrapper
                .selectAll(Workorder.class)
                .selectAs(Member::getName,Workorder::getMemberName)
                .selectAs(Member::getCompanyName,Workorder::getCompanyName)
                .selectAs(Member::getPhone,Workorder::getMemberPhone)
                .select(" c2.name ",Workorder::getCategoryName)
                .select(" c3.name ",Workorder::getTypeName)
                .leftJoin(Member.class,Member::getId,Workorder::getMemberId)
                .leftJoin(" category c3 on  t.TYPE_ID = c3.id   ") //风险类型
                .leftJoin(" category c2 on  t.CATEGORY_ID = c2.id   ") //DCA一级问题编码
                .eq( pageWrap.getId() != null, Workorder::getId, pageWrap.getId())
                .eq( pageWrap.getCreator() != null, Workorder::getCreator, pageWrap.getCreator())
                .ge( pageWrap.getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getStart( pageWrap.getCreateDate()))
                .le( pageWrap.getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getEnd( pageWrap.getCreateDate()))
                .eq( pageWrap.getEditor() != null, Workorder::getEditor, pageWrap.getEditor())
                .ge( pageWrap.getEditDate() != null, Workorder::getEditDate, Utils.Date.getStart( pageWrap.getEditDate()))
                .le( pageWrap.getEditDate() != null, Workorder::getEditDate, Utils.Date.getEnd( pageWrap.getEditDate()))
                .eq( pageWrap.getIsdeleted() != null, Workorder::getIsdeleted, pageWrap.getIsdeleted())
                .eq( pageWrap.getCategoryId() != null, Workorder::getCategoryId, pageWrap.getCategoryId())
                .eq( pageWrap.getRemark() != null, Workorder::getRemark, pageWrap.getRemark())
                .eq( pageWrap.getStatus() != null, Workorder::getStatus, pageWrap.getStatus())
                .eq( pageWrap.getSortnum() != null, Workorder::getSortnum, pageWrap.getSortnum())
                .eq( pageWrap.getType() != null, Workorder::getType, pageWrap.getType())
                .eq( pageWrap.getMemberId() != null, Workorder::getMemberId, pageWrap.getMemberId())
                .eq( pageWrap.getCompanyId() != null, Workorder::getCompanyId, pageWrap.getCompanyId())
                .eq( pageWrap.getSubmitDate() != null, Workorder::getSubmitDate, pageWrap.getSubmitDate())
                .eq( pageWrap.getMemberType() != null, Workorder::getMemberType, pageWrap.getMemberType())
                .eq( pageWrap.getMemberQwids() != null, Workorder::getMemberQwids,  pageWrap.getMemberQwids())
                .like( pageWrap.getMemberNames() != null, Workorder::getMemberNames,  pageWrap.getMemberNames())
                .eq( pageWrap.getLocaltionId() != null, Workorder::getLocaltionId,  pageWrap.getLocaltionId())
                .eq( pageWrap.getOutJiuyi() != null, Workorder::getOutJiuyi,  pageWrap.getOutJiuyi())
                .eq( pageWrap.getIsYiwushi() != null, Workorder::getIsYiwushi,  pageWrap.getIsYiwushi())
                .eq( pageWrap.getIsHurted() != null, Workorder::getIsHurted,  pageWrap.getIsHurted())
                .eq( pageWrap.getWorkRelated() != null, Workorder::getWorkRelated,  pageWrap.getWorkRelated())
                .eq( pageWrap.getEventInfo() != null, Workorder::getEventInfo,  pageWrap.getEventInfo())
                .eq( pageWrap.getEmialMemberIds() != null, Workorder::getEmialMemberIds,  pageWrap.getEmialMemberIds())
                .eq( pageWrap.getQwnoticeMemberIds() != null, Workorder::getQwnoticeMemberIds,  pageWrap.getQwnoticeMemberIds())
                .eq( pageWrap.getHappenTime() != null, Workorder::getHappenTime,  pageWrap.getHappenTime())
                .eq( pageWrap.getTypeId() != null, Workorder::getTypeId,  pageWrap.getTypeId())
                .eq( pageWrap.getRiskInfo() != null, Workorder::getRiskInfo,  pageWrap.getRiskInfo())
                .eq( pageWrap.getManagerId() != null, Workorder::getManagerId,  pageWrap.getManagerId())
                .eq( pageWrap.getDealerId() != null, Workorder::getDealerId,  pageWrap.getDealerId())
                .ge( pageWrap.getDispatchTime() != null, Workorder::getDispatchTime, Utils.Date.getStart( pageWrap.getDispatchTime()))
                .le( pageWrap.getDispatchTime() != null, Workorder::getDispatchTime, Utils.Date.getEnd( pageWrap.getDispatchTime()))
                .eq( pageWrap.getDispatchInfo() != null, Workorder::getDispatchInfo,  pageWrap.getDispatchInfo())
                .ge( pageWrap.getDealTime() != null, Workorder::getDealTime, Utils.Date.getStart( pageWrap.getDealTime()))
                .le( pageWrap.getDealTime() != null, Workorder::getDealTime, Utils.Date.getEnd( pageWrap.getDealTime()))
                .eq( pageWrap.getDealInfo() != null, Workorder::getDealInfo,  pageWrap.getDealInfo())
                .eq( pageWrap.getProblemTitle() != null, Workorder::getProblemTitle,  pageWrap.getProblemTitle())
                .eq( pageWrap.getProblemId() != null, Workorder::getProblemId,  pageWrap.getProblemId())
                .eq( pageWrap.getProblemInfo() != null, Workorder::getProblemInfo,  pageWrap.getProblemInfo())
                .eq( pageWrap.getLocationName() != null, Workorder::getLocationName,  pageWrap.getLocationName())
                .like( pageWrap.getCode() != null, Workorder::getCode,  pageWrap.getCode())
                .eq( pageWrap.getDcaYesNum() != null, Workorder::getDcaYesNum,  pageWrap.getDcaYesNum())
                .eq( pageWrap.getDcaNoNum() != null, Workorder::getDcaNoNum,  pageWrap.getDcaNoNum())
                .eq( pageWrap.getDcaRecordId() != null, Workorder::getDcaRecordId,  pageWrap.getDcaRecordId())
                .eq( pageWrap.getDcaCsIds() != null, Workorder::getDcaCsIds,  pageWrap.getDcaCsIds()) ;
        if ( pageWrap.getMemberName() != null) {
            queryWrapper.and( ms->ms.like(Member::getName, pageWrap.getMemberName())
                    .or().like(Member::getPhone, pageWrap.getMemberName()) );
        }
        queryWrapper.orderByDesc(Workorder::getProblemId);
        return queryWrapper;
    }

    @Override
    public PageData<Workorder> findPage(PageWrap<Workorder> pageWrap) {
        IPage<Workorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        MPJLambdaWrapper<Workorder> queryWrapper = getJoinQueryMapper(pageWrap.getModel());
        queryWrapper
                .selectAll(Workorder.class)
                .selectAs(Member::getName,Workorder::getMemberName)
                .selectAs(Member::getCompanyName,Workorder::getCompanyName)
                .selectAs(Member::getPhone,Workorder::getMemberPhone)
                .select(" c2.name ",Workorder::getCategoryName)
                .select(" c3.name ",Workorder::getTypeName)
                .select(" c4.name ",Workorder::getProblemName)
                .leftJoin(Member.class,Member::getId,Workorder::getMemberId)
                .leftJoin(" category c3 on  t.TYPE_ID = c3.id   ") //风险类型
                .leftJoin(" category c4 on  t.PROBLEM_ID = c4.id   ") //DCA问题编码
                .leftJoin(" category c2 on  t.CATEGORY_ID = c2.id   ") //DCA问题编码
                .apply(Objects.nonNull(pageWrap.getModel().getMyWorkOrder())&& org.apache.commons.lang3.StringUtils.isNotBlank(pageWrap.getModel().getQwId())
                                &&Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getMyWorkOrder()),
                        " ( t.id in (  select OBJ_ID from notices where param1 = '"+pageWrap.getModel().getQwId()+"' ))  ")
                .eq(pageWrap.getModel().getId() != null, Workorder::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getCreator() != null, Workorder::getCreator, pageWrap.getModel().getCreator())
                .ge(pageWrap.getModel().getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
@@ -527,12 +649,16 @@
                .eq(pageWrap.getModel().getProblemId() != null, Workorder::getProblemId, pageWrap.getModel().getProblemId())
                .eq(pageWrap.getModel().getProblemInfo() != null, Workorder::getProblemInfo, pageWrap.getModel().getProblemInfo())
                .eq(pageWrap.getModel().getLocationName() != null, Workorder::getLocationName, pageWrap.getModel().getLocationName())
                .eq(pageWrap.getModel().getCode() != null, Workorder::getCode, pageWrap.getModel().getCode())
                .like(pageWrap.getModel().getCode() != null, Workorder::getCode, pageWrap.getModel().getCode())
                .eq(pageWrap.getModel().getDcaYesNum() != null, Workorder::getDcaYesNum, pageWrap.getModel().getDcaYesNum())
                .eq(pageWrap.getModel().getDcaNoNum() != null, Workorder::getDcaNoNum, pageWrap.getModel().getDcaNoNum())
                .eq(pageWrap.getModel().getDcaRecordId() != null, Workorder::getDcaRecordId, pageWrap.getModel().getDcaRecordId())
                .eq(pageWrap.getModel().getDcaCsIds() != null, Workorder::getDcaCsIds, pageWrap.getModel().getDcaCsIds()) ;
                queryWrapper.orderByDesc(Workorder::getCreateDate);
        if (pageWrap.getModel().getMemberName() != null) {
            queryWrapper.and( ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
                    .or().like(Member::getPhone,pageWrap.getModel().getMemberName()) );
        }
        queryWrapper.orderByDesc(Workorder::getCreateDate);
        return PageData.from(workorderMapper.selectJoinPage(page,Workorder.class, queryWrapper));
    }

@@ -582,12 +708,14 @@
        if(Objects.isNull(workorder)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到工单数据");
        }
        if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"SHE工单无法进行该操作");
        if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)||Constants.equalsInteger(workorder.getType(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"SHE、DCA工单无法进行该操作");
        }
        if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.sheClose.getKey())||Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.wtsClose.getKey())||Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.close.getKey())){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"工单状态已流转");
        }
        //企微通知人 企微主键 
        List<String> qwIds = new ArrayList<>();
        //提交后的 待确认/待初审状态 如果去关闭 只有工单里绑定的SHE人员可以关闭
        if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitConfirm.getKey())){
            //判断SHE人员内是否有当前登录账号
@@ -595,12 +723,17 @@
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，当前工单非您的工单，无法进行处理");
            }
            workorder.setStatus(Constants.WorkOrderStatus.sheClose.getKey());
            qwIds = Arrays.asList(workorder.getQwnoticeMemberIds());
            qwIds.remove(closeDTO.getMember().getQwId());
        }else if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitAllocation.getKey())){
            //判断SHE人员内是否有当前登录账号
            if(workorder.getQwnoticeMemberIds().indexOf(closeDTO.getMember().getQwId())<Constants.ZERO &&  !workorder.getManagerId().equals(closeDTO.getMember().getQwId())){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，当前工单非您的工单，无法进行处理");
            }
            workorder.setStatus(Constants.WorkOrderStatus.wtsClose.getKey());
            qwIds = Arrays.asList(workorder.getQwnoticeMemberIds());
            qwIds.add(workorder.getManagerId());
            qwIds.remove(closeDTO.getMember().getQwId());
        }else if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitDeal.getKey())){
            //判断SHE人员内是否有当前登录账号
            if(workorder.getQwnoticeMemberIds().indexOf(closeDTO.getMember().getQwId())<Constants.ZERO &&  !workorder.getManagerId().equals(closeDTO.getMember().getQwId())
@@ -608,6 +741,9 @@
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，当前工单非您的工单，无法进行处理");
            }
            workorder.setStatus(Constants.WorkOrderStatus.wtsClose.getKey());
            qwIds = Arrays.asList(workorder.getQwnoticeMemberIds());
            qwIds.add(workorder.getDealerId());
            qwIds.remove(closeDTO.getMember().getQwId());
        }else{
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"工单状态已流转");
        }
@@ -626,6 +762,17 @@
            }
            multifileMapper.insert(multifileList);
        }
        //发送企微通知
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(qwIds)){
            Set<String> qwIdSet = new HashSet<>(qwIds);
            String qwIdStr  = String.join(",", qwIdSet);
            Category category = categoryMapper.selectById(workorder.getTypeId());
            if(Objects.nonNull(closeDTO.getMember())&&Objects.nonNull(category)&& org.apache.commons.lang3.StringUtils.isNotBlank(qwIdStr)){
                // 发送企微通知
                this.sendQwMsg(workorder,qwIdStr,closeDTO.getMember(),category.getName(),Constants.THREE,null);
            }
        }

    }


@@ -674,15 +821,49 @@
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
            for (Multifile multifile:multifileList) {
                multifile.setObjId(logId);
                multifile.setIsdeleted(Constants.ZERO);
                multifile.setCreateDate(new Date());
                multifile.setObjType(Constants.multiFileType.passOn);
            }
            multifileMapper.insert(multifileList);
        }
        //TODO 企业微信通知
        //企业微信通知
        Category category = categoryMapper.selectById(workorder.getTypeId());
        if(Objects.nonNull(passOnDTO.getMember())&&Objects.nonNull(category)){
            // 发送企微通知
            this.sendQwMsg(workorder,member.getQwId(),passOnDTO.getMember(),category.getName(),Constants.ZERO,null);
        }
        //存储待办人员信息
        this.saveNotice(Arrays.asList(passOnDTO.getMember().getQwId().split(",")),workorder.getId(),Constants.ZERO,Constants.TWO);
    }


    @Override
    public void sendCopy(SendCopyDTO sendCopyDTO) {
        if (Objects.isNull(sendCopyDTO)
                || Objects.isNull(sendCopyDTO.getWorkorderId())
                || StringUtils.isEmpty(sendCopyDTO.getUserIds())) {
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Workorder workorder = workorderMapper.selectById(sendCopyDTO.getWorkorderId());
        if (Objects.isNull(workorder)) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted, Constants.ZERO)
                .isNotNull(Member::getQwId)
                .in(Member::getId, sendCopyDTO.getUserIds().split(",")));
        if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
            List<String> qwIdList = memberList.stream().map(i -> i.getQwId()).collect(Collectors.toList());
            Category category = categoryMapper.selectById(workorder.getTypeId());
            if (Objects.nonNull(category)) {
                // 发送企微通知
                this.sendQwMsg(workorder, String.join(",", qwIdList), sendCopyDTO.getMember(), category.getName(), Constants.ONE, null);
            }
            //存储待办信息
            this.saveNotice(qwIdList, workorder.getId(), Constants.ONE, Constants.ONE);
        }

    }

    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -707,7 +888,12 @@
        this.saveLog(null,workorder,
                Constants.ONE
                ,member.getId(),"催促","已催促 "+urgeUser.getCompanyName() + "/" + urgeUser.getName());
        //TODO 发送企微通知
        //发送企微通知
        Category category = categoryMapper.selectById(workorder.getTypeId());
        if(Objects.nonNull(category)){
            // 发送企微通知
            this.sendQwMsg(workorder,urgeUser.getQwId(),null,category.getName(),Constants.ONE,null);
        }

    }

@@ -742,25 +928,62 @@
        }else{
            return;
        }
        //TODO 发送企微通知
        //发送企微通知
        Category category = categoryMapper.selectById(workorder.getTypeId());
        if(Objects.nonNull(category)){
            // 发送企微通知
            this.sendQwMsg(workorder,urgeUser.getQwId(),null,category.getName(),Constants.ONE,null);
        }
    }


    public void saveNotice(List<String> qwIdList ,Integer workorderId,Integer isSendCopy,Integer type){
        List<Notices> noticesList = new ArrayList<>();
        for (String qwId:qwIdList) {
            //存储抄送记录
            Notices notices = new Notices();
            notices.setCreateDate(new Date());
            notices.setIsdeleted(Constants.ZERO);
            notices.setObjId(workorderId);
            notices.setObjType(Constants.ZERO+"");
            notices.setStatus(Constants.ZERO);
            notices.setSendacopy(isSendCopy);
            notices.setParam1(qwId);
            notices.setType(Integer.toString(type));
            noticesList.add(notices);
        }
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(noticesList)){
            noticesMapper.insert(noticesList);
        }
    }



    /**
     * 数据报表
     * @param queryType 0=按照月份；1=按照季度；2=按照年份（暂不处理）
     * SHE / 跌绊滑报表
     * @return
     * @throws Exception
     */
    @Override
    public List<WorkOrderDataVO> getWorkOrderData(Integer queryType) throws Exception {
    public List<WorkOrderDataVO> getWorkOrderData(OrderDataDTO orderDataDTO) throws Exception {
        if (Objects.isNull(orderDataDTO.getQueryType())||Objects.isNull(orderDataDTO.getOrderType())) {
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        String year = DateUtil.getNowYear();
        Integer nowMonth = DateUtil.getNowMonth();
        Integer quarter  = (nowMonth - 1) / 3 + 1;
        List<WorkOrderDataVO> workOrderDataVOList = new ArrayList<>();
        //查询今年所有的数据
        List<Workorder> workorderList = workorderMapper.selectList(new QueryWrapper<Workorder>().lambda().like(Workorder::getCreateDate,year)
        List<Workorder> workorderList = workorderMapper.selectJoinList(Workorder.class,new MPJLambdaWrapper<Workorder>()
                        .selectAll(Workorder.class)
                        .leftJoin(" category c1 on c1.id = t.type_id " )
                        .leftJoin(" category c2 on c2.id = t.localtion_id " )
                        .apply(Objects.nonNull(orderDataDTO.getTypeId())," find_in_set("+orderDataDTO.getTypeId()+", REPLACE(c1.ID_PATH,'/',',')  )  ")
                        .apply(Objects.nonNull(orderDataDTO.getLocationId())," find_in_set("+orderDataDTO.getLocationId()+", REPLACE(c2.ID_PATH,'/',',')  )  ")
                        .like(Workorder::getCreateDate,year)
                        .eq(Workorder::getType,orderDataDTO.getOrderType())
                .eq(Workorder::getIsdeleted,Constants.ZERO));
        if(Constants.equalsInteger(queryType,Constants.ZERO)){
        if(Constants.equalsInteger(orderDataDTO.getQueryType(),Constants.ZERO)){
            for (int i = 1 ; i <= nowMonth; i++) {
                WorkOrderDataVO workOrderDataVO = new WorkOrderDataVO();
                String monthDay = year + "-" + org.apache.commons.lang3.StringUtils.leftPad(nowMonth.toString(),2,"0");
@@ -781,7 +1004,7 @@
                }
                workOrderDataVOList.add(workOrderDataVO);
            }
        }else if(Constants.equalsInteger(queryType,Constants.ONE)){
        }else if(Constants.equalsInteger(orderDataDTO.getQueryType(),Constants.ONE)){
            //按照季度查询
            for (int i = 1 ; i <= quarter; i++) {
                List<Workorder> dataList = new ArrayList<>();