Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-11 4d968c0ceb43dcbbc1c4226db163cb5618b3cf33

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

@@ -67,6 +67,8 @@
            if (sysUsers!=null){//系统分配导办人员
                SysUser sysUser = sysUsers.get(0);//因为sql用了升序排序所以第一条就是待办结最少的人员之一
                guideRepairOrder.setState("2");
                sysUser.setTransactionNum(sysUser.getTransactionNum()+1);
                sysUserMapper.updateById(sysUser);
                guideRepairOrder.setGuideUserId(sysUser.getUserId().toString());
                guideRepairOrder.setGuideDepartmentId(sysUser.getDepartmentId());
                //新增分配记录
@@ -78,7 +80,7 @@
                entity.setToUserId(guideRepairOrder.getGuideUserId()+"");
                entity.setFromUserId(guideRepairOrder.getSubmitUserId());
                entity.setFromDepartmentalId(guideRepairOrder.getGuideDepartmentId());
                entity.setGuideId(guideRepairOrder.getId().toString());
                entity.setGuidOrderNum(guideRepairOrder.getOrderNum());
                guideEvolveMapper.insertConfig(entity);
            }
        }
@@ -162,5 +164,38 @@
        return baseMapper.countConfigList(matterName,ids);
    }

    @Override
    public int updateSysUserOrderNum(GuideEvolveEntity order) {
       if(order.getState().equals("13")){
           SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId()));
           sysUser.setTransactionNum(sysUser.getTransactionNum()+1);
           return  sysUserMapper.updateById(sysUser);
       }else if(order.getState().equals("12")){
            SysUser sysUserTo= sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId()));
            SysUser sysUserFrom= sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getFromUserId()));
            sysUserTo.setTransactionNum(sysUserTo.getTransactionNum()+1);
            sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum()-1);
            sysUserMapper.updateById(sysUserFrom);
            return  sysUserMapper.updateById(sysUserTo);
       }
        return 0;
    }

    /**
     * 1 今天   2昨天   3本月   4本年度 String time
     * @param state
     * @param ids
     * @return
     */
    @Override
    public int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,String evaluateState) {
        return baseMapper.countStatisticsNum(state,ids,time,isTimeout,evaluateState);
    }

    @Override
    public List<CountListNum> countListNum(String state, List<String> ids, Integer time) {
        return baseMapper.countListNum(state, ids,time);
    }


}