Browse Source

项目增加work_event来源,为网格员上报事件,修改设计到的统计查询

master
zhaoqifeng 3 years ago
parent
commit
4aea47ba2f
  1. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
  2. 2
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java

@ -186,7 +186,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
} }
} }
} else if (ProjectConstant.PROJECT_ORIGIN_WORK_EVENT.equals(project.getOrigin())){ } else if (ProjectConstant.PROJECT_ORIGIN_WORK_EVENT.equals(project.getOrigin())){
entity.setGridId(project.getOrigin()); entity.setGridId(project.getOriginId());
} }
String[] pIds = project.getOrgIdPath().split(StrConstant.COLON); String[] pIds = project.getOrgIdPath().split(StrConstant.COLON);
if (pIds.length > 1) { if (pIds.length > 1) {

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

@ -69,7 +69,7 @@ public class ProjectApprovalFormDTO implements Serializable {
* 立项类型 直接立项agency上报事件work_event * 立项类型 直接立项agency上报事件work_event
*/ */
@NotBlank(message = "立项类型不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class}) @NotBlank(message = "立项类型不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class})
private String type; private String type = "agency";
/** /**
* 网格ID * 网格ID
*/ */

Loading…
Cancel
Save