Merge branch 'dev_routine_work' into develop

# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -67,7 +68,7 @@ public class IssueProjectCategoryDictDTO implements Serializable {
      * 分类名称
      */
 	private String categoryName;
-
+    private String parentCategoryName;
     /**
      * 分类类别1,2,3,4....
      */

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -4,9 +4,6 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.IssueApplicationDTO;
-import com.epmet.dto.IssueDTO;
-import com.epmet.dto.IssueSuggestionDTO;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -25,10 +22,7 @@ import com.epmet.resi.mine.dto.from.MyShiftIssueTopicsFormDTO;
 import com.epmet.resi.mine.dto.result.MyShiftIssueTopicsResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -372,4 +366,14 @@ public interface GovIssueOpenFeignClient {
 	 **/
 	@PostMapping(value = "/gov/issue/issueprojectcategorydict/getcategorylist")
     Result<List<IssueProjectCategoryDictDTO>> getCategoryList(@RequestBody IssueProjectCategoryDictListFormDTO formDTO);
+
+	/**
+	 * 获取项目分类名
+	 * @Param customerId
+	 * @Return {@link Result< Map< String, String>>}
+	 * @Author zhaoqifeng
+	 * @Date 2022/1/5 10:16
+	 */
+	@PostMapping("/gov/issue/issueprojectcategorydict/categoryMap/{customerId}")
+	Result<Map<String, String>> getCategoryMap(@PathVariable("customerId") String customerId);
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@@ -305,4 +305,18 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 	public Result<List<IssueProjectCategoryDictDTO>> getCategoryList(IssueProjectCategoryDictListFormDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getCategoryList", formDTO);
 	}
+
+	/**
+	 * 获取项目分类名
+	 *
+	 * @param customerId
+	 * @Param customerId
+	 * @Return {@link Result< Map< String, String>>}
+	 * @Author zhaoqifeng
+	 * @Date 2022/1/5 10:16
+	 */
+	@Override
+	public Result<Map<String, String>> getCategoryMap(String customerId) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getCategoryMap", customerId);
+	}
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java

@@ -33,7 +33,6 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.excel.IssueProjectCategoryDictExcel;
 import com.epmet.project.dto.CustomerCategoryDTO;
 import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
@@ -288,5 +287,17 @@ public class IssueProjectCategoryDictController {
         return new Result<List<CategoryListResultDTO>>().ok(issueProjectCategoryDictService.selectCategoryOneLevelListByCustomerId(tokenDto.getCustomerId()));
     }
 
+    /**
+     * 获取项目分类名
+     * @Param customerId
+     * @Return {@link Result< Map< String, String>>}
+     * @Author zhaoqifeng
+     * @Date 2022/1/5 10:16
+     */
+    @PostMapping("categoryMap/{customerId}")
+    public Result<Map<String, String>> getCategoryMap(@PathVariable("customerId") String customerId) {
+        return new Result<Map<String, String>>().ok(issueProjectCategoryDictService.getCategoryMap(customerId));
+    }
+
 }
 

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java

@@ -192,4 +192,13 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      */
     List<CategoryListResultDTO> selectCategoryOneLevelListByCustomerId(@Param("customerId")String customerId);
 
+    /**
+     * @Description 获取客户下分类
+     * @Param customerId
+     * @Return {@link List< IssueProjectCategoryDictDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/1/5 10:45
+     */
+    List<IssueProjectCategoryDictDTO> getCategoryByCustomer(@Param("customerId") String customerId);
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java

@@ -25,7 +25,6 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -230,4 +229,6 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
      */
     List<CategoryListResultDTO> selectCategoryOneLevelListByCustomerId(String customerId);
 
+    Map<String, String> getCategoryMap(String customerId);
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+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.page.PageData;
@@ -507,6 +508,20 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         return baseDao.selectCategoryOneLevelListByCustomerId(customerId);
     }
 
