From 235d4a96e780ce0b1751b2d658a3fc33c9290ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Thu, 1 Sep 2022 15:27:59 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../documentManage/tags/dialog/DicList.vue | 10 ++++++++++ .../documentManage/tags/tabs/TagContent.vue | 17 +++++++++++++---- .../views/documentManage/tags/tabs/TagItem.vue | 10 ++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) 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 From 6481275adc30d3dda166be4d2c2d47d51c96bc2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Thu, 1 Sep 2022 16:03:01 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/OcrTable/index.vue | 4 ++++ jero-web/src/components/SplitDetailTable/index.vue | 5 +++++ jero-web/src/components/SplitTable/index.vue | 5 +++++ jero-web/src/views/documentManage/ocr/index.vue | 4 ++-- jero-web/src/views/documentManage/splitting/index.vue | 9 +++++++-- .../documentManage/splitting/modules/SplitDetail.vue | 8 ++++---- 6 files changed, 27 insertions(+), 8 deletions(-) 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/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/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 0c7ae9535..2504c6a8f 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -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')) From 3e75d0a093bceef24a8e3ace34b7849484393e0d Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 1 Sep 2022 16:20:34 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-bug590?= =?UTF-8?q?41,58779?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/service/impl/FileSpiltService.java | 2 +- .../impl/FileSplitItemsEOServiceImpl.java | 38 ++++++++++++++++--- 2 files changed, 34 insertions(+), 6 deletions(-) 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(); From aa020e481b122a9a7890c4c0d48130d40869983f Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 1 Sep 2022 16:34:14 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E3=80=81=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B5=81=E7=A8=8B=E5=8F=91=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/enums/MessageTypeEnum.java | 2 + .../service/ILawsOpinionGatherEOService.java | 2 + .../impl/LawsOpinionGatherEOServiceImpl.java | 77 ++++++++++++++++++- .../ILawsTechnologyEvaluationEOService.java | 2 + ...LawsTechnologyEvaluationEOServiceImpl.java | 70 +++++++++++++++++ .../modules/project/enums/MsgTypeEnum.java | 10 +++ .../feginClient/WorkFlowFeignClient.java | 3 + 7 files changed, 164 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java index ec408861a..3181758a0 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java @@ -25,6 +25,8 @@ public enum MessageTypeEnum { LIST_CONFIRMATION("List Confirmation", "17"), // 清单确认 TASK_CONFIRMATION("Task Confirmation", "18"), // 任务确认 COMPLIANCE_CONFIRMATION("Compliance Confirmation", "19"), // 符合性确认 + COLLECTION_OF_LEGISLATIVE_COMMENTS("Collection of Legislative Comments", "20"), // 法规意见收集 + REGULATORY_AND_TECHNICAL_ASSESSMENT("Regulatory and technical assessment", "21"), // 法规技术评估 ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java index d3a492c06..710e61bf2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java @@ -73,4 +73,6 @@ public interface ILawsOpinionGatherEOService extends IService lawsOpinionGatherEOList,String cut); + + void workFlowSendMsg(JSONObject jsonObject); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index d966397cb..4f2fa5230 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -1,25 +1,39 @@ package com.jero.modules.lawsOpinionGather.service.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.exception.JeroBootException; +import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum; import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionGatherEOMapper; import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; +import com.jero.modules.project.entity.ProjectLibraryBase; +import com.jero.modules.project.entity.ProjectNameInfoEO; +import com.jero.modules.project.entity.ProjectYearNameInfoEO; +import com.jero.modules.project.enums.JumpLinkEnum; +import com.jero.modules.project.enums.MsgTypeEnum; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; +import com.jero.modules.project.util.SendMessageUtils; import com.jero.modules.system.entity.SysCategory; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; + +import java.text.SimpleDateFormat; +import java.util.*; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -40,6 +54,11 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl().success("调用成功！"); } @@ -192,4 +216,53 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); + + String msgContentEN = ""; + String msgTitle = ""; + if(StringUtils.equals(msgType,MsgTypeEnum.LAWS_OPOMOPM_GATHER_START_MSG.getValue())){ + userIdList.addAll(Arrays.asList(jsonObject.getString("evaluatorIds").split(","))); + String endTime = jsonObject.getString("endTime"); //截止日期 + msgContentEN = "You recieved the Collection of Legislative Comments of "+serialNumber+" . The due date is "+endTime+". Please check and address it in a timely manner."; + msgTitle = "You have a Collection of Legislative Comments task to complete"; + }else if(StringUtils.equals(msgType,MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_SUBMIT_MSG.getValue())){ + String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id + SysUser currentUser = sysUserService.getBaseMapper().selectOne(new QueryWrapper().lambda().eq(SysUser::getId, currentUserId)); + + userIdList.add(jsonObject.getString("initiatorUserId")); + msgContentEN = currentUser.getUsername() + " has submitted the collection process of Collection of Legislative Comments of "+serialNumber+", please check it in time."; + msgTitle = "You have a Collection of Legislative Comments task completed"; + }else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_MSG.getValue())){ + userIdList = (List) jsonObject.get("userIdList"); + msgContentEN = "The the Collection of Legislative Comments of "+serialNumber+" will expire tomorrow . Please check and address it in time."; + msgTitle = "You have a Collection of Legislative Comments task completed"; + } + + //飞书跳转链接 + String hrefFeishu = backUrl + JumpLinkEnum.TASK_AFFIRM_LINK.getLink(); + //系统内部跳转链接 + String href = "" + " View details" + ""; + String contentInfo = msgContentEN + " " + href; + + Map sendMessageMap = new HashMap<>(); + sendMessageMap.put("hrefFeishu",hrefFeishu); + sendMessageMap.put("contentInfo",contentInfo); + + SendMessageUtils.sendMessage(msgTitle,msgContentEN,userIdList,lawsOpinionGatherId,sendMessageMap,null,MessageTypeEnum.COLLECTION_OF_LEGISLATIVE_COMMENTS,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java index bac8a0c3c..f13cde5ca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java @@ -88,4 +88,6 @@ public interface ILawsTechnologyEvaluationEOService extends IService importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception; List> queryPageDummyById(Map parameter); + + void workFlowSendMsg(JSONObject jsonObject); } 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 5d2f587ec..e7b4158a7 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.exception.JeroBootException; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; @@ -17,12 +18,17 @@ import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper; import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService; +import com.jero.modules.project.enums.JumpLinkEnum; +import com.jero.modules.project.enums.MsgTypeEnum; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; +import com.jero.modules.project.util.SendMessageUtils; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import org.apache.commons.collections4.CollectionUtils; @@ -72,6 +78,10 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl().success("调用成功！"); @@ -524,6 +536,64 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); + + String msgContentEN = ""; + String msgTitle = ""; + if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_START_MSG.getValue())){ + userIdList.add(jsonObject.getString("evaluationId")); + String endTime = jsonObject.getString("endTime"); //截止日期 + //您收到GB 7258 的法规技术评估流程任务，请及时查看处理。 + msgContentEN = "You recieved the Regulatory and technical assessment of "+serialNumber+" . The due date is "+endTime+". Please check and address it in a timely manner."; + msgTitle = "You have a Regulatory and technical assessment task to complete"; + }else if(StringUtils.equals(msgType,MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_ENALUATOR_SUBMIT_MSG.getValue())){ + String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id + SysUser currentUser = this.sysUserService.getBaseMapper().selectOne(new QueryWrapper().lambda().eq(SysUser::getId, currentUserId)); + + userIdList.add(jsonObject.getString("initiatorUserId")); + //XXX（人员账号）已提交GB 7258 的法规意见收集流程，请及时查看审核。 + msgContentEN = currentUser.getUsername() + " has submitted the collection process of Regulatory and technical assessment of "+serialNumber+", Please check and address it in time."; + msgTitle = "You have a Regulatory and technical assessment task to complete"; + }else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_AUDIT_ACCEPTED_MSG.getValue())){ + userIdList.add(jsonObject.getString("evaluationId")); + //您提交的GB 7258 的法规技术评估流程已通过。 + msgContentEN = "The regulatory and technical assessment process for "+serialNumber+" you submitted has passed."; + msgTitle = "You have a Regulatory and technical assessment task completed"; + }else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_AUDIT_REJECTED_MSG.getValue())){ + userIdList.add(jsonObject.getString("evaluationId")); + //您提交的GB 7258 的法规技术评估流程已被退回，请及时查看处理。 + msgContentEN = "The regulatory and technical assessment process of "+serialNumber+" you submitted has been returned, Please check and address it in time."; + msgTitle = "You have a Regulatory and technical assessment task to complete"; + }else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_MSG.getValue())){ + userIdList = (List) jsonObject.get("userIdList"); + //您GB 7258的法规技术评估流程将于明天结束，请及时查看处理 + msgContentEN = "The the Regulatory and technical assessment of "+serialNumber+" will expire tomorrow. Please check and address it in time."; + msgTitle = "You have a Regulatory and technical assessment task to complete"; + } + + //飞书跳转链接 + String hrefFeishu = backUrl + JumpLinkEnum.TASK_AFFIRM_LINK.getLink(); + //系统内部跳转链接 + String href = "" + " View details" + ""; + String contentInfo = msgContentEN + " " + href; + + Map sendMessageMap = new HashMap<>(); + sendMessageMap.put("hrefFeishu",hrefFeishu); + sendMessageMap.put("contentInfo",contentInfo); + + SendMessageUtils.sendMessage(msgTitle,msgContentEN,userIdList,lawsTechnologyEvaluationId,sendMessageMap,null, MessageTypeEnum.COLLECTION_OF_LEGISLATIVE_COMMENTS,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); + } + private String getTreeName(String cut, List categoryList, List technologyTerritoryList) { StringBuilder sb = new StringBuilder(); for (String technologyTerritory : technologyTerritoryList) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java index 3be535686..c78462df3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java @@ -30,6 +30,16 @@ public enum MsgTypeEnum { DESIGN_INITIATOR_ACCEPTED_MSG("设计符合性发起人通过发送消息","designInitiatorAcceptedMsg"), PREHOMO_INITIATOR_ACCEPTED_MSG("prehomo发起人通过发送消息","prehomoInitiatorAcceptedMsg"), VERIFY_INITIATOR_ACCEPTED_MSG("验证符合性发起人通过发送消息","verifyInitiatorAcceptedMsg"), + + LAWS_OPOMOPM_GATHER_START_MSG("法规意见收集发起消息","lawsOpomopmGatherStartMsg"), + LAWS_OPOMOPM_GATHER_ENALUATOR_SUBMIT_MSG("法规意见收集评估人提交任务消息","lawsOpomopmGatherEnaluatorSubmitMsg"), + LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_MSG("法规意见收集到期前一天消息","lawsOpomopmGatherExpireRemindMsg"), + + LAWS_TECHNOLOGY_EVALUATION_START_MSG("法规技术评估发起消息","lawsTechnologyEvaluationStartMsg"), + LAWS_TECHNOLOGY_EVALUATION_ENALUATOR_SUBMIT_MSG("法规技术评估,评估人提交任务消息","lawsTechnologyEvaluationEnaluatorSubmitMsg"), + LAWS_TECHNOLOGY_EVALUATION_AUDIT_ACCEPTED_MSG("法规技术评估,发起人审核通过消息","lawsTechnologyEvaluationAuditAcceptedMsg"), + LAWS_TECHNOLOGY_EVALUATION_AUDIT_REJECTED_MSG("法规技术评估，发起人审核拒绝消息","lawsTechnologyEvaluationAuditRejectedMsg"), + LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_MSG("法规技术评估到期前一天消息","lawsTechnologyEvaluationExpireRemindMsg"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java index aa9bdd61b..add94d058 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java @@ -164,4 +164,7 @@ public interface WorkFlowFeignClient { */ @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByTaskId",method = RequestMethod.GET) Result deleteProcessInstanceByTaskId(@RequestParam("taskId") String taskId); + + @RequestMapping(value = "/bat-wkflow/task/getLawsOpinionGatherFlowAssigneeList",method = RequestMethod.GET) + List getLawsOpinionGatherFlowAssigneeList(@RequestParam("lawsOpinionGatherId") String lawsOpinionGatherId); } From fa148cb12ecf75402db48c49606e27d126ab2dad Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 1 Sep 2022 16:38:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-bug590?= =?UTF-8?q?41,58779?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/service/impl/FileSplitItemsEOServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 5f0c328d1..6b37ba8b2 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 @@ -1702,8 +1702,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Date: Thu, 1 Sep 2022 16:56:41 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listEditModel.vue | 68 +++++++++++- .../components/listOfRegulations.vue | 48 +++++++- .../components/listOfRegulationsView.vue | 103 ++++++++++-------- 3 files changed, 170 insertions(+), 49 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 38b7f34f6..9d45f7dec 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -804,6 +804,49 @@ +
+ {{$t('reasonsForRejection')}} +
+
+ + +
+
+ {{$t('rejectedBy')}} +
+
+ {{item.createBy ? item.createBy : '--'}} +
+
+ + +
+
+ {{$t('rejectionTime')}} +
+
+ {{item.rejectTime ? item.rejectTime : '--'}} +
+
+ + + + +
+
+ {{$t('rejectReason')}} +
+
+ {{item.rejectCause ? item.rejectCause : '--'}} +
+
+ + +
@@ -907,7 +950,8 @@ verifyDutyIdDisabled: false, verifyInitiatorIdDisabled: false, DeliverableTreeList: [], - userInfoQuery: {} + userInfoQuery: {}, + rejectCauseList: [] } }, mounted() { @@ -916,6 +960,18 @@ }, methods: { ...mapGetters(['userInfo']), + getRejectCause(id) { + let query = { + projectLawsInventoryId: id + } + getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => { + if (res.success) { + this.rejectCauseList = res.result + } else { + this.rejectCauseList = [] + } + }) + }, getDeliverableTree() { getAction('/sys/category/getDeliverableTree', {}).then((res) => { if (res.success) { @@ -1110,6 +1166,7 @@ item.designDeliverableType = item.designDeliverableType ? item.designDeliverableType.split(',') : [] item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : [] item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : [] + this.getRejectCause(item.id) if (item.dutyTerritory) { this.queryPersonByProject(item) } else { @@ -1400,6 +1457,15 @@ margin-top: 2px; } + .itemModel-reject { + width: calc(100% - 130px); + display: inline-block; + font-size: 16px; + word-break: break-all; + color: #040B29; + padding-top: 11px; + } + .Required { color: red; margin-right: 4px; diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 8b943d1a5..4a01f7b1e 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -220,6 +220,11 @@ @click="edit(record)"> {{ $t('edit') }} + + {{$t('view')}} + @@ -229,10 +234,13 @@ @click="resultReportedClick(record)"> {{$t('resultReported')}} - + + + + {{$t('view')}} - + @@ -745,6 +753,13 @@ fixed: 'right', width: 240, scopedSlots: { customRender: 'operation' } + }, + { + title: this.$t('operation'), + align: 'center', + fixed: 'right', + width: 140, + scopedSlots: { customRender: 'operationOne' } } ], columnsFileAll: [ @@ -1014,7 +1029,14 @@ let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) if (!this.isRoleSwitching) { for (var i = 0; i < columnResult.length; i++) { - if (columnResult[i].title === this.$t('operation')) { + if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 240) { + columnResult.splice(i, 1) + i-- + } + } + } else if (this.isRoleSwitching) { + for (var i = 0; i < columnResult.length; i++) { + if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 140) { columnResult.splice(i, 1) i-- } @@ -2019,15 +2041,18 @@ if (valid) { let url = '/project/projectCommentEO/add' let content = [] + let ids = [] if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) { this.rowKeysSuccessList.forEach(res => { content.push(res.serialNumber) + ids.push(res.id) }) } let query = { commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + '：' + this.formInlineComment.commentContent, projectLibraryId: this.$route.query.id } + this.rejectCauseAdd(this.formInlineComment.commentContent,ids) this.confirmLoadingComment = true let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) this.updateStatusBatch(1, selectedRowKeys) @@ -2042,6 +2067,19 @@ } }) }, + rejectCauseAdd(rejectCause,ids) { + let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + let query = { + rejectUserId:this.userInfo().id, + rejectTime:rejectTime, + rejectCause:rejectCause, + projectLawsInventoryId:ids.join(','), + rejectType:'0', + } + postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => { + + }) + }, handleCancelComment() { this.visibleComment = false }, @@ -2368,7 +2406,7 @@ } ::v-deep .ant-table-row:first-child { - background: #fff!important; + background: #fff !important; opacity: 0.9; } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue index 1642cae03..d95bdb5cc 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue @@ -433,46 +433,49 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ {{$t('reasonsForRejection')}} +
+
+ + +
+
+ {{$t('rejectedBy')}} +
+
+ {{item.createBy ? item.createBy : '--'}} +
+
+ + +
+
+ {{$t('rejectionTime')}} +
+
+ {{item.rejectTime ? item.rejectTime : '--'}} +
+
+ + + + +
+
+ {{$t('rejectReason')}} +
+
+ {{item.rejectCause ? item.rejectCause : '--'}} +
+
+ + +
@@ -486,7 +489,7 @@