Merge branch 'dev_routine_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_routine_work

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PcWorkListFormDTO.java

@@ -0,0 +1,45 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/1/4 2:00 下午
+ * @DESC
+ */
+@Data
+public class PcWorkListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3522636529743412120L;
+
+    public interface PcWorkListForm{}
+
+//    @NotBlank(message = "staffId不能为空",groups = PcWorkListForm.class)
+    private String staffId;
+
+    @NotBlank(message = "endTime不能为空",groups = PcWorkListForm.class)
+    private String endTime;
+
+    private String startTime;
+
+    @NotBlank(message = "orgId不能为空",groups = PcWorkListForm.class)
+    private String orgId;
+
+    @NotBlank(message = "orgType不能为空",groups = PcWorkListForm.class)
+    private String orgType;
+
+    @NotNull(message = "pageSize不能为空",groups = PcWorkListForm.class)
+    private Integer pageSize;
+
+    @NotNull(message = "pageNo不能为空",groups = PcWorkListForm.class)
+    private Integer pageNo;
+
+    /**
+     * 是否分页，默认分页
+     */
+    private Boolean isPage = true;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/patrol/PcworkRecordListFormDTO.java

@@ -0,0 +1,53 @@
+package com.epmet.dto.form.patrol;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 【网格员工作统计】巡查记录列表
+ * @Author sun
+ */
+@Data
+public class PcworkRecordListFormDTO implements Serializable {
+	private static final long serialVersionUID = 9156247659994638103L;
+
+	/**
+	 * 组织或网格Id
+	 */
+	@NotBlank(message = "组织Id不能为空", groups = Staff.class)
+	private String orgId;
+	/**
+	 * 组织agency  网格grid
+	 */
+	@NotBlank(message = "组织类型不能为空", groups = Staff.class)
+	private String orgType;
+	/**
+	 * 工作人员Id
+	 */
+	private String staffId;
+	/**
+	 * 开始时间【yyyymmdd】
+	 */
+	private String startTime;
+	/**
+	 * 结束时间【yyyymmdd】
+	 */
+	@NotBlank(message = "结束时间不能为空",groups = Staff.class)
+	private String endTime;
+	/**
+	 * 页码
+	 * */
+	@Min(1)
+	private Integer pageNo;
+	/**
+	 * 每页多少条
+	 * */
+	private Integer pageSize = 20;
+	private Boolean isPage = true;
+	public interface Staff extends CustomerClientShowGroup {}
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PcWorkListResultDTO.java

@@ -0,0 +1,107 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/1/4 2:06 下午
+ * @DESC
+ */
+@Data
+public class PcWorkListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -2072009617522409407L;
+
+    private Integer total;
+
+    private List<PcWorkListResult> list;
+
+    public PcWorkListResultDTO() {
+        this.total = NumConstant.ZERO;
+        this.list = new ArrayList<>();
+    }
+
+    @Data
+    public static class PcWorkListResult{
+
+        /**
+         * 事项名称
+         */
+        private String title;
+
+        /**
+         * 事项类型码
+         */
+        private List<String> workTypeCode;
+
+        /**
+         * 事项类型名称
+         */
+        private List<String> workTypeName;
+
+        /**
+         * 有无异常
+         */
+        private String isNormal;
+
+        /**
+         * 发生地点
+         */
+        private String happenAddress;
+
+        /**
+         * 发生时间  返回返回格式化字符串,yyyy-MM-dd
+         */
+        private String happenTime;
+
+        /**
+         * 人员ID
+         */
+        private String staffId;
+
+        /**
+         * 人员姓名
+         */
+        private String staffName;
+
+        /**
+         * 网格id
+         */
+        private String gridId;
+
+        /**
+         * 网格名字
+         */
+        private String gridName;
+
+        /**
+         * 提交日期  返回返回格式化字符串,yyyy-MM-dd HH:mm:ss
+         */
+        private String createdTime;
+
+        /**
+         * 工作内容
+         */
+        private String workContent;
+
+        public PcWorkListResult() {
+            this.title = "";
+            this.workTypeCode = new ArrayList<>();
+            this.workTypeName = new ArrayList<>();
+            this.isNormal = "";
+            this.happenAddress = "";
+            this.happenTime = "";
+            this.staffId = "";
+            this.staffName = "";
+            this.gridId = "";
+            this.gridName = "";
+            this.createdTime = "";
+            this.workContent = "";
+        }
+    }
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PcworkRecordListResultDTO.java

@@ -0,0 +1,43 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 【网格员工作统计】巡查记录列表
+ * @Author sun
+ */
+@Data
+public class PcworkRecordListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    List<StaffPatrol> list = new ArrayList<>();
+    private Integer total;
+
+    @Data
+    public static class StaffPatrol {
+        //人员ID
+        private String staffId;
+        //人员名称
+        private String staffName;
+        //网格ID
+        private String gridId;
+        //网格名称
+        private String gridName;
+        //状态（英文key）
+        private String status;
+        //状态（中文）
+        private String statusName;
+        //巡查开始时间  返回返回格式化字符串,yyyy-MM-dd HH:mm:ss
+        private String patrolStartTime;
+        //巡查结束时间  返回返回格式化字符串,yyyy-MM-dd HH:mm:ss
+        private String patrolEndTime;
+        //巡查时长 xx小时xx分钟
+        private String totalTime;
+    }
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PatrolRoutineWorkController.java

@@ -4,8 +4,10 @@ import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.PatrolRoutineWorkFormDTO;
+import com.epmet.dto.form.PcWorkListFormDTO;
 import com.epmet.dto.form.patrol.PatrolQueryFormDTO;
 import com.epmet.dto.result.PatrolRoutineWorkResult;
+import com.epmet.dto.result.PcWorkListResultDTO;
 import com.epmet.service.PatrolRoutineWorkService;
 import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,4 +58,16 @@ public class PatrolRoutineWorkController {
         return new Result().ok(true);
     }
 
+    /**
+     * @Description  【网格员工作统计】例行工作列表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/1/4 2:18 下午
+     */
+    @PostMapping("pcwork/list")
+    public Result<PcWorkListResultDTO> pcWorkList(@RequestBody PcWorkListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, PcWorkListFormDTO.PcWorkListForm.class);
+        return new Result<PcWorkListResultDTO>().ok(gridUserWorkService.pcWorkList(formDTO));
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java

@@ -8,6 +8,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
+import com.epmet.dto.form.patrol.PcworkRecordListFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.service.StaffPatrolDetailService;
 import com.epmet.service.StaffPatrolRecordService;
@@ -155,4 +156,15 @@ public class StaffPatrolController {
         return new Result<List<PatrolTrackResultDTO>>().ok(staffPatrolRecordService.patrolTrack(formDTO));
     }
 
+	/**
+	 * @Author sun
+	 * @Description 【网格员工作统计】巡查记录列表
+	 **/
+	@NoRepeatSubmit
+	@PostMapping("pcwork/record-list")
+	public Result<PcworkRecordListResultDTO> pcworkRecordList(@RequestBody PcworkRecordListFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, PcworkRecordListFormDTO.Staff.class);
+		return new Result<PcworkRecordListResultDTO>().ok(staffPatrolRecordService.pcworkRecordList(formDTO));
+	}
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PatrolRoutineWorkDao.java

