【网格员工作统计】例行工作列表

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

@@ -0,0 +1,41 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+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 = "agencyId不能为空",groups = PcWorkListForm.class)
+    private String agencyId;
+
+    @NotBlank(message = "pageSize不能为空",groups = PcWorkListForm.class)
+    private Integer pageSize;
+
+    @NotBlank(message = "pageNo不能为空",groups = PcWorkListForm.class)
+    private Integer pageNo;
+
+    /**
+     * 是否分页，默认分页
+     */
+    private Boolean isPage = true;
+}

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
+    class PcWorkListResult implements Serializable{
+
+        /**
+         * 事项名称
+         */
+        private String title;
+
+        /**
+         * 事项类型码
+         */
+        private String workTypeCode;
+
+        /**
+         * 事项类型名称
+         */
+        private 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 = "";
+            this.workTypeName = "";
+            this.isNormal = "";
+            this.happenAddress = "";
+            this.happenTime = "";
+            this.staffId = "";
+            this.staffName = "";
+            this.gridId = "";
+            this.gridName = "";
+            this.createdTime = "";
+            this.workContent = "";
+        }
+    }
+}

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<List<PcWorkListResultDTO>> pcWorkList(@RequestBody PcWorkListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, PcWorkListFormDTO.PcWorkListForm.class);
+        return new Result<List<PcWorkListResultDTO>>().ok(gridUserWorkService.pcWorkList(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 下午
+     */
+    List<PcWorkListResultDTO> pcWorkList(PcWorkListFormDTO formDTO);
 }

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

@@ -34,8 +34,10 @@ 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.PatrolRoutineWorkResult;
+import com.epmet.dto.result.PcWorkListResultDTO;
 import com.epmet.entity.PatrolRoutineWorkEntity;
 import com.epmet.entity.PatrolRoutineWorkTypeEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
@@ -147,6 +149,17 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
               .doSelectPage(() -> baseDao.selectList(formDTO));
     }
 
+    /**
+     * @Description  【网格员工作统计】例行工作列表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/1/4 2:18 下午
+     */
+    @Override
+    public List<PcWorkListResultDTO> pcWorkList(PcWorkListFormDTO formDTO) {
+        return null;
+    }
+
     /**
      * desc:递归遍历树形结构 构建pids 根节点pids 为空字符串
      *