From 21cea7644850f9fd9923d9ff83c5823eb90ef79f Mon Sep 17 00:00:00 2001 From: gaosong Date: Wed, 31 Aug 2022 22:04:13 +0800 Subject: [PATCH 01/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A-=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=B6=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/extRepo/entity/ExtRepoData.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java index d83dc65a2..bb44aab7e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java @@ -40,7 +40,7 @@ public class ExtRepoData implements Serializable { private java.lang.String createBy; /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; @@ -50,7 +50,7 @@ public class ExtRepoData implements Serializable { private java.lang.String updateBy; /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; From 83b17d0a7b637f7ef361bd38d9d4eceb63b4338b 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 09:05:25 +0800 Subject: [PATCH 02/42] =?UTF-8?q?=E8=A7=A3=E5=BC=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E3=80=81=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/documentManage/collection/index.vue | 14 +++++++------- .../src/views/documentTools/searchCenter/index.vue | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue index 5bb40aa2b..0e0ba89a0 100644 --- a/jero-web/src/views/documentManage/collection/index.vue +++ b/jero-web/src/views/documentManage/collection/index.vue @@ -1,8 +1,8 @@ diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 7e7cd2b69..8270a0c4b 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -65,10 +65,10 @@ - - - - + + + + From db53b943615755ab7488a2db51ce40e4b7c5fbf8 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 1 Sep 2022 09:08:42 +0800 Subject: [PATCH 03/42] =?UTF-8?q?=E6=94=BE=E5=BC=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93-=E9=9B=86=E6=88=90=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index c9cb88cd9..b7460d4c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -129,7 +129,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl> mapListTempCn = new ArrayList<>(); List> mapListTempEn = new ArrayList<>(); @@ -223,7 +223,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl targetMarketList){ From 58dec85b9ae07c9f7c7a0e2b4456f36bdb6bfbb7 Mon Sep 17 00:00:00 2001 From: aoao <1085499399@qq.com> Date: Thu, 1 Sep 2022 09:12:09 +0800 Subject: [PATCH 04/42] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5-=E8=A7=A3=E5=BC=80?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportManageEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index b43b2b7a6..85f26e2c4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -146,7 +146,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl Date: Thu, 1 Sep 2022 09:37:57 +0800 Subject: [PATCH 05/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/dashboard/components/myList.vue | 6 ++++-- .../views/documentManage/splitting/modules/SplitAddForm.vue | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue index 2ee3cfc6c..48c345398 100644 --- a/jero-web/src/views/dashboard/components/myList.vue +++ b/jero-web/src/views/dashboard/components/myList.vue @@ -10,7 +10,7 @@
- {{item.prcNum}} + {{item.prcName}} {{prcTypeName[item.prcType]}}
@@ -43,7 +43,9 @@ dataSource: [], loading: false, prcTypeName: { - 1: this.$t('taskConfirmationProcess') + 1: this.$t('taskConfirmationProcess'), + 5:this.$t('collectionOfRegulatoryOpinionsProcess'), + 6:this.$t('regulatoryTechnologyAssessmentProcess') } } }, diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index dc02a0bb9..8e8654af8 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -48,6 +48,7 @@
From 1b2c3fdeed8dddeff86df2d80d0cdc38bfa49a8b Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 1 Sep 2022 09:48:29 +0800 Subject: [PATCH 06/42] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83--?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E6=AE=B5=E8=90=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DocumentSearchServiceImpl.java | 46 +++++++++++++++---- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index d0c86f0de..50f5c7846 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -328,9 +328,11 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { Map queryMapTemp = new HashMap<>(); if (key.equals("serial_number")){ + s = s.toLowerCase(); queryMap.put(key, "*" + s + "*"); map.put("wildcard", queryMap); } else { + s = s.toLowerCase(); queryMapTemp.put("query", s); queryMapTemp.put("minimum_should_match", 2); queryMap.put(key, queryMapTemp); @@ -919,8 +921,27 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { */ @Override public IPage getParagraphInfoList(Map map) { + //指定module_type_flag= WDK + JSONArray queryJsonMust = new JSONArray(); + Map mapModule = new HashMap<>(); + Map mapModule1 = new HashMap<>(); + Map mapModule2 = new HashMap<>(); + mapModule.put("query", "WDK"); + mapModule1.put("module_type_flag", mapModule); + mapModule2.put("match", mapModule1); + queryJsonMust.add(mapModule2); + //段落, 有条件的时候,查询的数据中不含有魑的数据 + JSONArray queryJsonMustNot = new JSONArray(); if(ObjectUtils.isEmpty(map.get("mapOne"))){ ((Map) map.get("mapOne")).put("flag",SEARCH_FLAG); + }else{ + Map mapTemp = new HashMap<>(); + Map map1 = new HashMap<>(); + Map map2 = new HashMap<>(); + mapTemp.put("query", SEARCH_FLAG); + map1.put("flag", mapTemp); + map2.put("match", map1); + queryJsonMustNot.add(map2); } String cut = (String) map.get("cut"); //module_type 代表文档库的段落 @@ -956,17 +977,20 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { JSONArray queryMapJsonAll = new JSONArray(); //首次查询条件 if (ObjectUtils.isNotEmpty(mapOne)) { - if(StringUtils.isNotBlank((String)mapOne.get("title")) - || StringUtils.isNotBlank((String)mapOne.get("serial_number"))){ - Map queryMap = new HashMap<>(); - Map queryMapTemp = new HashMap<>(); - queryMapTemp.put("flag",SEARCH_FLAG ); - queryMap.put("match_phrase", queryMapTemp); - queryMapJsonTemp.add(queryMap); - } +// if(StringUtils.isNotBlank((String)mapOne.get("title")) +// || StringUtils.isNotBlank((String)mapOne.get("serial_number"))){ +// Map queryMap = new HashMap<>(); +// Map queryMapTemp = new HashMap<>(); +// queryMapTemp.put("flag",SEARCH_FLAG ); +// queryMap.put("match_phrase", queryMapTemp); +// queryMapJsonTemp.add(queryMap); +// } for (Map.Entry entry : mapOne.entrySet()) { String key = entry.getKey(); String value = (String) entry.getValue(); + if("serial_number".equals(key) || "title".equals(key) || "file_text".equals(key)){ + value = value.toLowerCase(); + } if (ObjectUtils.isNotEmpty(value)) { for (String s : value.split(",")) { Map queryMap = new HashMap<>(); @@ -1007,6 +1031,10 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, null, null); queryMapJsonAll.add(jsonObject); } + if(CollectionUtils.isNotEmpty(queryJsonMust)){ + JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryJsonMust, null, null); + queryMapJsonAll.add(jsonObject); + } } String ids = (String) mapTwo.get("ids"); @@ -1113,7 +1141,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { IPage iPage = getiPage(selectValue, selectValueTwo, queryMapJsonAll, mapHighlight1,null, - pageNo, pageSize, paragraphFlag,(String) map.get("cut"),sort,null); + pageNo, pageSize, paragraphFlag,(String) map.get("cut"),sort,queryJsonMustNot); return iPage; } From 892b9f69e5f3cfad707f8590b7df404d09a7bdf0 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 1 Sep 2022 09:48:38 +0800 Subject: [PATCH 07/42] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=94=99=E4=BD=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 411eef23b..2f8d6386c 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -125,7 +125,7 @@
- @@ -690,6 +690,17 @@ }) }, methods: { + selectChange(val){ + this.$nextTick(() => { + let element = document.querySelectorAll( + ".tableclassname .ant-table-expanded-row" + ); + let len = element.length / 2; + for (let i = 0; i < len; i++) { + element[i + len].style.height = element[i].offsetHeight + "px"; + } + }); + }, onInput(r) { let value = r.target.value r.target.value = value.replace(/[^\u4e00-\u9fa5]/g, '') @@ -770,7 +781,9 @@ height: 38px !important; line-height: 38px !important; } - + .ant-select-selection-selected-value{ + height:100%; + } .selectWid .ant-select-selection__rendered { line-height: 36px !important; } @@ -781,9 +794,12 @@ height: calc(100% - 100px); overflow: auto; } -/deep/ .ant-select-allow-clear{ - height: 30px; -} +///deep/ .ant-select-allow-clear{ +// height: 30px; +//} + /deep/.ant-table-row{ + height:69px; + } .text { margin-right: 10px; } From aacafc575236d3f606b6386f92698093cf1eacb9 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 1 Sep 2022 10:12:13 +0800 Subject: [PATCH 08/42] =?UTF-8?q?58268=20country=20card-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8F=91=E5=B8=83=20=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98,?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0countryCardManage=E8=A7=92=E8=89=B2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 5 +- .../CountryCardManageReleaseEOController.java | 4 ++ .../ICountryCardManageReleaseEOService.java | 2 + ...CountryCardManageReleaseEOServiceImpl.java | 65 ++++++++++++++++--- .../enums/CollectManifestRoleIdEnum.java | 4 +- 5 files changed, 69 insertions(+), 11 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 481865b1d..0f6f4a6a2 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -973,4 +973,7 @@ ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result` ADD COLUMN `feedback_time` datetime NULL COMMENT '反馈时间' AFTER `laws_technology_evaluation_id`; -- 表字段 英文修改 2022-08-31 -UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Sort Number' WHERE `id` = '1529373706885799937'; \ No newline at end of file +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Sort Number' WHERE `id` = '1529373706885799937'; + +-- 增加角色，countryCard管理员。 2022-08-31 +INSERT INTO `laws_weilai`.`sys_role` (`id`, `role_name`, `role_code`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `parent_code`, `role_order`) VALUES ('1564916346120916993', 'countryCard管理员', 'countryCardManage', 'countryCard最大权限', 'admin', '2022-08-31 18:01:46', NULL, NULL, NULL, NULL); \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java index 234a61609..1fb7ed795 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java @@ -56,6 +56,10 @@ public class CountryCardManageReleaseEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseEO, req.getParameterMap()); queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java index 0af88f36f..2e76c508d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java @@ -85,4 +85,6 @@ public interface ICountryCardManageReleaseEOService extends IService> getApplyMarketList(String queryFlag,String cut); List queryCountryCardManageReleaseByApplyMarkets(JSONObject params); + + boolean isCountryCardManage(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java index 2dc1c22fc..0d280e121 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -16,8 +16,11 @@ import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseEOMa import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService; import com.jero.modules.problemKnowledgeBase.service.ICountryNationalFlagEOService; +import com.jero.modules.project.enums.CollectManifestRoleIdEnum; +import com.jero.modules.system.entity.SysUserRole; import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.service.ISysDictService; +import com.jero.modules.system.service.ISysUserRoleService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; @@ -52,6 +55,8 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl userRoleList = this.sysUserRoleService.list(new QueryWrapper().lambda().eq(SysUserRole::getUserId, currentUser.getId())); // 查询用户所有角色 + if(CollectionUtils.isNotEmpty(userRoleList)){ + CollectManifestRoleIdEnum countruCardManage = CollectManifestRoleIdEnum.COUNTRU_CARD_MANAGE; + List userRoles = userRoleList.stream().filter(userRole -> { + boolean flag = false; + if(StringUtils.equals(userRole.getRoleId(),countruCardManage.getId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(userRoles)){ + result = true; + } + } + return result; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CollectManifestRoleIdEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CollectManifestRoleIdEnum.java index 46ac56ff5..a99a7decf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CollectManifestRoleIdEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CollectManifestRoleIdEnum.java @@ -14,7 +14,9 @@ import java.util.List; public enum CollectManifestRoleIdEnum { // STUDIO_ID("R&H Studio","R&H Studio","studio","1534019911296118786",1), ADMIN_ID("R&H Manager","R&H Manager","manager","1534020391015444481",2), - MANAGER_ID("系统管理员","Administrator","admin","f6817f48af4fb3af11b9e8bf182f618b",3); + MANAGER_ID("系统管理员","Administrator","admin","f6817f48af4fb3af11b9e8bf182f618b",3), + COUNTRU_CARD_MANAGE("countryCard管理员","countryCardManage","countryCardManage","1564916346120916993",4), + ; String name; String enName; From 022546fd050c39d409742258202f5753f7a3e38d Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 1 Sep 2022 10:17:16 +0800 Subject: [PATCH 09/42] =?UTF-8?q?57625=20=E6=96=87=E6=A1=A3=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E8=BD=AC=E6=8D=A2=E6=97=B6=E9=97=B4=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=97=B6=E5=88=86=E7=A7=92=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/docTranslation/entity/DocTranslationEO.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/entity/DocTranslationEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/entity/DocTranslationEO.java index dd63d984e..41a793654 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/entity/DocTranslationEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/entity/DocTranslationEO.java @@ -105,9 +105,9 @@ public class DocTranslationEO implements Serializable { private java.lang.String translationResult; /**转换时间*/ - @Excel(name = "转换时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @Excel(name = "转换时间", width = 15, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "转换时间") private java.util.Date translationTime; From 531a88752aa022625a834c950f3a4575baa4f78a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 1 Sep 2022 10:22:40 +0800 Subject: [PATCH 10/42] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=AE=B5=E8=90=BD--=E5=A4=84=E7=90=86=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=92=8C=E6=AD=A3=E6=96=87=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchcenter/service/impl/DocumentSearchServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 50f5c7846..5ad385a16 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -997,7 +997,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { Map queryMapTemp = new HashMap<>(); Map queryMap3 = new HashMap<>(); //特殊处理编号字段 - if (key.equals("serial_number")){ + if (key.equals("serial_number") || key.equals("title") || key.equals("file_text")){ queryMapTemp.put(key, "*" + s + "*"); queryMap.put("wildcard",queryMapTemp); queryMapJson.add(queryMap); From b228cb9e19375fbed2862ac622ef53f96d4c1848 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 10:55:14 +0800 Subject: [PATCH 11/42] =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/libraryPush/index.vue | 24 ++++++++++++++----- .../views/regulatoryEarlyWarning/index.vue | 8 ++++++- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/jero-web/src/components/libraryPush/index.vue b/jero-web/src/components/libraryPush/index.vue index 05d1e547f..b07315fdd 100644 --- a/jero-web/src/components/libraryPush/index.vue +++ b/jero-web/src/components/libraryPush/index.vue @@ -63,15 +63,17 @@ departId: '', defaultExpandedKeys: [], submitLoading: false, - visibleTree: false + visibleTree: false, + flag: '' } }, mounted() { }, methods: { - getPush(data) { + getPush(data, flag) { this.tableKey = data + this.flag = flag this.searchModel = '' this.visible = true this.visibleTree = false @@ -99,10 +101,20 @@ this.visibleTree = false }, handleSubmit() { - let query = { - documentIds: this.tableKey.join(','), - userIds: this.userIds.join(','), - departIds: this.userIds.join(',') + let query = {} + if (this.flag) { + query = { + documentIds: this.tableKey.join(','), + userIds: this.userIds.join(','), + departIds: this.userIds.join(','), + flag: this.flag + } + } else { + query = { + documentIds: this.tableKey.join(','), + userIds: this.userIds.join(','), + departIds: this.userIds.join(',') + } } this.submitLoading = true this.confirmLoading = true diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index fcb5b468c..1629ad194 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -234,7 +234,13 @@ handleCompare() { if (this.selectedRowKeys.length > 0) { this.$nextTick(() => { - this.$refs.libraryPushRef.getPush(JSON.parse(JSON.stringify(this.selectedRowKeys))) + let flag = '' + if (this.activeTab == this.$t('ImplementationDate')) { + flag = 1 + } else { + flag = 2 + } + this.$refs.libraryPushRef.getPush(JSON.parse(JSON.stringify(this.selectedRowKeys)),flag) }) } else { this.$message.warning(this.$t('selectLeastOne')) From 349160d8f10d7c6c664263b066d5967959f133d1 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 1 Sep 2022 11:13:32 +0800 Subject: [PATCH 12/42] =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4-?= =?UTF-8?q?=E6=8B=92=E7=BB=9D=E5=8E=9F=E5=9B=A0=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 24 ++- ...tLawsInventoryRejectCauseEOController.java | 170 ++++++++++++++++++ .../ProjectLawsInventoryRejectCauseEO.java | 91 ++++++++++ ...ojectLawsInventoryRejectCauseEOMapper.java | 17 ++ ...rojectLawsInventoryRejectCauseEOMapper.xml | 17 ++ ...jectLawsInventoryRejectCauseEOService.java | 63 +++++++ ...LawsInventoryRejectCauseEOServiceImpl.java | 95 ++++++++++ 7 files changed, 476 insertions(+), 1 deletion(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryRejectCauseEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryRejectCauseEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLawsInventoryRejectCauseEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryRejectCauseEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryRejectCauseEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryRejectCauseEOServiceImpl.java diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 0f6f4a6a2..a5292221a 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -976,4 +976,26 @@ ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result` UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Sort Number' WHERE `id` = '1529373706885799937'; -- 增加角色，countryCard管理员。 2022-08-31 -INSERT INTO `laws_weilai`.`sys_role` (`id`, `role_name`, `role_code`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `parent_code`, `role_order`) VALUES ('1564916346120916993', 'countryCard管理员', 'countryCardManage', 'countryCard最大权限', 'admin', '2022-08-31 18:01:46', NULL, NULL, NULL, NULL); \ No newline at end of file +INSERT INTO `laws_weilai`.`sys_role` (`id`, `role_name`, `role_code`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `parent_code`, `role_order`) VALUES ('1564916346120916993', 'countryCard管理员', 'countryCardManage', 'countryCard最大权限', 'admin', '2022-08-31 18:01:46', NULL, NULL, NULL, NULL); + +-- 清单确认，拒绝原因表 2022-09-01 +CREATE TABLE `laws_weilai`.`project_laws_inventory_reject_cause` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL , + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人' , + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期' , + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人' , + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期' , + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门' , + `reject_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝人id' , + `reject_time` datetime NULL DEFAULT NULL COMMENT '拒绝时间' , + `reject_cause` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因' , + `project_laws_inventory_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规清单id' , + `reject_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝类型' , + PRIMARY KEY (`id`) +) +ENGINE=InnoDB +DEFAULT CHARACTER SET=utf8mb4 COLLATE=utf8mb4_general_ci +COMMENT='清单确认-拒绝原因表' +ROW_FORMAT=DYNAMIC +; + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryRejectCauseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryRejectCauseEOController.java new file mode 100644 index 000000000..4b2d19ce5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryRejectCauseEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.project.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ProjectLawsInventoryRejectCauseEO; +import com.jero.modules.project.service.IProjectLawsInventoryRejectCauseEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 清单确认-拒绝原因表 + * @Author: jero-boot + * @Date: 2022-09-01 + * @Version: V1.0 + */ +@Api(tags="清单确认-拒绝原因表") +@RestController +@RequestMapping("/project/projectLawsInventoryRejectCauseEO") +@Slf4j +public class ProjectLawsInventoryRejectCauseEOController extends JeroController { + @Autowired + private IProjectLawsInventoryRejectCauseEOService projectLawsInventoryRejectCauseEOService; + + /** + * 分页列表查询 + * + * @param projectLawsInventoryRejectCauseEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-分页列表查询") + @ApiOperation(value="清单确认-拒绝原因表-分页列表查询", notes="清单确认-拒绝原因表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryRejectCauseEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectLawsInventoryRejectCauseEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-列表查询") + @ApiOperation(value="清单确认-拒绝原因表-列表查询", notes="清单确认-拒绝原因表-列表查询") + @GetMapping(value = "/list") + public Result> queryList(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO,HttpServletRequest req) { + List list = projectLawsInventoryRejectCauseEOService.queryList(projectLawsInventoryRejectCauseEO,req); + return Result.OK(list); + } + + /** + * 添加 + * + * @param projectLawsInventoryRejectCauseEO + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-添加") + @ApiOperation(value="清单确认-拒绝原因表-添加", notes="清单确认-拒绝原因表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO) { + projectLawsInventoryRejectCauseEOService.add(projectLawsInventoryRejectCauseEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param projectLawsInventoryRejectCauseEO + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-编辑") + @ApiOperation(value="清单确认-拒绝原因表-编辑", notes="清单确认-拒绝原因表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO) { + projectLawsInventoryRejectCauseEOService.editById(projectLawsInventoryRejectCauseEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-通过id删除") + @ApiOperation(value="清单确认-拒绝原因表-通过id删除", notes="清单确认-拒绝原因表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + projectLawsInventoryRejectCauseEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-批量删除") + @ApiOperation(value="清单确认-拒绝原因表-批量删除", notes="清单确认-拒绝原因表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.projectLawsInventoryRejectCauseEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-通过id查询") + @ApiOperation(value="清单确认-拒绝原因表-通过id查询", notes="清单确认-拒绝原因表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO = projectLawsInventoryRejectCauseEOService.queryById(id); + if(projectLawsInventoryRejectCauseEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectLawsInventoryRejectCauseEO); + } + + /** + * 导出excel + * + * @param request + * @param projectLawsInventoryRejectCauseEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO) { + return super.exportXls(request, projectLawsInventoryRejectCauseEO, ProjectLawsInventoryRejectCauseEO.class, "清单确认-拒绝原因表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProjectLawsInventoryRejectCauseEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryRejectCauseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryRejectCauseEO.java new file mode 100644 index 000000000..8b7304ff7 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryRejectCauseEO.java @@ -0,0 +1,91 @@ +package com.jero.modules.project.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 清单确认-拒绝原因表 + * @Author: jero-boot + * @Date: 2022-09-01 + * @Version: V1.0 + */ +@Data +@TableName("project_laws_inventory_reject_cause") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_laws_inventory_reject_cause对象", description="清单确认-拒绝原因表") +public class ProjectLawsInventoryRejectCauseEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**拒绝人id*/ + @Excel(name = "拒绝人id", width = 15) + @ApiModelProperty(value = "拒绝人id") + private java.lang.String rejectUserId; + + /**拒绝时间*/ + @Excel(name = "拒绝时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "拒绝时间") + private java.util.Date rejectTime; + + /**拒绝原因*/ + @Excel(name = "拒绝原因", width = 15) + @ApiModelProperty(value = "拒绝原因") + private java.lang.String rejectCause; + + /**法规清单id*/ + @Excel(name = "法规清单id", width = 15) + @ApiModelProperty(value = "法规清单id") + private java.lang.String projectLawsInventoryId; + + /**拒绝类型*/ + @Excel(name = "拒绝类型", width = 15) + @ApiModelProperty(value = "拒绝类型") + private java.lang.String rejectType; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLawsInventoryRejectCauseEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLawsInventoryRejectCauseEOMapper.java new file mode 100644 index 000000000..836720310 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLawsInventoryRejectCauseEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.project.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.project.entity.ProjectLawsInventoryRejectCauseEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 清单确认-拒绝原因表 + * @Author: jero-boot + * @Date: 2022-09-01 + * @Version: V1.0 + */ +public interface ProjectLawsInventoryRejectCauseEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryRejectCauseEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryRejectCauseEOMapper.xml new file mode 100644 index 000000000..c34c458e5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryRejectCauseEOMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryRejectCauseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryRejectCauseEOService.java new file mode 100644 index 000000000..f112fe1a4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryRejectCauseEOService.java @@ -0,0 +1,63 @@ +package com.jero.modules.project.service; + +import com.jero.modules.project.entity.ProjectLawsInventoryRejectCauseEO; +import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @Description: 清单确认-拒绝原因表 + * @Author: jero-boot + * @Date: 2022-09-01 + * @Version: V1.0 + */ +public interface IProjectLawsInventoryRejectCauseEOService extends IService { + + /** + * 保存 + * + * @param projectLawsInventoryRejectCauseEO + * @return + */ + void add(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO); + + /** + * 更新 + * + * @param projectLawsInventoryRejectCauseEO + * @return + */ + void editById(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectLawsInventoryRejectCauseEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO, HttpServletRequest req); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryRejectCauseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryRejectCauseEOServiceImpl.java new file mode 100644 index 000000000..539ecbb8c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryRejectCauseEOServiceImpl.java @@ -0,0 +1,95 @@ +package com.jero.modules.project.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ProjectLawsInventoryRejectCauseEO; +import com.jero.modules.project.mapper.ProjectLawsInventoryRejectCauseEOMapper; +import com.jero.modules.project.service.IProjectLawsInventoryRejectCauseEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.servlet.http.HttpServletRequest; + +/** + * @Description: 清单确认-拒绝原因表 + * @Author: jero-boot + * @Date: 2022-09-01 + * @Version: V1.0 + */ +@Service +public class ProjectLawsInventoryRejectCauseEOServiceImpl extends ServiceImpl implements IProjectLawsInventoryRejectCauseEOService { + + /** + * 保存 + * + * @param projectLawsInventoryRejectCauseEO + * @return + */ + @Override + public void add(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO) { + Date now = new Date(); + projectLawsInventoryRejectCauseEO.setCreateTime(now); + projectLawsInventoryRejectCauseEO.setUpdateTime(now); + save(projectLawsInventoryRejectCauseEO); + } + + /** + * 更新 + * + * @param projectLawsInventoryRejectCauseEO + * @return + */ + @Override + public void editById(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO) { + Date now = new Date(); + projectLawsInventoryRejectCauseEO.setUpdateTime(now); + saveOrUpdate(projectLawsInventoryRejectCauseEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProjectLawsInventoryRejectCauseEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryRejectCauseEO, req.getParameterMap()); + List result = this.list(queryWrapper); + return result; + } +} From ba36f428a477b5cea46232c66c96dd4d9a212b9c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 1 Sep 2022 11:52:28 +0800 Subject: [PATCH 13/42] =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=B7=B2=E7=BB=8F--?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warn/controller/LawsWarnController.java | 4 +- .../modules/warn/service/LawsWarnService.java | 135 +++++++++++++++++- 2 files changed, 131 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java index b1dba1d41..ef7064226 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java @@ -64,8 +64,8 @@ public class LawsWarnController { @ApiOperation(value = "推送") @GetMapping(value = "/warnPullMessage") // @RequiresPermissions("document:pullMessage") - public Result pullMessage(String departIds,String userIds,String documentIds) { - lawsWarnService.warnPullMessage(departIds,userIds,documentIds); + public Result pullMessage(String departIds,String userIds,String documentIds,String flag) { + lawsWarnService.warnPullMessage(departIds,userIds,documentIds,flag); return Result.OK("推送成功"); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index 302b9a27f..beab9d1eb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -338,7 +338,7 @@ public class LawsWarnService { } - public String warnPullMessage(String departIds, String userIds, String documentIds) { + public String warnPullMessage(String departIds, String userIds, String documentIds,String flag) { Set allDepartIds = new HashSet<>(); //查询当前部门下所有部门 if (StringUtils.isNotEmpty(departIds)) { @@ -379,6 +379,25 @@ public class LawsWarnService { List urlList = new ArrayList<>(); List hrefList = new ArrayList<>(); for (Map map : mapList) { + //1-->新车型实施日期, 2-->在产车实施日期 + String timeContent = ""; + if("1".equals(flag)){ + String value = StringUtils.valueOf(map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1")); + if(StringUtils.isNotBlank(value)){ + if(value.contains(" ")){ + value = value.split(" ")[0]; + } + timeContent =" to you as the implementation date of the new model is " +value; + } + }else if("2".equals(flag)){ + String value = StringUtils.valueOf(map.get("implement_time")); + if(StringUtils.isNotBlank(value)){ + if(value.contains(" ")){ + value = value.split(" ")[0]; + } + timeContent =" to you as the implementation date of vehicle production is " +value; + } + } serialNumberList.add(StringUtils.valueOf(map.get("serial_number"))); String url = backUrl + "/docManage/library/detail?id=" + map.get("id") + "&title=" + map.get("title") + @@ -388,13 +407,16 @@ public class LawsWarnService { "&title=" + map.get("title") + "&serial_number=" + map.get("serial_number") + "'" + " target='_blank'>" + map.get("serial_number") + ""; urlList.add(url); - hrefList.add(href); + hrefList.add(href+timeContent); } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you. Please be reminded to check it out."; - String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out."; + String content = StringUtils.join(serialNumberList, ",") + " has been shared with you, please check."; + //消息详情模板 + // XXX has pushed GB 7258 to you as the implementation date of vehicle production is XXXX-XX-XX， + // GB 7258 to you as the implementation date of vehicle production is XXXX-XX-XX， Please be reminded to check it out. + String contentInfo = sysUser.getUsername() + " has pushed " + StringUtils.join(hrefList, ",") + ", Please be reminded to check it out."; String title = content; //封装消息的实体类 @@ -409,10 +431,28 @@ public class LawsWarnService { mapList.stream().forEach(e->{ if(s.contains((String)e.get("id"))){ String serialNumber = StringUtils.valueOf(e.get("serial_number")); - list.add(serialNumber); + String timeContent = ""; + if("1".equals(flag)){ + String value = StringUtils.valueOf(e.get("xin1_che1_xing2_shi2_shi1_ri4_qi1")); + if(StringUtils.isNotBlank(value)){ + if(value.contains(" ")){ + value = value.split(" ")[0]; + } + timeContent =" to you as the implementation date of the new model is " +value; + } + }else if("2".equals(flag)){ + String value = StringUtils.valueOf(e.get("implement_time")); + if(StringUtils.isNotBlank(value)){ + if(value.contains(" ")){ + value = value.split(" ")[0]; + } + timeContent =" to you as the implementation date of vehicle production is " +value; + } + } + list.add(serialNumber + timeContent); } }); - String contentTemp = sysUser.getUsername() + " pushed " + StringUtils.join(list, ",") + " to you. Please be reminded to check it out."; + String contentTemp = sysUser.getUsername() + " has pushed " + StringUtils.join(list, ",") + ", Please be reminded to check it out."; iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode); } } catch (IOException e) { @@ -421,4 +461,87 @@ public class LawsWarnService { bussDocumentLibraryEOService.sendWebsocket(documentIds, contentInfo); return "推送成功"; } +// public String warnPullMessage(String departIds, String userIds, String documentIds,String flag) { +// Set allDepartIds = new HashSet<>(); +// //查询当前部门下所有部门 +// if (StringUtils.isNotEmpty(departIds)) { +// String[] departIdArr = departIds.split(","); +// for (String departId : departIdArr) { +// List subDepIdsByDepId = sysDepartService.getSubDepIdsByDepId(departId); +// allDepartIds.addAll(subDepIdsByDepId); +// } +// } +// +// List userIdList = new ArrayList<>(); +// List thirdIdList = new ArrayList<>(); +// if (StringUtils.isNotBlank(departIds)) { +// //查询部门下的人员 +// List userList = new ArrayList<>(); +// if(allDepartIds.size() != 0){ +// userList = sysUserService.getUserListByDepIds(new ArrayList<>(allDepartIds)); +// } +// +// if (userList.size() != 0) { +// userIdList = userList.stream().map(SysUser::getId).distinct().collect(Collectors.toList()); +// thirdIdList = userList.stream().map(SysUser::getThirdId).distinct().collect(Collectors.toList()); +// } +// } +// if(userIdList.size() == 0 && StringUtils.isNotBlank(userIds)){ +// List sysUsers = sysUserService.listByIds(Arrays.asList(userIds.split(","))); +// if(sysUsers.size() != 0){ +// List userId = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList()); +// List thirdId = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); +// userIdList.addAll(userId); +// thirdIdList.addAll(thirdId); +// } +// } +// +// //查询文档 +// List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(documentIds); +// List serialNumberList = new ArrayList<>(); +// List urlList = new ArrayList<>(); +// List hrefList = new ArrayList<>(); +// for (Map map : mapList) { +// serialNumberList.add(StringUtils.valueOf(map.get("serial_number"))); +// String url = backUrl + "/docManage/library/detail?id=" + map.get("id") + +// "&title=" + map.get("title") + +// "&serial_number=" + map.get("serial_number"); +// +// String href = "" + map.get("serial_number") + ""; +// urlList.add(url); +// hrefList.add(href); +// } +// +// +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you. Please be reminded to check it out."; +// String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out."; +// String title = content; +// +// //封装消息的实体类 +// SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.PUSH.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); +// sysAnnouncementService.saveAnnouncement(sysAnnouncement); +// bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo); +// //飞书 +// try { +// for (String s : urlList) { +// String encode = UriEncoder.encode(s); +// List list = new ArrayList<>(); +// mapList.stream().forEach(e->{ +// if(s.contains((String)e.get("id"))){ +// String serialNumber = StringUtils.valueOf(e.get("serial_number")); +// list.add(serialNumber); +// } +// }); +// String contentTemp = sysUser.getUsername() + " pushed " + StringUtils.join(list, ",") + " to you. Please be reminded to check it out."; +// iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// bussDocumentLibraryEOService.sendWebsocket(documentIds, contentInfo); +// return "推送成功"; +// } } From 36a32c9e65391fd53a3a187568b1fd9a4c843de2 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 1 Sep 2022 15:01:51 +0800 Subject: [PATCH 14/42] =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/components/TaskList.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 86f5aa9e1..1ab2063a7 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -81,9 +81,11 @@
+ {{$t('BatchMaintenanceProgress')}}
+ {{$t('BatchChangeStatus')}}
From dd474da90a2ee03984b0ef38f43d6692659e0759 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 1 Sep 2022 15:21:24 +0800 Subject: [PATCH 15/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E5=90=8E=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../documentManage/splitting/modules/ImportResult.vue | 2 +- .../documentManage/splitting/modules/SplitDetail.vue | 2 +- jero-web/src/views/externalReports/index.vue | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue index bd2816cf4..e32f15a33 100644 --- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue +++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue @@ -235,7 +235,7 @@ }, //模板下载 downLoad(){ - let name = this.$t('documentSplitTemplate')+'.xls' + let name = this.$t('documentSplitTemplate')+'.xlsx' downloadFile('split/sarFileSplitItems/exportTemplate',name, {}) }, //保存 diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index b3807a125..0c7ae9535 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -819,7 +819,7 @@ }, //模板下载 handleDownManage() { - let name = this.$t('documentSplitTemplate') + '.xls' + let name = this.$t('documentSplitTemplate') + '.xlsx' downloadFile('split/sarFileSplitItems/exportTemplate', name, {}) }, //合并条款 diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 601ecb279..7ef96c8bb 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -206,7 +206,7 @@ :title="$t('Administrativeprivileges')">{{$t('Administrativeprivileges')}}
- {{$t('Checkthepermissions')}}
- Date: Thu, 1 Sep 2022 15:27:26 +0800 Subject: [PATCH 16/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonnelSelectionAll/index.vue | 318 ++++++++++++++++++ 1 file changed, 318 insertions(+) create mode 100644 jero-web/src/components/PersonnelSelectionAll/index.vue diff --git a/jero-web/src/components/PersonnelSelectionAll/index.vue b/jero-web/src/components/PersonnelSelectionAll/index.vue new file mode 100644 index 000000000..9a050d228 --- /dev/null +++ b/jero-web/src/components/PersonnelSelectionAll/index.vue @@ -0,0 +1,318 @@ + + + + + \ No newline at end of file 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 17/42] =?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 18/42] =?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 19/42] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-bug5?= =?UTF-8?q?9041,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 20/42] =?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 21/42] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-bug5?= =?UTF-8?q?9041,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 22/42] =?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 @@ \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue index e62ec4b42..b5108ebad 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue @@ -1,76 +1,81 @@