Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.修改列表模板名称

Browse Source
This commit is contained in:
wr
2024-08-23 11:49:07 +08:00
parent ceb95be340
commit 6e8a188172
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java
View File

@@ -16,8 +16,8 @@ public class SensitiveReportExcel implements Serializable {
/** /**
* 对应用户名称 * 对应用户名称
*/ */
@Excel(name = "*工程名称", width = 30) @Excel(name = "*项目名称", width = 30)
@NotBlank(message = "工程名称不能为空") @NotBlank(message = "项目名称不能为空")
private String projectName; private String projectName;
@Excel(name = "*用户性质", width = 30, replace = {"新建电网工程_0", "扩建电网工程_1", "新建非线性负荷用户_2", "扩建非线性负荷用户_3", "新建新能源发电站_4", "扩建新能源发电站_5", "_null"}) @Excel(name = "*用户性质", width = 30, replace = {"新建电网工程_0", "扩建电网工程_1", "新建非线性负荷用户_2", "扩建非线性负荷用户_3", "新建新能源发电站_4", "扩建新能源发电站_5", "_null"})

4
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java
View File

@@ -15,8 +15,8 @@ public class SensitiveUserSExcel implements Serializable {
/** /**
* 对应用户名称 * 对应用户名称
*/ */
@Excel(name = "*工程名称", width = 30) @Excel(name = "*项目名称", width = 30)
@NotBlank(message = "工程名称不能为空") @NotBlank(message = "项目名称不能为空")
private String projectName; private String projectName;
@Excel(name = "*所属地市", width = 30) @Excel(name = "*所属地市", width = 30)

5
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java
View File

@@ -265,10 +265,7 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
if(Objects.nonNull(data)){ if(Objects.nonNull(data)){
name = data.getName(); name = data.getName();
} }
String sign = "监督类型为：".concat(name) String sign = name.concat("->")
.concat("，由")
.concat(surveyPlanVO.getDeptName())
.concat("负责")
.concat(surveyPlanVO.getPlanName()); .concat(surveyPlanVO.getPlanName());
bpmInstanceInfo.setInstanceSign(sign); bpmInstanceInfo.setInstanceSign(sign);
return bpmInstanceInfo; return bpmInstanceInfo;

3
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
View File

@@ -301,8 +301,7 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
if(Objects.nonNull(data)){ if(Objects.nonNull(data)){
name = data.getName(); name = data.getName();
} }
String sign = "监督类型为：".concat(name) String sign = name.concat("由")
.concat("由")
.concat(surveyTestVO.getDeptName()) .concat(surveyTestVO.getDeptName())
.concat("负责") .concat("负责")
.concat(surveyTestVO.getPlanName()) .concat(surveyTestVO.getPlanName())