+    @Override
+    public Map<String, String> getCategoryMap(String customerId) {
+        List<IssueProjectCategoryDictDTO> list = baseDao.getCategoryByCustomer(customerId);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyMap();
+        }
+        list.forEach(item -> {
+            if(StringUtils.isNotBlank(item.getParentCategoryName())) {
+                item.setCategoryName(item.getParentCategoryName().concat(StrConstant.HYPHEN).concat(item.getCategoryName()));
+            }
+        });
+        return list.stream().collect(Collectors.toMap(IssueProjectCategoryDictDTO::getCategoryCode, IssueProjectCategoryDictDTO::getCategoryName));
+    }
+
     /**
      * @Description  项目分类处理
      * @Param list

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml

@@ -41,7 +41,7 @@
         ORDER BY sort ASC
     </select>
     <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 end-->
-    <select id="selectCategoryListByCustomer" resultType="com.epmet.entity.IssueProjectCategoryDictEntity">
+    <select id="selectCategoryListByCustomer" resultType="com.epmet.dto.IssueProjectCategoryDictDTO">
         SELECT
             ID,
             PID,
@@ -292,4 +292,20 @@
         WHERE
         customer_id = #{customerId} AND id = #{id} AND DEL_FLAG = '0'
     </update>
+
+    <select id="getCategoryByCustomer" resultType="com.epmet.dto.IssueProjectCategoryDictDTO">
+        SELECT
+            a.CATEGORY_CODE,
+            a.CATEGORY_NAME,
+            b.CATEGORY_NAME AS parentCategoryName
+        FROM
+            issue_project_category_dict a
+            LEFT JOIN issue_project_category_dict b ON a.PARENT_CATEGORY_CODE = b.CATEGORY_CODE
+            AND b.DEL_FLAG = '0'
+            AND b.CUSTOMER_ID = #{customerId}
+        WHERE
+            a.DEL_FLAG = '0'
+            AND a.CUSTOMER_ID = #{customerId}
+            ORDER BY a.CATEGORY_CODE
+    </select>
 </mapper>

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ApprovaledListFromDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/1/4 14:49
+ */
+@NoArgsConstructor
+@Data
+public class ApprovaledListFromDTO implements Serializable {
+
+    private static final long serialVersionUID = 5700160700676332579L;
+    private String customerId;
+    @NotBlank(message = "组织id不能为空")
+    private String agencyId;
+    private String startTime;
+    private String endTime;
+    private String staffId;
+    private Integer pageSize = 1;
+    private Integer pageNo = 20;
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ApprovaledListResultDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/1/4 14:58
+ */
+@NoArgsConstructor
+@Data
+public class ApprovaledListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 5118030421632653558L;
+    private String projectId;
+    private String title;
+    private String projectCategory;
+    private String locateAddress;
+    private String happenTime;
+    private String staffId;
+    private String staffName;
+    private String gridId;
+    private String gridName;
+    private String createdTime;
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java

@@ -3,6 +3,7 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -380,5 +381,21 @@ public class ProjectTraceController {
 		ValidatorUtils.validateEntity(formDTO,EventToProjectFormDTO.ApprovalCategory.class,EventToProjectFormDTO.AddUserInternalGroup.class);
 		return new Result<EventToProjectResultDTO>().ok(projectTraceService.eventToProject(formDTO));
 	}
+
+	/**
+	 * 【网格员工作统计】项目列表
+	 *
+	 * @Param formDTO
+	 * @Return {@link Result< PageData< ApprovaledListResultDTO>>}
+	 * @Author zhaoqifeng
+	 * @Date 2022/1/4 15:32
+	 */
+	@PostMapping("approvaled-list")
+	public Result<PageData<ApprovaledListResultDTO>> approvaledList(@LoginUser TokenDto tokenDto, @RequestBody ApprovaledListFromDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO);
+		formDTO.setCustomerId(tokenDto.getCustomerId());
+		PageData<ApprovaledListResultDTO> result = projectTraceService.approvaledList(formDTO);
+		return new Result<PageData<ApprovaledListResultDTO>>().ok(result);
+	}
 }
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java

@@ -261,4 +261,15 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 	 */
 	List<ProjectDistributionAnalysisRightDTO> selectProjectCountByOrg(List<SonOrgResultDTO> orgIds,@Param("startDate")String startDate,@Param("endDate")String endDate);
 
