zhongrj
2024-01-15 44921e73793cf861f476430204d5ece4bfd8edb9
校园,旅馆,二手车、二手手机、打金店修改
4 files modified
33 ■■■■ changed files
src/main/java/org/springblade/modules/task/dto/TaskCampusReportingEventDTO.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java 10 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java 10 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java 8 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/dto/TaskCampusReportingEventDTO.java
@@ -37,5 +37,10 @@
    private Integer reportType;
    /**
     * 中转的状态
     */
    private Integer status;
}
src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
@@ -83,11 +83,15 @@
    @Override
    public Boolean updateCampusReporting(TaskCampusReportingEventDTO taskCampusReportingEvent) throws Exception {
        Integer integer = StringUtils.isBlank(taskCampusReportingEvent.getConfirmFlag()) ? null : Integer.valueOf(taskCampusReportingEvent.getConfirmFlag());
        Integer integer = null==taskCampusReportingEvent.getStatus() ? null : taskCampusReportingEvent.getStatus();
        Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskCampusReportingEvent.getTaskId(), integer);
        if (aLong > 0) {
            taskCampusReportingEvent.setConfirmUserId(AuthUtil.getUserId());
            taskCampusReportingEvent.setConfirmTime(new Date());
            if (null!=taskCampusReportingEvent.getStatus()
                && taskCampusReportingEvent.getStatus()!=4) {
                taskCampusReportingEvent.setConfirmFlag(taskCampusReportingEvent.getStatus().toString());
                taskCampusReportingEvent.setConfirmUserId(AuthUtil.getUserId());
                taskCampusReportingEvent.setConfirmTime(new Date());
            }
            Boolean b = baseMapper.updateById(taskCampusReportingEvent) > 0;
            if (b) {
                return b;
src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.constant.DictConstant;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.place.entity.PlaceEntity;
@@ -81,9 +82,12 @@
    public Boolean updateHotelReporting(TaskHotelReportingVO taskHotelReporting) throws Exception {
        Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskHotelReporting.getTaskId(), taskHotelReporting.getStatus());
        if (aLong > 0) {
            taskHotelReporting.setConfirmFlag(taskHotelReporting.getStatus().toString());
            taskHotelReporting.setConfirmUserId(AuthUtil.getUserId());
            taskHotelReporting.setConfirmTime(new Date());
            if (null!=taskHotelReporting.getStatus()
                && taskHotelReporting.getStatus()!=4) {
                taskHotelReporting.setConfirmFlag(taskHotelReporting.getStatus().toString());
                taskHotelReporting.setConfirmUserId(AuthUtil.getUserId());
                taskHotelReporting.setConfirmTime(new Date());
            }
            boolean b = baseMapper.updateById(taskHotelReporting) > 0;
            if (b) {
                return b;
src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.constant.DictConstant;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
@@ -97,7 +98,12 @@
        if (aLong > 0) {
            taskLabelReportingEvent.setConfirmFlag(taskLabelReportingEvent.getStatus().toString());
            taskLabelReportingEvent.setConfirmUserId(AuthUtil.getUserId());
            taskLabelReportingEvent.setConfirmTime(new Date());
            if (null!=taskLabelReportingEvent.getStatus()
                && taskLabelReportingEvent.getStatus()!=4) {
                taskLabelReportingEvent.setConfirmFlag(taskLabelReportingEvent.getStatus().toString());
                taskLabelReportingEvent.setConfirmUserId(AuthUtil.getUserId());
                taskLabelReportingEvent.setConfirmTime(new Date());
            }
            Boolean b = baseMapper.updateById(taskLabelReportingEvent) > 0;
            if (b) {
                return b;