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

合并分支 'fix_2nd_period' 到 'master'

Browse Source 
Fix 2nd period

查看合并请求 laws-nio/laws-weilai!269
This commit is contained in:
高嵩
2022-12-30 20:16:28 +08:00
parent 195417c2d8 e3273a8765
commit 0f09c75dce
4 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+38
View File
@@ -3931,6 +3931,44 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String dutyTerritory = (String) record1.get("duty_territory");
String state = (String) record1.get("state");
String control_type = record1.get("control_type").toString();
//references_col -> #a# #
String references_col = record1.get("references_col").toString();
String[] references_colArr = references_col.split("#");
if(StringUtils.equals(control_type,ControlTypeEnum.FILE.getValue())){
String fileId = references_colArr[2];
List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId);
String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName;
}else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_FILE.getValue())
||StringUtils.equals(control_type,ControlTypeEnum.PULL_SINGLE_FILE.getValue())
||StringUtils.equals(control_type,ControlTypeEnum.PULL_MORE_FILE.getValue())){
String fileId = references_colArr[2];
List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId);
String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName;
}else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue())){
String fileId = references_colArr[2];
List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId);
String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName;
}
StringBuilder references_colSb = new StringBuilder();
for (String col : references_col.split("#")) {
if(StringUtils.isNotEmpty(col) && !StringUtils.equals(col," ")){
references_colSb.append(col).append("#");
}
}
if(StringUtils.isNotEmpty(references_colSb)){
references_col = references_colSb.substring(0,references_colSb.length()-1);
}else {
references_col = references_colSb.toString();
}
record1.put("references_col",references_col);
// 处理负责领域
record1.put("duty_territory", dutyTerritoryMap.get(dutyTerritory));
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java
+2
View File
@@ -48,7 +48,9 @@ public class ProjectUserPermissionController extends JeroController<ProjectUserP
@ApiOperation(value="权限同步接口", notes="权限同步接口")
@PostMapping(value = "/sync")
public void sync(){
log.info("=================== 权限同步开始 ======================");
projectUserPermissionService.sync();
log.info("=================== 权限同步完毕 ======================");
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserPermissionServiceImpl.java
+2
View File
@@ -34,6 +34,7 @@ import java.util.Date;
import java.util.Set;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
/**
* @Description: 项目权限表
@@ -42,6 +43,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
* @Version: V1.0
*/
@Service
@Transactional
public class ProjectUserPermissionServiceImpl extends ServiceImpl<ProjectUserPermissionMapper, ProjectUserPermission> implements IProjectUserPermissionService {
@Autowired
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
+7 -4
View File
@@ -1304,11 +1304,11 @@ public class WordUtil {
return text;
}
if (text.equals("New Car Model")) {
text = "New Type ";
text = "New Type";
return text;
}
if (text.equals("Models In Production")) {
text = "New Vehicle ";
text = "New Vehicle";
return text;
}
return text;
@@ -1348,7 +1348,7 @@ public class WordUtil {
blank = "\r\n";
break;
case "New Car Model":
blank = " ";
blank = " ";
break;
case "Models In Production":
blank = "";
@@ -1366,7 +1366,7 @@ public class WordUtil {
blank = " ";
break;
case "Public Notice":
blank = " ";
blank = " ";
break;
case "Release":
blank = "";
@@ -1389,6 +1389,9 @@ public class WordUtil {
case "if fitted":
blank = "";
break;
case "Publicity":
blank = " ";
break;
default:
break;
}