linwei
2024-02-07 0f0b60762ec17a2e94eaf750920419ab7f80885a
阵地类型过滤
4 files modified
62 ■■■■■ changed files
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/controller/TaskController.java 11 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/ITaskService.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java 40 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -154,6 +154,10 @@
            and jp.is_front = #{place.isFront}
        </if>
        <if test="place.frontType!=null and place.frontType!=''">
            and jp.front_type = #{place.frontType}
        </if>
        <if test="place.neiName!=null and place.neiName!=''">
            and br.name like concat('%',#{place.neiName},'%')
        </if>
src/main/java/org/springblade/modules/task/controller/TaskController.java
@@ -129,5 +129,16 @@
        return R.data(taskService.countTypeNumber(roleType, neiCode));
    }
    /**
     * 任务表 新增或修改
     */
    @PostMapping("/examine")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "任务审核", notes = "传入task")
    public R examine(@Valid @RequestBody TaskEntity task) {
        return R.status(taskService.examine(task));
    }
}
src/main/java/org/springblade/modules/task/service/ITaskService.java
@@ -78,4 +78,11 @@
     * @return
     */
    boolean createTaskJob(String param);
    /**
     * 任务审核
     * @param task
     * @return
     */
    Boolean examine(TaskEntity task);
}
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -54,6 +54,8 @@
import org.springblade.modules.task.mapper.TaskMapper;
import org.springblade.modules.task.service.*;
import org.springblade.modules.task.vo.TaskVO;
import org.springblade.modules.taskPlaceSelfCheck.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.taskPlaceSelfCheck.service.ITaskPlaceSelfCheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -258,6 +260,7 @@
    /**
     * 获取网格员id
     *
     * @return
     */
    private String getGridCode() {
@@ -334,6 +337,7 @@
    /**
     * 根据类型创建任务
     *
     * @param param 参数
     * @return
     */
@@ -376,6 +380,7 @@
    /**
     * 新增走访任务
     *
     * @param household
     */
    public void saveGridWordTask(HouseholdVO household) {
@@ -475,6 +480,7 @@
    /**
     * 新增校园安全检查任务
     *
     * @param placeVO
     * @param taskEntity
     */
@@ -496,6 +502,7 @@
    /**
     * 新增旅馆安全检查任务
     *
     * @param placeVO
     * @param taskEntity
     */
@@ -518,6 +525,7 @@
    /**
     * 新增打金店/二手车/二手手机任务
     *
     * @param placeVO
     * @param taskEntity
     * @param taskName
@@ -554,6 +562,7 @@
    /**
     * 插入任务信息
     *
     * @param houseCode
     * @param type
     * @param taskName
@@ -582,4 +591,35 @@
        // 返回
        return taskEntity;
    }
    /**
     * 任务审核
     * @param task
     * @return
     */
    @Override
    public Boolean examine(TaskEntity task) {
        // 二手交易
        if (task.getReportType().equals(5)) {
            boolean b = updateById(task);
            if (b) {
                ITaskLabelReportingEventService bean = SpringUtils.getBean(ITaskLabelReportingEventService.class);
                return bean.update(Wrappers.<TaskLabelReportingEventEntity>lambdaUpdate()
                    .set(TaskLabelReportingEventEntity::getConfirmFlag, task.getStatus())
                    .eq(TaskLabelReportingEventEntity::getTaskId, task.getId()));
            }
        }
        // 消防只查
        if (task.getReportType().equals(2)) {
            boolean b = updateById(task);
            if (b) {
                ITaskPlaceSelfCheckService bean = SpringUtils.getBean(ITaskPlaceSelfCheckService.class);
                return bean.update(Wrappers.<TaskPlaceSelfCheckEntity>lambdaUpdate()
                    .set(TaskPlaceSelfCheckEntity::getStatus, task.getStatus())
                    .eq(TaskPlaceSelfCheckEntity::getTaskId, task.getId()));
            }
        }
        return false;
    }
}