1.更改系统设置更改问题 2.新增导半人员设置创建人 3.搜索sql优化

fengjin

2022-11-23 2edf8f5847bcc121a35c9aaee5531585e6b923f5

1.更改系统设置更改问题 2.新增导半人员设置创建人 3.搜索sql优化

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

@@ -106,6 +106,7 @@
    }



    /**
     * 通用上传请求（单个）
     */

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

@@ -72,7 +72,7 @@
    @ApiOperation("新增导办用户接口")
    @PostMapping("/add")
    @Authorization
    public ResultData insertConfig(@RequestBody SysUser config)
    public ResultData insertConfig(@RequestBody SysUser config,@CurrentUser SysUser sysUser)
    {
        Assert.notNull(config, "parameter can not be empty");

@@ -143,6 +143,7 @@
        {
            config.setRoleIds("2");
        }
        config.setCreateBy(sysUser.getUserId());
        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());
        config.setUserId(Snowflake.getId()+"");

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

@@ -44,9 +44,12 @@
    @ApiOperation(value = "修改设置信息",response = AutomessageSysSettings.class)
    @PostMapping("/update")
    @Authorization
    ResultData update(@RequestBody AutomessageSysSettings automessageSysSettings,@CurrentUser SysUser sysUser){
    public  ResultData update(@RequestBody AutomessageSysSettings automessageSysSettings,@CurrentUser SysUser sysUser){
        automessageSysSettings.setUpdateUserId(sysUser.getUserId());
        automessageSysSettings.setUpdateTime(LocalDateTime.now());
        if (automessageSysSettings.getTimeoutRemindNum()>(automessageSysSettings.getTimeoutNotificationNum()*60)){
               return  ResultData.error("系统提醒时间不能大于系统通知时间*60");
        }
        return  sysSettingsService.update(automessageSysSettings);
    }


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

@@ -401,6 +401,7 @@
            throw new RuntimeException(e);
        }
        for (GuideRepairOrder guideRepairOrder : guideRepairOrders) {
            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());
@@ -454,12 +455,12 @@
                baseMapper.updateById(guideRepairOrder);
                return ResultData.success("删除评论成功");
            } else {
                ResultData.error("已办结的单据才能进行删除评论操作");
             return   ResultData.error("已办结的单据才能进行删除评论操作");
            }
        } else {
            ResultData.error("只能部门领导和超级管理员才能删除评论");
            return ResultData.error("只能部门领导和超级管理员才能删除评论");
        }
        return  ResultData.error();

    }



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

@@ -378,7 +378,7 @@


    <select id="queryMatterNameList"  resultMap="TransactionEventEntityResult">
        <include refid="selectTransactionEventEntityVo"/>
       select id,matter_name from  automessage_transaction_event
        <where>
            <if test="matterName != null and matterName != ''">
                AND (matter_name like concat('%', #{matterName}, '%') )
@@ -392,7 +392,7 @@
    </select>

    <select id="queryAssociateNamesList"  resultMap="TransactionEventEntityResult">
        <include refid="selectTransactionEventEntityVo"/>
        select id,matter_name from  automessage_transaction_event
        <where>
            <if test="associateNames != null and associateNames != ''">
                AND (associate_names like concat('%', #{associateNames}, '%') )
@@ -465,7 +465,7 @@
    </select>

    <select id="selectSearchList" resultType="com.dg.core.db.manual.pojo.Search">
        select  id, title, content,classify_id, type,parentClassifyId  from   ( select  id,matter_name title,concat((select classify_name from  automessage_classify_administration
        select   distinct classify_id,  type,parentClassifyId  from   ( select  id,matter_name title,concat((select classify_name from  automessage_classify_administration
                                                                                                    where id=(select parent_id from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)),
                                                                                                   '/',(select classify_name from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)) content,
                                                                   classify_id,(select parent_id from automessage_classify_administration  where id=automessage_transaction_event.classify_id) parentClassifyId,