From 093b37bb3a7b20503d1233b46a3cd446b9347054 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 5 Jul 2022 14:47:23 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4-?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF404?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 84697d47d..041515f03 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 @@ -2103,8 +2103,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; String contentInfo = msgContentEN + " " + href; From 39da18419d1728698ff12e7da6fab20285aff491 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 5 Jul 2022 16:14:11 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) 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 84697d47d..aac2ae779 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 @@ -2163,32 +2163,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.in(ProjectLawsInventoryEO::getId,lawsInventoryEO.getId()); - setDateNull(lawsInventoryEO, updateWrapper); - //保存 - this.update(lawsInventoryEO,updateWrapper); - } + this.updateBatchById(projectLawsInventoryEOList); +// for (ProjectLawsInventoryEO lawsInventoryEO : projectLawsInventoryEOList) { +// LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); +// updateWrapper.in(ProjectLawsInventoryEO::getId,lawsInventoryEO.getId()); +// setDateNull(lawsInventoryEO, updateWrapper); +// //保存 +// this.update(lawsInventoryEO,updateWrapper); +// } //更新log LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); From ba1a751ee4b00e70a3a6fe39d4212ecb941a0043 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 5 Jul 2022 16:19:55 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/PersonnelSelection/index.vue | 26 ++++++------ .../components/engineeringConfirmation.vue | 40 ++++++++++++++----- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/jero-web/src/views/processCenter/components/PersonnelSelection/index.vue b/jero-web/src/views/processCenter/components/PersonnelSelection/index.vue index fb8bcc291..23f3160b7 100644 --- a/jero-web/src/views/processCenter/components/PersonnelSelection/index.vue +++ b/jero-web/src/views/processCenter/components/PersonnelSelection/index.vue @@ -58,7 +58,7 @@ export default { name: 'index', - props: ['query', 'value', 'personneQuery', 'isSingleChoice', 'isInput', 'isClass','isDelete','distributionEngineerList'], + props: ['query', 'value', 'personneQuery', 'isSingleChoice', 'isInput', 'isClass', 'isDelete', 'distributionEngineerList'], data() { return { loading: true, @@ -90,10 +90,10 @@ this.queryDepartUserTreeList() this.visible = true }, - standardDelete(){ + standardDelete() { this.$emit('input', null) this.$forceUpdate() - this.$emit('deleteData',this.query.db_field_name) + this.$emit('deleteData', this.query.db_field_name) }, // onSelect(selectedKeys, info) { // console.log(selectedKeys) @@ -155,23 +155,23 @@ for (var i = 0; i < arr.length - 1; i++) { for (var j = i + 1; j < arr.length; j++) { if (arr[i] === arr[j]) { - arr.splice(j, 1); - j--; + arr.splice(j, 1) + j-- } } } - return arr; + return arr } - if (this.distributionEngineerList && this.distributionEngineerList.length > 0){ - this.distributionEngineerList.forEach(res=>{ - userIds.shift(res.userId) - userName.shift(res.name) + if (this.distributionEngineerList && this.distributionEngineerList.length > 0) { + this.distributionEngineerList.forEach(res => { + userIds.unshift(res.userId) + userName.unshift(res.name) }) } userIds = noRepeat1(userIds) userName = noRepeat1(userName) this.$emit('input', userName.join(',')) - this.$emit('change', this.query.db_field_name, userIds.join(','),this.query.subscript) + this.$emit('change', this.query.db_field_name, userIds.join(','), this.query.subscript) this.visible = false this.treeVisible = false // } else { @@ -198,8 +198,8 @@ }, getUserAndDepart() { getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => { - if (res){ - this.gData = res.filter(ele => ele.flag === 'DEPART'); + if (res) { + this.gData = res.filter(ele => ele.flag === 'DEPART') } else { this.gData = [] } diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 662e0e33f..f298ae329 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -691,15 +691,37 @@ this.formInline = { ...this.formInline } }, deleteText(num) { - this.distributionEngineerList.splice(num, 1) - this.distributionEngineerList = [...this.distributionEngineerList] - this.formInline.userName = this.formInline.userName.split(',') - this.formInline.userName.splice(num, 1) - this.formInline.userName = this.formInline.userName.join(',') - this.formInline.userId = this.formInline.userId.split(',') - this.formInline.userId.splice(num, 1) - this.formInline.userId = this.formInline.userId.join(',') - this.formInline = { ...this.formInline } + let _this = this + this.$confirm({ + content: _this.$t('ConfirmDelete'), + onOk() { + let id = '' + _this.dataSourceTable.forEach(res => { + if (res.userName == _this.distributionEngineerList[num].name) { + id = res.id + } + }) + _this.distributionEngineerList.splice(num, 1) + _this.distributionEngineerList = [..._this.distributionEngineerList] + _this.formInline.userName = _this.formInline.userName.split(',') + _this.formInline.userName.splice(num, 1) + _this.formInline.userName = _this.formInline.userName.join(',') + _this.formInline.userId = _this.formInline.userId.split(',') + _this.formInline.userId.splice(num, 1) + _this.formInline.userId = _this.formInline.userId.join(',') + _this.formInline = { ..._this.formInline } + if (id){ + deleteAction('/project/projectTaskInventoryDetailEO/delete', { id: id }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) + } + } + }) }, edit(val, title) { this.title = title From 0a0902cba66d34126dde5fd99948d462224d087f Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 5 Jul 2022 16:20:45 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E3=80=81prehomo?= =?UTF-8?q?=E3=80=81=E9=AA=8C=E8=AF=81=20=E4=B8=8B=E5=8F=91dre=EF=BC=8C?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=8F=91=E8=BF=87=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProjectTaskInventoryDetailEO.java | 4 ++++ .../ProjectTaskInventoryDetailEOServiceImpl.java | 16 +++++++++++++++- .../impl/ProjectTaskInventoryEOServiceImpl.java | 2 +- .../wkflow/enums/DesignComplianceNodeEnum.java | 2 ++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java index d1b24903c..38be4e214 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java @@ -119,4 +119,8 @@ public class ProjectTaskInventoryDetailEO implements Serializable { @ApiModelProperty(value = "工程交付说明") private String deliveryInstructions; + + /**是否发送过消息 对应枚举 SendMsgFlagEnum**/ + @TableField(exist = false) + private String isSend; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java index 64f7b3868..87566e6cd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java @@ -13,6 +13,7 @@ import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.project.entity.*; import com.jero.modules.project.enums.JumpLinkEnum; import com.jero.modules.project.enums.MsgTypeEnum; +import com.jero.modules.project.enums.SendMsgFlagEnum; import com.jero.modules.project.mapper.*; import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService; import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService; @@ -27,6 +28,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.*; +import java.util.stream.Collectors; /** * @Description: 项目库-任务清单明细表 @@ -150,7 +152,19 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl sendUserIdList = projectTaskInventoryDetailEOAddList.stream().filter(e -> { + boolean flag = true; + if(StringUtils.isNotEmpty(e.getIsSend())){ + if(StringUtils.equals(e.getIsSend(), SendMsgFlagEnum.FALSE.getValue())){ + flag = false; + } + } + return flag; + }).map(ProjectTaskInventoryDetailEO::getUserId).distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(sendUserIdList)){ + sendMessage(taskInventoryDetail,sendUserIdList); + } } if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOUpdateList)){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index 399267b15..5322c1377 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -696,7 +696,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl Date: Tue, 5 Jul 2022 16:46:45 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E3=80=81=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E3=80=81prehomo=E5=88=A0=E9=99=A4dre=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectTaskInventoryDetailEOServiceImpl.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java index 87566e6cd..1734c2ea5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java @@ -15,6 +15,7 @@ import com.jero.modules.project.enums.JumpLinkEnum; import com.jero.modules.project.enums.MsgTypeEnum; import com.jero.modules.project.enums.SendMsgFlagEnum; import com.jero.modules.project.mapper.*; +import com.jero.modules.project.service.IFeedbackHistoryService; import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService; import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService; import com.jero.modules.project.util.SendMessageUtils; @@ -57,6 +58,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,id); + List list = this.projectTaskInventoryFeedbackEOService.list(queryWrapper); + if(CollectionUtils.isNotEmpty(list)){ + List projectTaskInventoryFeedbackIdList = list.stream().map(ProjectTaskInventoryFeedbackEO::getId).distinct().collect(Collectors.toList()); + this.projectTaskInventoryFeedbackEOService.deleteByIds(projectTaskInventoryFeedbackIdList); + QueryWrapper historyDeleteWrapper = new QueryWrapper<>(); + historyDeleteWrapper.lambda().in(FeedbackHistory::getFeedbackId,projectTaskInventoryFeedbackIdList); + this.feedbackHistoryService.remove(historyDeleteWrapper); + } + } /** * 批量删除 From 9f8aac7cfae060c257b11673f92e95f4ac848c40 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 5 Jul 2022 16:55:39 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/components/engineeringConfirmation.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index f298ae329..0d5b330b6 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -504,6 +504,7 @@ for (let j = 0; j < this.distributionEngineerList.length; j++) { if (this.dataSourceTable[i].userId == this.distributionEngineerList[j].userId) { this.distributionEngineerList[j].isSend = '1' + this.distributionEngineerList[j].id = this.dataSourceTable[i].id } } } @@ -687,7 +688,15 @@ userId: this.formInline[value].split(',')[index] }) }) + for (let i = 0; i < this.dataSourceTable.length; i++) { + for (let j = 0; j < this.distributionEngineerList.length; j++) { + if (this.dataSourceTable[i].userId == this.distributionEngineerList[j].userId) { + this.distributionEngineerList[j].deliveryInstructions = this.dataSourceTable[i].deliveryInstructions + } + } + } } + this.distributionEngineerList = [...this.distributionEngineerList] this.formInline = { ...this.formInline } }, deleteText(num) { From c517fbe1ea0bd5051589b6e86a5fc664ce70f3dc Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 5 Jul 2022 17:11:16 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/jero/JLoading.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/components/jero/JLoading.vue b/jero-web/src/components/jero/JLoading.vue index 8266f08ee..f6f42d096 100644 --- a/jero-web/src/components/jero/JLoading.vue +++ b/jero-web/src/components/jero/JLoading.vue @@ -54,7 +54,7 @@ position: absolute; top: 0; left: 0; - z-index: 111999; + z-index: 1009; width: 100%; height: 100%; background-color: rgba(255, 255, 255, 0.9); From c3b28cee618e0a7e85466059fe587b64a9a0f177 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 5 Jul 2022 17:23:56 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/libraryAddForm/index.vue | 2 ++ .../src/views/documentManage/library/modules/addForm.vue | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 47a13b0ec..6e340f31f 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -327,6 +327,7 @@ this.$emit('addFormClick') } else { this.confirmLoading = false + this.$emit('addFormWarning') if (res.message.indexOf('发布日期不能大于') >= 0) { this.$message.warning(res.message) } else if (res.message.indexOf('编号已存在') >= 0) { @@ -337,6 +338,7 @@ } }) } else { + this.$emit('addFormWarning') return false } }) diff --git a/jero-web/src/views/documentManage/library/modules/addForm.vue b/jero-web/src/views/documentManage/library/modules/addForm.vue index 712b31133..214cd6b4b 100644 --- a/jero-web/src/views/documentManage/library/modules/addForm.vue +++ b/jero-web/src/views/documentManage/library/modules/addForm.vue @@ -11,6 +11,7 @@ { @@ -66,6 +68,7 @@ }) }, edit(item) { + this.confirmLoading = false this.title = this.$t('edit') this.visible = true this.$nextTick(() => { @@ -73,8 +76,12 @@ }) }, handleSubmit() { + this.confirmLoading = true this.$refs.addFormDataRef.sumber() }, + addFormWarning(){ + this.confirmLoading = false + }, addFormClick() { this.visible = false } From 5a5958c1b1298977d7c2e3d55e63d4ae5507d76c Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 5 Jul 2022 17:50:52 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/CollectionType/index.vue | 6 +++--- jero-web/src/components/SplitDetailTable/index.vue | 6 +++--- jero-web/src/components/tableCollection/index.vue | 4 ---- .../src/views/projectManagement/components/TaskList.vue | 4 ++-- .../components/TaskParameterCollection.vue | 6 +++--- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index e133eb8b3..1dff728f2 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -714,9 +714,9 @@ font-weight: bold; } - .ant-table td { - white-space: nowrap; - } + /*.ant-table td {*/ + /* white-space: nowrap;*/ + /*}*/ .selectWid .ant-select-selection--multiple { overflow: auto; } diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue index 8fb036ea0..7adee1699 100644 --- a/jero-web/src/components/SplitDetailTable/index.vue +++ b/jero-web/src/components/SplitDetailTable/index.vue @@ -276,9 +276,6 @@ font-weight: bold; } - .ant-table td { - white-space: nowrap; - } .split-detail-wrap{ .table{ .ant-table-row-cell-break-word{ @@ -304,6 +301,9 @@ }