Merge remote-tracking branch 'origin/dev' into dev

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java

@@ -417,6 +417,10 @@ public class ProjectDetailVO {
     @Compare("建设周期（月）")
     private Integer originBuildCycle;
 
+    @ApiModelProperty("计划验收时间(有可能是延期后的)")
+    @Compare("计划验收时间")
+    private LocalDateTime planAcceptanceTime;
+
     public String getVersionStr() {
         if (Objects.nonNull(this.newest) && this.newest) {
             this.versionStr = "当前版本";

pmapi/src/main/java/com/ningdatech/pmapi/safety/manage/SafetyRiskManage.java

@@ -64,6 +64,7 @@ public class SafetyRiskManage {
                 .eq(Project::getNewest, Boolean.TRUE)
                 .ge(Project::getStatus, ProjectStatusEnum.UNDER_CONSTRUCTION.getCode())
                 .ne(Project::getStatus, ProjectStatusEnum.OPERATION.getCode())
+                .eq(StringUtils.isNotBlank(req.getRegionCode()),Project::getAreaCode,req.getRegionCode())
                 .like(StringUtils.isNotBlank(req.getProjectName()),Project::getProjectName,req.getProjectName())
                 .like(StringUtils.isNotBlank(req.getBuildOrgName()),Project::getBuildOrgName,req.getBuildOrgName())
                 .orderByDesc(Project::getUpdateOn);

pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/EarlyWarningManage.java

@@ -66,14 +66,17 @@ public class EarlyWarningManage {
             case PROCESS_WARNING:
                 content = convertContent(noticeContent,project.getProjectName(),
                         InstTypeEnum.getByCode(biz),timeout);
+                records.setRuleType(WarningRuleTypeEnum.PROCESS_WARNING.getCode());
                 break;
             case DECLARED_WARNING:
                 content = convertContent(noticeContent,project.getProjectName(),
                         WarningFlowTypeEnum.getByCode(biz),timeout);
+                records.setRuleType(WarningRuleTypeEnum.DECLARED_WARNING.getCode());
                 break;
             case OPERATION_WARNING:
                 content = convertContent(noticeContent,project.getProjectName(),
                         WarningOperationTypeEnum.getByCode(biz),timeout);
+                records.setRuleType(WarningRuleTypeEnum.OPERATION_WARNING.getCode());
                 break;
             default:
                 log.info("匹配不到 规则类型");
@@ -90,7 +93,6 @@ public class EarlyWarningManage {
         records.setNoticeMethod(noticeMethod);
         records.setNoticeContent(content);
         records.setProjectName(project.getProjectName());
-        records.setRuleType(WarningRuleTypeEnum.PROCESS_WARNING.getCode());
         records.setWarningUsername(Objects.nonNull(user) ? user.getUsername() : StringUtils.EMPTY);
         records.setWarningEmployeecode(employeeCode);
         earlyWarningRecordsService.save(records);

pmapi/src/main/java/com/ningdatech/pmapi/sys/model/req/WarningListReq.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
@@ -28,9 +29,11 @@ public class WarningListReq extends PagePo {
     private String buildOrgName;
 
     @ApiModelProperty("提醒开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
 
     @ApiModelProperty("提醒结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
     @ApiModelProperty("区域Code")