Merge remote-tracking branch 'origin/master'

jiangping

2025-04-22 3dd12d913b5d9c2096e53f9d14475c534b813e6b

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

@@ -406,8 +406,8 @@
     */
    public Integer saveLog(String beforeJson,Workorder afterWorkorder,Integer objType,Integer memberId,String title,String content,String paramr2){
        WorkorderLog workorderLog = new WorkorderLog();
        workorderLog.setCreateDate(afterWorkorder.getCreateDate());
        workorderLog.setEditDate(afterWorkorder.getCreateDate());
        workorderLog.setCreateDate(afterWorkorder.getEditDate());
        workorderLog.setEditDate(afterWorkorder.getEditDate());
        workorderLog.setIsdeleted(Constants.ZERO);
        workorderLog.setBeforeContent(beforeJson);
        workorderLog.setAfterContent(JSONObject.toJSONString(afterWorkorder));
@@ -857,7 +857,7 @@
            }
            workorder.setStatus(Constants.WorkOrderStatus.wtsClose.getKey());
            qwIds.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
            qwIds.add(workorder.getDealerId());
            qwIds.add(workorder.getManagerId());
            qwIds.remove(closeDTO.getMember().getQwId());
        }else{
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"工单状态已流转");
@@ -867,7 +867,7 @@
        workorder.setDealInfo(closeDTO.getInfo());
        workorderMapper.updateById(workorder);
        //处理上报日志
        Integer logId = this.saveLog(beforeJson,workorder,Constants.THREE,workorder.getMemberId(),"任务已处理",closeDTO.getInfo(),null);
        Integer logId = this.saveLog(beforeJson,workorder,Constants.THREE,closeDTO.getMember().getId(),"任务已处理",closeDTO.getInfo(),null);
        List<Multifile> multifileList = closeDTO.getMultifileList();
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
            for (Multifile multifile:multifileList) {
@@ -933,7 +933,7 @@
        //处理上报日志
        Integer logId = this.saveLog(beforeJson,workorder,
                Constants.equalsInteger(passOnDTO.getPassOnType(),Constants.ZERO)?Constants.ONE:Constants.TWO
                ,workorder.getMemberId(),"任务分配",passOnDTO.getInfo(),paramr2);
                ,passOnDTO.getMember().getId(),"任务分配",passOnDTO.getInfo(),paramr2);
        List<Multifile> multifileList = passOnDTO.getMultifileList();
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
            for (Multifile multifile:multifileList) {