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 68fbad730..6797f735b 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 @@ -51,7 +51,7 @@ public class PPEmployee { private String data_provider; // 第三方数据提供商 private String extension_attribute1; // O365标签 private String working_hour; // 工作制 - private String domain; // 账号所属域 + private String domain; // 账号所属域 美国-amer private String ad_failed; // 创建ad失败原账号 private String have_employees; // 是否有下属员工 private String id; // id ----id 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 a50b39aab..1e82ff964 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 @@ -227,7 +227,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ JSONObject resultJsonEU = (JSONObject) myJsonEU.get("data"); //将第一页的账户信息转换为本地dto集合 List userListEU = JSONObject.parseArray(resultJsonEU.get("list").toString(), JSONObject.class); - List currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EN"); + List currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EU"); ppEmployeeList.addAll(currentPPEmployeeListEU); //获取总记录数 @@ -246,7 +246,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ log.debug("【欧洲】打印输出本次同步信息返回结果:"+myJsonEU.get("data").toString()); resultJsonEU = (JSONObject) myJsonEU.get("data"); userListEU = JSONObject.parseArray(resultJsonEU.get("list").toString(), JSONObject.class); - currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EN"); + currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EU"); ppEmployeeList.addAll(currentPPEmployeeListEU); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index 32c13eaf0..0f51306b6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -213,6 +213,16 @@ public class FeishuServiceImpl implements IFeishuService { contentSb.append("}"); contentSb.append("}"); } + if (StrUtil.isNotEmpty(feishuMsgVo.getAssignee())){ + contentSb.append(","); + contentSb.append("{"); + contentSb.append("\"is_short\": false,"); + contentSb.append("\"text\": {"); + contentSb.append("\"content\": \"**Assignee：** " + feishuMsgVo.getAssignee() + "\","); + contentSb.append("\"tag\": \"lark_md\""); + contentSb.append("}"); + contentSb.append("}"); + } if (StrUtil.isNotEmpty(feishuMsgVo.getDueDate())){ contentSb.append(","); contentSb.append("{"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java index 631a32d97..0aee3596c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java @@ -24,5 +24,7 @@ public class FeishuMsgVo { private String url; //回调的网址 + private String assignee; //评估人 适用范围：责任人提交通知发起人（设计符合性，pre-homo符合性，验证符合性） + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 023bd336c..422882210 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -2273,10 +2273,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) - ); - initiatorLark = initiatorLarkInfo.getUsername(); + feishuMsgVo.setAssignee(sysUser.getUsername()); +// SysUser initiatorLarkInfo = this.sysUserMapper.selectOne( +// new QueryWrapper().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) +// ); +// initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String prehomoInitiatorId = jsonObject.getString("prehomoInitiatorId"); //pre-Home发起人id userIdList.add(prehomoInitiatorId); @@ -2291,10 +2292,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) - ); - initiatorLark = initiatorLarkInfo.getUsername(); + feishuMsgVo.setAssignee(sysUser.getUsername()); +// SysUser initiatorLarkInfo = this.sysUserMapper.selectOne( +// new QueryWrapper().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) +// ); +// initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String verifyInitiatorId = jsonObject.getString("verifyInitiatorId"); //验证符合性发起人id userIdList.add(verifyInitiatorId); @@ -2309,10 +2311,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) - ); - initiatorLark = initiatorLarkInfo.getUsername(); + feishuMsgVo.setAssignee(sysUser.getUsername()); +// SysUser initiatorLarkInfo = this.sysUserMapper.selectOne( +// new QueryWrapper().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) +// ); +// initiatorLark = initiatorLarkInfo.getUsername(); }else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())){ String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id userIdList.add(designDutyId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java index 544412b38..efca534c0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java @@ -142,6 +142,10 @@ public class ExcelUtil { if(ObjectUtil.isNull(cell)) { continue; } + // 判断单元格类型，非文本单元格不处理 + if(! (org.apache.poi.ss.usermodel.Cell.CELL_TYPE_STRING == cell.getCellType())) { + continue; + } String cellValue = cell.getStringCellValue(); diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue index 15a8814fc..6d6415529 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue @@ -115,6 +115,7 @@ }, handleCancel() { this.visible = false + this.$emit('classificationMaintenanceModelForm') }, onChange(page, pageSize) { this.pageNo = page diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index 61e974e72..4c2368253 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -47,6 +47,7 @@
- {{$t('See')}} + {{header_text}}
@@ -26,7 +26,7 @@
-
+
@@ -36,15 +36,28 @@
+ {{item2.lableName}} + v-else-if="item2.lableType == 7 && item2.lableName && index2 != 0"> {{$t('viewFile')}} + + {{item2.lableName}} + {{item2.lableName}} @@ -94,6 +107,7 @@ queryCountryList: [], countryCardViewList: [], applyMarkets: '', + header_text: '', url: { list: '/problemKnowledgeBase/countryCardTempEO/list', deleteOne: '' @@ -138,6 +152,9 @@ this.displayList.forEach(val => { val.showOrNot = true }) + this.$nextTick(() => { + this.$refs.displayInformationModelRef.dataListOne = JSON.parse(JSON.stringify(this.displayList)) + }) this.consolidateData() this.loading = false } else { @@ -169,12 +186,14 @@ }) } if (content && content.length > 0) { + console.log(content) content.forEach((res, index) => { this.contentList[index + 1] = { name: res.lableName } this.contentList[index + 1].list = [] this.contentList[index + 1].list.push({ lableName: res.lableName, - lableType: res.lableType + lableType: res.lableType, + relevantUrl: res.relevantUrl }) }) } @@ -215,6 +234,11 @@ this.clientWidth = 340 * (this.queryCountryList.length + 1) + 'px' this.isTrue = true }) + let content = [] + this.queryCountryList.forEach(val => { + content.push(val.applyMarket_dictText) + }) + this.header_text = content.join('-') callback && callback() if (!callback) { this.consolidateData() diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue index 724dc4f46..709a02c38 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue @@ -9,6 +9,27 @@ @close="handleCancel" :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> +
+ + + +
+
+ {{$t('LabelName')}} +
+ +
+ + + + {{$t('query')}} + {{$t('reset')}} + + + + +
{ + return res.lableName.includes(this.queryParam.labelName) + }) + this.dataList = [...this.dataList] + } + }, + searchReset() { + this.queryParam = {} + this.dataList = JSON.parse(JSON.stringify(this.dataListOne)) + this.dataList = [...this.dataList] + }, getData(data) { this.visible = true this.$nextTick(() => { - this.dataList = data + this.queryParam = {} + this.dataList = JSON.parse(JSON.stringify(data)) this.dataList = [...this.dataList] }) }, @@ -78,11 +115,16 @@ this.visible = false }, handleSubmit() { - this.$emit('displayInformationModelForm', this.dataList) + this.$emit('displayInformationModelForm', this.dataListOne) this.visible = false }, onCheckAllChange(index) { this.dataList[index].showOrNot = !this.dataList[index].showOrNot + this.dataListOne.forEach(res => { + if (res.id == this.dataList[index].id) { + res.showOrNot = !res.showOrNot + } + }) } } } @@ -107,18 +149,41 @@ border-radius: 0 0 2px 2px; } - .box-title { - width: 100%; - text-align: right; - margin-bottom: 20px; + .box-title-text { + line-height: 1.4; + display: flex; + align-items: center; + margin-bottom: 10px; } - .operator-text { - cursor: pointer; - margin-right: 13px; - font-size: 14px; - font-weight: 400; - color: #040B29; + .title-text { + width: 20%; + min-width: 110px; + color: #000F16; display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + margin-top: 3px; + text-align: right; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .box-input { + display: inline-block; + width: 70%; + height: 38px; + margin-top: 2px; + } + + .box-button { + height: 38px; + /*margin-top: 2px;*/ + } + + .text-operation { + margin-right: 8px; } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index c954fe235..87dba98fd 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -59,7 +59,7 @@
@@ -573,6 +573,7 @@ .box-button { height: 38px; + margin-top: 4px; } .submit-button { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 89f8433f7..0c8e92dd4 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -1,15 +1,17 @@ @@ -120,6 +123,9 @@ } }) }, + classificationMaintenanceModelForm(){ + this.replacePage() + }, onSearch() { this.pageNo = 1 this.getList() diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index cda30770c..d325f194d 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -12,15 +12,17 @@
-
-
- {{$t('searchContent')}} + +
+
+ {{$t('searchContent')}} +
+ + {{$t('query')}} + {{$t('reset')}}
- - {{$t('query')}} - {{$t('reset')}} -
+