Merge branch 'dev_20230424_TJ' into fix_20230508

# Conflicts:
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java

@@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.modules.dummy.entity.DummyInventoryInfoEO;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -57,7 +58,16 @@ public class AuthDummyInventoryInfoEOController extends JeroController<AuthDummy
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<AuthDummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryInfoEO, req.getParameterMap());
-		queryWrapper.orderByDesc("create_time");
+		String orderByField = authDummyInventoryInfoEO.getOrderByField();
+		String orderBy = authDummyInventoryInfoEO.getOrderBy();
+		// 如果排序字段不为空
+		if(StringUtils.isNotEmpty(orderByField)){
+			// 转换字段
+			orderByField = this.authDummyInventoryInfoEOService.convertOrderByField(orderByField);
+			queryWrapper.orderBy(true, "1".equals(orderBy)?true:false, orderByField);
+		}else {
+			queryWrapper.orderByDesc("create_time");
+		}
 		Page<AuthDummyInventoryInfoEO> page = new Page<AuthDummyInventoryInfoEO>(pageNo, pageSize);
 		IPage<AuthDummyInventoryInfoEO> pageList = this.authDummyInventoryInfoEOService.page(page, queryWrapper);
 		this.authDummyInventoryInfoEOService.disposeData(pageList.getRecords(),authDummyInventoryInfoEO.getCut());

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java

@@ -113,6 +113,8 @@ public interface IAuthDummyInventoryInfoEOService extends IService<AuthDummyInve
 	 */
 	void disposeData(List<AuthDummyInventoryInfoEO> datas, String cut);
 