+	/**
+	 * 网格员立项
+	 * @Param agencyId
+	 * @Param staffId
+	 * @Param startTime
+	 * @Param endTime
+	 * @Return {@link List< ApprovaledListResultDTO>}
+	 * @Author zhaoqifeng
+	 * @Date 2022/1/4 16:45
+	 */
+	List<ApprovaledListResultDTO> getGridMemberProjectList(@Param("agencyId") String agencyId, @Param("staffId") String staffId, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java

@@ -28,6 +28,7 @@ import com.epmet.entity.ProjectCategoryEntity;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * 项目所属分类表
@@ -126,4 +127,13 @@ public interface ProjectCategoryService extends BaseService<ProjectCategoryEntit
      * @return
      */
     List<ProjectCategoryDTO> getProjectCategoryService(String projectId);
+
+    /**
+     * @Description 获取项目分类列表
+     * @Param projectIds
+     * @Return {@link Map< String, Set< String>>}
+     * @Author zhaoqifeng
+     * @Date 2022/1/5 9:50
+     */
+    Map<String, Set<String>> getProjectCategoryMap(List<String> projectIds);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java

@@ -357,4 +357,14 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 	 * @return
 	 */
     TopicResearchAnalysisResDTO topicResearchAnalysis(TopicResearchAnalysisFormDTO formDTO);
+
+	/**
+	 * 【网格员工作统计】项目列表
+	 *
+	 * @Param formDTO
+	 * @Return {@link PageData< ApprovaledListResultDTO>}
+	 * @Author zhaoqifeng
+	 * @Date 2022/1/4 16:27
+	 */
+	PageData<ApprovaledListResultDTO>  approvaledList(ApprovaledListFromDTO formDTO);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTraceService.java

@@ -1,5 +1,6 @@
 package com.epmet.service;
 
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -183,4 +184,14 @@ public interface ProjectTraceService {
 	 * @date 2021/8/5 15:38
 	 */
 	EventToProjectResultDTO eventToProject(EventToProjectFormDTO formDTO);
+
+	/**
+	 * 【网格员工作统计】项目列表
+	 *
+	 * @Param formDTO
+	 * @Return {@link PageData< ApprovaledListResultDTO>}
+	 * @Author zhaoqifeng
+	 * @Date 2022/1/4 15:33
+	 */
+	PageData<ApprovaledListResultDTO>  approvaledList(ApprovaledListFromDTO formDTO);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java

@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -39,15 +40,14 @@ import com.epmet.entity.ProjectEntity;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.redis.ProjectCategoryRedis;
 import com.epmet.service.ProjectCategoryService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 项目所属分类表
@@ -225,4 +225,23 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
         return baseDao.selectListByProjectId(projectId);
     }
 
+    /**
+     * @param projectIds
+     * @Description 获取项目分类列表
+     * @Param projectIds
+     * @Return {@link Map< String,  Set < String>>}
+     * @Author zhaoqifeng
+     * @Date 2022/1/5 9:50
+     */
+    @Override
+    public Map<String, Set<String>> getProjectCategoryMap(List<String> projectIds) {
+        LambdaQueryWrapper<ProjectCategoryEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(ProjectCategoryEntity::getProjectId, projectIds);
+        List<ProjectCategoryEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyMap();
+        }
+        return list.stream().collect(Collectors.groupingBy(ProjectCategoryEntity::getProjectId, Collectors.mapping(ProjectCategoryEntity::getCategoryCode, Collectors.toSet())));
+    }
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -3047,6 +3047,24 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return resultDTO;
 	}
 
