diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 64e066ab9..44b400025 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -2586,7 +2586,7 @@ public class FileSpiltService { String path = splitUrl+"/jero-boot/sys/split/file/getImage?fileUrl="+filepathandname; CosBootUtil.uploadByte(bytev, filepathandname); String imgCon = path; - String imgConVal = ""; + String imgConVal = ""; message.getItemsCondi().add(imgConVal); message.setItermsConditions(message.getItermsConditions() + imgConVal); itemsValList.add(getSplitItemsValObject(message.getId(), SplitFilePragraTypeEnum.IMG.getValue(), imgCon, message.getItemsCondi().size(), null)); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 8b487319b..5f0c328d1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -158,7 +158,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl"; + valContent = ""; // valContent = valEO.getItemContent(); } else if ("TABLE".equals(valEO.getType())) { valContent = valEO.getItemContent(); @@ -233,7 +233,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl"; + valContent = ""; // valContent = valEO.getItemContent(); } else if ("TABLE".equals(valEO.getType())) { valContent = valEO.getItemContent(); @@ -1693,7 +1693,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl> read(File file, List dbfieldList, String[] titles, String cut) throws IOException, InvalidFormatException { + private List> read(File file, List dbfieldList, String[] titles, String cut) throws Exception { //最终返回数据 List> list = new ArrayList<>(); @@ -1744,10 +1744,38 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl map = null; //获得所有数据 - //从第x行开始获取 + //从第3行开始获取，第一行是表头，第二行是填写说明 for (int x = 2; x <= totalRowNum; x++) { map = new HashMap(); //获得第i行对象 @@ -2461,7 +2489,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl"; } else if ("IMG".equals(valEO.getType())) { - valContent += ""; + valContent += ""; // valContent += valEO.getItemContent(); } else if ("TABLE".equals(valEO.getType())) { valContent += valEO.getItemContent(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java index b1dba1d41..ef7064226 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java @@ -64,8 +64,8 @@ public class LawsWarnController { @ApiOperation(value = "推送") @GetMapping(value = "/warnPullMessage") // @RequiresPermissions("document:pullMessage") - public Result pullMessage(String departIds,String userIds,String documentIds) { - lawsWarnService.warnPullMessage(departIds,userIds,documentIds); + public Result pullMessage(String departIds,String userIds,String documentIds,String flag) { + lawsWarnService.warnPullMessage(departIds,userIds,documentIds,flag); return Result.OK("推送成功"); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index 302b9a27f..beab9d1eb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -338,7 +338,7 @@ public class LawsWarnService { } - public String warnPullMessage(String departIds, String userIds, String documentIds) { + public String warnPullMessage(String departIds, String userIds, String documentIds,String flag) { Set allDepartIds = new HashSet<>(); //查询当前部门下所有部门 if (StringUtils.isNotEmpty(departIds)) { @@ -379,6 +379,25 @@ public class LawsWarnService { List urlList = new ArrayList<>(); List hrefList = new ArrayList<>(); for (Map map : mapList) { + //1-->新车型实施日期, 2-->在产车实施日期 + String timeContent = ""; + if("1".equals(flag)){ + String value = StringUtils.valueOf(map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1")); + if(StringUtils.isNotBlank(value)){ + if(value.contains(" ")){ + value = value.split(" ")[0]; + } + timeContent =" to you as the implementation date of the new model is " +value; + } + }else if("2".equals(flag)){ + String value = StringUtils.valueOf(map.get("implement_time")); + if(StringUtils.isNotBlank(value)){ + if(value.contains(" ")){ + value = value.split(" ")[0]; + } + timeContent =" to you as the implementation date of vehicle production is " +value; + } + } serialNumberList.add(StringUtils.valueOf(map.get("serial_number"))); String url = backUrl + "/docManage/library/detail?id=" + map.get("id") + "&title=" + map.get("title") + @@ -388,13 +407,16 @@ public class LawsWarnService { "&title=" + map.get("title") + "&serial_number=" + map.get("serial_number") + "'" + " target='_blank'>" + map.get("serial_number") + ""; urlList.add(url); - hrefList.add(href); + hrefList.add(href+timeContent); } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you. Please be reminded to check it out."; - String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out."; + String content = StringUtils.join(serialNumberList, ",") + " has been shared with you, please check."; + //消息详情模板 + // XXX has pushed GB 7258 to you as the implementation date of vehicle production is XXXX-XX-XX， + // GB 7258 to you as the implementation date of vehicle production is XXXX-XX-XX， Please be reminded to check it out. + String contentInfo = sysUser.getUsername() + " has pushed " + StringUtils.join(hrefList, ",") + ", Please be reminded to check it out."; String title = content; //封装消息的实体类 @@ -409,10 +431,28 @@ public class LawsWarnService { mapList.stream().forEach(e->{ if(s.contains((String)e.get("id"))){ String serialNumber = StringUtils.valueOf(e.get("serial_number")); - list.add(serialNumber); + String timeContent = ""; + if("1".equals(flag)){ + String value = StringUtils.valueOf(e.get("xin1_che1_xing2_shi2_shi1_ri4_qi1")); + if(StringUtils.isNotBlank(value)){ + if(value.contains(" ")){ + value = value.split(" ")[0]; + } + timeContent =" to you as the implementation date of the new model is " +value; + } + }else if("2".equals(flag)){ + String value = StringUtils.valueOf(e.get("implement_time")); + if(StringUtils.isNotBlank(value)){ + if(value.contains(" ")){ + value = value.split(" ")[0]; + } + timeContent =" to you as the implementation date of vehicle production is " +value; + } + } + list.add(serialNumber + timeContent); } }); - String contentTemp = sysUser.getUsername() + " pushed " + StringUtils.join(list, ",") + " to you. Please be reminded to check it out."; + String contentTemp = sysUser.getUsername() + " has pushed " + StringUtils.join(list, ",") + ", Please be reminded to check it out."; iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode); } } catch (IOException e) { @@ -421,4 +461,87 @@ public class LawsWarnService { bussDocumentLibraryEOService.sendWebsocket(documentIds, contentInfo); return "推送成功"; } +// public String warnPullMessage(String departIds, String userIds, String documentIds,String flag) { +// Set allDepartIds = new HashSet<>(); +// //查询当前部门下所有部门 +// if (StringUtils.isNotEmpty(departIds)) { +// String[] departIdArr = departIds.split(","); +// for (String departId : departIdArr) { +// List subDepIdsByDepId = sysDepartService.getSubDepIdsByDepId(departId); +// allDepartIds.addAll(subDepIdsByDepId); +// } +// } +// +// List userIdList = new ArrayList<>(); +// List thirdIdList = new ArrayList<>(); +// if (StringUtils.isNotBlank(departIds)) { +// //查询部门下的人员 +// List userList = new ArrayList<>(); +// if(allDepartIds.size() != 0){ +// userList = sysUserService.getUserListByDepIds(new ArrayList<>(allDepartIds)); +// } +// +// if (userList.size() != 0) { +// userIdList = userList.stream().map(SysUser::getId).distinct().collect(Collectors.toList()); +// thirdIdList = userList.stream().map(SysUser::getThirdId).distinct().collect(Collectors.toList()); +// } +// } +// if(userIdList.size() == 0 && StringUtils.isNotBlank(userIds)){ +// List sysUsers = sysUserService.listByIds(Arrays.asList(userIds.split(","))); +// if(sysUsers.size() != 0){ +// List userId = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList()); +// List thirdId = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); +// userIdList.addAll(userId); +// thirdIdList.addAll(thirdId); +// } +// } +// +// //查询文档 +// List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(documentIds); +// List serialNumberList = new ArrayList<>(); +// List urlList = new ArrayList<>(); +// List hrefList = new ArrayList<>(); +// for (Map map : mapList) { +// serialNumberList.add(StringUtils.valueOf(map.get("serial_number"))); +// String url = backUrl + "/docManage/library/detail?id=" + map.get("id") + +// "&title=" + map.get("title") + +// "&serial_number=" + map.get("serial_number"); +// +// String href = "" + map.get("serial_number") + ""; +// urlList.add(url); +// hrefList.add(href); +// } +// +// +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you. Please be reminded to check it out."; +// String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out."; +// String title = content; +// +// //封装消息的实体类 +// SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.PUSH.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); +// sysAnnouncementService.saveAnnouncement(sysAnnouncement); +// bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo); +// //飞书 +// try { +// for (String s : urlList) { +// String encode = UriEncoder.encode(s); +// List list = new ArrayList<>(); +// mapList.stream().forEach(e->{ +// if(s.contains((String)e.get("id"))){ +// String serialNumber = StringUtils.valueOf(e.get("serial_number")); +// list.add(serialNumber); +// } +// }); +// String contentTemp = sysUser.getUsername() + " pushed " + StringUtils.join(list, ",") + " to you. Please be reminded to check it out."; +// iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// bussDocumentLibraryEOService.sendWebsocket(documentIds, contentInfo); +// return "推送成功"; +// } } diff --git a/jero-web/src/components/OcrTable/index.vue b/jero-web/src/components/OcrTable/index.vue index eca906c74..ab2772555 100644 --- a/jero-web/src/components/OcrTable/index.vue +++ b/jero-web/src/components/OcrTable/index.vue @@ -124,6 +124,10 @@ this.getData() this.getTableList() }) + eventBUs.$on('searchGetData', target => { + this.getData() + this.getTableList() + }) this.getData() this.getTableList() this.userData = this.userInfo() diff --git a/jero-web/src/components/PersonnelSelectionAll/index.vue b/jero-web/src/components/PersonnelSelectionAll/index.vue new file mode 100644 index 000000000..9a050d228 --- /dev/null +++ b/jero-web/src/components/PersonnelSelectionAll/index.vue @@ -0,0 +1,318 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue index 6d2e41c15..55dabd96e 100644 --- a/jero-web/src/components/SplitDetailTable/index.vue +++ b/jero-web/src/components/SplitDetailTable/index.vue @@ -136,6 +136,11 @@ this.getData() this.getTableList() }) + eventBUs.$on('searchGetData', target => { + this.selectedRowKeys = [] + this.getData() + this.getTableList() + }) this.getData() this.getTableList() }, diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index 10b6a4a38..25849e0dc 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -129,6 +129,11 @@ this.getData() this.getTableList() }) + eventBUs.$on('searchGetData', target => { + this.selectedRowKeys = [] + this.getData() + this.getTableList() + }) this.getData() this.getTableList() this.userData = this.userInfo() diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue index ed28b1112..09d7b89e6 100644 --- a/jero-web/src/views/documentManage/ocr/index.vue +++ b/jero-web/src/views/documentManage/ocr/index.vue @@ -285,7 +285,7 @@ .then( (res) =>{ if (res.data.success) { this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') }else{ this.$message.warning(this.$t('operationFailed')) } @@ -362,7 +362,7 @@ getAction(`ocr/ocrRecord/delete`,params).then(res=> { if(res.success){ this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') }else{ this.$message.warning(this.$t('operationFailed')) } diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index 4a8283bd1..b5637ac12 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -152,6 +152,11 @@ } getAction(`split/sarFileSplitInfo/page`,params).then(res=>{ if(res.success){ + if (res.result.current > 1 && res.result.records.length == 0) { + this.queryParams.pageNo = res.result.current - 1 + this.loadData() + return + } this.tableData=[...res.result.records] this.loading=false this.total=res.result.total @@ -206,7 +211,7 @@ // this.queryParams.pageNo=this.queryParams.pageNo-1 // } this.selectedRowKeys=[] - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') // this.loadData() }else{ this.$message.warning(this.$t('operationFailed')) @@ -232,7 +237,7 @@ // if (this.tableData && this.tableData.length == 1 && this.queryParams.pageNo != 1) { // this.queryParams.pageNo = this.queryParams.pageNo - 1 // } - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') // this.loadData() } else { this.$message.warning(this.$t('operationFailed')) diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue index bd2816cf4..e32f15a33 100644 --- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue +++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue @@ -235,7 +235,7 @@ }, //模板下载 downLoad(){ - let name = this.$t('documentSplitTemplate')+'.xls' + let name = this.$t('documentSplitTemplate')+'.xlsx' downloadFile('split/sarFileSplitItems/exportTemplate',name, {}) }, //保存 diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index b3807a125..2504c6a8f 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -819,7 +819,7 @@ }, //模板下载 handleDownManage() { - let name = this.$t('documentSplitTemplate') + '.xls' + let name = this.$t('documentSplitTemplate') + '.xlsx' downloadFile('split/sarFileSplitItems/exportTemplate', name, {}) }, //合并条款 @@ -853,7 +853,7 @@ info_id: this.infoId } - eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam))) + eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam))) // eventBUs.$emit('searchReset') this.selectedRowKeys = [] } else { @@ -895,7 +895,7 @@ info_id: this.infoId } - eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam))) + eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam))) }, //批量删除 handleBatCancel() { @@ -934,7 +934,7 @@ info_id: this.infoId } - eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam))) + eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam))) this.selectClear() // eventBUs.$emit('searchReset') } else { @@ -1004,7 +1004,7 @@ info_id: this.infoId } - eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam))) + eventBUs.$emit('searchGetData', JSON.parse(JSON.stringify(queryParam))) // eventBUs.$emit('searchReset') } else { this.$message.warning(this.$t('operationFailed')) diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index 398f4e56c..383f989e0 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -196,6 +196,11 @@ getAction(`sys/dictItem/page`, params).then(res => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.queryParams.pageNo = 1 + this.loadData() + return + } this.total = res.result.total this.tableData = [...res.result.records] this.dataFlag = true @@ -210,6 +215,11 @@ sysDictId: this.record.id, isTagDict: 1 }).then(res => { + if (res.result.current > 1 && res.result.records.length == 0) { + this.queryParams.pageNo = 1 + this.loadData() + return + } this.tabletreeDataSource = [...res.result.records] this.total = res.result.total let data = this.toTree(this.tabletreeDataSource) diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue index 62ef32172..1596e96d7 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue @@ -88,7 +88,7 @@ show-size-changer :page-size.sync="queryParams.pageSize" :total="total" - :current="pageNo" + :current="queryParams.pageNo" @change="onChangePage" @showSizeChange="SizeChange" /> @@ -233,12 +233,21 @@ // sys/dict/page postAction(`sys/dict/tagDictPage`, params).then(res => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.queryParams.pageNo = 1 + this.loadData() + return + } + this.loading = false this.total = res.result.total this.tableData = [...res.result.records] + }else{ + this.loading = false } - }).finally(() => { - this.loading = false }) + // .finally(() => { + // this.loading = false + //}) }, //查询 searchQuery() { @@ -260,7 +269,7 @@ }, hideModal() { this.form.dictName = this.form.dictName.trim() - if (this.form.description){ + if (this.form.description) { this.form.description = this.form.description.trim() } let params = { diff --git a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue index 3b8025019..2643c4b11 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue @@ -305,6 +305,16 @@ } postAction(`tag/onlCgformTag/page`, paramsItem).then(res => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + if (this.key == 1) { + this.queryParamOne.pageNo = 1 + this.loadData(1) + } else if (this.key == 2) { + this.queryParamTwo.pageNo = 1 + this.loadData(0) + } + return + } this.total = res.result.total this.tableData = [...res.result.records] this.spinning = false diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 601ecb279..7ef96c8bb 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -206,7 +206,7 @@ :title="$t('Administrativeprivileges')">{{$t('Administrativeprivileges')}} - {{$t('Checkthepermissions')}} -
+ {{$t('BatchMaintenanceProgress')}}
+ {{$t('BatchChangeStatus')}}