+	String convertOrderByField(String orderByField);
+
 	/**
 	 * 获取责任领域名称
 	 * @param cut

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java

@@ -607,8 +607,8 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 		List<AuthDummyInventoryInfoEO> authDummyInventoryInfoEOList = this.list(queryWrapper);
 		return authDummyInventoryInfoEOList;
     }
-
+	@Override
-	private String convertOrderByField(String orderByField) {
+	public String convertOrderByField(String orderByField) {
 		if(StringUtils.isEmpty(orderByField)){
 			return null;
 		}
@@ -620,6 +620,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			case "serialNumber" : return "serial_number";
 			case "dutyTerritory" : return "duty_territory";
 			case "deliverableType" : return "deliverable_type";
+			case "attestationTypeName" : return "attestation_type";
 			default: return null;
 		}
 	}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java

@@ -106,12 +106,87 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 
 	@Override
 	public IPage<DummyInventoryInfoEO> getPageInfo(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
+		long startTime = System.currentTimeMillis();
+		String orderBy = dummyInventoryInfoEO.getOrderBy();
+		String orderByField = dummyInventoryInfoEO.getOrderByField();
+
 		QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO, req.getParameterMap());
-		queryWrapper.orderByDesc("create_time");
+		//新车型实施日期,在产车实施日期（排序）
+		if("xin1_che1_xing2_shi2_shi1_ri4_qi1".equals(orderByField) || "implement_time".equals(orderByField)){
+			if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+				queryWrapper.orderByAsc(orderByField);
+			}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+				queryWrapper.orderByDesc(orderByField);
+			}
+		}
+		if(StringUtils.isBlank(orderByField)){
+			queryWrapper.orderByDesc("create_time","serial_number");
+		}
+
+		if(StringUtils.isNotEmpty(dummyInventoryInfoEO.getImplementTimeString())){
+			String[] implementTimeArr = dummyInventoryInfoEO.getImplementTimeString().split(",");
+
+			QueryWrapper<PhasedImplementationDetailsEO> phasedDetailsQueryWrap = new QueryWrapper<>();
+			phasedDetailsQueryWrap.lambda().like(PhasedImplementationDetailsEO::getImplementationType,ImplementationTypeEnum.CAR_IN_PRODUCTION.getItemValue());
+			phasedDetailsQueryWrap.lambda().ge(PhasedImplementationDetailsEO::getImplementationDate,implementTimeArr[0]);
+			phasedDetailsQueryWrap.lambda().le(PhasedImplementationDetailsEO::getImplementationDate,implementTimeArr[1]);
+			List<String> bussDocumentLibraryIdList = this.phasedImplementationDetailsEOService.list(phasedDetailsQueryWrap)
+					.stream().map(PhasedImplementationDetailsEO::getBussDocumentLibraryId).collect(Collectors.toList());
+
+			queryWrapper.and(query -> {
+				query.and(q -> {
+					q.lambda().ge(DummyInventoryInfoEO::getImplementTime,implementTimeArr[0]);
+					q.lambda().le(DummyInventoryInfoEO::getImplementTime,implementTimeArr[1]);
+				});
+
+				if(CollectionUtils.isNotEmpty(bussDocumentLibraryIdList)){
+					query.or(q -> {
+						q.lambda().in(DummyInventoryInfoEO::getBussDocumentLibraryId,bussDocumentLibraryIdList);
+					});
+				}
+			});
+		}
+		if(StringUtils.isNotEmpty(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String())){
+			String[] newCarTimeArr = dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String().split(",");
+
+			QueryWrapper<PhasedImplementationDetailsEO> phasedDetailsQueryWrap = new QueryWrapper<>();
+			phasedDetailsQueryWrap.lambda().like(PhasedImplementationDetailsEO::getImplementationType,ImplementationTypeEnum.NEW_CAR_MODEL.getItemValue());
+			phasedDetailsQueryWrap.lambda().ge(PhasedImplementationDetailsEO::getImplementationDate,newCarTimeArr[0]);
+			phasedDetailsQueryWrap.lambda().le(PhasedImplementationDetailsEO::getImplementationDate,newCarTimeArr[1]);
+			List<String> bussDocumentLibraryIdList = this.phasedImplementationDetailsEOService.list(phasedDetailsQueryWrap)
+					.stream().map(PhasedImplementationDetailsEO::getBussDocumentLibraryId).collect(Collectors.toList());
+
+			queryWrapper.and(query -> {
+				query.and(q -> {
+					q.lambda().ge(DummyInventoryInfoEO::getXin1Che1Xing2Shi2Shi1Ri4Qi1,newCarTimeArr[0]);
+					q.lambda().le(DummyInventoryInfoEO::getXin1Che1Xing2Shi2Shi1Ri4Qi1,newCarTimeArr[1]);
+				});
+				if(CollectionUtils.isNotEmpty(bussDocumentLibraryIdList)){
+					query.or(q -> {
+						q.lambda().in(DummyInventoryInfoEO::getBussDocumentLibraryId,bussDocumentLibraryIdList);
+					});
+				}
+			});
+		}
+
 		Page<DummyInventoryInfoEO> page = new Page<DummyInventoryInfoEO>(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize());
 		IPage<DummyInventoryInfoEO> pageInfo = this.page(page, queryWrapper);
 		//技术领域处理
 //    treeDict(dummyInventoryInfoEO, pageInfo);
+		List<DummyInventoryInfoEO> dummyInventoryInfoEOList = pageInfo.getRecords();
+		log.info("一阶段消耗时间：" + (System.currentTimeMillis() - startTime));
+		//数据字典
+		List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
+		//技术领域处理
+		treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList,sysDictItems);
+		log.info("二阶段消耗时间：" + (System.currentTimeMillis() - startTime));
+		this.dataDicDispose(dummyInventoryInfoEOList,dummyInventoryInfoEO.getCut());
+		log.info("三阶段消耗时间：" + (System.currentTimeMillis() - startTime));
+		treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList,sysDictItems);
+		// 数据处理
+		this.disposeData(dummyInventoryInfoEOList,dummyInventoryInfoEO.getCut());
+		//表头排序
+		dummyInventoryInfoEOList = hearSort(orderBy, orderByField, dummyInventoryInfoEOList);
 		return pageInfo;
 	}
 
@@ -634,18 +709,18 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			if("xin1Che1Xing2Shi2Shi1Ri4Qi1String".equals(orderByField)){
 				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
 					Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
-						if(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null && e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null){
+						if(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1String() != null && e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1String() != null){
-							String e1xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
+							String e1xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
-							String e2xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
+							String e2xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
 							return comparator.compare(e1xin1Che1Xing2Shi2Shi1Ri4Qi,e2xin1Che1Xing2Shi2Shi1Ri4Qi);
 						}
 						return 0;
 					});
 				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
 					Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
-						if(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null && e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null){
+						if(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1String() != null && e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1String() != null){
-							String e1xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
+							String e1xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
-							String e2xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
+							String e2xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
 							return comparator.compare(e2xin1Che1Xing2Shi2Shi1Ri4Qi,e1xin1Che1Xing2Shi2Shi1Ri4Qi);
 						}
 						return 0;
@@ -656,18 +731,18 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			if("implementTimeString".equals(orderByField)){
 				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
 					Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
-						if(e1.getImplementTime() != null && e2.getImplementTime() != null){
+						if(e1.getImplementTimeString() != null && e2.getImplementTimeString() != null){
-							String e1ImplementTime = DateUtils.formatDate(e1.getImplementTime());
+							String e1ImplementTime = DateUtils.formatDate(e1.getImplementTimeString());
-							String e2ImplementTime = DateUtils.formatDate(e2.getImplementTime());
+							String e2ImplementTime = DateUtils.formatDate(e2.getImplementTimeString());
 							return comparator.compare(e1ImplementTime,e2ImplementTime);
 						}
 						return 0;
 					});
 				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
 					Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
-						if(e1.getImplementTime() != null && e2.getImplementTime() != null){
+						if(e1.getImplementTimeString() != null && e2.getImplementTimeString() != null){
-							String e1ImplementTime = DateUtils.formatDate(e1.getImplementTime());
+							String e1ImplementTime = DateUtils.formatDate(e1.getImplementTimeString());
-							String e2ImplementTime = DateUtils.formatDate(e2.getImplementTime());
+							String e2ImplementTime = DateUtils.formatDate(e2.getImplementTimeString());
 							return comparator.compare(e2ImplementTime,e1ImplementTime);
 						}
 						return 0;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java

@@ -81,9 +81,7 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap());
+		IPage<ProjectLawsInventoryEO> pageList = this.projectLawsInventoryEOService.queryPage(projectLawsInventoryEO,pageNo,pageSize,req);
-		Page<ProjectLawsInventoryEO> page = new Page<ProjectLawsInventoryEO>(pageNo, pageSize);
-		IPage<ProjectLawsInventoryEO> pageList = projectLawsInventoryEOService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 
@@ -566,4 +564,11 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
 						   @RequestParam Map<String,Object> params) {
 		this.projectLawsInventoryEOService.exportNotComplianList(response,request, params);
 	}
+
+	@AutoLog(value = "项目库-法规清单表-定版校验")
+	@ApiOperation(value="项目库-法规清单表-定版校验", notes="项目库-法规清单表-定版校验")
+	@GetMapping(value = "/finalizationVerify")
+	public Result<?> finalizationVerify(@RequestParam Map<String,Object> params){
+		return this.projectLawsInventoryEOService.finalizationVerify(params);
+	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java

@@ -304,4 +304,8 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 	 * @return
 	 */
 	Map<String, Object> groupByVerifyStatus(List<ProjectLawsInventoryEO> pliEos);
