emm

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

@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -17,7 +18,7 @@ public class PcWorkListFormDTO implements Serializable {
 
     public interface PcWorkListForm{}
 
-    @NotBlank(message = "staffId不能为空",groups = PcWorkListForm.class)
+//    @NotBlank(message = "staffId不能为空",groups = PcWorkListForm.class)
     private String staffId;
 
     @NotBlank(message = "endTime不能为空",groups = PcWorkListForm.class)
@@ -25,13 +26,16 @@ public class PcWorkListFormDTO implements Serializable {
 
     private String startTime;
 
-    @NotBlank(message = "agencyId不能为空",groups = PcWorkListForm.class)
+    @NotBlank(message = "orgId不能为空",groups = PcWorkListForm.class)
-    private String agencyId;
+    private String orgId;
 
-    @NotBlank(message = "pageSize不能为空",groups = PcWorkListForm.class)
+    @NotBlank(message = "orgType不能为空",groups = PcWorkListForm.class)
+    private String orgType;
+
+    @NotNull(message = "pageSize不能为空",groups = PcWorkListForm.class)
     private Integer pageSize;
 
-    @NotBlank(message = "pageNo不能为空",groups = PcWorkListForm.class)
+    @NotNull(message = "pageNo不能为空",groups = PcWorkListForm.class)
     private Integer pageNo;
 
     /**

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

@@ -27,7 +27,7 @@ public class PcWorkListResultDTO implements Serializable {
     }
 
     @Data
-    class PcWorkListResult implements Serializable{
+    public static class PcWorkListResult{
 
         /**
          * 事项名称
@@ -37,12 +37,12 @@ public class PcWorkListResultDTO implements Serializable {
         /**
          * 事项类型码
          */
-        private String workTypeCode;
+        private List<String> workTypeCode;
 
         /**
          * 事项类型名称
          */
-        private String workTypeName;
+        private List<String> workTypeName;
 
         /**
          * 有无异常
@@ -91,8 +91,8 @@ public class PcWorkListResultDTO implements Serializable {
 
         public PcWorkListResult() {
             this.title = "";
-            this.workTypeCode = "";
+            this.workTypeCode = new ArrayList<>();
-            this.workTypeName = "";
+            this.workTypeName = new ArrayList<>();
             this.isNormal = "";
             this.happenAddress = "";
             this.happenTime = "";

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

@@ -65,9 +65,9 @@ public class PatrolRoutineWorkController {
      * @date 2022/1/4 2:18 下午
      */
     @PostMapping("pcwork/list")
-    public Result<List<PcWorkListResultDTO>> pcWorkList(@RequestBody PcWorkListFormDTO formDTO){
+    public Result<PcWorkListResultDTO> pcWorkList(@RequestBody PcWorkListFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, PcWorkListFormDTO.PcWorkListForm.class);
-        return new Result<List<PcWorkListResultDTO>>().ok(gridUserWorkService.pcWorkList(formDTO));
+        return new Result<PcWorkListResultDTO>().ok(gridUserWorkService.pcWorkList(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/service/PatrolRoutineWorkService.java

@@ -55,5 +55,5 @@ public interface PatrolRoutineWorkService extends BaseService<PatrolRoutineWorkE
      * @author zxc
      * @date 2022/1/4 2:18 下午
      */
-    List<PcWorkListResultDTO> pcWorkList(PcWorkListFormDTO formDTO);
+    PcWorkListResultDTO pcWorkList(PcWorkListFormDTO formDTO);
 }

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

@@ -48,6 +48,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;
@@ -156,8 +157,22 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
      * @date 2022/1/4 2:18 下午
      */
     @Override
-    public List<PcWorkListResultDTO> pcWorkList(PcWorkListFormDTO formDTO) {
+    public PcWorkListResultDTO pcWorkList(PcWorkListFormDTO formDTO) {
-        return null;
+        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.setList(list);
+        return result;
     }
 
     /**

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

@@ -38,5 +38,50 @@
         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"/>
+        <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
+        FROM patrol_routine_work w
+        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>