修改提交判重bug 及个人中心排序bug

fengjin

2022-10-14 22ab478185c9f50e54ca30191bf3c847980e99e1

修改提交判重bug 及个人中心排序bug

 flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java

@@ -64,7 +64,7 @@
             return ResultData.success();
          }
          else
            return  ResultData.error();
              return  ResultData.error("提交失败,请检查你是否有相同的咨询内容在处理中");
    }



 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java

@@ -66,7 +66,7 @@
            return ResultData.success();
          }
          else
            return  ResultData.error();
              return  ResultData.error("提交失败,请检查你是否有相同的咨询内容在处理中");
    }



 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -47,6 +47,21 @@
        guideRepairOrder.setDepartmentId(transactionEvent.getDepartmentId());
        guideRepairOrder.setClassifyId(transactionEvent.getClassifyId());
        List<String> departmentIds=new ArrayList<>();
        Boolean isAdd=true;//是否能够新建工单
        List<GuideRepairOrder> guideRepairOrders = baseMapper.selectList(new QueryWrapper<GuideRepairOrder>().lambda()
                .eq(GuideRepairOrder::getMatterId, guideRepairOrder.getMatterId())
                .eq(GuideRepairOrder::getConsultContent, guideRepairOrder.getConsultContent()));
        if (guideRepairOrders.size()==0){
            isAdd=true;
        }else {
            for (GuideRepairOrder guideRepair:guideRepairOrders) {
                if (guideRepair.getState().equals("1")||guideRepair.getState().equals("2")||guideRepair.getState().equals("6")||guideRepair.getState().equals("7")){
                    isAdd=false;
                    break;
                }
            }
        }
         if (isAdd) {
        //自动分配业务代码开始
        List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByCode(guideRepairOrder.getAreaCode());
        if (organizationChartEntities!=null){
@@ -129,7 +144,10 @@
            return 1;
        else
            return 0;

         }
         else {
             return  0;
         }
    }

    public  List<String> getDepartmentIds(  List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){

 flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml

@@ -122,7 +122,7 @@
    <select id="selectBySubmitId"  resultMap="GuideRepairOrderResult">
        <include refid="selectGuideRepairOrderVo"/>
        where submit_user_id=#{id} and ( state not in (3,5)  or ( state  in (3,5) and 60>datediff(now(),create_time)
        ))
        )) order by create_time desc 
    </select>