+
+	IPage<ProjectLawsInventoryEO> queryPage(ProjectLawsInventoryEO projectLawsInventoryEO, Integer pageNo, Integer pageSize, HttpServletRequest req);
+
+	Result<?> finalizationVerify(Map<String, Object> params);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java

@@ -1467,6 +1467,23 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				}
 			}
 
+			// 认证类型 attestationTypeName
+			if(StringUtils.equals("attestationTypeName",orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1, e2)->{
+						String e1AttestationTypeName = (StringUtils.isNotEmpty(e1.getAttestationTypeName()) ? e1.getAttestationTypeName() : "");
+						String e2AttestationTypeName = (StringUtils.isNotEmpty(e2.getAttestationTypeName()) ? e2.getAttestationTypeName() : "");
+						return comparator.compare(e1AttestationTypeName,e2AttestationTypeName);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(datas,(e1,e2)->{
+						String e1AttestationTypeName = (StringUtils.isNotEmpty(e1.getAttestationTypeName()) ? e1.getAttestationTypeName() : "");
+						String e2AttestationTypeName = (StringUtils.isNotEmpty(e2.getAttestationTypeName()) ? e2.getAttestationTypeName() : "");
+						return comparator.compare(e2AttestationTypeName,e1AttestationTypeName);
+					});
+				}
+			}
+
 			// WVTA ID wvtaId
 			if(StringUtils.equals("wvtaId",orderByField)){
 				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -1454,6 +1454,38 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					});
 				}
 			}