+	/**
+	 * 【网格员工作统计】项目列表
+	 *
+	 * @param formDTO
+	 * @Param formDTO
+	 * @Return {@link PageData< ApprovaledListResultDTO>}
+	 * @Author zhaoqifeng
+	 * @Date 2022/1/4 16:27
+	 */
+	@Override
+	public PageData<ApprovaledListResultDTO> approvaledList(ApprovaledListFromDTO formDTO) {
+		PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+		List<ApprovaledListResultDTO> list = baseDao.getGridMemberProjectList(formDTO.getAgencyId(), formDTO.getStaffId(),
+				formDTO.getStartTime(), formDTO.getEndTime());
+		PageInfo<ApprovaledListResultDTO> pageInfo = new PageInfo<>(list);
+		return new PageData<>(list, pageInfo.getTotal());
+	}
+
 	/**
 	 * @Description  区间项目分类数量处理
 	 * 查询的是时间段内的分类项目数，查询的时间 是传入一个日期，拼上时间，在进行比较大小

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java

@@ -5,10 +5,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
@@ -33,14 +38,14 @@ import com.epmet.feign.*;
 import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -887,6 +892,49 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		return resultDTO;
 	}
 
+	/**
+	 * 【网格员工作统计】项目列表
+	 *
+	 * @param formDTO
+	 * @Param formDTO
+	 * @Return {@link PageData < ApprovaledListResultDTO>}
+	 * @Author zhaoqifeng
+	 * @Date 2022/1/4 15:33
+	 */
+	@Override
+	public PageData<ApprovaledListResultDTO> approvaledList(ApprovaledListFromDTO formDTO) {
+		//获取项目列表
+		PageData<ApprovaledListResultDTO> result = projectService.approvaledList(formDTO);
+		//获取项目分类
+		Result<Map<String, String>> categoryMapResult = govIssueOpenFeignClient.getCategoryMap(formDTO.getCustomerId());
+		if (!categoryMapResult.success()) {
+			throw new EpmetException(categoryMapResult.getCode(),categoryMapResult.getMsg());
+		}
+		Map<String, String> categoryMap = categoryMapResult.getData();
+		if(CollectionUtils.isNotEmpty(result.getList())) {
+			List<String> projectIds = result.getList().stream().map(ApprovaledListResultDTO::getProjectId).collect(Collectors.toList());
+			Map<String, Set<String>> projectCategory = projectCategoryService.getProjectCategoryMap(projectIds);
+			result.getList().forEach(item -> {
+				//工作人员姓名
+				CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), item.getStaffId());
+				item.setStaffName(staff.getRealName());
+				//项目分类
+				Set<String> categoryList = projectCategory.get(item.getProjectCategory());
+				if (null != categoryList) {
+					List<String> categoryNames = new ArrayList<>();
+					categoryList.forEach(category -> {
+						if (StringUtils.isNotBlank(categoryMap.get(category))) {
+							categoryNames.add(categoryMap.get(category));
+						}
+					} );
+					item.setProjectCategory(StringUtils.join(categoryNames.toArray(), StrConstant.SEMICOLON));
+				}
+			});
+
+		}
+		return result;
+	}
+
 	private List<StaffListResultDTO> queryStaffListRes(List<TickStaffFormDTO> staffList,String currentUserId) {
 		List<String> staffIdList = staffList.stream().map(TickStaffFormDTO::getStaffId).collect(Collectors.toList());
 		staffIdList.add(currentUserId);

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -481,4 +481,29 @@
                 AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
         </foreach>
     </select>
+    <select id="getGridMemberProjectList" resultType="com.epmet.dto.result.ApprovaledListResultDTO">
+        SELECT
+            ID AS "projectId",
+            TITLE,
+            LOCATE_ADDRESS,
+            DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) AS "happenTime",
+            CREATED_BY AS "staffId",
+            DATE_FORMAT( CREATED_TIME, '%Y-%m-%d %H:%i:%s' ) AS "createdTime"
+        FROM
+            project
+        WHERE
+            DEL_FLAG = '0'
+            AND ORIGIN = 'agency'
+            AND AGENCY_ID = #{agencyId}
+            <if test="staffId != null and staffId != ''">
+                AND CREATED_BY = #{staffId}
+            </if>
+            <if test="startTime != null and startTime != ''">
+                AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) &lt;= #{endTime}
+            </if>
+        ORDER BY CREATED_TIME DESC
+    </select>
 </mapper>

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

@@ -1,6 +1,10 @@
 package com.epmet.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.PatrolRoutineWorkFormDTO;
@@ -8,16 +12,21 @@ 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.excel.PcWorkListExport;
 import com.epmet.service.PatrolRoutineWorkService;
 import com.github.pagehelper.Page;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
