map = new HashMap<>();
+ formDTO.getStaffList().forEach(staff->{
+ if(!map.containsKey(staff.getStaffId())){
+ WxSubscribeMessageFormDTO msg = new WxSubscribeMessageFormDTO();
+ msg.setCustomerId(entity.getCustomerId());
+ msg.setClientType(AppClientConstant.APP_GOV);
+ msg.setUserId(staff.getStaffId());
+ msg.setBehaviorType(UserMessageConstant.WXMP_ISSUE_TITLE);
+ msg.setMessageContent(projectStaffMessage);
+ msg.setMessageTime(new Date());
+ msg.setGridId("*");
+ msgList.add(msg);
+ map.put(staff.getStaffId(),staff.getStaffId());
+ }
+ });
+ logger.info("议题转项目，推送微信订阅消息");
+ return epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
+ }
/**
* @Description
diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
index 3bc86de1dc..11c377e5dc 100644
--- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-mine-server:
container_name: gov-mine-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.33
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:version_placeholder
ports:
- "8098:8098"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
index 265d79c930..3f5da9911a 100644
--- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-mine-server:
container_name: gov-mine-server-test
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.33
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:version_placeholder
ports:
- "8098:8098"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyInfoFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyInfoFormDTO.java
new file mode 100644
index 0000000000..2d751240cb
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyInfoFormDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 对外接口-根据组织Id获取组织信息-接口入参
+ * @Author sun
+ */
+@Data
+public class AgencyInfoFormDTO implements Serializable {
+
+ private static final long serialVersionUID = -1719033407335647411L;
+
+ /**
+ * 组织或网格Id
+ */
+ @NotBlank(message = "组织或网格Id不能为空", groups = StaffIdGroup.class)
+ private String orgId;
+ /**
+ * 组织或网格类型（agency/grid）
+ */
+ @NotBlank(message = "组织或网格类型不能为空", groups = StaffIdGroup.class)
+ private String orgType;
+ public interface StaffIdGroup extends CustomerClientShowGroup {
+ }
+
+
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffBasicInfoFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffBasicInfoFromDTO.java
new file mode 100644
index 0000000000..5c5e1ed6e9
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffBasicInfoFromDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author sun
+ * @dscription
+ */
+
+@Data
+public class StaffBasicInfoFromDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 用户ID
+ */
+ @NotBlank(message = "staffId不能为空", groups = {AddUserInternalGroup.class})
+ String staffId;
+ public interface AddUserInternalGroup {}
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/SubAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/SubAgencyFormDTO.java
index 6cdf21a193..ce80929e97 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/SubAgencyFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/SubAgencyFormDTO.java
@@ -39,5 +39,10 @@ public class SubAgencyFormDTO implements Serializable {
@NotBlank(message = "机关组织ID不能为空")
private String agencyId;
+ /**
+ * 机关组织数量
+ */
+ private Integer agencyNum = 10;
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyInfoResultDTO.java
new file mode 100644
index 0000000000..7b753259e4
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyInfoResultDTO.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 组织信息
+ *
+ * @author sun
+ */
+@Data
+public class AgencyInfoResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+ /**
+ * 机关组织Id
+ */
+ private String agencyId;
+ /**
+ * 机关组织名称
+ */
+ private String agencyName;
+ /**
+ * 所有上级名称,以-连接
+ */
+ private String allParentName;
+ /**
+ * 上级组织机构ID
+ */
+ private String pid;
+ /**
+ * 所有上级组织机构ID(以英文:隔开)
+ */
+ private String pids;
+ /**
+ * 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
+ */
+ private String level;
+ /**
+ * 地区编码
+ */
+ private String areaCode;
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffInfoResultDTO.java
index e8d385c116..31d5e24a34 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffInfoResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffInfoResultDTO.java
@@ -79,6 +79,11 @@ public class ExtStaffInfoResultDTO implements Serializable {
* */
private String adminFlag;
+ /**
+ * 手机号
+ * */
+ private String mobile;
+
/**
* 用户角色列表
* */
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
index 241f2eb44f..de4bf27a47 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
@@ -50,4 +50,9 @@ public class MineResultDTO implements Serializable {
* 我所属的机关名称
*/
private String myAgencyName;
+
+ /**
+ * 手机号
+ */
+ private String mobile;
}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizeTreeDeptResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizeTreeDeptResultDTO.java
new file mode 100644
index 0000000000..8249d17991
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizeTreeDeptResultDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 外挂-部门信息
+ * @Auth sun
+ */
+@Data
+public class OrganizeTreeDeptResultDTO implements Serializable {
+ private static final long serialVersionUID = 1792371558965832432L;
+
+ /**
+ * 部门Id
+ * */
+ private String deptId;
+ /**
+ * 部门名称
+ * */
+ private String deptName;
+ /**
+ * 所有上级组织机构ID(以英文:隔开)
+ */
+ private String pids;
+ /**
+ * 所有上级名称,以-连接
+ */
+ private String allParentName;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizeTreeGridResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizeTreeGridResultDTO.java
new file mode 100644
index 0000000000..4c855f6956
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizeTreeGridResultDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 外挂-网格信息
+ * @Auth sun
+ */
+@Data
+public class OrganizeTreeGridResultDTO implements Serializable {
+ private static final long serialVersionUID = -4531574240525562587L;
+
+ /**
+ * 网格Id
+ * */
+ private String gridId;
+ /**
+ * 网格名称
+ * */
+ private String gridName;
+ /**
+ * 所有上级组织机构ID(以英文:隔开)
+ */
+ private String pids;
+ /**
+ * 所有上级名称,以-连接
+ */
+ private String allParentName;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizeTreeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizeTreeResultDTO.java
new file mode 100644
index 0000000000..ee06600de6
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizeTreeResultDTO.java
@@ -0,0 +1,50 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据-接口返参
+ * @Auth sun
+ */
+@Data
+public class OrganizeTreeResultDTO implements Serializable {
+ private static final long serialVersionUID = 2513553862809278219L;
+
+ /**
+ * 直属机关Id
+ * */
+ private String agencyId;
+ /**
+ * 直属机关名称
+ * */
+ private String agencyName;
+ /**
+ * 机关级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province）
+ * */
+ private String level;
+ /**
+ * 所有上级组织机构ID(以英文:隔开)
+ */
+ private String pids;
+ /**
+ * 所有上级名称,以-连接
+ */
+ private String allParentName;
+
+ /**
+ * 直属机关直属网格列表
+ * */
+ private List gridList = new ArrayList<>();
+ /**
+ * 直属机关直属部门列表
+ * */
+ private List departmentList = new ArrayList<>();
+ /**
+ * 子集机关列表
+ * */
+ private List subAgencyList = new ArrayList<>();
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubListResultDTO.java
index 17dc985695..b6bf347332 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubListResultDTO.java
@@ -41,5 +41,9 @@ public class SubListResultDTO implements Serializable {
*/
private String agencyName = "";
+ /**
+ * 机关组织级别
+ */
+ private String agencyLevel = "";
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index 2ebce80475..82c64c24eb 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -250,4 +250,29 @@ public interface GovOrgOpenFeignClient {
**/
@PostMapping("/gov/org/customeragency/userinfoext")
Result userInfoExt(@RequestBody ExtUserInfoResultDTO result);
+
+ /**
+ * @param formDTO
+ * @return
+ * @Author sun
+ * @Description 组织首页-下级机关列表
+ */
+ @PostMapping("/gov/org/agency/subagencylist")
+ Result subAgencyList(@RequestBody SubAgencyFormDTO formDTO);
+
+ /**
+ * @param formDTO
+ * @Author sun
+ * @Description 根据组织Id获取组织信息
+ */
+ @PostMapping("/gov/org/customeragency/agencyinfo")
+ Result agencyInfo(@RequestBody AgencyInfoFormDTO formDTO);
+
+ /**
+ * @param agencyId
+ * @Author sun
+ * @Description 获取当前组织及部门、网格数据，递归查询所有下级数据
+ */
+ @PostMapping("/gov/org/customeragency/organizetree/{agencyId}")
+ Result organizeTree(@PathVariable("agencyId") String agencyId);
}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index 8f70da4530..c3811eb323 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -146,4 +146,19 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
public Result userInfoExt(ExtUserInfoResultDTO result) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "userInfoExt", result);
}
+
+ @Override
+ public Result subAgencyList(SubAgencyFormDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "subAgencyList", formDTO);
+ }
+
+ @Override
+ public Result agencyInfo(AgencyInfoFormDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "agencyInfo", formDTO);
+ }
+
+ @Override
+ public Result organizeTree(String agencyId) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "organizeTree", agencyId);
+ }
}
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
index 902ce5e8d0..abdd0d45e1 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-org-server:
container_name: gov-org-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.88
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:version_placeholder
ports:
- "8092:8092"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
index f942a8fdb1..0f0c900f89 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-org-server:
container_name: gov-org-server-prod
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.91
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.92
ports:
- "8092:8092"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
index d8a3a119a0..8e81106bf9 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-org-server:
container_name: gov-org-server-test
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.81
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:version_placeholder
ports:
- "8092:8092"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 041a45f6fc..5c6f53c739 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.91
+ 0.3.92
com.epmet
gov-org
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
index cb1865ba35..08154a921d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
@@ -38,7 +38,6 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.xml.validation.Validator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index 1876fedb9b..b88368a11d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -279,4 +279,22 @@ public class CustomerAgencyController {
}
return new Result>().ok(customerAgencyService.getAgencyElementTree(customerId).getDefaultKeys());
}
-}
+
+ /**
+ * @Description 对外接口-根据组织Id获取组织信息
+ * @author sun
+ **/
+ @PostMapping("agencyinfo")
+ Result agencyInfo(@RequestBody AgencyInfoFormDTO formDTO) {
+ return new Result().ok(customerAgencyService.agencyInfo(formDTO));
+ }
+
+ /**
+ * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+ * @author sun
+ **/
+ @PostMapping("organizetree/{agencyId}")
+ Result organizeTree(@PathVariable("agencyId") String agencyId) {
+ return new Result().ok(customerAgencyService.organizeTree(agencyId));
+ }
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
index c3187e3e8e..88ee0bd046 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
@@ -8,14 +8,10 @@ import com.epmet.commons.tools.enums.RequirePermissionEnum;
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.StaffInfoFromDTO;
-import com.epmet.dto.form.StaffSubmitFromDTO;
-import com.epmet.dto.form.StaffTransferFormDTO;
-import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.service.StaffService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -151,4 +147,14 @@ public class StaffController {
staffService.staffTransfer(tokenDto, formDTO);
return new Result();
}
+
+ /**
+ * 根据staffId查询用户基本信息
+ * @author sun
+ */
+ @PostMapping("staffbasicinfo")
+ public Result staffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO) {
+ ValidatorUtils.validateEntity(fromDTO, StaffBasicInfoFromDTO.AddUserInternalGroup.class);
+ return staffService.staffBasicInfo(fromDTO);
+ }
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 19b2e338b4..9c1735a886 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -57,7 +57,7 @@ public interface CustomerAgencyDao extends BaseDao {
* @Author sun
* @Description 组织首页-下级机关列表
**/
- List selectSubAgencyById(@Param("pId") String pId);
+ List selectSubAgencyById(@Param("pId") String pId, @Param("agencyNum") Integer agencyNum);
/**
* @param pId
@@ -185,4 +185,25 @@ public interface CustomerAgencyDao extends BaseDao {
* @Date 2020/11/6 14:57
*/
List getAgencyElementTree(@Param("customerId") String customerId,@Param("pid") String pid);
-}
+
+ /**
+ * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+ * @author sun
+ **/
+ OrganizeTreeResultDTO selectorganizeTree(@Param("agencyId") String agencyId);
+ /**
+ * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+ * @author sun
+ **/
+ List selectAgencyGridList(@Param("agencyId") String agencyId);
+ /**
+ * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+ * @author sun
+ **/
+ List selectAgencyDeptList(@Param("agencyId") String agencyId);
+ /**
+ * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+ * @author sun
+ **/
+ List selectAllSub(@Param("agencyId") String agencyId);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
index aecfd85109..8051ca63f5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
@@ -222,4 +222,16 @@ public interface CustomerAgencyService extends BaseService
* @Date 2020/11/6 14:02
*/
AgencyElementTreeResultDTO getAgencyElementTree(String customerId);
-}
+
+ /**
+ * @Description 对外接口-根据组织Id获取组织信息
+ * @author sun
+ **/
+ AgencyInfoResultDTO agencyInfo(AgencyInfoFormDTO formDTO);
+
+ /**
+ * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+ * @author sun
+ **/
+ OrganizeTreeResultDTO organizeTree(String agencyId);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
index dab238f3fb..f23330fa24 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
@@ -2,10 +2,7 @@ package com.epmet.service;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.StaffInfoFromDTO;
-import com.epmet.dto.form.StaffSubmitFromDTO;
-import com.epmet.dto.form.StaffTransferFormDTO;
-import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import java.util.List;
@@ -103,4 +100,9 @@ public interface StaffService {
*/
void staffTransfer(TokenDto tokenDto, StaffTransferFormDTO fromDTO);
+ /**
+ * 根据staffId查询用户基本信息
+ * @author sun
+ */
+ Result staffBasicInfo(StaffBasicInfoFromDTO fromDTO);
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index 7595aafa33..8fbd617cf2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -25,14 +25,12 @@ import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.CustomerAgencyConstant;
import com.epmet.constant.RoleKeyConstants;
-import com.epmet.constant.UserWorkType;
import com.epmet.dao.CustomerAgencyDao;
import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.GovStaffRoleDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.entity.CustomerAgencyEntity;
-import com.epmet.feign.EpmetUserFeignClient;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.redis.CustomerAgencyRedis;
import com.epmet.service.AgencyService;
@@ -177,7 +175,7 @@ public class AgencyServiceImpl implements AgencyService {
public Result removeAgency(RemoveAgencyFormDTO formDTO) {
Result result = new Result();
//1:查询当前机关是否存在所属下级机关，存在下级的不能删除
- List agencyList = customerAgencyDao.selectSubAgencyById(formDTO.getAgencyId());
+ List agencyList = customerAgencyDao.selectSubAgencyById(formDTO.getAgencyId(), 10);
if (null != agencyList && agencyList.size() > NumConstant.ZERO) {
result.setCode(EpmetErrorCode.NOT_DEL_AGENCY.getCode());
result.setMsg(EpmetErrorCode.NOT_DEL_AGENCY.getMsg());
@@ -238,7 +236,7 @@ public class AgencyServiceImpl implements AgencyService {
public Result subAgencyList(SubAgencyFormDTO formDTO) {
SubAgencyResultDTO subAgencyResultDTO = new SubAgencyResultDTO();
//1:根据当前机关Id查询直属下一级机关列表，只返回前十条
- List agencyList = customerAgencyDao.selectSubAgencyById(formDTO.getAgencyId());
+ List agencyList = customerAgencyDao.selectSubAgencyById(formDTO.getAgencyId(),formDTO.getAgencyNum());
if (null == agencyList || agencyList.size() < NumConstant.ONE) {
subAgencyResultDTO.setAgencyList(new ArrayList());
subAgencyResultDTO.setSubAgencyCount(NumConstant.ZERO);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index 9838fdd95f..bc91668e7c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -1021,4 +1021,40 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl staffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
+ return epmetUserOpenFeignClient.getStaffBasicInfo(fromDTO);
+ }
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 7326a91f31..b85f892aa1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -62,11 +62,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -298,4 +381,4 @@
-
+
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java
new file mode 100644
index 0000000000..a092793cf2
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java
@@ -0,0 +1,113 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目机关历时关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-10-19
+ */
+@Data
+public class ProjectOrgRelationDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ *
+ */
+ private String id;
+
+ /**
+ * 关联PROJECT_STAFF，由此ID可以关联出PROJECT_ID、CUSTOMER_ID、PROCESS_ID
+ */
+ private String projectStaffId;
+
+ /**
+ * 流转到的日期 同CREATED_TIME
+ */
+ private Date informedDate;
+
+ /**
+ * 流转走或结案的日期
+ */
+ private Date handledDate;
+
+ /**
+ * 节点耗时，从流转到自己到流转走共耗时，单位：分钟，如果项目还没有结案且该项目在这个组织下一直滞留，这一项为空
+ * 8*60的倍数
+ */
+ private Integer totalPeriod;
+
+ /**
+ * 第一次响应时间
+ */
+ private Date firstDealtDate;
+
+ /**
+ * 首次响应时长，单位：分钟
+ * 8*60的倍数
+ */
+ private Integer firstReplyPeriod;
+
+ /**
+ * 来源动作，return(回退)、transfer(流转)、closed(结案)、response(响应)、created(立项时第一个流转到的)
+ */
+ private String sourceOperation;
+
+ /**
+ * 处理动作，return(回退)、transfer(流转)、closed(结案)、response(响应)
+ */
+ private String operation;
+
+ /**
+ * 删除标识
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ *
+ */
+ private Date createdTime;
+
+ /**
+ *
+ */
+ private String createdBy;
+
+ /**
+ *
+ */
+ private Date updatedTime;
+
+ /**
+ *
+ */
+ private String updatedBy;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
index 4a0e30f907..689b3317d1 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
@@ -114,4 +114,24 @@ public class ProjectProcessDTO implements Serializable {
*/
private Date updatedTime;
+ /**
+ * 节点发起人所属机关Id
+ */
+ private String agencyId;
+
+ /**
+ * 节点发起人所属部门Id 可空
+ */
+ private String departmentId;
+
+ /**
+ * 节点发起人所属网格Id 可空
+ */
+ private String gridId;
+
+ /**
+ * 节点发起人所属机关全路径
+ */
+ private String orgIdPath;
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OverdueAndDelayDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OverdueAndDelayDTO.java
new file mode 100644
index 0000000000..93434edacc
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OverdueAndDelayDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/10/22 15:45
+ */
+@Data
+public class OverdueAndDelayDTO implements Serializable {
+ private static final long serialVersionUID = -3632539647818460833L;
+ /**
+ * 工作人员ID
+ */
+ private String staffId;
+ /**
+ * 即将超期
+ */
+ private List overdueList;
+ /**
+ * 滞留
+ */
+ private List delayList;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectOrgPeriodResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectOrgPeriodResultDTO.java
new file mode 100644
index 0000000000..69a2362b9d
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectOrgPeriodResultDTO.java
@@ -0,0 +1,97 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 从数据库中查询出的 项目 - 机关（网格、部门、机关）的响应时长
+ * @ClassName ProjectOrgPeriodResultDTO
+ * @Auth wangc
+ * @Date 2020-09-16 15:28
+ */
+@Data
+public class ProjectOrgPeriodResultDTO implements Serializable {
+ private static final long serialVersionUID = 6216112710806237600L;
+
+ /**
+ * 节点Id
+ * */
+ private String processId;
+
+ /**
+ * 项目Id
+ * */
+ private String projectId;
+
+
+ /**
+ * 对这个节点的处理，如果未处理则为null
+ * created transfer close return response(查不出response,因为response类型的节点不会与process_staff产生关联，需要另取)
+ * */
+ private String operation;
+
+ /**
+ * source_operation
+ * 是生成这个节点的操作，相当于上一个人的操作，而不是对于这个节点的处理
+ * created transfer close return response
+ * */
+ private String lastAction;
+
+ /**
+ * 节点所属的机关，即上个节点推到这个节点的负责部门
+ * */
+ private String departmentName;
+
+ /**
+ * 当前节点所属的Agency，如果负责的是部门或者网格则是其所属的机关
+ * */
+ private String orgId;
+
+ /**
+ * 如果是部门处理，则有值，否则null
+ * */
+ private String departmentId;
+
+ /**
+ * 如果是网格处理，则有值，否则null
+ * */
+ private String gridId;
+
+ /**
+ * 当前所属的机关的所有Pid集合以及当前的机关Id，所以此项不会未null，至少也是它的所属Agency
+ * */
+ private String orgIdPath;
+
+ /**
+ * 从节点流入到节点流出，且当前负责单位确实解决（包括退回）了的情况下，所耗费的时间(以分钟为单位)
+ * 如果未当前负责单位一直停留在unresolved状态，即使做出response、或者项目被其他单位结案，该项依旧是0，不参与办结的计时
+ * 如果负责单位只是做出回应，但未处理(即没有让节点流走)，需要查出其相应的第一次响应时间，另取
+ * */
+ private Integer totalPeriod;
+
+ /**
+ * 节点流入时间
+ * */
+ private Date informedDate;
+
+ /**
+ * 节点流出时间，如果未解决则未null
+ * */
+ private Date handledDate;
+
+ /**
+ * 第一次响应时间
+ * */
+ private Date periodTillReplyFirstly;
+
+ private String customerId;
+
+ private String staffId;
+
+ private String isResolved;
+
+ private String projectStaffId;
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectOrgRelationWhenResponseResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectOrgRelationWhenResponseResultDTO.java
new file mode 100644
index 0000000000..e29f37dde9
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectOrgRelationWhenResponseResultDTO.java
@@ -0,0 +1,49 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 查询机关在项目节点上响应的结果
+ * 查询的是存在“响应”的所有相关工作人员节点，如果同一个人对同一个项目已经做过一次处理（并未做出响应）而在第二次流转到自己时
+ * 做出了响应，也会连带查询出其第一次未响应过的数据
+ * @ClassName ProjectOrgRelationWhenResponseResultDTO
+ * @Auth wangc
+ * @Date 2020-09-16 17:27
+ */
+@Data
+public class ProjectOrgRelationWhenResponseResultDTO implements Serializable {
+ private static final long serialVersionUID = 1962332392048752037L;
+
+ /**
+ * 项目Id
+ * */
+ private String projectId;
+
+ /**
+ * 节点Id
+ * */
+ private String processId;
+
+ /**
+ * 节点动作的发起人
+ * */
+ private String staffId;
+
+ /**
+ * 负责人所属的单位名称:xx机关-xx部门 、 xx机关-xx网格 、 xx机关
+ * */
+ private String departmentName;
+
+ /**
+ * 动作分类
+ * */
+ private String operation;
+
+ /**
+ * 节点创建时间，动作发起时间
+ * */
+ private Date createdTime;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/StaffUnHandledDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/StaffUnHandledDTO.java
new file mode 100644
index 0000000000..7f19ab6754
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/StaffUnHandledDTO.java
@@ -0,0 +1,41 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/10/21 16:48
+ */
+@Data
+public class StaffUnHandledDTO implements Serializable {
+ private static final long serialVersionUID = 5257146338113364709L;
+ /**
+ * project_staff ID
+ */
+ private String id;
+ /**
+ * 项目ID
+ */
+ private String projectId;
+ /**
+ * 项目标题
+ */
+ private String title;
+ /**
+ * 工作人员ID
+ */
+ private String staffId;
+ /**
+ * 吹哨时间
+ */
+ private Date createdTime;
+ /**
+ * 响应处理时间
+ */
+ private Date updatedTime;
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
index 0f89d630d4..17bd06d5df 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
@@ -2,6 +2,7 @@ package com.epmet.feign;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.ProjectDTO;
import com.epmet.dto.form.ProjectListFromDTO;
import com.epmet.dto.result.PendProjectListResultDTO;
import com.epmet.dto.result.ProcessAndCurrentDeptResultDTO;
@@ -33,6 +34,16 @@ public interface GovProjectOpenFeignClient {
@PostMapping("gov/project/project/pendprojectlist")
Result> getPendProjectList(@RequestBody ProjectListFromDTO fromDTO);
+ /**
+ * 滞留消息提醒定时任务
+ * @author zhaoqifeng
+ * @date 2020/10/26 14:05
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ */
+ @PostMapping("gov/project/project/sendmessagejob")
+ Result sendMessageJob(@RequestBody ProjectDTO formDTO);
+
@PostMapping("gov/project/trace/processlistnotrule")
Result getProcessList(@RequestBody ProcessListFormDTO fromDTO);
}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
index a3eb7d7e01..b0bb14a9eb 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
@@ -3,6 +3,7 @@ package com.epmet.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.ProjectDTO;
import com.epmet.dto.form.ProcessListFormDTO;
import com.epmet.dto.form.ProjectListFromDTO;
import com.epmet.dto.result.PendProjectListResultDTO;
@@ -26,6 +27,19 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli
return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getPendProjectList", fromDTO);
}
+ /**
+ * 滞留消息提醒定时任务
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @author zhaoqifeng
+ * @date 2020/10/26 14:05
+ */
+ @Override
+ public Result sendMessageJob(ProjectDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "sendMessageJob", formDTO);
+ }
+
@Override
public Result getProcessList(ProcessListFormDTO fromDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getProcessList", fromDTO);
diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
index 1d61afd8af..2293705079 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-project-server:
container_name: gov-project-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.43
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:version_placeholder
ports:
- "8102:8102"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
index b00690b656..cee65e15cc 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-project-server:
container_name: gov-project-server-prod
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.45
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.46
ports:
- "8102:8102"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
index d7bf5d6939..d6c9360982 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-project-server:
container_name: gov-project-server-test
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.39
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:version_placeholder
ports:
- "8102:8102"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml
index 1d80b96d6b..06ec668460 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@@ -2,7 +2,7 @@
- 0.3.45
+ 0.3.46
gov-project
com.epmet
@@ -54,6 +54,12 @@
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-config
+
+ org.apache.commons
+ commons-collections4
+ 4.3
+ compile
+
io.github.openfeign
@@ -90,6 +96,12 @@
2.0.0
compile
+
+ com.epmet
+ oper-crm-client
+ 2.0.0
+ compile
+
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ParameterKeyConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ParameterKeyConstant.java
index 502b895544..2d5ae69fbb 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ParameterKeyConstant.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ParameterKeyConstant.java
@@ -11,4 +11,34 @@ public interface ParameterKeyConstant {
* 可滞留天数
*/
String DETENTION_DAYS = "detention_days";
+
+ /**
+ * 计算方式
+ */
+ String CALCULATION = "calculation";
+
+ /**
+ * 计算方式-工作日
+ */
+ String WORK = "work";
+
+ /**
+ * 计算方式-日历天
+ */
+ String CALENDAR = "calendar";
+
+ /**
+ * 即将超期提醒时间
+ */
+ String REMIND_TIME = "remind_time";
+
+ /**
+ * 推送时间
+ */
+ String PUSH_TIME = "push_time";
+
+ /**
+ * 起止时间
+ */
+ String START_AND_END_TIME = "start_and_end_time";
}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
index dd0f37c086..d529abf12e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
@@ -105,6 +105,10 @@ public interface ProjectConstant {
* 调用user-message服务失败
*/
String SAVE_MSG_EXCEPTION = "发送消息失败";
+ /**
+ * 调用user-message服务失败
+ */
+ String SAVE_WXMP_MSG_EXCEPTION = "发送微信订阅消息失败";
/**
* 查询项目表数据失败
*/
@@ -128,4 +132,24 @@ public interface ProjectConstant {
String SAVE_PROJECT_EXCEPTION = "已存在项目数据，不能重复转项目";
String REVIEW_PROJECT = "项目评论失败，评论内容为：%s";
+
+ /***
+ * 计算方式 使用自定应
+ */
+ String CALCULATION_TYPE_CUSTOM = "custom";
+
+ /**
+ * 计算方式 使用默认24小时制
+ */
+ String CALCULATION_TYPE_DEFAULT = "default";
+
+ /**
+ * 精准计算
+ */
+ String PRECISE_CALCULATION = "precise";
+
+ /**
+ * 非精准计算
+ */
+ String IMPRECISE_CALCULATION = "imprecise";
}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/UserMessageConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/UserMessageConstant.java
index 756a599ac3..9a1323f55f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/UserMessageConstant.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/UserMessageConstant.java
@@ -11,14 +11,50 @@ public interface UserMessageConstant {
*/
String PROJECT_TITLE = "您有一条项目消息";
+ /**
+ * 微信订阅消息部分标题
+ */
+ String WXMP_PROJECT_TITLE = "您有一条项目消息";
+
/**
* 议题转项目、项目流转、项目退回消息模板
*/
- String PROJECT_RESOLVED_MSG = "您好。您收到一条【%s】的新信息，请您尽快处理。";
+ String PROJECT_RESOLVED_MSG = "您收到一条【%s】的新信息，请您尽快处理。";
/**
* 项目结案消息模板
*/
- String PROJECT_CLOSED_MSG = "您好，您参与的【%s】项目已结案，原因：%s";
+ String PROJECT_CLOSED_MSG = "您参与的【%s】项目已结案，原因：%s";
+
+
+ /**
+ * 滞留超期消息标题
+ */
+ String STAY_REMINDER_TITLE_1 = "您有%d个项目即将超期，%d个项目已经滞留";
+
+ /**
+ * 滞留超期消息模板
+ */
+ String STAY_REMINDER_MSG_1 = "即将超期项目：%n%s 滞留项目：%n%s";
+
+ /**
+ * 滞留超期消息标题
+ */
+ String STAY_REMINDER_TITLE_2 = "您有%d个项目即将超期";
+
+ /**
+ * 滞留超期消息模板
+ */
+ String STAY_REMINDER_MSG_2 = "即将超期项目：%n%s";
+
+ /**
+ * 滞留超期消息标题
+ */
+ String STAY_REMINDER_TITLE_3 = "您有%d个项目已经滞留";
+
+ /**
+ * 滞留超期消息模板
+ */
+ String STAY_REMINDER_MSG_3 = "滞留项目：%n%s";
}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
index 5ccc25b279..345fb495a3 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -152,4 +152,35 @@ public class ProjectController {
return new Result>().ok(result);
}
+ /**
+ * 滞留消息提醒
+ * @author zhaoqifeng
+ * @date 2020/10/26 14:02
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ */
+ @PostMapping("message")
+ public Result sendMessage(@RequestBody ProjectDTO formDTO) {
+ projectService.sendMessage(formDTO.getCustomerId());
+ return new Result();
+ }
+
+ /**
+ * 滞留消息提醒定时任务
+ * @author zhaoqifeng
+ * @date 2020/10/26 14:03
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ */
+ @PostMapping("sendmessagejob")
+ public Result sendMessageJob(@RequestBody ProjectDTO formDTO) {
+ projectService.sendMessageJob(formDTO);
+ return new Result();
+ }
+
+ @PostMapping("compensation")
+ public Result compensation(){
+ projectService.projectProcessCostTimeDataCompensation();
+ return new Result();
+ }
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java
index c94ad69046..349b07308b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java
@@ -18,10 +18,14 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.CustomerProjectParameterDTO;
import com.epmet.entity.CustomerProjectParameterEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
+
/**
* 项目客户参数订制表
*
@@ -38,5 +42,32 @@ public interface CustomerProjectParameterDao extends BaseDao
+ */
+ List getParameterByCustomer(@Param("customerId") String customerId);
+
+ /**
+ * 获取推送时间范围内的客户ID
+ * @author zhaoqifeng
+ * @date 2020/10/26 13:44
+ * @param
+ * @return java.util.List
+ */
+ CustomerProjectParameterDTO getPushTime(@Param("customerId") String customerId);
+ /**
+ * 获取默认配置
+ * @author zhaoqifeng
+ * @date 2020/10/26 14:59
+ * @param
+ * @return com.epmet.dto.CustomerProjectParameterDTO
+ */
+ CustomerProjectParameterDTO getDefaultPushTime();
+
+ CustomerProjectParameterDTO getPushTimeConfig(@Param("customerId") String customerId);
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
index 4d20d6327c..0584789909 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
@@ -121,4 +121,13 @@ public interface ProjectDao extends BaseDao {
* @Description 根据客户Id、机关Id、议题Id查询项目数据是否存在
**/
List selectProjectList(ProjectDTO projectDTO);
+
+ /**
+ * @Description 得到所有的customerId
+ * @param
+ * @return java.util.List
+ * @author wangc
+ * @date 2020.10.26 11:20
+ */
+ List selectAllCustomerIds();
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectOrgRelationDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectOrgRelationDao.java
new file mode 100644
index 0000000000..b628f0cbbe
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectOrgRelationDao.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.ProjectOrgRelationDTO;
+import com.epmet.entity.ProjectOrgRelationEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 项目机关历时关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-10-19
+ */
+@Mapper
+public interface ProjectOrgRelationDao extends BaseDao {
+
+ /***
+ * @Description
+ * @param entity
+ * @return int
+ * @author wangc
+ * @date 2020.10.20 14:18
+ */
+ int maintainTimePropertyConsistency(ProjectOrgRelationEntity entity);
+
+
+ /***
+ * @Description 批量插入
+ * @param list
+ * @return void
+ * @author wangc
+ * @date 2020.10.20 09:57
+ */
+ void insertBatch(@Param("list") List list);
+
+ /***
+ * @Description 根据projectStaffId查找项目机关关联的数据
+ * @param projectStaffId
+ * @return com.epmet.entity.ProjectOrgRelationEntity
+ * @author wangc
+ * @date 2020.10.21 15:37
+ */
+ ProjectOrgRelationEntity selectByProjectStaffId(@Param("projectStaffId") String projectStaffId);
+
+ /***
+ * @Description 查询出所有未处理的节点耗时记录 - 结案时使用
+ * @param projectId
+ * @return java.util.List
+ * @author wangc
+ * @date 2020.10.22 13:37
+ */
+ List selectAllUnhandledProcess(@Param("projectId")String projectId);
+
+ /**
+ * @Description 批量新增(数据补偿)
+ * @param list
+ * @return int
+ * @author wangc
+ * @date 2020.10.26 13:55
+ */
+ int batchInsertProjectOrgRelation(@Param("list") List list);
+
+ /**
+ * @Description 批量删除
+ * @param list
+ * @return int
+ * @author wangc
+ * @date 2020.10.26 14:07
+ */
+ int deleteBatch(@Param("list") List list);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
index 333d1aefeb..dc3260b2c8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.form.ProcessProjectIdFormDTO;
import com.epmet.dto.form.ProjectIdFormDTO;
import com.epmet.dto.result.ProcesslistResultDTO;
+import com.epmet.dto.result.ProjectOrgRelationWhenResponseResultDTO;
import com.epmet.dto.result.ProjectProcessListResultDTO;
import com.epmet.entity.ProjectProcessEntity;
import org.apache.ibatis.annotations.Mapper;
@@ -67,4 +68,13 @@ public interface ProjectProcessDao extends BaseDao {
* @author zxc
*/
Integer checkProjectClose(ProjectIdFormDTO projectIdFormDTO);
+
+ /**
+ * @Description 查询项目-机关各个节点的响应列表
+ * @param projects
+ * @return
+ * @author wangc
+ * @date 2020.09.17 17:56
+ **/
+ List selectResponseTrace(@Param("projects") List projects);
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
index 88bc5dadf2..b3728bf23a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
@@ -20,6 +20,7 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.ProjectStaffDTO;
import com.epmet.dto.result.DepartmentResultDTO;
+import com.epmet.dto.result.StaffUnHandledDTO;
import com.epmet.entity.ProjectStaffEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -79,4 +80,44 @@ public interface ProjectStaffDao extends BaseDao {
* @return java.util.List
*/
List selectCreatedProcess(ProjectStaffDTO dto);
+
+ /**
+ * 获取未做处理的节点
+ * @author zhaoqifeng
+ * @date 2020/10/21 16:56
+ * @param customerId
+ * @return java.util.List
+ */
+ List getStaffUnHandledList(@Param("customerId") String customerId);
+
+ /***
+ * @Description 根据项目ID查询项目-人员表的ID
+ * @param projectId
+ * @return java.util.List
+ * @author wangc
+ * @date 2020.10.19 18:00
+ */
+ List selectIdByProjectId(@Param("projectId") String projectId);
+
+ /**
+ * @Description 根据项目Id和工作人员Id查找最新的project_staff表的ID
+ * @param projectId
+ * @param staffId
+ * @return com.epmet.dto.ProjectStaffDTO
+ * @author wangc
+ * @date 2020.10.21 15:07
+ */
+ ProjectStaffDTO selectLatestByProjectIdAndStaffId(@Param("projectId") String projectId,@Param("staffId") String staffId);
+
+ /**
+ * @Description 查询项目-机关各个节点历时详情
+ * @param customerId
+ * @return
+ * @author wangc
+ * @date 2020.09.17 09:43
+ **/
+ List selectProjectOrgPeriod(@Param("customerId") String customerId);
+
+
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectOrgRelationEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectOrgRelationEntity.java
new file mode 100644
index 0000000000..23e190ab90
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectOrgRelationEntity.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 项目机关历时关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-10-19
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("project_org_relation")
+public class ProjectOrgRelationEntity extends BaseEpmetEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 关联PROJECT_STAFF，由此ID可以关联出PROJECT_ID、CUSTOMER_ID、PROCESS_ID
+ */
+ private String projectStaffId;
+
+ /**
+ * 流转到的日期 同CREATED_TIME
+ */
+ private Date informedDate;
+
+ /**
+ * 流转走或结案的日期
+ */
+ private Date handledDate;
+
+ /**
+ * 节点耗时，从流转到自己到流转走共耗时，单位：分钟，如果项目还没有结案且该项目在这个组织下一直滞留，这一项为空
+ * 8*60的倍数
+ */
+ private Integer totalPeriod;
+
+ /**
+ * 第一次响应时间
+ */
+ private Date firstDealtDate;
+
+ /**
+ * 首次响应时长，单位：分钟
+ * 8*60的倍数
+ */
+ private Integer firstReplyPeriod;
+
+ /**
+ * 来源动作，return(回退)、transfer(流转)、closed(结案)、response(响应)、created(立项时第一个流转到的)
+ */
+ private String sourceOperation;
+
+ /**
+ * 处理动作，return(回退)、transfer(流转)、closed(结案)、response(响应)
+ */
+ private String operation;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
index e9ae924698..a862140529 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
@@ -43,6 +43,11 @@ public class ProjectProcessEntity extends BaseEpmetEntity {
*/
private String projectId;
+ /**
+ * 项目改造新增字段：客户Id
+ */
+ private String customerId;
+
/**
* 部门名
*/
@@ -83,4 +88,24 @@ public class ProjectProcessEntity extends BaseEpmetEntity {
*/
private String costWorkdays;
+ /**
+ * 节点发起人所属机关Id
+ */
+ private String agencyId;
+
+ /**
+ * 节点发起人所属部门Id 可空
+ */
+ private String departmentId;
+
+ /**
+ * 节点发起人所属网格Id 可空
+ */
+ private String gridId;
+
+ /**
+ * 节点发起人所属机关全路径
+ */
+ private String orgIdPath;
+
}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java
index 87664dc583..c9b487e7d0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java
@@ -101,4 +101,40 @@ public interface CustomerProjectParameterService extends BaseService
+ */
+ List getParameterByCustomer(String customerId);
+
+ /**
+ * 获取推送时间范围内的客户ID
+ * @author zhaoqifeng
+ * @date 2020/10/26 13:43
+ * @param customerId
+ * @return com.epmet.dto.CustomerProjectParameterDTO
+ */
+ CustomerProjectParameterDTO getPushTime(String customerId);
+
+ /**
+ * 获取默认配置
+ * @author zhaoqifeng
+ * @date 2020/10/26 14:58
+ * @param
+ * @return com.epmet.dto.CustomerProjectParameterDTO
+ */
+ CustomerProjectParameterDTO getDefaultPushTime();
+
+ /**
+ * 获取推送时间范围内的客户ID
+ * @author zhaoqifeng
+ * @date 2020/10/26 13:43
+ * @param customerId
+ * @return com.epmet.dto.CustomerProjectParameterDTO
+ */
+ CustomerProjectParameterDTO getPushTimeConfig(String customerId);
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
index c8b4dfdcc7..59f41ab307 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
@@ -19,7 +19,6 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.dto.ProjectProcessDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
@@ -143,4 +142,13 @@ public interface ProjectProcessService extends BaseService
*/
ProcessAndCurrentDeptResultDTO progressAndCurrentDept(ProcessListFormDTO formDTO);
+ /**
+ * @Description 查询项目-机关各个节点的响应列表
+ * @param projects
+ * @return
+ * @author wangc
+ * @date 2020.09.17 17:56
+ **/
+ List selectResponseTrace(List projects);
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
index 9f3bfa8bf1..2050b5921e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
@@ -188,4 +188,32 @@ public interface ProjectService extends BaseService {
* @return void
*/
void response(ProjectResponseFormDTO formDTO);
+
+ /**
+ * 项目滞留超期提醒
+ * @author zhaoqifeng
+ * @date 2020/10/21 15:21
+ * @param customerId
+ * @return void
+ */
+ void sendMessage(String customerId);
+
+ /**
+ * 项目滞留超期提醒定时任务
+ * @author zhaoqifeng
+ * @date 2020/10/26 10:53
+ * @param dto
+ * @return void
+ */
+ void sendMessageJob(ProjectDTO dto);
+
+
+ /**
+ * @Description 项目节点耗时数据补齐
+ * @param
+ * @return void
+ * @author wangc
+ * @date 2020.10.26 10:54
+ */
+ void projectProcessCostTimeDataCompensation();
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
index af0ee6061d..fa4f17266d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
@@ -23,8 +23,10 @@ import com.epmet.dto.ProjectStaffDTO;
import com.epmet.dto.form.DepartmentStaffListFormDTO;
import com.epmet.dto.result.DepartmentResultDTO;
import com.epmet.dto.result.DepartmentStaffListResultDTO;
+import com.epmet.dto.result.StaffUnHandledDTO;
import com.epmet.entity.ProjectStaffEntity;
+
import java.util.List;
import java.util.Map;
@@ -140,4 +142,42 @@ public interface ProjectStaffService extends BaseService {
* @return java.util.List
*/
List getCreatedProcess(ProjectStaffDTO dto);
+
+ /**
+ * 获取未做处理的节点
+ * @author zhaoqifeng
+ * @date 2020/10/21 16:54
+ * @param customerId
+ * @return java.util.List
+ */
+ List getStaffUnHandledList(String customerId);
+
+ /***
+ * @Description 根据项目ID查询项目-人员表的ID
+ * @param projectId
+ * @return java.util.List
+ * @author wangc
+ * @date 2020.10.19 18:00
+ */
+ List getIdByProjectId(String projectId);
+
+ /**
+ * @Description 根据项目Id和工作人员Id查找最新的project_staff表的ID
+ * @param projectId
+ * @param staffId
+ * @return com.epmet.dto.ProjectStaffDTO
+ * @author wangc
+ * @date 2020.10.21 15:07
+ */
+ ProjectStaffDTO getLatestIdByProjectIdAndStaffId(String projectId,String staffId);
+
+ /**
+ * @Description 查询项目-机关各个节点历时详情
+ * @param customerId
+ * @return
+ * @author wangc
+ * @date 2020.09.17 09:43
+ **/
+ List selectProjectOrgPeriod(String customerId);
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
index 3df0971eb3..a3b249ab4b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
@@ -107,4 +107,54 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl
+ * @author zhaoqifeng
+ * @date 2020/10/21 14:16
+ */
+ @Override
+ public List getParameterByCustomer(String customerId) {
+ return baseDao.getParameterByCustomer(customerId);
+ }
+
+ /**
+ * 获取推送时间范围内的客户ID
+ *@param customerId
+ * @return java.util.List
+ * @author zhaoqifeng
+ * @date 2020/10/26 13:43
+ */
+ @Override
+ public CustomerProjectParameterDTO getPushTime(String customerId) {
+ return baseDao.getPushTime(customerId);
+ }
+
+ /**
+ * 获取默认配置
+ *
+ * @return com.epmet.dto.CustomerProjectParameterDTO
+ * @author zhaoqifeng
+ * @date 2020/10/26 14:58
+ */
+ @Override
+ public CustomerProjectParameterDTO getDefaultPushTime() {
+ return baseDao.getDefaultPushTime();
+ }
+
+ /**
+ * 获取推送时间范围内的客户ID
+ *
+ * @param customerId
+ * @return com.epmet.dto.CustomerProjectParameterDTO
+ * @author zhaoqifeng
+ * @date 2020/10/26 13:43
+ */
+ @Override
+ public CustomerProjectParameterDTO getPushTimeConfig(String customerId) {
+ return baseDao.getPushTimeConfig(customerId);
+ }
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
index 6af8b68c00..759d57bcb2 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
@@ -17,6 +17,7 @@
package com.epmet.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -35,6 +36,7 @@ import com.epmet.commons.tools.utils.ScanContentUtils;
import com.epmet.constant.ProjectConstant;
import com.epmet.constant.ReadFlagConstant;
import com.epmet.constant.UserMessageConstant;
+import com.epmet.dao.ProjectOrgRelationDao;
import com.epmet.dao.ProjectDao;
import com.epmet.dao.ProjectProcessDao;
import com.epmet.dao.ProjectStaffDao;
@@ -44,8 +46,11 @@ import com.epmet.dto.ProjectStaffDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.entity.ProjectEntity;
+import com.epmet.entity.ProjectOrgRelationEntity;
import com.epmet.entity.ProjectProcessEntity;
import com.epmet.entity.ProjectStaffEntity;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
import com.epmet.feign.EpmetUserFeignClient;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.feign.GovOrgFeignClient;
@@ -53,11 +58,15 @@ import com.epmet.redis.ProjectProcessRedis;
import com.epmet.service.ProjectProcessService;
import com.epmet.service.ProjectService;
import com.epmet.service.ProjectStaffService;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
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 java.util.*;
import java.util.stream.Collectors;
@@ -69,8 +78,10 @@ import java.util.stream.Collectors;
* @since v1.0.0 2020-05-11
*/
@Service
+@Slf4j
public class ProjectProcessServiceImpl extends BaseServiceImpl implements ProjectProcessService {
+ protected static final Logger logger = LoggerFactory.getLogger(ProjectProcessServiceImpl.class);
@Autowired
private ProjectProcessRedis projectProcessRedis;
@Autowired
@@ -87,6 +98,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl page(Map params) {
@@ -223,12 +240,18 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl staffList = formDTO.getStaffList();
@@ -284,10 +307,58 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl intervalList = new LinkedList<>();intervalList.add(interval);
+ timeParam.setTimeList(intervalList);
+ Result> timeResult = epmetCommonServiceOpenFeignClient.workMinutes(timeParam);
+
+ if(timeResult.success() && !CollectionUtils.isEmpty(timeResult.getData()) && null != timeResult.getData().get(staffEntity.getId())){
+
+ ProjectOrgRelationEntity relationDto = new ProjectOrgRelationEntity();
+ relationDto.setProjectStaffId(orientRelation.getProjectStaffId());
+ relationDto.setHandledDate(current);
+ relationDto.setTotalPeriod(timeResult.getData().get(staffEntity.getId()));
+ relationDto.setOperation(ProjectConstant.OPERATION_TRANSFER);
+ if(null == orientRelation.getFirstDealtDate()){
+ relationDto.setFirstDealtDate(current);
+ relationDto.setFirstReplyPeriod(relationDto.getTotalPeriod());
+ }
+ relationDao.maintainTimePropertyConsistency(relationDto);
+ }else{
+ log.error("com.epmet.service.impl.ProjectProcessServiceImpl.transfer,计算节点耗时失败，参数:{}", JSON.toJSONString(timeParam));
+ throw new RenException("计算节点耗时失败");
+ }
+
+ //3.4 项目机关历时关系 project_org_relation 插入新增的
+ List relationList = new LinkedList<>();
+ entityList.forEach(staff -> {
+ ProjectOrgRelationEntity relation = new ProjectOrgRelationEntity();
+ relation.setProjectStaffId(staff.getId());
+ relation.setInformedDate(current);
+ relation.setSourceOperation(ProjectConstant.OPERATION_TRANSFER);
+ relationList.add(relation);
+ });
+ relationDao.insertBatch(relationList);
+
//4:调用epmet-message服务，给项目流转过程中的工作人员发送消息
if (!transferMessage(formDTO).success()) {
throw new RenException(ProjectConstant.SAVE_MSG_EXCEPTION);
}
+
+ //5:调用epmet-message服务，给项目流转过程中的工作人员发送订阅的微信消息
+ if (!transferWxmpMessage(formDTO).success()) {
+ logger.error("项目流转，推送微信订阅消息失败");
+ //throw new RenException(ProjectConstant.SAVE_WXMP_MSG_EXCEPTION);
+ }
}
/**
@@ -320,6 +391,37 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl msgList = new ArrayList<>();
+ ProjectEntity projectEntity = projectService.selectById(formDTO.getProjectId());
+ if (null == projectEntity) {
+ throw new RenException(ProjectConstant.SELECT_PROJECT_EXCEPTION);
+ }
+ //3:创建项目工作人员消息对象
+ //所选人员如果即在部门下又在网格下则只发一条消息
+ Map map = new HashMap<>();
+ String projectStaffMessage = String.format(UserMessageConstant.PROJECT_RESOLVED_MSG, projectEntity.getTitle());
+ formDTO.getStaffList().forEach(staff->{
+ if(!map.containsKey(staff.getStaffId())){
+ WxSubscribeMessageFormDTO msg = new WxSubscribeMessageFormDTO();
+ msg.setCustomerId(projectEntity.getCustomerId());
+ msg.setClientType(ProjectConstant.GOV);
+ msg.setUserId(staff.getStaffId());
+ msg.setBehaviorType(UserMessageConstant.WXMP_PROJECT_TITLE);
+ msg.setMessageContent(projectStaffMessage);
+ msg.setMessageTime(new Date());
+ msg.setGridId("*");
+ msgList.add(msg);
+ map.put(staff.getStaffId(),staff.getStaffId());
+ }
+ });
+ logger.info("项目流转，推送微信订阅消息");
+ return epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
+ }
/**
* @Description 议题处理进展——已转项目
@@ -407,4 +509,16 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl selectResponseTrace(List projects) {
+ return baseDao.selectResponseTrace(projects);
+ }
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 38f5ac64a7..7808c44d57 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -17,13 +17,11 @@
package com.epmet.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.AppClientConstant;
-import com.epmet.commons.tools.constant.Constant;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.*;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
@@ -37,24 +35,29 @@ import com.epmet.constant.ParameterKeyConstant;
import com.epmet.constant.ProjectConstant;
import com.epmet.constant.UserMessageConstant;
import com.epmet.dao.ProjectDao;
+import com.epmet.dao.ProjectOrgRelationDao;
import com.epmet.dto.*;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
-import com.epmet.entity.ProjectEntity;
-import com.epmet.entity.ProjectProcessEntity;
-import com.epmet.entity.ProjectRelatedPersonnelEntity;
-import com.epmet.entity.ProjectStaffEntity;
+import com.epmet.entity.*;
import com.epmet.feign.*;
import com.epmet.redis.ProjectRedis;
import com.epmet.service.*;
+import org.apache.commons.collections4.CollectionUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.ListUtils;
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 java.text.SimpleDateFormat;
import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -64,8 +67,9 @@ import java.util.stream.Collectors;
* @since v1.0.0 2020-05-11
*/
@Service
+@Slf4j
public class ProjectServiceImpl extends BaseServiceImpl implements ProjectService {
-
+ private Logger logger = LogManager.getLogger(ProjectServiceImpl.class);
@Autowired
private ProjectRedis projectRedis;
@Autowired
@@ -86,10 +90,16 @@ public class ProjectServiceImpl extends BaseServiceImpl periodsToUpdate = relationDao.selectAllUnhandledProcess(fromDTO.getProjectId());
+ //if(CollectionUtils.isEmpty(periodsToUpdate)){
+ // log.error("com.epmet.service.impl.ProjectServiceImpl.closed，至少存在一条处理时间为空的项目节点耗时记录，但是没有找到，参数:{}",JSON.toJSONString(fromDTO));
+ // throw new RenException("至少存在一条处理时间为空的项目节点耗时记录，但是没有找到");
+ //}
+
+
+ //List intervalList = new LinkedList<>();
+ //periodsToUpdate.forEach(local -> {
+ // TimestampIntervalFormDTO obj = new TimestampIntervalFormDTO();
+ // obj.setId(local.getProjectStaffId());
+ // obj.setLeft(local.getInformedDate());
+ // obj.setRight(current);
+ // intervalList.add(obj);
+ //});
+
+ ProjectOrgRelationEntity orientRelation = relationDao.selectByProjectStaffId(operatorProjectReference.getId());
+ if(null == orientRelation){
+ log.error("com.epmet.service.impl.ProjectServiceImpl.closed，找不到结案工作人员的节点耗时相关记录，参数:{}",JSON.toJSONString(fromDTO));
+ throw new RenException("找不到结案工作人员的节点耗时相关记录");
+ }
+
+ Integer delta_t = calculateDelta_T(ProjectConstant.IMPRECISE_CALCULATION,
+ ProjectConstant.CALCULATION_TYPE_DEFAULT, operatorProjectReference.getId(),orientRelation.getInformedDate(),current);
+
+ ProjectOrgRelationEntity carrier = new ProjectOrgRelationEntity();
+ carrier.setProjectStaffId(operatorProjectReference.getId());
+ carrier.setOperation(ProjectConstant.OPERATION_CLOSE);
+ carrier.setTotalPeriod(delta_t);
+ carrier.setHandledDate(current);
+ if(null == orientRelation.getFirstDealtDate()){
+ carrier.setFirstReplyPeriod(delta_t);
+ carrier.setFirstDealtDate(current);
+ }
+
+ relationDao.maintainTimePropertyConsistency(carrier);
+
//通知
List msgList = new ArrayList<>();
+ //2020.10.26 添加项目结案发送微信订阅消息操作 sun
+ List wxmpMsgList = new ArrayList<>();
//通知项目相关人员
List personnelList = projectRelatedPersonnelService.getPersonnelListByProjectId(fromDTO.getProjectId());
personnelList.forEach(p -> {
@@ -394,6 +460,15 @@ public class ProjectServiceImpl extends BaseServiceImpl staffList = projectStaffService.getStaffsByProjectId(fromDTO.getProjectId());
@@ -408,8 +483,23 @@ public class ProjectServiceImpl extends BaseServiceImpl msgList = new ArrayList<>();
UserMessageFormDTO messageFormDTO = new UserMessageFormDTO();
@@ -477,6 +610,23 @@ public class ProjectServiceImpl extends BaseServiceImpl wxmpMsgList = new ArrayList<>();
+ WxSubscribeMessageFormDTO msg = new WxSubscribeMessageFormDTO();
+ msg.setCustomerId(projectEntity.getCustomerId());
+ msg.setClientType(AppClientConstant.APP_GOV);
+ msg.setUserId(projectStaffDTO.getStaffId());
+ msg.setBehaviorType("项目消息");
+ msg.setMessageContent(String.format(UserMessageConstant.PROJECT_RESOLVED_MSG, projectEntity.getTitle()));
+ msg.setMessageTime(new Date());
+ msg.setGridId("*");
+ wxmpMsgList.add(msg);
+ //发送微信订阅消息 sun
+ logger.info("项目退回，开始推送微信订阅消息");
+ Result result = epmetMessageOpenFeignClient.sendWxSubscribeMessage(wxmpMsgList);
+ if (!result.success()) {
+ logger.error("项目退回成功，发送微信订阅消息失败" + JSON.toJSONString(result));
+ }
}
@Override
@@ -593,6 +743,7 @@ public class ProjectServiceImpl extends BaseServiceImpl {
if (issueDTO.getOrgId().equals(agency.getId())) {
processEntity.setDepartmentName(agency.getOrganizationName());
+ processEntity.setAgencyId(agency.getId());
+ if(StringUtils.isBlank(agency.getPids()) || StringUtils.equals(NumConstant.ZERO_STR,agency.getPids().trim()) || "".equals(agency.getPids().trim())){
+ processEntity.setOrgIdPath(agency.getId());
+ }else{
+ processEntity.setOrgIdPath(agency.getPids().concat(":").concat(agency.getId()));
+ }
}
});
agencyDeptGrid.getGridList().forEach(grid -> {
if (issueDTO.getGridId().equals(grid.getId())) {
processEntity.setDepartmentName(processEntity.getDepartmentName() + "-" + grid.getGridName());
+ processEntity.setGridId(grid.getId());
}
});
projectProcessService.insert(processEntity);
@@ -643,6 +801,24 @@ public class ProjectServiceImpl extends BaseServiceImpl projectStaffIds = entityList.stream().map(ProjectStaffEntity::getId).distinct().collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(projectStaffIds)){
+ List container = new LinkedList<>();
+ projectStaffIds.forEach(o -> {
+ ProjectOrgRelationEntity period = new ProjectOrgRelationEntity();
+ period.setProjectStaffId(o);
+ period.setInformedDate(current);
+ //created
+ period.setSourceOperation(ProjectConstant.OPERATION_CREATED);
+ period.setCreatedBy(formDTO.getStaffId());
+ container.add(period);
+ });
+ relationDao.insertBatch(container);
+ }
+
//5:项目相关人员表初始数据
List list = new ArrayList<>();
ProjectRelatedPersonnelEntity entity1 = new ProjectRelatedPersonnelEntity();
@@ -660,6 +836,8 @@ public class ProjectServiceImpl extends BaseServiceImpl intervalList = new LinkedList<>();intervalList.add(interval);
+ timeParam.setTimeList(intervalList);
+ Result> timeResult = epmetCommonServiceOpenFeignClient.workMinutes(timeParam);
+
+ if(timeResult.success() && !org.springframework.util.CollectionUtils.isEmpty(timeResult.getData()) && null != timeResult.getData().get(identity)){
+ return timeResult.getData().get(identity);
+ }else{
+ log.error("com.epmet.service.impl.ProjectServiceImpl.response,计算首次响应时间失败");
+ throw new RenException("计算首次响应时间失败");
+ }
+ }
+
+ private Map batchCalculateDelta_T(String ifPrecise,String ifCustom,List intervalList){
+ WorkMinuteFormDTO timeParam = new WorkMinuteFormDTO();
+ timeParam.setIfPrecise(ifPrecise);
+ timeParam.setIfCustom(ifCustom);
+ timeParam.setTimeList(intervalList);
+ Result> timeResult = epmetCommonServiceOpenFeignClient.workMinutes(timeParam);
+ if(timeResult.success() && !org.springframework.util.CollectionUtils.isEmpty(timeResult.getData())){
+ return timeResult.getData();
+ }else{
+ log.error("com.epmet.service.impl.ProjectServiceImpl.response,计算首次响应时间失败");
+ throw new RenException("计算首次响应时间失败");
+ }
+ }
+
+ /**
+ * 项目滞留超期提醒
+ *
+ * @param customerId
+ * @return void
+ * @author zhaoqifeng
+ * @date 2020/10/21 15:21
+ */
+ @Override
+ public void sendMessage(String customerId) {
+ List paramList = parameterService.getParameterByCustomer(customerId);
+ List defaultList = parameterService.getParameterByCustomer("default");
+ //可滞留天数
+ int detentionDays = 5;
+ //计算方式
+ String calculation = ParameterKeyConstant.WORK;
+ //即将超期提醒时间
+ int remindTime = 0;
+ //推送时间
+ String pushTime = "08:00";
+ if (CollectionUtils.isNotEmpty(paramList)) {
+ for (CustomerProjectParameterDTO dto : paramList) {
+ if (ParameterKeyConstant.DETENTION_DAYS.equals(dto.getParameterKey())) {
+ detentionDays = Integer.parseInt(dto.getParameterValue());
+ } else if (ParameterKeyConstant.CALCULATION.equals(dto.getParameterKey())) {
+ calculation = dto.getParameterValue();
+ } else if (ParameterKeyConstant.REMIND_TIME.equals(dto.getParameterKey())) {
+ remindTime = Integer.parseInt(dto.getParameterValue());
+ } else if (ParameterKeyConstant.PUSH_TIME.equals(dto.getParameterKey())) {
+ pushTime = dto.getParameterValue();
+ }
+ }
+
+ } else {
+ for (CustomerProjectParameterDTO dto : defaultList) {
+ if (ParameterKeyConstant.DETENTION_DAYS.equals(dto.getParameterKey())) {
+ detentionDays = Integer.parseInt(dto.getParameterValue());
+ } else if (ParameterKeyConstant.CALCULATION.equals(dto.getParameterKey())) {
+ calculation = dto.getParameterValue();
+ } else if (ParameterKeyConstant.REMIND_TIME.equals(dto.getParameterKey())) {
+ remindTime = Integer.parseInt(dto.getParameterValue());
+ } else if (ParameterKeyConstant.PUSH_TIME.equals(dto.getParameterKey())) {
+ pushTime = dto.getParameterValue();
+ }
+ }
+ }
+ //获取工作人员未处理的节点
+ List unHandledList = projectStaffService.getStaffUnHandledList(customerId);
+ if (CollectionUtils.isNotEmpty(unHandledList)) {
+ List form = unHandledList.stream().map(item -> {
+ CostDayFormDTO dto = new CostDayFormDTO();
+ dto.setId(item.getId());
+ dto.setStaffId(item.getStaffId());
+ if (null != item.getUpdatedTime()) {
+ dto.setStartDate(item.getUpdatedTime());
+ } else {
+ dto.setStartDate(item.getCreatedTime());
+ }
+ dto.setEndDate(new Date());
+ return dto;
+ }).collect(Collectors.toList());
+ List costDayList;
+ if (ParameterKeyConstant.WORK.equals(calculation)) {
+ //工作日计算
+ Result> result = epmetCommonServiceOpenFeignClient.costWorkDays(form);
+ if (!result.success()) {
+ throw new RenException(result.getCode(), result.getMsg());
+ }
+ costDayList = result.getData();
+ } else {
+ //日历日计算
+ Result> result = epmetCommonServiceOpenFeignClient.costCalendarDays(form);
+ if (!result.success()) {
+ throw new RenException(result.getCode(), result.getMsg());
+ }
+ costDayList = result.getData();
+ }
+ //即将超期项目
+ List overdueList = new ArrayList<>();
+ //滞留项目
+ List delayList = new ArrayList<>();
+ List finalCostDayList = costDayList;
+ List list = new ArrayList<>();
+ int finalDetentionDays = detentionDays;
+ int finalRemindTime = remindTime;
+ unHandledList.forEach(unHandle -> finalCostDayList.stream().filter(cost ->
+ unHandle.getId().equals(cost.getId())).forEach(item -> {
+ int diff = finalDetentionDays - item.getDetentionDays();
+ OverdueAndDelayDTO dto = new OverdueAndDelayDTO();
+ if (diff < 0) {
+ dto.setStaffId(unHandle.getStaffId());
+ list.add(dto);
+ delayList.add(unHandle);
+ } else if (diff <= finalRemindTime) {
+ dto.setStaffId(unHandle.getStaffId());
+ overdueList.add(unHandle);
+ list.add(dto);
+ }
+ }));
+ if (CollectionUtils.isNotEmpty(list)) {
+ setMessage(customerId, overdueList, delayList, list);
+ }
+ }
+ }
+
+ /**
+ * @Description 项目节点耗时数据补齐
+ * @param
+ * @return void
+ * @author wangc
+ * @date 2020.10.26 10:54
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void projectProcessCostTimeDataCompensation() {
+ List customers = baseDao.selectAllCustomerIds();
+ if(CollectionUtils.isEmpty(customers))return;
+ List totalContainer = new LinkedList<>();
+ customers.forEach(customerId -> {
+ List projectNodePeriodPerOrgList = projectStaffService.selectProjectOrgPeriod(customerId);
+ if(!org.springframework.util.CollectionUtils.isEmpty(projectNodePeriodPerOrgList)){
+
+ Map> projectMap
+ = projectNodePeriodPerOrgList.stream().collect(Collectors.groupingBy(ProjectOrgPeriodResultDTO :: getProjectId));
+
+ List projects =
+ projectNodePeriodPerOrgList.stream().map(ProjectOrgPeriodResultDTO::getProjectId).distinct().collect(Collectors.toList());
+
+ if(!projects.isEmpty()){
+ List responseList = projectProcessService.selectResponseTrace(projects);
+ Map> sorted =
+ responseList.stream().collect(Collectors.groupingBy(ProjectOrgRelationWhenResponseResultDTO::getProjectId));
+ //跨级分组
+ skipLevelGrouping(projectMap,sorted);
+ List calculatedData = new LinkedList<>();
+ projectMap.values().forEach(list -> {list.forEach(obj -> {calculatedData.add(obj);});});
+
+
+ if(!org.apache.commons.collections4.CollectionUtils.isEmpty(calculatedData)){
+ List formatted = calculatedData.stream().map(period -> {
+ ProjectOrgRelationDTO relation = ConvertUtils.sourceToTarget(period,ProjectOrgRelationDTO.class);
+ relation.setFirstDealtDate(period.getPeriodTillReplyFirstly());
+ relation.setSourceOperation(period.getLastAction());
+ return relation;
+ }).collect(Collectors.toList());
+ totalContainer.addAll(formatted);
+ }
+
+
+ }
+
+ }
+ });
+ if(!CollectionUtils.isEmpty(totalContainer)){
+ List identities = totalContainer.stream().map(ProjectOrgRelationDTO::getProjectStaffId).distinct().collect(Collectors.toList());
+ ListUtils.partition(identities,NumConstant.ONE_THOUSAND).forEach(partition -> {relationDao.deleteBatch(partition);});
+
+ /*List timeInterval = totalContainer.stream().map(relation -> {
+ TimestampIntervalFormDTO interval = new TimestampIntervalFormDTO();
+ interval.setId(relation.getProjectStaffId());
+ interval.setLeft(relation.getInformedDate());
+ interval.setRight(relation.getHandledDate());
+ return interval;
+ }).collect(Collectors.toList());*/
+
+ List handleTimeInterval = new LinkedList<>();
+
+ List responseTimeInterval = new LinkedList<>();
+ totalContainer.forEach(local -> {
+ if(null != local.getHandledDate()){
+ TimestampIntervalFormDTO handle = new TimestampIntervalFormDTO();
+ handle.setId(local.getProjectStaffId());
+ handle.setLeft(local.getInformedDate());
+ handle.setRight(local.getHandledDate());
+ handleTimeInterval.add(handle);
+ }
+ if(null != local.getFirstDealtDate()){
+ TimestampIntervalFormDTO response = new TimestampIntervalFormDTO();
+ response.setId(local.getProjectStaffId());
+ response.setLeft(local.getInformedDate());
+ response.setRight(local.getFirstDealtDate());
+ responseTimeInterval.add(response);
+ }
+ });
+
+
+ Map batchDelta_T = batchCalculateDelta_T(ProjectConstant.IMPRECISE_CALCULATION,
+ ProjectConstant.CALCULATION_TYPE_DEFAULT,handleTimeInterval);
+ Map batchDelta_TResponse = batchCalculateDelta_T(ProjectConstant.IMPRECISE_CALCULATION,
+ ProjectConstant.CALCULATION_TYPE_DEFAULT,responseTimeInterval);
+
+
+ Map dataMap =
+ totalContainer.stream().collect(Collectors.toMap(ProjectOrgRelationDTO::getProjectStaffId, Function.identity(), (key1, key2) -> key2));
+
+ if(!org.springframework.util.CollectionUtils.isEmpty(batchDelta_T) &&
+ !org.springframework.util.CollectionUtils.isEmpty(dataMap)){
+ dataMap.forEach((k,v) -> {
+ if(null != v){
+ v.setTotalPeriod(batchDelta_T.get(k));
+ if(v.getHandledDate() == v.getFirstDealtDate())v.setFirstReplyPeriod(batchDelta_T.get(k));
+ else v.setFirstReplyPeriod(batchDelta_TResponse.get(k));
+ }
+ });
+ List> partition = ListUtils.partition(totalContainer, NumConstant.ONE_HUNDRED);
+ partition.forEach(subList -> {relationDao.batchInsertProjectOrgRelation(subList);});
+ }
+ }
+ }
+
+ /**
+ * 项目滞留超期提醒定时任务
+ *
+ * @param dto
+ * @return void
+ * @author zhaoqifeng
+ * @date 2020/10/26 10:53
+ */
+ @Override
+ public void sendMessageJob(ProjectDTO dto) {
+ Result> result = operCrmOpenFeignClient.getAllCustomerList();
+ if (!result.success()) {
+ throw new RenException(result.getCode(), result.getMsg());
+ }
+ if (CollectionUtils.isNotEmpty(result.getData())) {
+ if(null != dto && StringUtils.isNotBlank(dto.getCustomerId())) {
+ sendMessage(dto.getCustomerId());
+ } else {
+ for (CustomerDTO customerDTO : result.getData()) {
+ //获取客户配置，如果存在，则判断客户配置是否在该时间段内，如果不存在，则使用默认配置
+ CustomerProjectParameterDTO config = parameterService.getPushTimeConfig(customerDTO.getId());
+ if (null != config) {
+ //客户配置是否在该时间段内
+ CustomerProjectParameterDTO pushTime = parameterService.getPushTime(customerDTO.getId());
+ if(null != pushTime) {
+ sendMessage(customerDTO.getId());
+ }
+ } else {
+ //获取默认配置
+ CustomerProjectParameterDTO defaultPushTime = parameterService.getDefaultPushTime();
+ if(null != defaultPushTime) {
+ sendMessage(customerDTO.getId());
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private void setMessage(String customerId, List overdueList, List delayList, List list) {
+ list = list.stream().distinct().collect(Collectors.toList());
+ Map> overdueMap = overdueList.stream().collect(Collectors.groupingBy(StaffUnHandledDTO::getStaffId));
+ Map> delayMap = delayList.stream().collect(Collectors.groupingBy(StaffUnHandledDTO::getStaffId));
+
+ List overdue = overdueMap.entrySet().stream().map(item -> {
+ OverdueAndDelayDTO dto = new OverdueAndDelayDTO();
+ dto.setStaffId(item.getKey());
+ dto.setOverdueList(item.getValue());
+ return dto;
+ }).collect(Collectors.toList());
+ List delay = delayMap.entrySet().stream().map(item -> {
+ OverdueAndDelayDTO dto = new OverdueAndDelayDTO();
+ dto.setStaffId(item.getKey());
+ dto.setDelayList(item.getValue());
+ return dto;
+ }).collect(Collectors.toList());
+
+ list.forEach(dto -> overdue.forEach(item -> {
+ if (dto.getStaffId().equals(item.getStaffId())) {
+ dto.setOverdueList(item.getOverdueList());
+ }
+ }));
+
+ list.forEach(dto -> delay.forEach(item -> {
+ if (dto.getStaffId().equals(item.getStaffId())) {
+ dto.setDelayList(item.getDelayList());
+ }
+ }));
+ //通知
+ List msgList = new ArrayList<>();
+ //10.29 项目滞留提醒添加推送微信消息 sun
+ List wxmpMsgList = new ArrayList<>();
+ list.forEach(dto -> {
+ String title;
+ String msg;
+ if (CollectionUtils.isNotEmpty(dto.getOverdueList()) && CollectionUtils.isNotEmpty(dto.getDelayList())) {
+ title = String.format(UserMessageConstant.STAY_REMINDER_TITLE_1, dto.getOverdueList().size(), dto.getDelayList().size());
+ StringBuilder overdueMsg = new StringBuilder();
+ StringBuilder delayMsg = new StringBuilder();
+ for (int i = 0; i < dto.getOverdueList().size(); i++) {
+ overdueMsg.append(i + 1).append(StrConstant.COMMA_ZH).append(dto.getOverdueList().get(i).getTitle()).append("\n");
+ }
+ for (int i = 0; i < dto.getDelayList().size(); i++) {
+ delayMsg.append(i + 1).append(StrConstant.COMMA_ZH).append(dto.getDelayList().get(i).getTitle()).append("\n");
+ }
+ msg = String.format(UserMessageConstant.STAY_REMINDER_MSG_1, overdueMsg.toString(), delayMsg.toString());
+ } else if (CollectionUtils.isNotEmpty(dto.getOverdueList()) && CollectionUtils.isEmpty(dto.getDelayList())) {
+ title = String.format(UserMessageConstant.STAY_REMINDER_TITLE_2, dto.getOverdueList().size());
+ StringBuilder overdueMsg = new StringBuilder();
+ for (int i = 0; i < dto.getOverdueList().size(); i++) {
+ overdueMsg.append(i + 1).append(StrConstant.COMMA_ZH).append(dto.getOverdueList().get(i).getTitle()).append("\n");
+ }
+ msg = String.format(UserMessageConstant.STAY_REMINDER_MSG_2, overdueMsg.toString());
+ } else {
+ title = String.format(UserMessageConstant.STAY_REMINDER_TITLE_3, dto.getDelayList().size());
+ StringBuilder delayMsg = new StringBuilder();
+ for (int i = 0; i < dto.getDelayList().size(); i++) {
+ delayMsg.append(i + 1).append(StrConstant.COMMA_ZH).append(dto.getDelayList().get(i).getTitle()).append("\n");
+ }
+ msg = String.format(UserMessageConstant.STAY_REMINDER_MSG_3, delayMsg.toString());
+ }
+ UserMessageFormDTO messageFormDTO = new UserMessageFormDTO();
+ messageFormDTO.setCustomerId(customerId);
+ messageFormDTO.setApp(ProjectConstant.GOV);
+ messageFormDTO.setGridId(StrConstant.STAR);
+ messageFormDTO.setUserId(dto.getStaffId());
+ messageFormDTO.setTitle(title);
+ messageFormDTO.setMessageContent(msg);
+ messageFormDTO.setReadFlag(Constant.UNREAD);
+ msgList.add(messageFormDTO);
+
+ //10.29 项目滞留提醒添加推送微信消息 sun
+ WxSubscribeMessageFormDTO wxmp = new WxSubscribeMessageFormDTO();
+ wxmp.setCustomerId(customerId);
+ wxmp.setClientType(ProjectConstant.GOV);
+ wxmp.setUserId(dto.getStaffId());
+ wxmp.setBehaviorType("项目滞留提醒");
+ wxmp.setMessageContent(msg);
+ wxmp.setMessageTime(new Date());
+ wxmp.setGridId(StrConstant.STAR);
+ wxmpMsgList.add(wxmp);
+ });
+ messageFeignClient.saveUserMessageList(msgList);
+ logger.info("项目滞留提醒，开始推送微信订阅消息");
+ Result result = epmetMessageOpenFeignClient.sendWxSubscribeMessage(wxmpMsgList);
+ if (!result.success()) {
+ logger.error("项目滞留提醒，发送微信订阅消息失败" + JSON.toJSONString(result));
+ }
+ }
+
+
+ /**
+ * @Description 跨级分组 eg -> transfer ; response response transfer ; return ; response close.
+ * @param dest - Map> 需要填充的数据 projectMap
+ * @param fillFactor - Map> 填充因子
+ * @return
+ * @author wangc
+ * @date 2020.09.18 15:27
+ **/
+ private void skipLevelGrouping(Map> dest, Map> fillFactor){
+ for(String projectId : fillFactor.keySet()){
+ //拿到同一个项目下的的节点记录(只有存在响应节点的项目)
+ List projectTraceUnit = fillFactor.get(projectId);
+ if(!projectTraceUnit.isEmpty()){
+ // K : staffId
+ // V : 项目下对于某个员工(可能是在不同部门、网格、机关下)的所有节点顺时针操作，因为对于但项目单人来说，只能串行不能并行
+ Map> staffResponseTrace =
+ projectTraceUnit.stream().collect(Collectors.groupingBy(ProjectOrgRelationWhenResponseResultDTO::getStaffId));
+ if(!org.springframework.util.CollectionUtils.isEmpty(staffResponseTrace)){
+ List incompleteBody = dest.get(projectId);
+ if(!org.springframework.util.CollectionUtils.isEmpty(incompleteBody)) {
+ Map> incompleteBodyGroupByStaffMap =
+ incompleteBody.stream().collect(Collectors.groupingBy(ProjectOrgPeriodResultDTO::getStaffId));
+ if(!org.springframework.util.CollectionUtils.isEmpty(incompleteBodyGroupByStaffMap)) {
+ staffResponseTrace.keySet().forEach(staffId -> {
+ List staffResponseTraceUnit
+ = staffResponseTrace.get(staffId);
+ List incompleteBodyUnit = incompleteBodyGroupByStaffMap.get(staffId);
+ if (!org.springframework.util.CollectionUtils.isEmpty(incompleteBodyUnit) && !org.springframework.util.CollectionUtils.isEmpty(staffResponseTraceUnit)) {
+
+ //int lastEndCount = NumConstant.ONE_NEG;
+ int seq = NumConstant.ZERO;
+ a:
+ for (int index = NumConstant.ZERO; index < staffResponseTraceUnit.size(); index++) {
+ if(StringUtils.isNotBlank(staffResponseTraceUnit.get(index).getOperation()) && staffResponseTraceUnit.get(index).getOperation().contains("create")) continue;
+ if (StringUtils.equals("response", staffResponseTraceUnit.get(index).getOperation())) {
+
+ replaceFirstResponseDate(incompleteBodyUnit,staffResponseTraceUnit.get(index),seq);
+ seq++;
+ int cursor = index;
+ if (cursor == staffResponseTraceUnit.size() - NumConstant.ZERO) break;
+ while (StringUtils.equals("response", staffResponseTraceUnit.get(cursor++).getOperation())) {
+ if (cursor == staffResponseTraceUnit.size() - NumConstant.ZERO) break a;
+ }
+ if (cursor == staffResponseTraceUnit.size() - NumConstant.ZERO) break;
+ index = cursor;
+ } else {
+ replaceFirstResponseDate(incompleteBodyUnit,staffResponseTraceUnit.get(index),seq);
+ seq++;
+ }
+ }
+ }
+ });
+ }
+ }
+ }
+
+ }
+ }
+ }
+
+ private void replaceFirstResponseDate(List dest,
+ ProjectOrgRelationWhenResponseResultDTO staffResponseTraceUnit,int seq){
+ // 传递过来的dest是已经按照projectId分好组之后再按照staff分组的集合
+ // dest key->staff
+ ProjectOrgPeriodResultDTO target = dest.get(seq);
+ if(null != target) target.setPeriodTillReplyFirstly(staffResponseTraceUnit.getCreatedTime());
+ }
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
index e33943f2e4..9ef8a2dc14 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
@@ -30,8 +30,10 @@ import com.epmet.dao.ProjectStaffDao;
import com.epmet.dto.ProjectStaffDTO;
import com.epmet.dto.form.DepartmentStaffListFormDTO;
import com.epmet.dto.form.TransferOptionalStaffListFormDTO;
+
import com.epmet.dto.result.DepartmentResultDTO;
import com.epmet.dto.result.DepartmentStaffListResultDTO;
+import com.epmet.dto.result.StaffUnHandledDTO;
import com.epmet.entity.ProjectStaffEntity;
import com.epmet.feign.GovOrgFeignClient;
import com.epmet.redis.ProjectStaffRedis;
@@ -155,4 +157,48 @@ public class ProjectStaffServiceImpl extends BaseServiceImpl
+ * @author zhaoqifeng
+ * @date 2020/10/21 16:54
+ */
+ @Override
+ public List getStaffUnHandledList(String customerId) {
+ return baseDao.getStaffUnHandledList(customerId);
+ }
+
+ /***
+ * @Description 根据项目ID查询项目-人员表的ID
+ * @param projectId
+ * @return java.util.List
+ * @author wangc
+ * @date 2020.10.19 18:00
+ */
+ @Override
+ public List getIdByProjectId(String projectId) {
+ return baseDao.selectIdByProjectId(projectId);
+ }
+
+ /**
+ * @Description 根据项目Id和工作人员Id查找最新的project_staff表的ID
+ * @param projectId
+ * @param staffId
+ * @return com.epmet.dto.ProjectStaffDTO
+ * @author wangc
+ * @date 2020.10.21 15:07
+ */
+ @Override
+ public ProjectStaffDTO getLatestIdByProjectIdAndStaffId(String projectId, String staffId) {
+ return baseDao.selectLatestByProjectIdAndStaffId(projectId,staffId);
+ }
+
+ @Override
+ public List selectProjectOrgPeriod(String customerId) {
+
+ return baseDao.selectProjectOrgPeriod(customerId);
+ }
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.2__period.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.2__period.sql
new file mode 100644
index 0000000000..739433fb77
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.2__period.sql
@@ -0,0 +1,100 @@
+CREATE TABLE `project_org_relation` (
+ `ID` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+ `PROJECT_STAFF_ID` varchar(64) COLLATE utf8_unicode_ci NOT NULL COMMENT '关联PROJECT_STAFF，由此ID可以关联出PROJECT_ID、CUSTOMER_ID、PROCESS_ID',
+ `INFORMED_DATE` datetime DEFAULT NULL COMMENT '流转到的日期 同CREATED_TIME',
+ `HANDLED_DATE` datetime DEFAULT NULL COMMENT '流转走或结案的日期',
+ `TOTAL_PERIOD` int(12) DEFAULT NULL COMMENT '节点耗时，从流转到自己到流转走共耗时，单位：分钟，如果项目还没有结案且该项目在这个组织下一直滞留，这一项为空\r\n8*60的倍数',
+ `FIRST_DEALT_DATE` datetime DEFAULT NULL COMMENT '第一次响应时间',
+ `FIRST_REPLY_PERIOD` int(12) DEFAULT NULL COMMENT '首次响应时长，单位：分钟\r\n8*60的倍数',
+ `SOURCE_OPERATION` varchar(32) COLLATE utf8_unicode_ci NOT NULL COMMENT '来源动作，return(回退)、transfer(流转)、closed(结案)、response(响应)、created(立项时第一个流转到的)',
+ `OPERATION` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '处理动作，return(回退)、transfer(流转)、closed(结案)、response(响应)',
+ `DEL_FLAG` char(1) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0' COMMENT '删除标识',
+ `REVISION` int(4) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+ `CREATED_TIME` datetime NOT NULL,
+ `CREATED_BY` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+ `UPDATED_TIME` datetime NOT NULL,
+ `UPDATED_BY` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+ PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='项目机关历时关系表';
+
+ALTER TABLE `epmet_gov_project`.`project_process`
+ADD COLUMN `AGENCY_ID` varchar(64) NULL COMMENT '组织ID' ,
+ADD COLUMN `DEPARTMENT_ID` varchar(64) NULL COMMENT '部门ID' ,
+ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' ,
+ADD COLUMN `ORG_ID_PATH` varchar(500) NULL COMMENT '所属机关（11:22:33）',
+ADD COLUMN `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id';
+
+
+UPDATE project_process a
+INNER JOIN (
+ SELECT DISTINCT
+ pp.ID,
+ p.AGENCY_ID,
+ p.ORG_ID_PATH,
+ prp.GRID_ID
+ FROM
+ project_process pp
+ INNER JOIN project p ON pp.PROJECT_ID = p.ID
+ LEFT JOIN project_related_personnel prp ON pp.PROJECT_ID = prp.PROJECT_ID
+ WHERE
+ pp.OPERATION = 'created'
+ ) b ON a.ID = b.ID
+ SET a.AGENCY_ID = b.AGENCY_ID,
+ a.GRID_ID = b.GRID_ID,
+ a.ORG_ID_PATH = b.ORG_ID_PATH;
+
+
+
+UPDATE project_process a
+INNER JOIN (
+ SELECT DISTINCT
+ pp.ID,
+ ps.ORG_ID,
+ ps.GRID_ID,
+ ps.DEPARTMENT_ID,
+ ps.ORG_ID_PATH
+ FROM
+ project_process pp
+ INNER JOIN project_staff ps ON pp.PROJECT_ID = ps.PROJECT_ID
+ AND pp.DEPARTMENT_NAME = ps.DEPARTMENT_NAME
+ AND ps.IS_HANDLE = 'handle'
+ AND pp.STAFF_ID = ps.STAFF_ID
+ AND ps.DEL_FLAG = '0'
+ WHERE
+ pp.OPERATION != 'created'
+ AND pp.OPERATION != 'response'
+ ) b ON a.ID = b.ID
+ SET a.AGENCY_ID = b.ORG_ID,
+ a.GRID_ID = b.GRID_ID,
+ a.DEPARTMENT_ID = b.DEPARTMENT_ID,
+ a.ORG_ID_PATH = b.ORG_ID_PATH;
+
+
+UPDATE project_process a
+INNER JOIN (
+ SELECT DISTINCT
+ pp.ID,
+ ps.ORG_ID,
+ ps.GRID_ID,
+ ps.DEPARTMENT_ID,
+ ps.ORG_ID_PATH
+ FROM
+ project_process pp
+ LEFT JOIN project_staff ps ON pp.PROJECT_ID = ps.PROJECT_ID
+ AND pp.STAFF_ID = ps.STAFF_ID
+ AND pp.DEPARTMENT_NAME = ps.DEPARTMENT_NAME
+ WHERE
+ pp.OPERATION = 'response'
+ ) b ON a.ID = b.ID
+ SET a.AGENCY_ID = b.ORG_ID,
+ a.GRID_ID = b.GRID_ID,
+ a.DEPARTMENT_ID = b.DEPARTMENT_ID,
+ a.ORG_ID_PATH = b.ORG_ID_PATH;
+
+ UPDATE PROJECT_PROCESS process
+INNER JOIN PROJECT project ON process.PROJECT_ID = project.ID
+AND project.DEL_FLAG = '0'
+AND process.DEL_FLAG = '0'
+SET process.CUSTOMER_ID = project.CUSTOMER_ID;
+
+
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.3__default.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.3__default.sql
new file mode 100644
index 0000000000..d022ebec3a
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.3__default.sql
@@ -0,0 +1,6 @@
+INSERT INTO customer_project_parameter(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000', 'default', 'detention_days', '可滞留天数', '5', '默5天', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');
+INSERT INTO customer_project_parameter(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1001', 'default', 'calculation', '计算方式', 'work', '计算方式 工作日work 日历天calendar', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');
+INSERT INTO customer_project_parameter(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1002', 'default', 'remind_time', '即将超期提醒时间', '0', '默认 当天', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');
+INSERT INTO customer_project_parameter(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1003', 'default', 'push_time', '推送时间', '08:00', '默认 上午8点', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');
+INSERT INTO customer_project_parameter(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1004', 'default', 'start_time', '设定核算单位天开始时间', '00:00:00', '默认 00:00:00', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');
+INSERT INTO customer_project_parameter(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1005', 'default', 'end_time', '设定核算单位天结束时间', '23:59:00', '默认 23:59:00', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
index 236abcb4e9..c4e23d9fe9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
@@ -134,7 +134,7 @@
-
+
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml
index 25a30d23a9..51e132a61c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml
@@ -26,6 +26,49 @@
and CUSTOMER_ID = #{customerId}
and PARAMETER_KEY = #{parameterKey}