fengjin
2022-12-05 4b92c6f30a86ad0f804614b2659c1dda368b8fdd
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -106,8 +106,7 @@
                        for (String departmentId : departmentIdsParent) {
                            OrganizationChartEntity organizationChart = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, departmentId));
                            OrganizationChartEntity organizationChartParent = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, organizationChart.getParentId()));
                            if (organizationChartParent!=null)
                            {
                            if (organizationChartParent != null) {
                                departmentIds.add(organizationChartParent.getId().toString());
                            }
                        }
@@ -146,7 +145,7 @@
                    //消息推送
                    this.sendGuideRepairOrderSubmit(sysUser.getOpenid(), guideRepairOrder);
                    //短信发送
                    smsUtil.sendSmsSubmit(sysUser.getPhonenumber(), sysUser.getUserName());
                    smsUtil.sendSmsSubmitNew(sysUser.getPhonenumber(), sysUser.getUserName());
                    guideEvolveMapper.insertConfig(entity);
                }
            } else {//如果该办事指南用户所选所属地区无导半部门则为特殊单据需要手动分配
@@ -230,14 +229,14 @@
    public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
                                                   String matterName, List<String> ids, String status,
                                                   String guideUserId, String createTimeStartTime,
                                                   String createTimeTimeEndTime,String classifyId) {
        return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId,createTimeStartTime,createTimeTimeEndTime,classifyId);
                                                   String createTimeTimeEndTime, String classifyId) {
        return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId, createTimeStartTime, createTimeTimeEndTime, classifyId);
    }
    @Override
    public List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids, String status,
                                                   String guideUserId, String createTimeStartTime,String createTimeTimeEndTime,String classifyId) {
        return baseMapper.selectConfigList(matterName, ids, status, guideUserId,createTimeStartTime,createTimeTimeEndTime,classifyId);
                                                   String guideUserId, String createTimeStartTime, String createTimeTimeEndTime, String classifyId) {
        return baseMapper.selectConfigList(matterName, ids, status, guideUserId, createTimeStartTime, createTimeTimeEndTime, classifyId);
    }
    @Override
@@ -261,7 +260,7 @@
                    this.sendGuideRepairOrderSubmit(sysUser.getOpenid(), guideRepairOrder);
                }
                //短信发送
                smsUtil.sendSmsSubmit(sysUser.getPhonenumber(), sysUser.getUserName());
                smsUtil.sendSmsSubmitNew(sysUser.getPhonenumber(), sysUser.getUserName());
                sysUser.setTransactionNum(sysUser.getTransactionNum() + 1);
                return sysUserMapper.updateById(sysUser);
            } else if (order.getState().equals("10")) {
@@ -275,7 +274,7 @@
                GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda()
                        .eq(GuideRepairOrder::getId, order.getGuideId()));
                //短信发送
                smsUtil.sendSmsSubmit(sysUserTo.getPhonenumber(), sysUserTo.getUserName());
                smsUtil.sendSmsSubmitNew(sysUserTo.getPhonenumber(), sysUserTo.getUserName());
                if (guideRepairOrder != null) {
                    this.sendGuideRepairOrderSubmit(sysUserTo.getOpenid(), guideRepairOrder);
                }
@@ -379,7 +378,9 @@
        //删除进展记录
        guideEvolveMapper.delete(new QueryWrapper<GuideEvolveEntity>().lambda().eq(GuideEvolveEntity::getGuideId, Id));
        TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrderDelete.getMatterId()));
        transactionEvent.setTransactionNum(transactionEvent.getTransactionNum() - 1);
        if (transactionEvent.getTransactionNum() > 0) {
            transactionEvent.setTransactionNum(transactionEvent.getTransactionNum() - 1);
        }
        //对应办事指南减一
        transactionEventMapper.updateById(transactionEvent);
        SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrderDelete.getGuideUserId()));
@@ -397,18 +398,24 @@
        WxUtil wxUtil = new WxUtil();
        String accessToken = "0";
        try {
            accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString();
            accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
        for (GuideRepairOrder guideRepairOrder : guideRepairOrders) {
            SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
            if (sysUser != null) {
                smsUtil.sendSmsOvertime(sysUser.getPhonenumber(), sysUser.getUserName());
                wxUtil.sendGuideRepairOrderOvertime(sysUser.getOpenid(), accessToken, "86JgWHhR8b1XxD72WYqMnndyfkiMtSSoCk9NFMwLEZ8", sysUser);
                guideRepairOrder.setIsPush(1);
                guideRepairOrder.setIsTimeout("2");
                baseMapper.updateById(guideRepairOrder);
            List<SysUser> sysUsers = sysUserMapper.selectList(new QueryWrapper<SysUser>().lambda().eq(SysUser::getDepartmentId, guideRepairOrder.getGuideUserPhone()).eq(SysUser::getIsDivisionHead, 1));
            if (sysUsers != null && sysUsers.size() > 0) {
                for (SysUser sysUser : sysUsers) {
//            transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrder.getMatterId()));
//            SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
                    if (sysUser != null) {
                        smsUtil.sendSmsOvertime(sysUser.getPhonenumber(), sysUser.getUserName());
                        wxUtil.sendGuideRepairOrderOvertime(sysUser.getOpenid(), accessToken, "86JgWHhR8b1XxD72WYqMnndyfkiMtSSoCk9NFMwLEZ8", sysUser);
                        guideRepairOrder.setIsPush(1);
                        guideRepairOrder.setIsTimeout("2");
                        baseMapper.updateById(guideRepairOrder);
                    }
                }
            }
        }
        return ResultData.success();
@@ -437,5 +444,31 @@
        return 0;
    }
    @Override
    public ResultData deleteComment(Integer id, SysUser sysUser) {
        if (sysUser.getUserType().equals("1") || sysUser.getIsDivisionHead().equals("1")) {
            GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, id));
            if (guideRepairOrder != null && guideRepairOrder.getState().equals("3")) {
                guideRepairOrder.setIsHideComments(1);
                baseMapper.updateById(guideRepairOrder);
                //新增删除评论进展
                GuideEvolveEntity entity = new GuideEvolveEntity();
                entity.setCreateTime(LocalDateTime.now());
                entity.setUpdateTime(LocalDateTime.now());
                entity.setState("14");
                entity.setFromUserId(sysUser.getUserId() + "");
                entity.setGuideId(guideRepairOrder.getId().toString());
                guideEvolveMapper.insertConfig(entity);
                baseMapper.updateById(guideRepairOrder);
                return ResultData.success("删除评论成功");
            } else {
                return ResultData.error("已办结的单据才能进行删除评论操作");
            }
        } else {
            return ResultData.error("只能部门领导和超级管理员才能删除评论");
        }
    }
}