From 87cab0fa11280d603dd7c2dff3d5c49c61204b09 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 14 Jul 2022 15:56:43 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluationResultsList.vue | 1 + .../RegulationMonthlyManagement.vue | 6 +- .../components/monthlyReportRegulations.vue | 97 +++++++++++++------ .../components/feedbackInformation.vue | 7 ++ .../processForm/regulatoryProcess/index.vue | 16 +-- 5 files changed, 91 insertions(+), 36 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index 61b515122..60fa6094d 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -92,6 +92,7 @@ title: this.$t('relevantSections'), align: 'center', dataIndex: 'relatedSection', + ellipsis: true, width: 180 }, { diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue index 171c1e423..b10d4c466 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue @@ -220,7 +220,11 @@ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix) window.open(url, '_blank') } else { - this.$message.warning(this.$t('theDoesNotSupportPreview')) + if (item.createBy == this.userInfo().username){ + downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username }) + }else{ + this.$message.warning(this.$t('theDoesNotSupportPreview')) + } } }, download(item) { diff --git a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue index 5f005c4e8..b70c93ce8 100644 --- a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue +++ b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue @@ -2,60 +2,98 @@
{{this.$t('monthlyReportRegulations')}}
-
+
More
-
-
+
+
{{item.name}}
-
{{item.time}}
+
{{item.createTime}}
+
+ +
+ {{$t('dataLoading')}}
\ No newline at end of file From fad922ffba7c1f6ed8e3f324b1de2e9767afe5c7 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 14 Jul 2022 16:58:47 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 50832f377..73f000e8c 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1180,12 +1180,12 @@ selectedRowKeysValue.push(res) } }) + console.log(selectedRowKeysValue) for (let i = 0; i < selectedRowKeysValue.length; i++) { let postDateobj = {} let itemIn = Object.keys(selectedRowKeysValue[i]) for (let j = 0; j < itemIn.length; j++) { - if (itemIn[j] !== 'sdt') { - console.log(selectedRowKeysValue[i][itemIn[j]]) + if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { @@ -1244,7 +1244,7 @@ let postDateobj = {} let itemIn = Object.keys(selectedRowKeysValue[i]) for (let j = 0; j < itemIn.length; j++) { - if (itemIn[j] !== 'sdt') { + if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { From db50bba7f2e3fcc0920481a7b7624f5e011febb0 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 14 Jul 2022 17:19:52 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 + jero-web/src/common/lang/zh-cn.js | 3 + .../documentComparison/index.vue | 2 +- .../documentTranslation/index.vue | 330 ++++++++++++++++++ 4 files changed, 337 insertions(+), 1 deletion(-) create mode 100644 jero-web/src/views/documentTools/documentTranslation/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d8636703c..41480baf8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1142,4 +1142,7 @@ module.exports = { comparisonResults:'Comparison results', Published:'Published', initiateComparison:'Initiate comparison', + translationLanguage:'Translation language', + translationResults:'Translation results', + conversionTime:'Conversion time', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 15bbd4c33..98f362d10 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1146,4 +1146,7 @@ module.exports = { comparisonResults:'对比结果', Published:'已发布', initiateComparison:'发起对比', + translationLanguage:'翻译语言', + translationResults:'翻译结果', + conversionTime:'转换时间', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 034141af2..9038af696 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -73,7 +73,7 @@ {{$t('comparisonResults')}} - {{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}} + {{!record.state || record.state == 0 ? $t('release') :$t('withdraw')}} {{$t('edit')}} {{$t('delete')}} diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue new file mode 100644 index 000000000..28593c4e6 --- /dev/null +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -0,0 +1,330 @@ + + + + \ No newline at end of file From 37ad2c8e3d8b04c8c17347ae281483d6ef1ddcee Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 14 Jul 2022 17:45:04 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluationResultsClause.vue | 10 ++- .../components/evaluationResultsWhole.vue | 12 +++- .../components/initiatingProcess.vue | 63 +++++++++++-------- .../technologyAssessment/index.vue | 19 ++++-- 4 files changed, 69 insertions(+), 35 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index 7ddf2723d..0eb59c342 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -230,7 +230,15 @@ }, methods: { CurrentStandard() { - + let query = { + firstInitiation: '2', + whetherTobring: '1' + } + let newUrl = this.$router.resolve({ + path: '/evaluationInitiationProcess', + query: query + }) + window.open(newUrl.href, '_blank') }, onSelectChange(value) { this.selectedRowKeys = value diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue index cde7e8ce8..8d83206c5 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue @@ -81,7 +81,7 @@ dataSource: [], url: { list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/list', - exportData:'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip', + exportData: 'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip' }, selectedRowKeys: [], loading: false, @@ -114,7 +114,15 @@ }, methods: { CurrentStandard() { - + let query = { + firstInitiation: '2', + whetherTobring: '2' + } + let newUrl = this.$router.resolve({ + path: '/evaluationInitiationProcess', + query: query + }) + window.open(newUrl.href, '_blank') }, onSelectChange(value) { diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index e5d051ce9..b89247abf 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -5,34 +5,37 @@ />
-
+
- - -
- +
+ + +
+ +
+ @@ -238,6 +241,7 @@ }, searchParmes: {}, selectedRowKeysRecord: [], + whetherDisplay: false, columns: [ { title: this.$t('standard'), @@ -293,6 +297,11 @@ } else { this.isTrue = false } + if (this.$route.query.firstInitiation == '1') { + this.whetherDisplay = true + } else { + this.whetherDisplay = false + } eventBUs.$on('searchQuery', search => { Object.keys(search).forEach(res => { if (search[res] instanceof Array) { @@ -454,7 +463,9 @@ value.startTime = startTime value.flowStatus = 'Underway' value.taskAffirmDueDate = value.endTime - value.lawsTechnologyEvaluationId = this.getUUID() + if (!value.lawsTechnologyEvaluationId){ + value.lawsTechnologyEvaluationId = this.getUUID() + } value.regulationOwnerId = this.userInfo().id value.regulationOwnerName = this.userInfo().username Object.keys(value).forEach(res => { @@ -474,14 +485,14 @@ query = { type: 6, ...value, - firstInitiation:"1", + firstInitiation: this.$route.query.firstInitiation, msg: JSON.stringify({ itemList: dataList }).replace(/\"/g, '\'') } } else { query = { type: 6, ...value, - firstInitiation:"1", + firstInitiation: this.$route.query.firstInitiation, msg: JSON.stringify({ evaluators: value.evaluators }).replace(/\"/g, '\'') } } diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index a91cd38f5..f0d7db090 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -339,6 +339,7 @@ this.$refs.ruleForm.validate(valid => { if (valid) { this.visible = false + this.formInline.firstInitiation = '1' let newUrl = this.$router.resolve({ path: '/evaluationInitiationProcess', query: this.formInline @@ -365,9 +366,12 @@ let newUrl = this.$router.resolve({ path: '/evaluationResultsWhole', query: { - id:row.id, - processBackground:row.processBackground, - serialNumber:row.serialNumber + id: row.id, + processBackground: row.processBackground, + serialNumber: row.serialNumber, + title: row.title, + technologyTerritory: row.technologyTerritory, + standId: row.standId } }) window.open(newUrl.href, '_blank') @@ -375,9 +379,12 @@ let newUrl = this.$router.resolve({ path: '/evaluationResultsClause', query: { - id:row.id, - processBackground:row.processBackground, - serialNumber:row.serialNumber + id: row.id, + processBackground: row.processBackground, + serialNumber: row.serialNumber, + title: row.title, + technologyTerritory: row.technologyTerritory, + standId: row.standId } }) window.open(newUrl.href, '_blank') From 933335d491b4319f14e8c1aaaaa433871129dd54 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 14 Jul 2022 18:13:48 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsProcessHistoryEOServiceImpl.java | 2 +- .../job/LawsTechnologyEvaluationJob.java | 2 +- ...aluationComplianceResultEOServiceImpl.java | 29 ++++++++----------- ...LawsTechnologyEvaluationEOServiceImpl.java | 27 +++++------------ .../feginClient/WorkFlowFeignClient.java | 3 ++ 5 files changed, 25 insertions(+), 38 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java index 0196e3a53..ec91475dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java @@ -11,7 +11,7 @@ import com.jero.modules.lawsOpinionGather.enums.LawsOpinionGatherNodeEnum; import com.jero.modules.lawsOpinionGather.enums.OperatorRoleCodeEnum; import com.jero.modules.lawsOpinionGather.mapper.LawsProcessHistoryEOMapper; import com.jero.modules.lawsOpinionGather.service.ILawsProcessHistoryEOService; -import com.jero.modules.lawsTechnologyEvaluation.job.LawsTechnologyEvaluationNodeEnum; +import com.jero.modules.lawsTechnologyEvaluation.enums.LawsTechnologyEvaluationNodeEnum; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; import com.jero.modules.system.entity.SysUser; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java index 43d11a9a9..63f308573 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java @@ -63,7 +63,7 @@ public class LawsTechnologyEvaluationJob implements Job { if(CollectionUtils.isNotEmpty(lawsTechnologyEvaluationFlowDetailEOList)){ String actiProcInstIds = lawsTechnologyEvaluationFlowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.joining(",")); - Result result = this.workFlowFeignClient.completeTaskByPids(actiProcInstIds); + Result result = this.workFlowFeignClient.completeLawsTechnologyEvaluationTaskByPids(actiProcInstIds); if(result.getCode().equals(CommonConstant.SC_OK_200)){ updateLawsTechnologyEvaluationEOList.forEach(lawsTechnologyEvaluationEO -> { lawsTechnologyEvaluationEO.setFlowStatus(GatherResultEnum.COMPLETED.getValue()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java index 5040fe749..59b68e181 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java @@ -137,7 +137,7 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi List complianceResultEOList = this.baseMapper.selectList(queryWrapper); if(CollectionUtils.isNotEmpty(complianceResultEOList)){ - + this.disposeData(complianceResultEOList,cut); List complianceResultIdList = complianceResultEOList.stream().map(LawsTechnologyEvaluationComplianceResultEO::getId).distinct().collect(Collectors.toList()); QueryWrapper evaluationResultEOQueryWrapper = new QueryWrapper<>(); evaluationResultEOQueryWrapper.lambda().in(LawsTechnologyEvaluationResultEO::getComplianceResultId,complianceResultIdList); @@ -179,14 +179,17 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi String title = ""; String bottomTitle = ""; String fileName = ""; + String sheetName = ""; if(org.apache.commons.lang3.StringUtils.equals(cut, CutEnum.CN.getValue())){ title = "相关章节,问题说明,附件"; bottomTitle = "符合性结果："; fileName = "评估结果 " + ".xlsx"; + sheetName = "反馈结果"; }else if(org.apache.commons.lang3.StringUtils.equals(cut,CutEnum.EN.getValue())){ title = "Related section,Problem description,Accessory"; bottomTitle = "Compliance results:"; fileName = "Evaluation results " + ".xlsx"; + sheetName = "Feedback result"; } OutputStream os = null; @@ -201,10 +204,12 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi //设置导出数据 if(CollectionUtils.isNotEmpty(exportData)) { - int size = exportData.size(); + //创建表头 + String[] titleArr = title.split(","); + for (int i = 0; i < exportData.size(); i++){ //使用评估人的名字命名sheet页 - HSSFSheet sheet = workbook.createSheet(exportData.get(i).getCreateBy()); + HSSFSheet sheet = workbook.createSheet(exportData.get(i).getCreateBy() + " " + sheetName); CellStyle titleCellStyle = workbook.createCellStyle(); titleCellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中 @@ -212,11 +217,8 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi titleCellStyle.setWrapText(true);//自动换行 Row firstRow = sheet.createRow(0); - - //创建表头 - String[] titleArr = title.split(","); - for (int j=0; j<=3; j++){ - sheet.setColumnWidth(j,4000); + for (int j=0; j<3; j++){ + sheet.setColumnWidth(j,10000); Cell cell = firstRow.createCell(j); cell.setCellStyle(titleCellStyle); cell.setCellValue(titleArr[j]); @@ -236,18 +238,12 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi //把符合性结果设置进excel表格中。 Row bottomRow = sheet.createRow(evaluationResultListSize + 1); - Cell bottomRowFirstCell = bottomRow.getCell(0); + Cell bottomRowFirstCell = bottomRow.createCell(0); bottomRowFirstCell.setCellStyle(titleCellStyle); - bottomRowFirstCell.setCellValue(bottomTitle); - - Cell bottomRowSecondCell = bottomRow.getCell(1); - bottomRowSecondCell.setCellValue(exportData.get(i).getComplianceResultName()); + bottomRowFirstCell.setCellValue(bottomTitle + " " + exportData.get(i).getComplianceResultName()); } - - } - File fileTemp = new File(path); if (fileTemp.exists()) { fileTemp.delete(); @@ -291,7 +287,6 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi } } } - } ZipUtil.zip(path, path + ".zip"); //文件 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index df16067d3..333d1ad29 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -327,33 +327,22 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl startLawsTechnologyEvaluationProcess(String jsonObject); + + @RequestMapping(value = "/bat-wkflow/task/completeLawsTechnologyEvaluationTaskByPids",method = RequestMethod.GET) + Result completeLawsTechnologyEvaluationTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds); } From 832b866eecea3fe50f66bc06e2794eddcca86b4d Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 14 Jul 2022 18:14:06 +0800 Subject: [PATCH 7/9] update --- .../{job => enums}/LawsTechnologyEvaluationNodeEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/{job => enums}/LawsTechnologyEvaluationNodeEnum.java (96%) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/LawsTechnologyEvaluationNodeEnum.java similarity index 96% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationNodeEnum.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/LawsTechnologyEvaluationNodeEnum.java index 745cb58d4..3cc205f1c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationNodeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/LawsTechnologyEvaluationNodeEnum.java @@ -1,4 +1,4 @@ -package com.jero.modules.lawsTechnologyEvaluation.job; +package com.jero.modules.lawsTechnologyEvaluation.enums; import com.alibaba.druid.util.StringUtils; import com.jero.common.constant.enums.CutEnum; From dccc534f74bf0354f2294e38db517fddc42ec044 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 14 Jul 2022 18:27:01 +0800 Subject: [PATCH 8/9] =?UTF-8?q?people-=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5?= =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/mapper/SysUserMapper.java | 2 ++ .../jero/modules/system/mapper/xml/SysUserMapper.xml | 5 +++++ .../system/service/impl/SyncDataServiceImpl.java | 12 ++++++------ .../system/service/impl/SysUserServiceImpl.java | 6 +----- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java index 251bde680..9bacd0c8d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java @@ -149,4 +149,6 @@ public interface SysUserMapper extends BaseMapper { * @return */ List queryByDepIds(@Param("departIds")List departIds,@Param("username") String username); + + List getPPEmployeeList(@Param("thirdType") String thirdType); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 1b96854a8..6c22a7661 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -195,4 +195,9 @@ and username != #{username} + + + diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java index bb0397e54..9b820f396 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java @@ -202,25 +202,25 @@ public class SyncDataServiceImpl implements ISyncDataService{ List sysUserList = sysUserService.getPPEmployeeList(); // log.info("查询到的用户信息结果集为："+JSONObject.toJSONString(userEOList)); for(SysUser user:sysUserList){ - localUserMap.put(user.getId(),user); + localUserMap.put(user.getUsername(),user); } // log.info("将用户信息集合转换为的用户MAP为："+JSONObject.toJSONString(localUserMap)); log.info("开始更新数据库信息"); for(PPEmployee ppEmployee:ppEmployeeList){ try { - PPEmployeeMap.put(ppEmployee.getId(), ppEmployee); + PPEmployeeMap.put(ppEmployee.getUser_name(), ppEmployee); //1.判断当前账号是否已添加到用户中 - if (!localUserMap.containsKey(ppEmployee.getId())) { + if (!localUserMap.containsKey(ppEmployee.getUser_name())) { //删除数据库中与该账户相同的数据 - if(StringUtils.isNotBlank(ppEmployee.getId())) { + if(StringUtils.isNotBlank(ppEmployee.getUser_name())) { // sysUserService.removeById(ppEmployee.getId()); // 这个为什么是逻辑删除 log.info("需要新增的用户信息为:" + JSONObject.toJSONString(ppEmployee)); SysUser newUser = sysUserService.addPPUserInfo(ppEmployee); - localUserMap.put(ppEmployee.getId(), newUser); + localUserMap.put(ppEmployee.getUser_name(), newUser); } } else { - SysUser userEO = localUserMap.get(ppEmployee.getId()); + SysUser userEO = localUserMap.get(ppEmployee.getUser_name()); log.info("需要更新的用户信息为:" + JSONObject.toJSONString(userEO) + " " + JSONObject.toJSONString(ppEmployee)); if(userEO != null) { sysUserService.updatePPUserInfo(userEO, ppEmployee); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 065a8b693..6b70e6909 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -1,6 +1,5 @@ package com.jero.modules.system.service.impl; -import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -19,7 +18,6 @@ import com.jero.modules.base.service.BaseCommonService; import com.jero.modules.system.entity.*; import com.jero.modules.system.enums.PPSyncEnum; import com.jero.modules.system.mapper.*; -import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.model.SysUserSysDepartModel; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.vo.SysUserDepVo; @@ -480,9 +478,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public List getPPEmployeeList() { - QueryWrapper sysUserQueryWrapper = new QueryWrapper<>(); - sysUserQueryWrapper.lambda().eq(SysUser::getThirdType, PPSyncEnum.PP.getValue()); - return list(sysUserQueryWrapper); + return this.baseMapper.getPPEmployeeList(PPSyncEnum.PP.getValue()); } @Override From 4b68f8ddf3f2d5681988e631789a6b9eb0cf7531 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 14 Jul 2022 18:58:06 +0800 Subject: [PATCH 9/9] =?UTF-8?q?people-=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5?= =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/entity/PPEmployee.java | 4 ++-- .../system/service/impl/SyncDataServiceImpl.java | 14 ++++++-------- .../system/service/impl/SysUserServiceImpl.java | 8 ++++---- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java index 0890cb30b..68fbad730 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java @@ -15,8 +15,8 @@ public class PPEmployee { private String data_difference; //数据来源[WORKDAY,XPT,NIOCAPITAL] private String employee_difference; // 员工来源[CN, EU_US,EU] private String employee_id; // 员工编号(员工唯一标识) ----workNo - private String worker_user_id; //WD帐号创建SSO账号 / AD账户 ----thirdId - private String user_name; // WD同步到people的域帐号 ----username + private String worker_user_id; //WD帐号创建SSO账号 / AD账户 ----thirdId, username + private String user_name; // WD同步到people的域帐号 // private String foreign_employee_id; // 兼职公司对应的员工编号 private String name; // 全名 private String formatted_name; // 全名-拼音及中文 ----realname diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java index 9b820f396..7af3627da 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java @@ -1,7 +1,6 @@ package com.jero.modules.system.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.jero.common.constant.CommonConstant; @@ -25,7 +24,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.IOException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -202,25 +200,25 @@ public class SyncDataServiceImpl implements ISyncDataService{ List sysUserList = sysUserService.getPPEmployeeList(); // log.info("查询到的用户信息结果集为："+JSONObject.toJSONString(userEOList)); for(SysUser user:sysUserList){ - localUserMap.put(user.getUsername(),user); + localUserMap.put(user.getThirdId(),user); } // log.info("将用户信息集合转换为的用户MAP为："+JSONObject.toJSONString(localUserMap)); log.info("开始更新数据库信息"); for(PPEmployee ppEmployee:ppEmployeeList){ try { - PPEmployeeMap.put(ppEmployee.getUser_name(), ppEmployee); + PPEmployeeMap.put(ppEmployee.getWorker_user_id(), ppEmployee); //1.判断当前账号是否已添加到用户中 - if (!localUserMap.containsKey(ppEmployee.getUser_name())) { + if (!localUserMap.containsKey(ppEmployee.getWorker_user_id())) { //删除数据库中与该账户相同的数据 - if(StringUtils.isNotBlank(ppEmployee.getUser_name())) { + if(StringUtils.isNotBlank(ppEmployee.getWorker_user_id())) { // sysUserService.removeById(ppEmployee.getId()); // 这个为什么是逻辑删除 log.info("需要新增的用户信息为:" + JSONObject.toJSONString(ppEmployee)); SysUser newUser = sysUserService.addPPUserInfo(ppEmployee); - localUserMap.put(ppEmployee.getUser_name(), newUser); + localUserMap.put(ppEmployee.getWorker_user_id(), newUser); } } else { - SysUser userEO = localUserMap.get(ppEmployee.getUser_name()); + SysUser userEO = localUserMap.get(ppEmployee.getWorker_user_id()); log.info("需要更新的用户信息为:" + JSONObject.toJSONString(userEO) + " " + JSONObject.toJSONString(ppEmployee)); if(userEO != null) { sysUserService.updatePPUserInfo(userEO, ppEmployee); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 6b70e6909..e457b8b91 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -487,11 +487,11 @@ public class SysUserServiceImpl extends ServiceImpl impl SysUser sysUser = new SysUser(); // 基本信息 sysUser.setId(ppEmployee.getId()); - sysUser.setUsername(ppEmployee.getUser_name()); + sysUser.setUsername(ppEmployee.getWorker_user_id()); sysUser.setRealname(ppEmployee.getFormatted_name()); sysUser.setStatus("Active".equals(ppEmployee.getEmployee_status())? CommonConstant.USER_UNFREEZE : CommonConstant.USER_FREEZE); sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1); - sysUser.setThirdId(ppEmployee.getUser_name()); + sysUser.setThirdId(ppEmployee.getWorker_user_id()); sysUser.setActivitiSync(CommonConstant.ACT_SYNC_1); sysUser.setWorkNo(ppEmployee.getEmployee_id()); sysUser.setWorkerType("Employee".equals(ppEmployee.getWorker_type())? CommonConstant.WORKER_TYPE_1 : CommonConstant.WORKER_TYPE_2); @@ -531,11 +531,11 @@ public class SysUserServiceImpl extends ServiceImpl impl public void updatePPUserInfo(SysUser sysUser, PPEmployee ppEmployee) { // 基本信息 - sysUser.setUsername(ppEmployee.getUser_name()); + sysUser.setUsername(ppEmployee.getWorker_user_id()); sysUser.setRealname(ppEmployee.getFormatted_name()); sysUser.setStatus("Active".equals(ppEmployee.getEmployee_status())? CommonConstant.USER_UNFREEZE : CommonConstant.USER_FREEZE); sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1); - sysUser.setThirdId(ppEmployee.getUser_name()); + sysUser.setThirdId(ppEmployee.getWorker_user_id()); sysUser.setWorkNo(ppEmployee.getEmployee_id()); sysUser.setWorkerType("Employee".equals(ppEmployee.getWorker_type())? CommonConstant.WORKER_TYPE_1 : CommonConstant.WORKER_TYPE_2); sysUser.setCreateTime(ppEmployee.getCreation_time());