修改Bug添加其他附件小程序

fengjin

2022-10-10 5f755d2f28a39d176c1ad0ad1be4a6b07d9df307

修改Bug添加其他附件小程序

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

New file
@@ -0,0 +1,111 @@
package com.dg.core.api;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
import com.dg.core.controller.BaseController;
import com.dg.core.db.gen.entity.ElseAccessoryEntity;
import com.dg.core.db.gen.entity.GuideRepairOrder;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IElseAccessoryService;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@Api(tags = {"其他附件小程序接口"})
@RestController
@RequestMapping("/applets/else")
public class ElseAccessoryAppletsController extends BaseController
{

    @Autowired
    IElseAccessoryService iElseAccessoryService;

    @Autowired
    IOrganizationChartService iOrganizationChartService;

    /**
     * 获取附件列表
     * @param Name
     * @return
     */
    @ApiOperation(value = "获取附件列表接口(全部)",response = ElseAccessoryEntity.class)
    @GetMapping(path = "/getAllList")
    @Authorization
    public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
                                             @CurrentUser SysUser sysUser)
    {
        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
        int num=iElseAccessoryService.countNum(Name,ids);
        return getDataTable(list,num);
    }


    /**
     * 新增列表
     * @param entity
     * @return
     */
    @ApiOperation(value = "新增附件",response = ElseAccessoryEntity.class)
    @PostMapping(path = "/add")
    @Authorization
    public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity)
    {
        if(entity==null)
        {
            return ResultData.error("参数不能为空");
        }

        if(StringUtils.isEmpty(entity.getName()))
        {
            return ResultData.error("事项名称不能为空");
        }

        if(StringUtils.isEmpty(entity.getUrl()))
        {
            return ResultData.error("文件url不能为空");
        }

        if(StringUtils.isEmpty(entity.getDepartmentId()))
        {
            return ResultData.error("部门不能为空");
        }

        return toAjax(iElseAccessoryService.insertConfig(entity));
    }

    /**
     * 更新附件
     * @param entity
     * @return
     */
    @ApiOperation(value = "更新附件",response = ElseAccessoryEntity.class)
    @PostMapping(path = "/update")
    @Authorization
    public ResultData updateConfig(@RequestBody ElseAccessoryEntity entity)
    {
        return toAjax(iElseAccessoryService.updateConfig(entity));
    }

    /**
     * 删除
     * @param Id
     * @return
     */
    @ApiOperation(value = "删除附件",response = ElseAccessoryEntity.class)
    @DeleteMapping(path = "/delete")
    @Authorization
    public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
    {
        return toAjax(iElseAccessoryService.deleteConfigById(Id));
    }

}

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

@@ -116,7 +116,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 create_time>sysdate()-60
        where submit_user_id=#{id} and ( state not in (3,5)  or ( state  in (3,5) and 60>datediff(now(),create_time)
        ))
    </select>


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

@@ -119,8 +119,12 @@
                #{id}
            </foreach>
         </if>
         and (master_ids like concat('%',#{classifyIdFront}, '%') or master_ids like concat('%',#{classifyIdAfter}, '%'))
         <if test="classifyIdFront!=null and classifyIdFront!='' and classifyIdAfter!=null and classifyIdAfter!=''">
            and (master_ids like concat('%',#{classifyIdFront}, '%') or master_ids like concat('%',#{classifyIdAfter}, '%'))
         </if>

         </where>
         order by transaction_num
    </select>