skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
@@ -40,7 +40,7 @@ /** * nacos dev 地址 */ String NACOS_DEV_ADDR = "192.168.0.200:8848"; String NACOS_DEV_ADDR = "127.0.0.1:8848"; /** * nacos prod 地址 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
@@ -19,7 +19,8 @@ <result property="itemsName" column="itemsName"/> <result property="description" column="description"/> <result property="patrolTime" column="update_time"/> <result property="toUserId" column="to_user_id"/> <result property="phone" column="phone"/> <result property="toUserId" column="create_user"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> @@ -48,12 +49,14 @@ </select> <select id="getDetail" resultMap="selectPatrolRecordList"> SELECT record.id,record.patrol_type,record.images,record.content,record.status,record.item_id,record.content,record.task_id,record.patrol_route, item.description record.id,record.patrol_type,record.images,record.content,record.status,record.item_id,record.content,record.task_id,record.patrol_route,record.create_user, item.description, u.phone FROM SM_PATROL_RECORD record LEFT JOIN sm_patrol_type type ON type.id = record.patrol_type LEFT JOIN sm_patrol_task task ON task.id = record.task_id LEFT JOIN sm_patrol_group_item item ON item.id = record.item_id LEFT JOIN BLADE_USER u ON u.id = record.create_user WHERE record.is_deleted = 0 AND record.id =#{id} </select> @@ -63,7 +66,7 @@ <select id="getByTaskIdAndItemId" resultMap="selectPatrolRecordList"> SELECT r.id,r.patrol_type,r.device_ids,r.images,r.content,r.status,r.item_id,r.task_id,r.update_time, c.name groupName,c.id groupId,c.items_name itemsName,c.description,t.to_user_id c.name groupName,c.id groupId,c.items_name itemsName,c.description FROM BLADEX.SM_PATROL_RECORD r LEFT JOIN (SELECT g.ID,g.NAME,a.id itemId, a.items_name,description FROM skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
@@ -6,15 +6,23 @@ import cn.gistack.sm.patrol.util.EnhancementServicesTool; import cn.gistack.sm.patrol.util.IdWorker; import cn.gistack.sm.patrol.vo.PatrolTaskVO; import cn.gistack.system.user.feign.IUserClient; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.Func; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; @Service @AllArgsConstructor public class PatrolTaskServiceImpl extends BaseServiceImpl<PatrolTaskMapper, PatrolTask> implements IPatrolTaskService { IUserClient userClient; /** * 自定义分页查询 @@ -24,7 +32,8 @@ */ @Override public IPage<PatrolTaskVO> selectPatrolTask(IPage<PatrolTaskVO> page, PatrolTaskVO patrolTask) { return page.setRecords(baseMapper.selectPatrolTask(page,patrolTask)); List<PatrolTaskVO> patrolTaskList = baseMapper.selectPatrolTask(page, patrolTask); return page.setRecords(patrolTaskList); } /** skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java
@@ -40,4 +40,8 @@ * 巡查人id */ private String toUserId; /** * 联系方式 */ private String phone; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java
@@ -26,4 +26,9 @@ * 历时 */ private Integer timeGap; /** * 角色名 */ private String roleName; }
