diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java index eee95e3d9..9d946189b 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java @@ -16,8 +16,8 @@ public class SensitiveReportExcel implements Serializable { /** * 对应用户名称 */ - @Excel(name = "*工程名称", width = 30) - @NotBlank(message = "工程名称不能为空") + @Excel(name = "*项目名称", width = 30) + @NotBlank(message = "项目名称不能为空") private String projectName; @Excel(name = "*用户性质", width = 30, replace = {"新建电网工程_0", "扩建电网工程_1", "新建非线性负荷用户_2", "扩建非线性负荷用户_3", "新建新能源发电站_4", "扩建新能源发电站_5", "_null"}) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java index 20ee564c2..96e20957f 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java @@ -15,8 +15,8 @@ public class SensitiveUserSExcel implements Serializable { /** * 对应用户名称 */ - @Excel(name = "*工程名称", width = 30) - @NotBlank(message = "工程名称不能为空") + @Excel(name = "*项目名称", width = 30) + @NotBlank(message = "项目名称不能为空") private String projectName; @Excel(name = "*所属地市", width = 30) diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java index 1d2dcc73f..f6c8b9a1f 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java @@ -265,10 +265,7 @@ public class SurveyPlanServiceImpl extends ServiceImpl") .concat(surveyPlanVO.getPlanName()); bpmInstanceInfo.setInstanceSign(sign); return bpmInstanceInfo; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java index a09db9dad..d991b5bdd 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java @@ -301,8 +301,7 @@ public class SurveyTestServiceImpl extends ServiceImpl