diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java index d3a09887..cc56b08a 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java @@ -246,6 +246,7 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date plannedCompletionDate; + private String alertType; @TableField(exist = false) private String unit; diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java index 9637d1a9..92283923 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java @@ -26,7 +26,9 @@ import com.kms.earlyStage.domain.SpecialProjectInfo; import com.kms.enterprise.domain.dto.NumDto; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.warn.domain.BsSgcJsjdWarnResult; import com.kms.warn.domain.dto.FlowDto; +import com.kms.warn.mapper.BsSgcJsjdWarnResultMapper; import lombok.Data; import org.apache.ibatis.reflection.wrapper.BaseWrapper; import org.springframework.beans.factory.annotation.Autowired; @@ -49,6 +51,8 @@ public class BsSgcjsjdBuiProInfoService extends BaseServiceqw=new QueryWrapper<>(); + List bsSgcJsjdWarnResults = bsSgcJsjdWarnResultMapper.selectList(qw.eq("pro_no", proNo).eq("pro_code", proCode)); + for (BsSgcJsjdWarnResult bs:bsSgcJsjdWarnResults){ + if (ObjectUtil.isNotEmpty(bs)&&ObjectUtil.isNotEmpty(bs.getAlertType())){ + if (bs.getAlertType().equals("0")){ + list.getRecords().get(i).setAlertType("预警"); + break; + }else { + list.getRecords().get(i).setAlertType("提醒"); + } + } + } + } return list; }