jczz_manager.git

			@@ -17,7 +17,6 @@
			package org.springblade.modules.task.service.impl;

			import com.baomidou.mybatisplus.core.metadata.IPage;
			import org.springblade.common.utils.SpringUtils;
			import org.springblade.core.mp.base.BaseServiceImpl;
			import org.springblade.core.secure.utils.AuthUtil;
			import org.springblade.modules.grid.entity.GridmanEntity;
			@@ -28,7 +27,6 @@
			import org.springblade.modules.task.entity.TaskEntity;
			import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
			import org.springblade.modules.task.mapper.TaskReportForRepairsMapper;
			import org.springblade.modules.task.service.ITaskRepairStepService;
			import org.springblade.modules.task.service.ITaskReportForRepairsService;
			import org.springblade.modules.task.service.ITaskService;
			import org.springblade.modules.task.vo.TaskReportForRepairsVO;
			@@ -78,16 +76,18 @@
			list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
			} else if (taskReportForRepairs.getRoleName().equals("居民")) {
			taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
			} else if (taskReportForRepairs.getRoleName().equals("物业")) {
			}
			}
			if (AuthUtil.getUserRole().equals("wygly")) {
			taskReportForRepairs.setRegionCode("");
			taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
			}
			}
			return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,list));
			}

			/**
			* 查询报事报修统计
			*
			* @return
			*/
			@Override
			@@ -97,6 +97,7 @@

			/**
			* 报事报修任务表新增
			*
			* @param taskReportForRepairs
			* @return
			*/
			@@ -126,6 +127,7 @@

			/**
			* 报事报修任务表自定义修改
			*
			* @param taskReportForRepairs
			* @return
			*/
			@@ -140,6 +142,7 @@

			/**
			* 报事报修任务表审核
			*
			* @param taskReportForRepairs
			* @return
			*/

	src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml	3 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java	11 ●●●●● patch \| view \| raw \| blame \| history

			@@ -174,6 +174,9 @@
			<if test="vo.confirmFlag != null">
			AND jtrfr.confirm_flag = #{vo.confirmFlag}
			</if>
			<if test="vo.confirmUserId != null">
			AND jtrfr.confirm_user_id = #{vo.confirmUserId}
			</if>
			<if test="vo.status != null">
			AND jtrfr.status = #{vo.status}
			</if>