From b2e3a1b8665b600b379764f9569386d99c38fcd6 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 15 Jul 2022 17:10:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9-=E7=BC=96=E5=8F=B7=E6=A0=A1=E9=AA=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=B0=8F=E6=95=B0=E7=82=B9=E5=B7=A6=E6=96=9C=E6=9D=A0?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsInfoEOServiceImpl.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 6230b8ec3..67cffe1bd 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -98,12 +98,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Date: Fri, 15 Jul 2022 17:30:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9Fbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/collect/entity/ParamsCollectManifestBaseEO.java | 3 +++ .../service/impl/ParamsCollectManifestEOServiceImpl.java | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java index 8e42caf35..ab5cc26e9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java @@ -1,6 +1,8 @@ package com.jero.modules.cert.collect.entity; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -119,6 +121,7 @@ public class ParamsCollectManifestBaseEO implements Serializable { /**工程接口人*/ @Excel(name = "工程接口人", width = 15) @ApiModelProperty(value = "工程接口人") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String sdt; /**填写人*/ diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 16c1754a6..3821d7723 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1226,8 +1226,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Fri, 15 Jul 2022 17:36:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?people-=E5=90=8C=E6=AD=A5=E7=94=A8=E6=88=B7?= =?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/service/impl/SyncDataServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 7af3627da..b16e49cfb 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 @@ -195,6 +195,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ } // 处理同步过来的数据id不同，username相同的情况 creation_time不能为空 // ppEmployeeList.sort(Comparator.comparing(PPEmployee::getCreation_time).reversed()); + ppEmployeeList = ppEmployeeList.stream().distinct().collect(Collectors.toList()); // 去重 //此处获取全部pp用户信息 List sysUserList = sysUserService.getPPEmployeeList(); From 54e23f4bc40e1cd25c30ea71ef53384102986778 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 15 Jul 2022 17:57:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 34ab134c9..03f462ef7 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -117,7 +117,7 @@ @cancel="cancel"> --> @@ -146,7 +147,7 @@
- {{$t('preservation')}} + {{$t('preservation')}} {{$t('cancel')}}
@@ -278,6 +279,7 @@ indeterminate: false, columns: [], content: [], + confirmLoading:false, selectedRowKeys: [], selectedRowrowValue: [], dataSource: [], @@ -348,6 +350,12 @@ return 'rowClassRed' } }, + handleInput(value) { + this.$nextTick(() => { + this.Dateline = { ...this.Dateline } + this.$refs.ruleFormOne.validateField([value]) + }) + }, pageOnChange(page, pageSize) { this.pageNo = page this.$emit('handlePreservation') @@ -415,8 +423,9 @@ handleSubmitzr(record) { let _this = this let param = { dutyTerritory: this.Dateline.queryzr, ids: this.getquerySdtId,paramsManifestId: this.$route.query.id, } - this.$refs.ruleForm.validate(valid => { + this.$refs.ruleFormOne.validate(valid => { if (valid) { + this.confirmLoading = true axios({ url: '/jero-boot/params/collectManifest/updateDutyTerritory', method: 'post', @@ -442,8 +451,10 @@ } else { _this.$message.warning(_this.$t('operationFailed')) } + this.confirmLoading = false }) .catch((error) => { + this.confirmLoading = false console.log(error) }) } @@ -494,7 +505,7 @@ }, cancel(){ this.areaVisiblezr = false - this.$refs['ruleForm'].resetFields() + this.$refs['ruleFormOne'].resetFields() }, // 点击工程接口人的详情人员 有权限 areaOfResponsibility(record) { @@ -513,7 +524,7 @@ this.$nextTick(() => { this.Dateline = { ...this.Dateline } this.getquerySdtId = record.id - this.$refs.ruleForm.clearValidate() + this.$refs.ruleFormOne.clearValidate() }) }, dataValueTobeinitiated() {