+			// 认证类型 attestationType
+			if("attestationType".equals(orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(result,(e1, e2)->{
+						String e1AttestationType = StringUtils.isNotBlank(e1.getAttestationType()) ? e1.getAttestationType() : "";
+						String e2AttestationType = StringUtils.isNotBlank(e2.getAttestationType()) ? e2.getAttestationType() : "";
+						return comparator.compare(e1AttestationType,e2AttestationType);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(result,(e1,e2)->{
+						String e1AttestationType = StringUtils.isNotBlank(e1.getAttestationType()) ? e1.getAttestationType() : "";
+						String e2AttestationType = StringUtils.isNotBlank(e2.getAttestationType()) ? e2.getAttestationType() : "";
+						return comparator.compare(e2AttestationType,e1AttestationType);
+					});
+				}
+			}
+			// 认证级别 attestationRank
+			if("attestationRank".equals(orderByField)){
+				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					Collections.sort(result,(e1, e2)->{
+						String e1AttestationRank = StringUtils.isNotBlank(e1.getAttestationRank()) ? e1.getAttestationRank() : "";
+						String e2AttestationRank = StringUtils.isNotBlank(e2.getAttestationRank()) ? e2.getAttestationRank() : "";
+						return comparator.compare(e1AttestationRank,e2AttestationRank);
+					});
+				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+					Collections.sort(result,(e1,e2)->{
+						String e1AttestationRank = StringUtils.isNotBlank(e1.getAttestationRank()) ? e1.getAttestationRank() : "";
+						String e2AttestationRank = StringUtils.isNotBlank(e2.getAttestationRank()) ? e2.getAttestationRank() : "";
+						return comparator.compare(e2AttestationRank,e1AttestationRank);
+					});
+				}
+			}
 			// WVTA ID  wvtaId
 			if ("wvtaId".equals(orderByField)) {
 				if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
@@ -13364,6 +13396,103 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		return result;
 	}
 
+	@Override
+	public IPage<ProjectLawsInventoryEO> queryPage(ProjectLawsInventoryEO projectLawsInventoryEO, Integer pageNo, Integer pageSize, HttpServletRequest req) {
+		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time","serial_number");
+
+		String dutyTerritoryStr = "";
+		if (StringUtils.isNotEmpty(projectLawsInventoryEO.getDutyTerritory())) {
+			dutyTerritoryStr = projectLawsInventoryEO.getDutyTerritory();
+			projectLawsInventoryEO.setDutyTerritory(null);
+		}
+
+		String projectLibraryId = projectLawsInventoryEO.getProjectLibraryId();
+
+		if (StringUtils.isNotEmpty(dutyTerritoryStr)) {
+			String finalDutyTerritoryStr = dutyTerritoryStr.replaceAll("\\*","");
+			queryWrapper.and(query -> {
+				query.lambda().like(ProjectLawsInventoryEO::getDutyTerritory, finalDutyTerritoryStr);
+				if(StringUtils.contains(finalDutyTerritoryStr,",")){
+					String[] dutyTerritoryArr = finalDutyTerritoryStr.split(",");
+					for (String duty : dutyTerritoryArr) {
+						query.or(q -> {
+							q.like("duty_territory",duty);
+						});
+					}
+				}
+			});
+		}
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
+		if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())){
+			// 创建查询权限
+			this.createQueryPermission(isProjectRole,currentUser,queryWrapper);
+		}
+
+		Page<ProjectLawsInventoryEO> page = new Page<ProjectLawsInventoryEO>(pageNo, pageSize);
+		IPage<ProjectLawsInventoryEO> pageList = this.page(page, queryWrapper);
+		List<ProjectLawsInventoryEO> result = pageList.getRecords();
+		if (isProjectRole == Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())) {
+			//查当前用户Viewer对应责任领域
+			List<String> dutyTerritoryList = this.projectUserDutyTerritoryService.queryDutyTerritoryByUserId(currentUser.getId());
+			if (ObjectUtils.isNotEmpty(dutyTerritoryList)) {
+				result = result.stream().filter(e -> dutyTerritoryList.contains(e.getDutyTerritory())).collect(Collectors.toList());
+			} else {
+				result = new ArrayList<>();
+			}
+		}
+		this.dataDispose(result,currentUser,isProjectRole,projectLawsInventoryEO.getCut());
+		this.dataDictDispose(result,projectLawsInventoryEO.getCut());
+		//表头排序
+		result = this.hearSort(projectLawsInventoryEO, result);
+		return pageList;
+	}
+
+	@Override
+	public Result<?> finalizationVerify(Map<String, Object> params) {
+		boolean result = false; // 返回true，可以定版，返回false 不能定版
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		if(StringUtils.isEmpty(projectLibraryId)){
+			throw new JeroBootException("项目库id不能为空，请检查！");
+		}
+		QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
+		pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
+		List<ProjectLawsInventoryEO> pliEoList = this.list(pliQueryWrap);
+		if(CollectionUtils.isNotEmpty(pliEoList)){
+			for (ProjectLawsInventoryEO pliEo : pliEoList) {
+				String designFlowStatus = pliEo.getDesignFlowStatus();
+				String verifyFlowStatus = pliEo.getVerifyFlowStatus();
+				boolean designFlowStatusFlag = (
+						StringUtils.equals(designFlowStatus,ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+								|| StringUtils.equals(designFlowStatus,ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+								|| StringUtils.equals(designFlowStatus,ComplianceFlowStatusEnum.CONFORMITY.getValue())
+								|| StringUtils.equals(designFlowStatus,ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+								|| StringUtils.equals(designFlowStatus,ComplianceFlowStatusEnum.TO_TRACK.getValue())
+								|| StringUtils.equals(designFlowStatus,ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+				);
+				boolean verifyFlowStatusFlag = (
+						StringUtils.equals(verifyFlowStatus,ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
+								|| StringUtils.equals(verifyFlowStatus,ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
+								|| StringUtils.equals(verifyFlowStatus,ComplianceFlowStatusEnum.CONFORMITY.getValue())
+								|| StringUtils.equals(verifyFlowStatus,ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+								|| StringUtils.equals(verifyFlowStatus,ComplianceFlowStatusEnum.TO_TRACK.getValue())
+								|| StringUtils.equals(verifyFlowStatus,ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+				);
+				if(designFlowStatusFlag && verifyFlowStatusFlag){
+					result = true;
+				}else {
+					result = false;
+					break;
+				}
+			}
+		}
+		return Result.OK(result);
+	}
+
 	@Override
 	public Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params) {
 		Map<String, List<Map<String, Object>>> result = new HashMap<>();

jero-web/src/App.vue

@@ -180,18 +180,18 @@
   }
 
   .ant-table-column-title {
-    font-weight: bold!important;
+    font-weight: bold !important;
   }
 
   .ant-table-thead > tr > th {
-    background: #f3f6f6!important;
+    background: #f3f6f6 !important;
-    padding-top: 12px!important;
+    padding-top: 12px !important;
-    padding-bottom: 12px!important;
+    padding-bottom: 12px !important;
   }
 
   .ant-table-tbody > tr > td {
-    padding-top: 12px!important;
+    padding-top: 12px !important;
-    padding-bottom: 12px!important;
+    padding-bottom: 12px !important;
   }
 
   .ant-tooltip-inner {
@@ -206,4 +206,13 @@
   .ant-menu-inline-collapsed-tooltip a {
     color: #333 !important;
   }
+
+  .page .ant-select-selection--single {
+    height: 32px !important;
+    line-height: 32px !important;
+  }
+  .page .ant-select-selection__rendered{
+    height: 32px !important;
+    line-height: 32px !important;
+  }
 </style>

jero-web/src/common/lang/en-us.js

@@ -1827,4 +1827,5 @@ module.exports = {
   proportion:'Proportion',
   projectProgressStatistics:'Project Progress Statistics',
   GRPSystemProjectProgressStatistics:'GRP system project progress statistics',
+  statisticalNodes:'Statistical Nodes',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1928,4 +1928,5 @@ module.exports = {
   proportion:'占比',
   projectProgressStatistics:'项目进度统计',
   GRPSystemProjectProgressStatistics:'GRP系统项目进度统计',
+  statisticalNodes:'统计节点',
 }

jero-web/src/views/documentManage/tags/dialog/DicList.vue

@@ -75,6 +75,9 @@
             <a-input-number v-model="form.sortOrder" :placeholder="$t('PleaseEnterDisplayOrder')" style="width: 100%"
                             :min="1" :max="99999" :formatter="limitNumber" :parser="limitNumber"/>
           </a-form-model-item>
+          <a-form-model-item :label="$t('statisticalNodes')" prop="statNode" v-if="record.id == '1513417672023441409'">
+            <a-input v-model.trim="form.statNode" :placeholder="$t('pleaseEnter')+$t('statisticalNodes')"/>
+          </a-form-model-item>
           <a-form-model-item :label="$t('describe')" prop="description">
             <a-input v-model.trim="form.description" :placeholder="$t('PleaseEnterDescription')"/>
           </a-form-model-item>
@@ -139,6 +142,14 @@
             { min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' },
             { validator: this.test }
           ],
+          statNode:[
+            { required: true, message: this.$t('statisticalNodes')+ this.$t('cannotEmpty'), trigger: 'blur' },
+            {
+              max: 100,
+              message: this.$t('statisticalNodes') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
           valueType:[
             { required: true, message: this.$t('type') + this.$t('cannotEmpty'), trigger: 'change' },
           ],

jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue

@@ -314,9 +314,22 @@
                 <span v-else>--</span>
               </span>
             </a-table>
-            <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
+            <div class="page" v-if="dataSource.length > 0">
-              {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}
+              <a-pagination
+                :show-total="total => $t('total')+` ${total} `+$t('strip')"
+                show-quick-jumper
+                show-size-changer
+                :page-size.sync="pageSize"
+                :total="total"
+                :pageSizeOptions="['50','100','200','300']"
+                :current="pageNo"
+                @change="onChangeSize"
+                @showSizeChange="SizeChange"
+              />
             </div>
+<!--            <div class="buttom-box" v-if="dataSource && dataSource.length > 0">-->
+<!--              {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}-->
+<!--            </div>-->
           </div>
         </a-card>
       </div>
@@ -403,6 +416,9 @@
         orderBy: '1',
         istable: true,
         orderByField: '',
+        pageNo: 1,
+        pageSize: 50,
+        total: 0,
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         dataSourceFile: [],
@@ -424,7 +440,7 @@
         url: {
           addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy',
           queryConditionInventory: '/dummy/dummyInventoryInfoEO/queryConditionInventory',
-          list: '/dummy/dummyInventoryInfoEO/list',
+          list: '/dummy/dummyInventoryInfoEO/page',
           addModel: '/dummy/dummyInventoryInfoEO/add',
           editModel: '/dummy/dummyInventoryInfoEO/edit',
           deleteBatch: '/dummy/dummyInventoryInfoEO/deleteBatch',
@@ -1231,6 +1247,15 @@
           }
         })
       },
+      onChangeSize(page, pageSize) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
       getList() {
         if (this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String && this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String instanceof Array) {
           this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String = this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String.join(',')
@@ -1243,12 +1268,21 @@
           ...this.queryParamQuery,
           orderBy: this.orderBy,
           orderByField: this.orderByField,
-          dummyInventoryBaseId: this.$route.query.id
+          dummyInventoryBaseId: this.$route.query.id,
+          pageNo: this.pageNo,
+          pageSize: this.pageSize
         }
         this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
-            this.dataSource = res.result || []
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            // this.dataSource = res.result || []
             if (this.dataSource.length == 0) {
               this.$nextTick(() => {
                 let anttablebody = document.getElementsByClassName('ant-table-body')
@@ -1727,6 +1761,11 @@
     padding-left: 16px!important;
     border-right: 1px solid #e8e8e8;
   }
+  .page {
+    text-align: right;
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
 </style>
 <style lang="less">
   .popconfirm {

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -388,22 +388,22 @@
               :title="text">{{text}}</a>
         </span>
       </a-table>
-      <!--      <div class="page" v-if="dataSource.length > 0">-->
+      <div class="page" v-if="dataSource.length > 0">
-      <!--        <a-pagination-->
+        <a-pagination
-      <!--          :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
-      <!--          show-quick-jumper-->
+          show-quick-jumper
-      <!--          show-size-changer-->
+          show-size-changer
-      <!--          :page-size.sync="pageSize"-->
+          :page-size.sync="pageSize"
-      <!--          :total="total"-->
+          :total="total"
-      <!--          :pageSizeOptions="['50','100','200','300']"-->
+          :pageSizeOptions="['50','100','200','300']"
-      <!--          :current="pageNo"-->
+          :current="pageNo"
-      <!--          @change="onChangeSize"-->
+          @change="onChangeSize"
-      <!--          @showSizeChange="SizeChange"-->
+          @showSizeChange="SizeChange"
-      <!--        />-->
+        />
-      <!--      </div>-->
-      <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
-        {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
       </div>
+<!--      <div class="buttom-box" v-if="dataSource && dataSource.length > 0">-->
+<!--        {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}-->
+<!--      </div>-->
     </div>
     <listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
     <listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
@@ -748,14 +748,16 @@
             align: 'left',
             ellipsis: true,
             dataIndex: 'attestationType_dictText',
-            width: 180
+            width: 180,
+            sorter: true,
           },
           {
             title: this.$t('certificationLevel'),
             align: 'left',
             ellipsis: true,
             dataIndex: 'attestationRank_dictText',
-            width: 180
+            width: 180,
+            sorter: true,
           },
           {
             title: this.$t('areaOfResponsibility'),
@@ -1176,7 +1178,7 @@
         url: {
           addModelList: '/project/projectLawsInventoryEO/queryPageDummy',
           queryConditionInventory: '/project/projectLawsInventoryEO/queryConditionInventory',
-          list: '/project/projectLawsInventoryEO/list',
+          list: '/project/projectLawsInventoryEO/page',
           addModel: 'project/projectLawsInventoryEO/add',
           editModel: '/project/projectLawsInventoryEO/edit',
           deleteBatch: '/project/projectLawsInventoryEO/deleteBatch',
@@ -1520,7 +1522,7 @@
         }
       },
       modifyOperatorForm() {
-        this
+        this.pageNo = 1
         this.getList()
       },
       //收起/展开
@@ -2156,6 +2158,7 @@
               if (res.success) {
                 _this.$message.success(_this.$t('OperationSuccessful'))
                 _this.selectedRowKeys = []
+                _this.pageNo = 1
                 _this.getList()
               } else {
                 _this.$message.warning(_this.$t('operationFailed'))
@@ -2188,6 +2191,7 @@
             // this.confirmLoadingRoleSwitching = false
             this.$emit('getRoleSwitch', roleSwitchingCode)
             this.selectedRowKeys = []
+            this.pageNo = 1
             this.getList()
           } else {
             this.confirmLoadingRoleSwitching = false
@@ -2306,6 +2310,7 @@
       //搜索
       searchQuery() {
         this.selectedRowKeys = []
+        this.pageNo = 1
         this.getList()
       },
       //重置
@@ -2319,6 +2324,7 @@
 
       addModelList() {
         this.selectedRowKeys = []
+        this.pageNo = 1
         this.getList()
       },
       customizeListForm(val) {
@@ -2329,6 +2335,7 @@
       },
       transferListFormHomo() {
         this.$refs.transferListRef.handleCancel()
+        this.pageNo = 1
         this.getList()
       },
       handleSuperQuery(params, matchType) {
@@ -2342,6 +2349,7 @@
           sqp['superQueryMatchType'] = matchType
         }
         this.queryParamQuery = sqp
+        this.pageNo = 1
         this.getList()
       },
 
@@ -2363,20 +2371,24 @@
           this.orderByField = 'verifyFlowStatus'
         }  else if (sorter.columnKey == 'designFlowStatusName') {
           this.orderByField = 'designFlowStatus'
+        } else if (sorter.columnKey == 'attestationType_dictText') {
+          this.orderByField = 'attestationType'
+        } else if (sorter.columnKey == 'attestationRank_dictText') {
+          this.orderByField = 'attestationRank'
         } else {
           this.orderByField = sorter.columnKey
         }
         this.getList()
       },
-      // onChangeSize(page, pageSize) {
+      onChangeSize(page, pageSize) {
-      //   this.pageNo = page
+        this.pageNo = page
-      //   this.getList()
+        this.getList()
-      // },
+      },
-      // SizeChange(page, pageSize) {
+      SizeChange(page, pageSize) {
-      //   this.pageNo = 1
+        this.pageNo = 1
-      //   this.pageSize = pageSize
+        this.pageSize = pageSize
-      //   this.getList()
+        this.getList()
-      // },
+      },
       getList() {
         let roleCode = this.roleSwitchingCode
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
@@ -2395,20 +2407,20 @@
           projectLibraryId: this.$route.query.id,
           orderBy: this.orderBy,
           orderByField: this.orderByField,
-          roleCode: roleCode
+          roleCode: roleCode,
-          // pageNo: this.pageNo,
+          pageNo: this.pageNo,
-          // pageSize: this.pageSize
+          pageSize: this.pageSize
         }
         this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
-            // if (res.result.current > 1 && res.result.records.length == 0) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
-            //   this.pageNo = 1
+              this.pageNo = 1
-            //   this.getList()
+              this.getList()
-            //   return
+              return
-            // }
+            }
-            this.dataSource = res.result || []
+            this.dataSource = res.result.records || []
-            // this.total = res.result.total
+            this.total = res.result.total
             this.loading = false
             this.JLoading = false
             if (this.dataSource.length == 0) {

jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue

@@ -237,9 +237,22 @@
               </span>
 
             </a-table>
-            <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
+            <div class="page" v-if="dataSource.length > 0">
-              {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}
+              <a-pagination
+                :show-total="total => $t('total')+` ${total} `+$t('strip')"
+                show-quick-jumper
+                show-size-changer
+                :page-size.sync="pageSize"
+                :total="total"
+                :pageSizeOptions="['50','100','200','300']"
+                :current="pageNo"
+                @change="onChangeSize"
+                @showSizeChange="SizeChange"
+              />
             </div>
+<!--            <div class="buttom-box" v-if="dataSource && dataSource.length > 0">-->
+<!--              {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}-->
+<!--            </div>-->
           </div>
         </a-card>
       </div>
@@ -288,8 +301,11 @@
         isbutton: false,
         toggleSearchStatus:false,
         dataSource: [],
+        pageNo: 1,
+        pageSize: 50,
+        total: 0,
         url: {
-          list: '/authDummy/authDummyInventoryInfoEO/list',
+          list: '/authDummy/authDummyInventoryInfoEO/page',
           logList: '/authDummy/authDummyLog/page',//更新log
           exportTemplate: '/authDummy/authDummyInventoryInfoEO/exportTemplate',//模板下载
           exportData: '/authDummy/authDummyInventoryInfoEO/exportData',//导出
@@ -535,17 +551,35 @@
       getPersonnelList(){
          this.getList()
       },
+      onChangeSize(page, pageSize) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
       getList() {
         let query = {
           ...this.queryParam,
           orderBy: this.orderBy,
           orderByField: this.orderByField,
-          authDummyInventoryBaseId: this.$route.query.id
+          authDummyInventoryBaseId: this.$route.query.id,
+          pageNo: this.pageNo,
+          pageSize: this.pageSize
         }
         this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
-            this.dataSource = res.result || []
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            // this.dataSource = res.result || []
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
             this.loading = false
           } else {
             this.loading = false
@@ -723,4 +757,12 @@
     color: #00B3BE;
     cursor: pointer;
   }
+  .page {
+    text-align: right;
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
+  ::v-deep .ant-card-body {
+    padding: 14px 32px 0 32px;
+  }
 </style>