+import static io.netty.handler.codec.smtp.SmtpRequests.data;
+
 /**
  * 例行工作
  *
@@ -70,4 +79,21 @@ public class PatrolRoutineWorkController {
         return new Result<PcWorkListResultDTO>().ok(gridUserWorkService.pcWorkList(formDTO));
     }
 
+    @PostMapping("pcwork/list/export")
+    public void pcWorkListExport(@RequestBody PcWorkListFormDTO formDTO, HttpServletResponse response) throws Exception {
+//        formDTO.setIsPage(false);
+        ValidatorUtils.validateEntity(formDTO, PcWorkListFormDTO.PcWorkListForm.class);
+        gridUserWorkService.pcWorkListExport(formDTO,response);
+//        ExcelUtils.exportExcelToTarget(response, null, resultDTO.getList(), PcWorkListExport.class);
+
+    }
+
+    public String getPcWorkListExportName(PcWorkListFormDTO formDTO){
+        String result = "例行工作列表";
+        if (StringUtils.isNotBlank(formDTO.getStartTime())){
+
+        }
+        return result;
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java

@@ -0,0 +1,57 @@
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/1/5 10:00 上午
+ * @DESC
+ */
+@Getter
+@Setter
+@EqualsAndHashCode
+public class PcWorkListExport {
+
+    @ExcelProperty("事项名称")
+    private String title;
+
+    @ExcelProperty("事项类型码")
+    private String workTypeCode;
+
+    @ExcelProperty("事项类型名称")
+    private String workTypeName;
+
+    @ExcelProperty("有无异常")
+    private String isNormal;
+
+    @ExcelProperty("发生地点")
+    private String happenAddress;
+
+    @ExcelProperty("发生时间")
+    private String happenTime;
+
+    @ExcelProperty("人员ID")
+    private String staffId;
+
+    @ExcelProperty("人员姓名")
+    private String staffName;
+
+    @ExcelProperty("网格ID")
+    private String gridId;
+
+    @ExcelProperty("网格名字")
+    private String gridName;
+
+    @ExcelProperty("提交日期")
+    private String createdTime;
+
+    @ExcelProperty("工作内容")
+    private String workContent;
+}

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

@@ -26,6 +26,7 @@ import com.epmet.dto.result.PcWorkListResultDTO;
 import com.epmet.entity.PatrolRoutineWorkEntity;
 import com.github.pagehelper.Page;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -56,4 +57,5 @@ public interface PatrolRoutineWorkService extends BaseService<PatrolRoutineWorkE
      * @date 2022/1/4 2:18 下午
      */
     PcWorkListResultDTO pcWorkList(PcWorkListFormDTO formDTO);
+    void pcWorkListExport(PcWorkListFormDTO formDTO, HttpServletResponse response) throws Exception;
 }

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

@@ -17,6 +17,9 @@
 
 package com.epmet.service.impl;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.rocketmq.messages.BaseMQMsgDTO;
@@ -28,6 +31,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.dao.PatrolRoutineWorkDao;
@@ -41,6 +45,7 @@ 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.excel.PcWorkListExport;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
@@ -57,6 +62,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -190,6 +196,34 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
         return result;
     }
 
+    @Override
+    public void pcWorkListExport(PcWorkListFormDTO formDTO, HttpServletResponse response) throws Exception {
+        String name = "zxc.xlsx";
+        ExcelWriter excelWriter = null;
+        try {
+            // 这里 需要指定写用哪个class去写
+            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(name,response)).build();
+            // 这里注意 如果同一个sheet只要创建一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("模板").build();
+            Integer pageNo = NumConstant.ONE;
+            Integer pageSize = NumConstant.ONE_HUNDRED;
+            Integer num = NumConstant.ZERO;
+            do {
+                formDTO.setPageNo(pageNo);
+                formDTO.setPageSize(pageSize);
+                List<PcWorkListExport> data = ConvertUtils.sourceToTarget(pcWorkList(formDTO).getList(), PcWorkListExport.class);
+                num = data.size();
+                excelWriter.write(data, writeSheet);
+                pageNo++;
+            }while (num > NumConstant.ZERO && num.compareTo(pageSize) == NumConstant.ZERO);
+
+        } finally {
+            if (excelWriter != null) {
+                excelWriter.finish();
+            }
+        }
+    }
+
     /**
      * @Description  处理 workTypeName
      * @param workTypeList