WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
高嵩
2023-03-28 23:08:50 +08:00
parent d27cfec343 5f8fdd5f31
commit 3775a08c23
5 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java
+1
View File
@@ -659,6 +659,7 @@ public class SysPermissionController {
flowTypeList.add("3");
flowTypeList.add("4");
flowTypeList.add("10");
flowTypeList.add("21");
params.put("flowTypeList",flowTypeList);
//存在待办任务标识，true为有
boolean existTaskFlag = false;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
+5 -5
View File
@@ -63,22 +63,22 @@ public class AuthDummyInventoryInfoEO implements Serializable {
private java.lang.String sysOrgCode;
/**类别*/
@Excel(name = "类别", width = 15)
@Excel(name = "*类别", width = 15)
@ApiModelProperty(value = "类别")
private java.lang.String category;
/**检验项目*/
@Excel(name = "检验项目", width = 15)
@Excel(name = "*检验项目", width = 15)
@ApiModelProperty(value = "检验项目")
private java.lang.String inspectionItem;
/**配置项*/
@Excel(name = "配置项", width = 15)
@Excel(name = "*配置项", width = 15)
@ApiModelProperty(value = "配置项")
private java.lang.String configItem;
/**WVTA ID*/
@Excel(name = "WVTA ID", width = 15)
@Excel(name = "*WVTA ID", width = 15)
@ApiModelProperty(value = "WVTA ID")
private java.lang.String wvtaId;
@@ -107,7 +107,7 @@ public class AuthDummyInventoryInfoEO implements Serializable {
@ApiModelProperty(value = "交付物类型")
private String deliverableType;
@TableField(exist = false)
@Excel(name = "交付物类型", width = 15)
@Excel(name = "*交付物类型", width = 15)
// 交付物类型名称
private String deliverableTypeName;
// 交付物类型名称-英文
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java
+5 -5
View File
@@ -60,22 +60,22 @@ public class AuthDummyInventoryInfoEOEn implements Serializable {
private String sysOrgCode;
/**类别*/
@Excel(name = "Category", width = 15)
@Excel(name = "*Category", width = 15)
@ApiModelProperty(value = "类别")
private String category;
/**检验项目*/
@Excel(name = "Inspection Items", width = 15)
@Excel(name = "*Inspection Items", width = 15)
@ApiModelProperty(value = "检验项目")
private String inspectionItem;
/**配置项*/
@Excel(name = "Configuration Item", width = 15)
@Excel(name = "*Configuration Item", width = 15)
@ApiModelProperty(value = "配置项")
private String configItem;
/**WVTA ID*/
@Excel(name = "WVTA ID", width = 15)
@Excel(name = "*WVTA ID", width = 15)
@ApiModelProperty(value = "WVTA ID")
private String wvtaId;
@@ -104,7 +104,7 @@ public class AuthDummyInventoryInfoEOEn implements Serializable {
@ApiModelProperty(value = "交付物类型")
private String deliverableType;
@TableField(exist = false)
@Excel(name = "Deliverable Type", width = 15)
@Excel(name = "*Deliverable Type", width = 15)
// 交付物类型名称
private String deliverableTypeName;
// 交付物类型名称-英文
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+14 -16
View File
@@ -859,18 +859,18 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
try {
String title = "";
if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
title = "类别,检验项目,配置项,WVTA ID," +
"*编号,*责任领域,交付物类型,";
title = "*类别,*检验项目,*配置项,*WVTA ID," +
"*编号,*责任领域,*交付物类型,";
}else{
title = "Category,Inspection Items,Configuration Item,WVTA ID," +
"*Number,*Responsible Field,Deliverable Type,";
title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
"*Number,*Responsible Field,*Deliverable Type,";
}
List<String> list = Arrays.asList(title.split(","));
int index = 0;
if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
index = list.indexOf("交付物类型") + 1;
index = list.indexOf("*交付物类型") + 1;
}else{
index = list.indexOf("Deliverable Type") + 1;
index = list.indexOf("*Deliverable Type") + 1;
}
//创建临时文件夹
@@ -897,18 +897,16 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
explain = "填写说明\n" +
"1.导入数据从第三行开始\n" +
"2.所有带*号的字段必须填写\n"+
"3.交付物类型,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
"4.编号,责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" +
"5.类别,WVTA ID,检验项目,配置项填写文本内容\n" +
"6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
"3.交付物类型,责任领域字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
"4.编号,类别,检验项目,配置项，WVTA ID,填写文本内容\n" +
"5.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx" ;
}else{
explain = "Filling explanation\n" +
"1.Import data starts at the fourth line\n" +
"1.Import data starts at the third line\n" +
"2.All fields marked with * must be filled in\n"+
"3.Deliverable Type,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.Number,Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.Category,WVTA ID,Inspection Items,Configuration Item，Fill in the text\n" +
"6.Deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B.docx";
"3.Deliverable Type,Responsible,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.Number,Category,Inspection Items,Configuration Item,WVTA ID,Fill in the text\n" +
"5.Deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B.docx";
}
@@ -926,7 +924,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
}
}
}else{
short height = (short) (7 * 252);
short height = (short) (6 * 252);
row.setHeight((short) height);
Cell cell = row.createCell(0);
cell.setCellStyle(cellStyleTemp);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+9 -3
View File
@@ -3742,11 +3742,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
"5.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
}else{
explain = "Filling explanation\n" +
"1.Import data starts at the fourth line\n" +
"1.Import data starts at the third line\n" +
"2.All fields marked with * must be filled in\n"+
"3.Assignee,Deliverable Type,Eng. Interface,Standard No,Responsible Field,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.Category,WVTA ID,Configuration Item,Inspection Items,Fill in the text\n" +
"5.Deliverable Template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. doc is stored under the AAA standard number, enter AAA/B. doc";
"5.Deliverable Template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. docx is stored under the AAA standard number, enter AAA/B. docx";
}
for(int i = 0; i < 2; i++){
//表头
@@ -3785,8 +3785,14 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
@Override
public Result<?> citeDeliverable(JSONObject json) {
String resultMsg = "引用交付物成功！";
String cut = json.getString("cut");
String resultMsg = "";
if(StringUtils.equals(cut,CutEnum.CN.getValue())){
resultMsg = "引用交付物成功！";
}else {
resultMsg = "Successfully referenced deliverables!";
}
String projectCertificationInventoryIds = json.getString("projectCertificationInventoryIds");
if(StringUtils.isEmpty(projectCertificationInventoryIds)){