1.派遣记录接口修改 2.培训报名查询接口修改 3.指令新增，修改，删除接口修改

Administrator

2021-07-22 328add9a80c8588ff22f1836d7aa3f4824374181

1.派遣记录接口修改
2.培训报名查询接口修改
3.指令新增，修改，删除接口修改

 src/main/java/org/springblade/modules/directive/controller/DirectiveController.java

@@ -9,6 +9,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.directive.entity.Directive;
import org.springblade.modules.directive.entity.DirectiveFile;
import org.springblade.modules.directive.service.DirectiveService;
import org.springblade.modules.directive.vo.DirectiveVo;
import org.springframework.web.bind.annotation.*;
@@ -51,16 +52,66 @@


    /**
     * 指令信息新增，同时新增到轨迹表中
     * 指令信息新增，同时新增图片到指令文件表中
     * @param directive 指令信息对象
     */
    @PostMapping("/saveDirectiveAndLocus")
    public R saveDirectiveAndLocus(@RequestBody Directive directive) {
        //先查询是否已有指令信息，如果有，则更新，没有则插入
        DirectiveVo directiveVo = directiveService.selectDirectiveInfo(directive);
    @PostMapping("/saveDirectiveAndFile")
    public R saveDirectiveAndFile(@RequestBody DirectiveVo directive) {
        //新增指令信息
        boolean save = directiveService.save(directive);
        boolean status = false;
        if (save){
            //新增图片
            if (null!=directive.getUrl() && directive.getUrl()!=""){
                String[] directiveUrl = directive.getUrl().split(",");
                for (String url : directiveUrl) {
                    DirectiveFile directiveFile = new DirectiveFile();
                    directiveFile.setType(1);
                    directiveFile.setDirectiveId(directive.getId());
                    directiveFile.setUrl(url);
                    status = directiveService.saveDirectiveFile(directiveFile);
                    if (!status){
                        R.status(false);
                    }
                }
            }
            return R.status(status);
        }
        //返回数据
        return R.status(false);
        return R.status(status);
    }


    /**
     * 指令信息修改，同时新增图片到指令文件表中
     * @param directive 指令信息对象
     */
    @PostMapping("/updateDirectiveAndFile")
    public R updateDirectiveAndFile(@RequestBody DirectiveVo directive) {
        //新增指令信息
        boolean update = directiveService.updateById(directive);
        boolean status = false;
        if (update){
            //先删除图片
            int i = directiveService.deleleByDirectiveId(directive.getId());
            //新增图片
            if (null!=directive.getUrl() && directive.getUrl()!=""){
                String[] directiveUrl = directive.getUrl().split(",");
                for (String url : directiveUrl) {
                    DirectiveFile directiveFile = new DirectiveFile();
                    directiveFile.setType(1);
                    directiveFile.setDirectiveId(directive.getId());
                    directiveFile.setUrl(url);
                    status = directiveService.saveDirectiveFile(directiveFile);
                    if (!status){
                        R.status(false);
                    }
                }
            }
            return R.status(status);
        }
        //返回数据
        return R.status(status);
    }

    /**
@@ -87,6 +138,13 @@
     */
    @PostMapping("/remove")
    public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
        //图片也删除
        if (null!=ids && ids!=""){
            String[] directiveIds = ids.split(",");
            for (String directiveId : directiveIds) {
                directiveService.deleleByDirectiveId(Long.parseLong(directiveId));
            }
        }
        return R.status(directiveService.removeByIds(Func.toLongList(ids)));
    }


 src/main/java/org/springblade/modules/directive/entity/Directive.java

