项目列表bug修改

项目添加项目耗时字段

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/ProjectSendMessageService.java

@@ -1,7 +1,6 @@
 package com.epmet.service;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 
 /**
@@ -18,4 +17,13 @@ public interface ProjectSendMessageService {
 	 * @return com.epmet.commons.tools.utils.Result
 	 */
 	Result projectSendMessage(ExtractOriginFormDTO formDTO);
+
+	/**
+	 * 项目耗时
+	 * @Param formDTO
+	 * @Return {@link Result}
+	 * @Author zhaoqifeng
+	 * @Date 2022/1/12 14:04
+	 */
+	Result projectWorkMinutes(ExtractOriginFormDTO formDTO);
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ProjectSendMessageServiceImpl.java

@@ -32,4 +32,22 @@ public class ProjectSendMessageServiceImpl implements ProjectSendMessageService
 		projectDTO.setCustomerId(formDTO.getCustomerId());
 		return govProjectOpenFeignClient.sendMessageJob(projectDTO);
 	}
+
+	/**
+	 * 项目耗时
+	 *
+	 * @param formDTO
+	 * @Param formDTO
+	 * @Return {@link Result}
+	 * @Author zhaoqifeng
+	 * @Date 2022/1/12 14:04
+	 */
+	@Override
+	public Result projectWorkMinutes(ExtractOriginFormDTO formDTO) {
+		ProjectDTO projectDTO = new ProjectDTO();
+		projectDTO.setCustomerId(formDTO.getCustomerId());
+		projectDTO.setId(formDTO.getObjectId());
+		projectDTO.setStatus("pending");
+		return govProjectOpenFeignClient.projectWorkMinutesJob(projectDTO);
+	}
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ProjectWorkMinutesTask.java

@@ -0,0 +1,43 @@
+package com.epmet.task;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.service.ProjectSendMessageService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/1/12 14:01
+ */
+@Component("projectWorkMinutesTask")
+@Slf4j
+public class ProjectWorkMinutesTask implements ITask{
+    @Autowired
+    private ProjectSendMessageService projectSendMessageService;
+
+    /**
+     * 执行定时任务接口
+     *
+     * @param params 参数，多参数使用JSON数据
+     */
+    @Override
+    public void run(String params) {
+        log.info("ProjectWorkMinutesTask定时任务正在执行，参数为：{}", params);
+        ExtractOriginFormDTO formDTO = new ExtractOriginFormDTO();
+        if (StringUtils.isNotBlank(params)) {
+            formDTO = JSON.parseObject(params, ExtractOriginFormDTO.class);
+        }
+        Result result = projectSendMessageService.projectWorkMinutes(formDTO);
+        if (result.success()) {
+            log.info("ProjectSendMessageTask定时任务执行成功");
+        } else {
+            log.error("ProjectSendMessageTask定时任务执行失败:" + result.getMsg());
+        }
+    }
+
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java

@@ -134,4 +134,15 @@ public interface GovProjectOpenFeignClient {
 	 */
 	@PostMapping("gov/project/resievent/queryResiEventManageRedDot/{agencyId}")
 	Result<ResiEventManageRedDotRes> queryResiEventManageRedDot(@PathVariable("agencyId") String agencyId);
+
+	/**
+	 * 计算项目耗时
+	 *
+	 * @Param dto
+	 * @Return {@link Result}
+	 * @Author zhaoqifeng
+	 * @Date 2022/1/12 13:56
+	 */
+	@PostMapping("gov/project/project/project-work-minutes-job")
+	Result projectWorkMinutesJob(@RequestBody ProjectDTO dto);
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java

@@ -9,7 +9,6 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -132,4 +131,18 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli
 	public Result<ResiEventManageRedDotRes> queryResiEventManageRedDot(String agencyId) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "queryResiEventManageRedDot", agencyId);
 	}
+
+	/**
+	 * 计算项目耗时
+	 *
+	 * @param dto
+	 * @Param dto
+	 * @Return {@link Result}
+	 * @Author zhaoqifeng
+	 * @Date 2022/1/12 13:56
+	 */
+	@Override
+	public Result projectWorkMinutesJob(ProjectDTO dto) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectWorkMinutesJob", dto);
+	}
 }

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

@@ -320,7 +320,7 @@ public class ProjectController {
      * @Author zhaoqifeng
      * @Date 2022/1/11 17:52
      */
-    @PostMapping("project-Work-Minutes-Job")
+    @PostMapping("project-work-minutes-job")
     public Result projectWorkMinutesJob(@RequestBody ProjectDTO dto) {
         projectService.projectWorkMinutesJob(dto);
         return new Result();

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

@@ -3078,6 +3078,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			PageHelper.startPage(pageNo, PageSize);
 			//获取项目列表
 			LambdaQueryWrapper<ProjectEntity> wrapper = new LambdaQueryWrapper<>();
+			wrapper.eq(StringUtils.isNotBlank(dto.getCustomerId()), ProjectEntity::getCustomerId, dto.getCustomerId());
 			wrapper.eq(StringUtils.isNotBlank(dto.getId()), ProjectEntity::getId, dto.getId());
 			wrapper.eq(StringUtils.isNotBlank(dto.getStatus()), ProjectEntity::getStatus, dto.getStatus());
 			list = baseDao.selectList(wrapper);