洪城义警-正式版后台
zengh
2022-02-18 03cceb276da695690b0b2b41e85a07f45b958aaa
任务下发人员调整
6 files modified
73 ■■■■ changed files
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java 32 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java 21 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml 12 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -155,7 +155,7 @@
                    //String serid2 = list.get(0).getSerid();
                    //String substring = serid2.substring(0, serid.length() - 1);
                    //String s = serid + substring;
                    taskqdService.updatet(taskqd.getId(), i, serid);
                    taskqdService.updatet(taskqd.getId(), i, serid,null,null);
                    return R.success("抢单成功");
                }
                else {
@@ -163,7 +163,18 @@
                    String ser2 = list.get(0).getSerid();
                    String sub = ser2.substring(0, serid.length() - 1);
                    String ss = ser + sub;
                    taskqdService.updatet(taskqd.getId(), i, ss);
                    String team = taskqd.getCaptain();
                    boolean isteam = StringUtil.isEmpty(list.get(0).getTeam());
                    String team2 = list.get(0).getTeam();
                    String teamz = "";
                    if (isteam){
                        teamz = team;
                    }else {
                        teamz = team2 + "," + team;
                    }
                    taskqdService.updatet(taskqd.getId(), i, ss,null,teamz);
                    return R.success("抢单成功");
                }
@@ -171,13 +182,26 @@
                int i = num + 1;
                String serid = taskqd.getSerid();
                if (empty==true){
                    taskqdService.updatet(taskqd.getId(), i, serid);
                    String captain = taskqd.getCaptain();
                    taskqdService.updatet(taskqd.getId(), i, serid,captain,null);
                    return R.success("抢单成功");
                }
                else {
                    String serid1 = list.get(0).getSerid();
                    String s = serid + serid1;
                    taskqdService.updatet(taskqd.getId(), i, s);
                    String team = taskqd.getCaptain();
                    boolean isteam = StringUtil.isEmpty(list.get(0).getTeam());
                    String team2 = list.get(0).getTeam();
                    String teamz = "";
                    if (isteam){
                        teamz = team;
                    }else {
                        teamz = team2 + "," + team;
                    }
                    taskqdService.updatet(taskqd.getId(), i, s,null,teamz);
                    return R.success("抢单成功");
                }
            }
src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java
@@ -128,6 +128,25 @@
    @ApiModelProperty(value = "图片")
    private String url;
    /**
     * 队长
     */
    @ApiModelProperty(value = "队长")
    private String captain;
    /**
     * 成员
     */
    @ApiModelProperty(value = "成员")
    private String team;
    /**
     * 是否是队长
     */
    @ApiModelProperty(value = "是否是队长")
    private String iscation;
    /**
     * 发布人
     */
    @ApiModelProperty(value = "发布人")
    private String publisher;
}
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
@@ -35,7 +35,7 @@
 */
public interface TaskqdMapper extends BaseMapper<Taskqd> {
    //抢单任务
    void updatet(Integer id, Integer num, String serid);
    void updatet(Integer id, Integer num, String serid,String captain,String team);
    List<Taskqd> selectList(Integer id);
    List<Map<String, Object>> queryReceiver(String serid);
    List<TaskqdVO> selectLi(String type, String serid);
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -17,6 +17,10 @@
        <result column="serid" property="serid"/>
        <result column="integral" property="integral"/>
        <result column="url" property="url"/>
        <result column="captain" property="captain"/>
        <result column="team" property="team"/>
        <result column="iscation" property="iscation"/>
        <result column="publisher" property="publisher"/>
    </resultMap>
@@ -24,13 +28,19 @@
        update sys_taskqd
        SET serid=#{serid},
            num=#{num}
            <if test="param4!='' and param4!=null">
                ,captain =#{param4}
            </if>
            <if test="param5!='' and param5!=null">
                ,team =#{param5}
            </if>
        where id = #{id}
    </update>
    <!--日常任务列表-->
    <select id="selectList" resultMap="taskResultMap">
        select jnum, num, serid
        select jnum, num, serid,team
        from sys_taskqd
        where id = #{id}
    </select>
src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
@@ -34,7 +34,7 @@
 * @since 2020-08-06
 */
public interface ITaskqdService extends IService<Taskqd> {
    void updatet(Integer id, Integer num, String serid);
    void updatet(Integer id, Integer num, String serid,String captain,String team);
    List<Taskqd> selectList(Integer id);
    List<Map<String, Object>> queryReceiver(String serid);
    List<TaskqdVO> selectLi(String type, String serid);
src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java
@@ -37,8 +37,8 @@
public class TaskqdServiceImpl extends ServiceImpl<TaskqdMapper, Taskqd> implements ITaskqdService {
    @Override
    public void updatet(Integer id, Integer num, String serid) {
        baseMapper.updatet(id, num, serid);
    public void updatet(Integer id, Integer num, String serid,String captain,String team) {
        baseMapper.updatet(id, num, serid,captain,team);
    }
    @Override