@@ -18,8 +18,10 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.PcWorkListFormDTO;
 import com.epmet.dto.form.patrol.PatrolQueryFormDTO;
 import com.epmet.dto.result.PatrolRoutineWorkResult;
+import com.epmet.dto.result.PcWorkListResultDTO;
 import com.epmet.entity.PatrolRoutineWorkEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -35,4 +37,6 @@ import java.util.List;
 public interface PatrolRoutineWorkDao extends BaseDao<PatrolRoutineWorkEntity> {
 
     List<PatrolRoutineWorkResult> selectList(PatrolQueryFormDTO formDTO);
+
+    List<PcWorkListResultDTO.PcWorkListResult> pcWorkList(PcWorkListFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolRecordDao.java

@@ -19,7 +19,9 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.RecordListFormDTO;
+import com.epmet.dto.form.patrol.PcworkRecordListFormDTO;
 import com.epmet.dto.result.GridManagerUserListResultDTO;
+import com.epmet.dto.result.PcworkRecordListResultDTO;
 import com.epmet.dto.result.RecordListResultDTO;
 import com.epmet.entity.StaffPatrolRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -62,4 +64,9 @@ public interface StaffPatrolRecordDao extends BaseDao<StaffPatrolRecordEntity> {
      */
     List<RecordListResultDTO> recordList(RecordListFormDTO formDTO);
 
+    /**
+     * @Author sun
+     * @Description 【网格员工作统计】巡查记录列表
+     **/
+    List<PcworkRecordListResultDTO.StaffPatrol> pcworkRecordList(PcworkRecordListFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/PatrolRoutineWorkService.java

@@ -19,11 +19,15 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.form.PatrolRoutineWorkFormDTO;
+import com.epmet.dto.form.PcWorkListFormDTO;
 import com.epmet.dto.form.patrol.PatrolQueryFormDTO;
 import com.epmet.dto.result.PatrolRoutineWorkResult;
+import com.epmet.dto.result.PcWorkListResultDTO;
 import com.epmet.entity.PatrolRoutineWorkEntity;
 import com.github.pagehelper.Page;
 
+import java.util.List;
+
 /**
  * 巡查例行工作
  *
@@ -44,4 +48,12 @@ public interface PatrolRoutineWorkService extends BaseService<PatrolRoutineWorkE
      * @return
      */
     Page<PatrolRoutineWorkResult> listPage(PatrolQueryFormDTO formDTO);
+
+    /**
+     * @Description  【网格员工作统计】例行工作列表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/1/4 2:18 下午
+     */
+    PcWorkListResultDTO pcWorkList(PcWorkListFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolRecordService.java

@@ -20,12 +20,8 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.PatrolUploadResultDTO;
+import com.epmet.dto.form.patrol.PcworkRecordListFormDTO;
-import com.epmet.dto.result.StaffPatrolInitResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.StartPatrolResultDTO;
-import com.epmet.dto.result.PatrolTrackResultDTO;
-import com.epmet.dto.result.RecordListResultDTO;
-import com.epmet.dto.result.UserNameAndLLResultDTO;
 import com.epmet.entity.StaffPatrolRecordEntity;
 
 import java.util.List;
@@ -115,4 +111,9 @@ public interface StaffPatrolRecordService extends BaseService<StaffPatrolRecordE
      */
     List<PatrolTrackResultDTO> patrolTrack(PatrolTrackFormDTO formDTO);
 
+	/**
+	 * @Author sun
+	 * @Description 【网格员工作统计】巡查记录列表
+	 **/
+    PcworkRecordListResultDTO pcworkRecordList(PcworkRecordListFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java

@@ -34,8 +34,11 @@ import com.epmet.dao.PatrolRoutineWorkDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.PatrolRoutineWorkFormDTO;
+import com.epmet.dto.form.PcWorkListFormDTO;
 import com.epmet.dto.form.patrol.PatrolQueryFormDTO;
+import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.PatrolRoutineWorkResult;
+import com.epmet.dto.result.PcWorkListResultDTO;
 import com.epmet.entity.PatrolRoutineWorkEntity;
 import com.epmet.entity.PatrolRoutineWorkTypeEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
@@ -46,6 +49,7 @@ import com.epmet.service.PatrolRoutineWorkService;
 import com.epmet.service.PatrolRoutineWorkTypeService;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +61,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 巡查例行工作
@@ -147,6 +152,68 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
               .doSelectPage(() -> baseDao.selectList(formDTO));
     }
 
+    /**
+     * @Description  【网格员工作统计】例行工作列表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/1/4 2:18 下午
+     */
+    @Override
+    public PcWorkListResultDTO pcWorkList(PcWorkListFormDTO formDTO) {
+        PcWorkListResultDTO result = new PcWorkListResultDTO();
+        List<PcWorkListResultDTO.PcWorkListResult> list;
+        if (formDTO.getIsPage()){
+            PageInfo<PcWorkListResultDTO.PcWorkListResult> listPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.pcWorkList(formDTO));
+            result.setTotal(Integer.valueOf(String.valueOf(listPageInfo.getTotal())));
+            list = listPageInfo.getList();
+        }else {
+            list = baseDao.pcWorkList(formDTO);
+            result.setTotal(list.size());
+        }
+        if (CollectionUtils.isEmpty(list)){
+            return result;
+        }
+        Result<List<DictTreeResultDTO>> workTypeResult = adminOpenFeignClient.dictTree(DictTypeEnum.PATROL_WORK_TYPE.getCode());
+        if (!workTypeResult.success()){
+            throw new EpmetException("查询例行工作分类失败...");
+        }
+        List<String> gridIds = list.stream().map(m -> m.getGridId()).distinct().collect(Collectors.toList());
+        Result<List<AllGridsByUserIdResultDTO>> gridNamesResult = govOrgOpenFeignClient.getGridListByGridIds(gridIds);
+        if (!gridNamesResult.success()){
+            throw new EpmetException("查询网格名字失败...");
+        }
+        list.forEach(l -> {
+            l.setWorkTypeName(disposeWorkTypeCode(workTypeResult.getData(),l.getWorkTypeCode()));
+            gridNamesResult.getData().stream().filter(g -> l.getGridId().equals(g.getGridId())).forEach(g -> l.setGridName(g.getGridName()));
+        });
+        result.setList(list);
+        return result;
+    }
+
+    /**
+     * @Description  处理 workTypeName
+     * @param workTypeList
+     * @param code
+     * @author zxc
+     * @date 2022/1/5 9:27 上午
+     */
+    public List<String> disposeWorkTypeCode(List<DictTreeResultDTO> workTypeList,List<String> code){
+        if (CollectionUtils.isEmpty(code)){
+            return new ArrayList<>();
+        }
+        List<String> result = new ArrayList<>();
+        code.forEach(c -> {
+            workTypeList.forEach(w1 -> {
+                w1.getChildren().forEach(w2 -> {
+                    if (c.equals(w2.getId())){
+                        result.add(w1.getName() + "-" + w2.getName());
+                    }
+                });
+            });
+        });
+        return result;
+    }
+
     /**
      * desc:递归遍历树形结构 构建pids 根节点pids 为空字符串
      *

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java

@@ -1,13 +1,17 @@
 package com.epmet.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.rocketmq.messages.StaffPatrolMQMsg;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -20,6 +24,7 @@ import com.epmet.dao.StatsStaffPatrolRecordDailyDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.StaffPatrolDetailDTO;
 import com.epmet.dto.form.*;
+import com.epmet.dto.form.patrol.PcworkRecordListFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.StaffPatrolDetailEntity;
 import com.epmet.entity.StaffPatrolRecordEntity;
@@ -31,6 +36,8 @@ import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.StaffPatrolDetailService;
 import com.epmet.service.StaffPatrolRecordService;
 import com.epmet.util.DimIdGenerator;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -39,9 +46,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -70,6 +75,8 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 	private GovProjectOpenFeignClient govProjectOpenFeignClient;
 	@Autowired
 	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+	@Autowired
+	private RedisUtils redisUtils;
 
 
 	/**
@@ -451,4 +458,49 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
         }
         return new ArrayList<>();
     }
+
+	/**
+	 * @Author sun
+	 * @Description 【网格员工作统计】巡查记录列表
+	 **/
+	@Override
+	public PcworkRecordListResultDTO pcworkRecordList(PcworkRecordListFormDTO formDTO) {
+		PcworkRecordListResultDTO resultDTO = new PcworkRecordListResultDTO();
+		//1.按条件查询网格员巡查数据
+		PageInfo<PcworkRecordListResultDTO.StaffPatrol> result =
+				PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> staffPatrolRecordDao.pcworkRecordList(formDTO));
+		if (org.springframework.util.CollectionUtils.isEmpty(result.getList())) {
+			return resultDTO;
+		}
+
+		//2.查询网格信息并赋值
+		Map<String, CustomerGridDTO> map = new HashMap<>();
+		for (PcworkRecordListResultDTO.StaffPatrol r : result.getList()) {
+			if (map.containsKey(r.getGridId())) {
+				r.setGridName(map.get(r.getGridId()).getGridName());
+				continue;
+			}
+			String redisKey = RedisKeys.getGridInfoKey(r.getGridId());
+			Map<String, Object> gridCache = redisUtils.hGetAll(redisKey);
+			if (gridCache != null && gridCache.size() > 0) {
+				// 直接取缓存中的
+				CustomerGridDTO dto = BeanUtil.mapToBean(gridCache, CustomerGridDTO.class, true);
+				r.setGridName(dto.getGridName());
+				map.put(r.getGridId(), dto);
+			} else {
+				CustomerGridFormDTO form = new CustomerGridFormDTO();
+				form.setGridId(r.getGridId());
+				Result<CustomerGridDTO> resultGrid = govOrgOpenFeignClient.getGridBaseInfoByGridId(form);
+				if (!resultGrid.success()) {
+					throw new RenException("调用org服务获取网格基础信息失败......");
+				}
+				r.setGridName(resultGrid.getData().getGridName());
+				map.put(r.getGridId(), resultGrid.getData());
+			}
+		}
+		//3.封装数据并返回
+		resultDTO.setTotal((int)result.getTotal());
+		resultDTO.setList(result.getList());
+		return resultDTO;
+	}
 }

epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml

@@ -38,5 +38,53 @@
         AND m.DEL_FLAG = '0'
     </select>
 
+    <resultMap id="pcWorkListMap" type="com.epmet.dto.result.PcWorkListResultDTO$PcWorkListResult">
+        <result property="title" column="title"/>
+        <result property="isNormal" column="isNormal"/>
+        <result property="happenAddress" column="happenAddress"/>
+        <result property="happenTime" column="happenTime"/>
+        <result property="staffId" column="staffId"/>
+        <result property="gridId" column="gridId"/>
+        <result property="createdTime" column="createdTime"/>
+        <result property="workContent" column="workContent"/>
+        <result property="staffName" column="staffName"/>
+        <collection property="workTypeCode" ofType="java.lang.String" select="pcWorkTypeCodeList" column="wid">
+            <result column="workTypeCode"/>
+        </collection>
+    </resultMap>
+    <select id="pcWorkList" resultMap="pcWorkListMap">
+        SELECT
+            w.ID AS wid,
+            w.TITLE as title,
+            (CASE WHEN w.IS_NORMAL = 1 THEN '有' ELSE '无' END) AS isNormal,
+            w.ADDRESS AS happenAddress,
+            w.HAPPEN_TIME AS happenTime,
+            w.USER_ID AS staffId,
+            w.GRID_ID AS gridId,
+            DATE_FORMAT(w.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS createdTime,
+            w.WORK_CONTENT AS workContent,
+            s.REAL_NAME AS staffName
+        FROM patrol_routine_work w
+        INNER JOIN customer_staff s ON (s.USER_ID = w.USER_ID AND s.DEL_FLAG = 0)
+        WHERE w.DEL_FLAG = 0
+            <if test="staffId != null and staffId != '' ">
+                AND w.USER_ID = #{staffId}
+            </if>
+            <if test='orgType == "grid" '>
+                AND w.GRID_ID = #{orgId}
+            </if>
+            <if test='orgType == "agency" '>
+                AND w.PIDS LIKE CONCAT('%',#{orgId},'%')
+            </if>
+            AND DATE_FORMAT(w.CREATED_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endTime}
+            <if test="startTime != '' and startTime != null">
+                AND DATE_FORMAT(w.CREATED_TIME,'%Y%m%d') >= #{startTime}
+            </if>
+        ORDER BY w.CREATED_TIME DESC
+    </select>
+    <select id="pcWorkTypeCodeList" resultType="java.lang.String">
+        SELECT WORK_TYPE_CODE AS workTypeCode FROM patrol_routine_work_type WHERE DEL_FLAG = 0 AND ROUTINE_WORK_ID = #{wid}
+    </select>
+
 
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml

@@ -75,4 +75,37 @@
         GROUP BY recordId
     </select>
 
+    <select id="pcworkRecordList" resultType="com.epmet.dto.result.PcworkRecordListResultDTO$StaffPatrol">
+        SELECT
+            spr.staff_id staffId,
+            cs.real_name staffName,
+            spr.grid gridId,
+            spr.`status` status,
+            if(spr.`status`='patrolling', '巡查中', if(spr.is_hand_end=0, '结束巡查(系统自动)', '结束巡查'))statusName,
+            spr.patrol_start_time patrolStartTime,
+            spr.patrol_end_time patrolEndTime,
+            spr.total_time totalTime
+        FROM
+            staff_patrol_record spr
+        LEFT JOIN customer_staff cs ON spr.staff_id = cs.user_id
+        WHERE
+            spr.del_flag = '0'
+        <if test='orgType != "" and orgType != null and "agency" == orgType'>
+            AND spr.agency_id = #{orgId}
+        </if>
+        <if test='orgType != "" and orgType != null and "grid" == orgType'>
+            AND spr.grid = #{orgId}
+        </if>
+        <if test='staffId != "" and staffId != null '>
+            AND spr.staff_id = #{staffId}
+        </if>
+        <if test='startTime != "" and startTime != null '>
+            AND DATE_FORMAT(spr.created_time,'%Y%m%d') <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test='endTime != "" and endTime != null '>
+            AND DATE_FORMAT(spr.created_time,'%Y%m%d') <![CDATA[ <= ]]> #{endTime}
+        </if>
+        ORDER BY spr.total_time DESC
+    </select>
+
 </mapper>