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

合并分支 'fix_20230627' 到 'master'

Browse Source 
Fix 20230627

查看合并请求 laws-nio/laws-weilai!341
This commit is contained in:
高嵩
2023-06-28 11:48:34 +08:00
parent 2c7060bc91 f4259a34a5
commit 9a71922035
8 changed files with 109 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java
+3 -3
View File
@@ -415,11 +415,11 @@ public class ToDoCenterServiceImpl implements IToDoCenterService {
data.setTaskDefinitionKeyName(taskDefinitionKeyName);
}
}
// 如果是清单确认流程，将任务节点设置为 清单校核：Checklist verification
// 如果是清单确认流程，将任务节点设置为 任务发起：Task initiation
if (StringUtils.equals(data.getFlowType(), FlowTypeEnum.QDQR.getValue())) {
String taskDefinitionKeyName = "清单校核";
String taskDefinitionKeyName = "任务发起";
if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
taskDefinitionKeyName = "Checklist verification";
taskDefinitionKeyName = "Task initiation";
}
data.setTaskDefinitionKeyName(taskDefinitionKeyName);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationFlowNodeEnum.java
+1 -1
View File
@@ -25,7 +25,7 @@ public enum CertificationFlowNodeEnum {
* 任务办理 -> 责任人接受之后，等待提交交付物
* 任务审查 -> 责任人提交交付物之后，认证工程师审查。
*/
CHECKLIST_VERIFICATION ("Checklist verification","清单校核","Checklist verification"),
CHECKLIST_VERIFICATION ("Task initiation","任务发起","Task initiation"),
TASK_RESPONSIBILITY_CONFIRMATION ("Task responsibility confirmation","任务责任确认","Task responsibility confirmation"),
TASK_HANDLING ("Task handling","任务办理","Task handling"),
TASK_REVIEW ("Task Review","任务审查","Task Review"),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java
+26 -27
View File
@@ -203,7 +203,6 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
* @return
*/
public boolean checkData(String projectLibraryId,String id,String cut){
boolean result = false;
int roleCode = checkUserRole(projectLibraryId);
if(roleCode != Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
String message = "";
@@ -215,31 +214,31 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
throw new JeroBootException(message);
}
try{
if(StringUtils.isNotEmpty(id)){
QueryWrapper<ProjectCertificationDirectoryEO> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ProjectCertificationDirectoryEO::getId,id);
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
queryWrapper.lambda().eq(ProjectCertificationDirectoryEO::getCreateBy,currentUser.getUsername());
Integer integer = this.baseMapper.selectCount(queryWrapper);
if(integer > 0){
result = true;
}else {
String message = "";
if(StringUtils.equals(cut, CutEnum.CN.getValue())){
message = "用户只能对自己创建的数据进行操作。";
}else if(StringUtils.equals(cut, CutEnum.EN.getValue())){
message = "Users can only operate data created by themselves.";
}
throw new JeroBootException(message);
}
}else {
result = true;
}
}catch (Exception ex){
log.error("验证项目库-认证目录数据异常：" + ex.getMessage());
throw new JeroBootException("验证项目库-认证目录数据异常！");
}
return result;
// try{
// if(StringUtils.isNotEmpty(id)){
// QueryWrapper<ProjectCertificationDirectoryEO> queryWrapper = new QueryWrapper<>();
// queryWrapper.lambda().eq(ProjectCertificationDirectoryEO::getId,id);
// LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// queryWrapper.lambda().eq(ProjectCertificationDirectoryEO::getCreateBy,currentUser.getUsername());
// Integer integer = this.baseMapper.selectCount(queryWrapper);
// if(integer > 0){
// result = true;
// }else {
// String message = "";
// if(StringUtils.equals(cut, CutEnum.CN.getValue())){
// message = "用户只能对自己创建的数据进行操作。";
// }else if(StringUtils.equals(cut, CutEnum.EN.getValue())){
// message = "Users can only operate data created by themselves.";
// }
// throw new JeroBootException(message);
// }
// }else {
// result = true;
// }
// }catch (Exception ex){
// log.error("验证项目库-认证目录数据异常：" + ex.getMessage());
// throw new JeroBootException("验证项目库-认证目录数据异常！");
// }
return true;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+3 -3
View File
@@ -2055,7 +2055,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
private void projectDetailsStatisticsGroupByTerritoryHearSort(List<Map<String, Object>> dataList,Map<String,Object> params) {
String orderByField = (String) params.get("orderByField");
String orderBy = (String) params.get("orderBy");
if(CollectionUtils.isNotEmpty(dataList) && StringUtils.isNotEmpty(orderByField) && StringUtils.isNotEmpty(orderBy)){
if(CollectionUtils.isNotEmpty(dataList)){
Collator comparator = Collator.getInstance(Locale.CHINESE);
Collections.sort(dataList,(data1,data2)->{
String param1 = "";
@@ -2071,10 +2071,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
}
}
// 数量
if("amount".equals(orderByField)){
if(StringUtils.isEmpty(orderByField) || "amount".equals(orderByField)){
double p1 = data1.get("amount") != null ? (double) data1.get("amount") : 0;
double p2 = data2.get("amount") != null ? (double) data2.get("amount") : 0;
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
if(StringUtils.isEmpty(orderBy) || OrderEnum.POSITIVE.getValue().equals(orderBy)){
return (int)(p1 - p2);
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
return (int)(p2 - p1);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+65 -1
View File
@@ -15,6 +15,7 @@ import com.jero.modules.cert.collect.entity.ParamsManifestEO;
import com.jero.modules.cert.collect.enums.CollectManifestStatisticsStateEnum;
import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
import com.jero.modules.cert.collect.service.IParamsManifestEOService;
import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
import com.jero.modules.cert.template.enums.ControlTypeEnum;
import com.jero.modules.project.entity.*;
import com.jero.modules.project.enums.*;
@@ -50,6 +51,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.CountDownLatch;
@@ -171,7 +173,8 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp);
}
}
Collections.sort(projectLibraryBaseList);
//Collections.sort(projectLibraryBaseList);
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region");
for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
@@ -194,6 +197,67 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
}
}
}
Collections.sort(result, new Comparator<Map<String,Object>>() {
@Override
public int compare(Map<String, Object> o1, Map<String, Object> o2) {
ProjectLibraryBase p1 = (ProjectLibraryBase) o1.get("projectInfo");
ProjectLibraryBase p2 = (ProjectLibraryBase) o2.get("projectInfo");
Date defaultTime = null;
try {
defaultTime = sdf.parse("2099-01-01");
} catch (ParseException e) {
e.printStackTrace();
}
Date HomoKoTime1 = defaultTime;
List<List<TimeNodeVO>> tnvList1 = (List<List<TimeNodeVO>>) o1.get("data");
if (CollectionUtils.isNotEmpty(tnvList1)) {
List<TimeNodeVO> tnList1 = tnvList1.get(0);
if (CollectionUtils.isNotEmpty(tnList1)) {
for (TimeNodeVO tnv1 : tnList1) {
if (tnv1.getName().equals(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName())
|| tnv1.getName().equals(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getValue())) {
HomoKoTime1 = tnv1.getTime();
}
}
}
}
Date HomoKoTime2 = defaultTime;
List<List<TimeNodeVO>> tnvList2 = (List<List<TimeNodeVO>>) o2.get("data");
if (CollectionUtils.isNotEmpty(tnvList2)) {
List<TimeNodeVO> tnList2 = tnvList2.get(0);
if (CollectionUtils.isNotEmpty(tnList2)) {
for (TimeNodeVO tnv2 : tnList2) {
if (tnv2.getName().equals(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName())
|| tnv2.getName().equals(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getValue())) {
HomoKoTime2 = tnv2.getTime();
}
}
}
}
//首先排序-认证批准
if(!HomoKoTime1.equals(HomoKoTime2)){
return HomoKoTime1.compareTo(HomoKoTime2);//升序
}
if (!p1.getProjectName().equals(p2.getProjectName())) {
return p1.getProjectName().compareTo(p2.getProjectName());//升序
}
if (!p1.getYearName().equals(p2.getYearName())) {
if (p1.getYearName().length() != p2.getYearName().length()) {
return p1.getYearName().length() - p2.getYearName().length();
} else {
return p1.getYearName().compareTo(p2.getYearName());//升序
}
}
if (!p1.getTargetMarket().equals(p2.getTargetMarket())) {
return p1.getTargetMarket().compareTo(p2.getTargetMarket());//升序
}
if (!p1.getProjectVersion().equals(p2.getProjectVersion())) {
return Integer.valueOf(p1.getProjectVersion()) - Integer.valueOf(p2.getProjectVersion());//升序
}
return 0;
}
});
return result;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
+7 -1
View File
@@ -44,6 +44,7 @@ import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.swing.*;
import java.util.*;
import java.util.stream.Collectors;
@@ -413,6 +414,8 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
}
if(StringUtils.isBlank(searchVO.getSelectValue())){
searchVO.setSelectValue(SEARCH_FLAG);
}else{
searchVO.setSelectValue(searchVO.getSelectValue().replaceAll("/", "\\\\/"));
}
//判断索引是否存在
@@ -428,6 +431,9 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
}
String selectValue = searchVO.getSelectValue();
String selectValueTwo = searchVO.getSelectValueTwo();
if(StringUtils.isNotEmpty(selectValueTwo)){
selectValueTwo = selectValueTwo.replaceAll("/", "\\\\/");
}
//1. 需要查询的字段
List<String> fieldList = new ArrayList<>();
fieldList.add("serial_number");//权重6
@@ -532,7 +538,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
if(StringUtils.isEmpty(selectValue) || StringUtils.equals(selectValue,SEARCH_FLAG)){
Map<String,Object> createTime = new HashMap<>();
Map<String,Object> createTime1 = new HashMap<>();
createTime.put("order","desc");
createTime.put("order", "desc");
createTime1.put("create_time",createTime);
sort.putAll(createTime1);
}else {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+3 -3
View File
@@ -778,11 +778,11 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
data.setTaskDefinitionKeyName(taskDefinitionKeyName);
}
}
// 如果是清单确认流程，将任务节点设置为 清单校核：Checklist verification
// 如果是清单确认流程，将任务节点设置为 verdutyId：Task initiation
if(StringUtils.equals(data.getFlowType(),FlowTypeEnum.QDQR.getValue())){
String taskDefinitionKeyName = "清单校核";
String taskDefinitionKeyName = "任务发起";
if(StringUtils.equals(cut,CutEnum.EN.getValue())){
taskDefinitionKeyName = "Checklist verification";
taskDefinitionKeyName = "Task initiation";
}
data.setTaskDefinitionKeyName(taskDefinitionKeyName);
}
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+1 -1
View File
@@ -247,7 +247,7 @@
{{$t('Assignedby')}}
</div>
<!-- 导出-->
<div @click="handleExport" class="operator-text" v-if='currentPersonRole == "sdt" || currentPersonRole == "admin"'>
<div @click="handleExport" class="operator-text" v-if='currentPersonRole == "sdt" || currentPersonRole == "admin" || currentPersonRole == "studio"'>
<a-icon type="export"/>
{{$t('dataExport')}}
</div>