@@ -38,14 +38,14 @@
     * 发送人 id
     */
    @TableField("send_directive_id")
    private Long sendDirectiveId;
    private String sendDirectiveId;


    /**
     * 接收人ids  可以是多个
     */
    @TableField("receive_directive_ids")
    private Long receiveDirectiveIds;
    private String receiveDirectiveIds;


    /**

 src/main/java/org/springblade/modules/directive/entity/DirectiveFile.java

@@ -38,7 +38,7 @@
     * 指令id
     */
    @TableField("directive_id")
    private Long directive_id;
    private Long directiveId;


    /**

 src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.java

@@ -37,4 +37,18 @@
     * @return
     */
    List<DirectiveFile> getDirectiveFileList(Long id);

    /**
     * 插入图片
     * @param directiveFile
     * @return
     */
    int saveDirectiveFile(@Param("directiveFile") DirectiveFile directiveFile);

    /**
     * 删除图片
     * @param id 指令id
     * @return
     */
    int deleteByDirectiveId(@Param("id") Long id);
}

 src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.xml

@@ -48,4 +48,18 @@
        </if>
    </select>

    <!--插入图片-->
    <insert id="saveDirectiveFile">
        insert into
            sys_directive_file
        (type,directive_id,url)
            value
        (#{directiveFile.type},#{directiveFile.directiveId},#{directiveFile.url})
    </insert>

    <!--删除图片-->
    <delete id="deleteByDirectiveId">
        delete from sys_directive_file where directive_id = #{id}
    </delete>

</mapper>

 src/main/java/org/springblade/modules/directive/service/DirectiveService.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.directive.entity.Directive;
import org.springblade.modules.directive.entity.DirectiveFile;
import org.springblade.modules.directive.vo.DirectiveVo;

import java.util.List;
@@ -28,4 +29,17 @@
     */
    IPage<DirectiveVo> selectDirectivePage(IPage<DirectiveVo> page, DirectiveVo directive);

    /**
     * 插入图片
     * @param directiveFile
     * @return
     */
    boolean saveDirectiveFile(DirectiveFile directiveFile);

    /**
     * 删除图片
     * @param id 指令id
     * @return
     */
    int deleleByDirectiveId(Long id);
}

 src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java

@@ -66,4 +66,29 @@
    public DirectiveVo selectDirectiveInfo(Directive directive) {
        return baseMapper.selectDirectiveInfo(directive);
    }


    /**
     * 插入图片
     * @param directiveFile
     * @return
     */
    @Override
    public boolean saveDirectiveFile(DirectiveFile directiveFile) {
        int i = baseMapper.saveDirectiveFile(directiveFile);
        if (i>0){
            return true;
        }
        return false;
    }

    /**
     * 删除图片
     * @param id 指令id
     * @return
     */
    @Override
    public int deleleByDirectiveId(Long id) {
        return baseMapper.deleteByDirectiveId(id);
    }
}

 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml

@@ -36,6 +36,9 @@
        <if test="dispatcher.cardid!=null and  dispatcher.cardid!=''">
            and sd.cardid like concat('%', #{dispatcher.cardid},'%')
        </if>
        <if test="dispatcher.userIds!=null and  dispatcher.userIds!=''">
            and sd.user_ids like concat('%', #{dispatcher.userIds},'%')
        </if>
        <if test="dispatcher.dispatcherCompany!=null and  dispatcher.dispatcherCompany!=''">
            and sdu.name like concat('%', #{dispatcher.dispatcherCompany},'%')
        </if>

 src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml

@@ -23,6 +23,9 @@
        <if test="trainingRegistration.cancel!=null">
            and sr.cancel = #{trainingRegistration.cancel}
        </if>
        <if test="trainingRegistration.idCardNo!=null and trainingRegistration.idCardNo!=''">
            and sr.id_card_no = #{trainingRegistration.idCardNo}
        </if>
    </select>

    <!--报名培训详情信息-->

 src/main/resources/application.yml

@@ -196,6 +196,8 @@
      - /liveLocation/**
      - /locus/**
      - /examScore/**
      - /trainingRegistration/**
      - /directive/**
    #授权认证配置
    auth:
      - method: ALL