From 0e6ae94f81c3f319d78c6aa2008dfcae5dad7d53 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 13 Mar 2023 09:54:10 +0800 Subject: [PATCH 01/46] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E9=A1=B9?= =?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 --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 7 ++++++ ...ectCertificationInventoryEOController.java | 7 ++++++ .../ProjectCertificationInventoryEO.java | 1 + ...rojectCertificationInventoryEOService.java | 7 ++++++ ...ctCertificationInventoryEOServiceImpl.java | 22 +++++++++++++++++++ 5 files changed, 44 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 1eb94cb36..d50c0e628 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -325,3 +325,10 @@ CREATE TABLE `auth_dummy_content_change` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +-- 标签管理 增加认证清单-配置项数据 2023-03-13 未同步生产环境 +INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1635093263477002242', '认证清单-配置项', 'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4', '认证清单-配置项', 0, 'admin', '2023-03-13 09:39:47', NULL, NULL, NULL, NULL, 1, 0, '1', 1); + +INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093344389320705', '1635093263477002242', '配置1', '46c10455e29e4855bb7e5d653b11a51d', '开发环境假数据', 1, 1, 'admin', '2023-03-13 09:40:07', 'admin', '2023-03-13 09:40:46', 1, NULL, NULL, '0', 'pz1'); +INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093406049783810', '1635093263477002242', '配置2', '4718f8eef0434d079b970834a2b9dd69', '开发环境假数据', 2, 1, 'admin', '2023-03-13 09:40:21', 'admin', '2023-03-13 09:40:43', 1, NULL, NULL, '0', 'Pz2'); +INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093480922304513', '1635093263477002242', '配置3', 'd3dd928d93d74e07ad8fa31bffea9641', '开发环境假数据', 3, 1, 'admin', '2023-03-13 09:40:39', NULL, NULL, 1, NULL, NULL, '0', 'Pz3'); + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java index 898b198d4..fbc8ec65b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java @@ -241,4 +241,11 @@ public class ProjectCertificationInventoryEOController extends JeroController expediting(@RequestBody JSONObject json) { return this.projectCertificationInventoryEOService.expediting(json); } + + @AutoLog(value = "项目库-认证清单表-批量修改配置项") + @ApiOperation(value="项目库-认证清单表-批量修改配置项", notes="项目库-认证清单表-批量修改配置项") + @PostMapping(value = "/updateConfigItemBatch") + public Result updateConfigItemBatch(@RequestBody JSONObject json) { + return this.projectCertificationInventoryEOService.updateConfigItemBatch(json); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java index 9242934e8..c600ead2a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java @@ -75,6 +75,7 @@ public class ProjectCertificationInventoryEO implements Serializable { /**配置项*/ @Excel(name = "配置项", width = 15) @ApiModelProperty(value = "配置项") + @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") private java.lang.String configItem; /**WVTA ID*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index 7ae88da7e..792c9ce16 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -160,4 +160,11 @@ public interface IProjectCertificationInventoryEOService extends IService getCertificationInventoryLinkHrefFeishu(String projectLibraryId,String PRN_CN,String PRN_EN); Map getStandNameAndItemName(List projectCertificationInventoryEOList); + + /** + * 批量修改配置项 + * @param json + * @return + */ + Result updateConfigItemBatch(JSONObject json); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index b4eea846e..bd93b3bb0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -1746,4 +1746,26 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl updateConfigItemBatch(JSONObject json) { + String ids = json.getString("ids"); + if(StringUtils.isEmpty(ids)){ + throw new JeroBootException("至少选择一条数据进行操作！"); + } + + String configItem = json.getString("configItem"); + if(StringUtils.isEmpty(ids)){ + throw new JeroBootException("请选择一个配置！"); + } + QueryWrapper queryWrap = new QueryWrapper<>(); + queryWrap.lambda().in(ProjectCertificationInventoryEO::getId,ids.split(",")); + List projectCertificationInventoryEOList = this.list(queryWrap); + projectCertificationInventoryEOList.forEach(certificationInventoryEO -> { + certificationInventoryEO.setConfigItem(configItem); + }); + + this.updateBatchById(projectCertificationInventoryEOList); + return Result.OK("修改配置成功！"); + } } From 1e81d1731f5fc6ef7f95065b17621e443becde0a Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 13 Mar 2023 10:13:11 +0800 Subject: [PATCH 02/46] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=98=8E=E7=BB=86=E8=A1=A8=20=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=20=E4=BA=A4=E4=BB=98=E7=89=A9?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 3 +++ .../authDummy/entity/AuthDummyInventoryInfoEO.java | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index d50c0e628..a08943981 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -332,3 +332,6 @@ INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `descri INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093406049783810', '1635093263477002242', '配置2', '4718f8eef0434d079b970834a2b9dd69', '开发环境假数据', 2, 1, 'admin', '2023-03-13 09:40:21', 'admin', '2023-03-13 09:40:43', 1, NULL, NULL, '0', 'Pz2'); INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093480922304513', '1635093263477002242', '配置3', 'd3dd928d93d74e07ad8fa31bffea9641', '开发环境假数据', 3, 1, 'admin', '2023-03-13 09:40:39', NULL, NULL, 1, NULL, NULL, '0', 'Pz3'); +-- 认证虚拟清单明细表 增加字段 交付物类型 2023-03-13 未同步生产环境 +ALTER TABLE `auth_dummy_inventory_info` + ADD COLUMN `deliverable_type` varchar(255) NULL COMMENT '交付物类型' AFTER `deliverable`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java index 8dee0aa8a..a140133ef 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java @@ -97,6 +97,14 @@ public class AuthDummyInventoryInfoEO implements Serializable { @ApiModelProperty(value = "交付物") private java.lang.String deliverable; + /**交付物类型*/ + @Excel(name = "交付物类型", width = 15) + @ApiModelProperty(value = "交付物类型") + private String deliverableType; + @TableField(exist = false) + // 交付物类型名称 + private String deliverableTypeName; + /**文档库id*/ // @Excel(name = "文档库id", width = 15) @ApiModelProperty(value = "文档库id") From f1725f92e0381ef85827d1803a11f0ed23804fc9 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 13 Mar 2023 10:23:57 +0800 Subject: [PATCH 03/46] update --- .../controller/ProjectCertificationInventoryEOController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java index fbc8ec65b..e391fdfbf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java @@ -60,7 +60,7 @@ public class ProjectCertificationInventoryEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = this.projectCertificationInventoryEOService.queryPage(queryWrapper,page,projectCertificationInventoryEO,cut); - return Result.OK(pageList); + return Result.OK(cut,pageList); } /** From f62aecb925481ede899e40ba6a55e23b0146c1b4 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 13 Mar 2023 11:24:47 +0800 Subject: [PATCH 04/46] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E8=B0=83=E5=8F=96=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ectCertificationInventoryEOController.java | 7 +++ ...rojectCertificationInventoryEOService.java | 7 +++ ...ctCertificationInventoryEOServiceImpl.java | 46 ++++++++++++++++++- 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java index e391fdfbf..51f739282 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java @@ -248,4 +248,11 @@ public class ProjectCertificationInventoryEOController extends JeroController updateConfigItemBatch(@RequestBody JSONObject json) { return this.projectCertificationInventoryEOService.updateConfigItemBatch(json); } + + @AutoLog(value = "项目库-认证清单表-调取添加") + @ApiOperation(value="项目库-认证清单表-调取添加", notes="项目库-认证清单表-调取添加") + @PostMapping(value = "/callAdd") + public Result callAdd(@RequestBody JSONObject json) { + return this.projectCertificationInventoryEOService.callAdd(json); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index 792c9ce16..4d86f8bbe 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -167,4 +167,11 @@ public interface IProjectCertificationInventoryEOService extends IService updateConfigItemBatch(JSONObject json); + + /** + * 调取添加 + * @param json + * @return + */ + Result callAdd(JSONObject json); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index bd93b3bb0..e8535fb80 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -11,6 +11,9 @@ import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; +import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; +import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService; +import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.project.entity.ProjectCertificationInventoryEO; @@ -84,6 +87,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl standNameAndItemName = this.getStandNameAndItemName(projectCertificationInventoryEOList); String standName = (String) standNameAndItemName.get("standName"); String itemName = (String) standNameAndItemName.get("itemName"); @@ -1693,8 +1704,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl callAdd(JSONObject json) { + String authDummyInventoryBaseId = json.getString("authDummyInventoryBaseId"); + if(StringUtils.isEmpty(authDummyInventoryBaseId)){ + throw new JeroBootException("请选择一个认证虚拟清单进行操作！"); + } + + String authDummyInventoryInfoIds = json.getString("authDummyInventoryInfoIds"); + if(StringUtils.isEmpty(authDummyInventoryInfoIds)){ + throw new JeroBootException("至少选择一条数据进行调取！"); + } + + String projectLibraryId = json.getString("projectLibraryId"); + + QueryWrapper authDummyInfoQueryWrap = new QueryWrapper<>(); + authDummyInfoQueryWrap.lambda().in(AuthDummyInventoryInfoEO::getId,authDummyInventoryInfoIds.split(",")); + List authDummyInventoryInfoEOList = this.authDummyInventoryInfoEOService.list(authDummyInfoQueryWrap); + + if(CollectionUtils.isNotEmpty(authDummyInventoryInfoEOList)){ + List projectCertificationInventoryEOList = new ArrayList<>(); + for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : authDummyInventoryInfoEOList) { + ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = new ProjectCertificationInventoryEO(); + BeanUtils.copyProperties(authDummyInventoryInfoEO,projectCertificationInventoryEOTemp); + + projectCertificationInventoryEOTemp.setProjectLibraryId(projectLibraryId); + projectCertificationInventoryEOList.add(projectCertificationInventoryEOTemp); + } + this.saveBatch(projectCertificationInventoryEOList); + } + + return Result.OK("调取成功！"); + } } From 36426c7ac597185379a7e6522fc3812e74af1e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 13 Mar 2023 11:30:28 +0800 Subject: [PATCH 05/46] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationList/components/addModel.vue | 210 +++++++++++++----- .../components/batSetting.vue | 133 +++++++---- .../components/certificationList/index.vue | 60 ++++- 3 files changed, 303 insertions(+), 100 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 03441eca1..3edbcd8c6 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -93,7 +93,46 @@ - + + +
+
+ * + {{$t('configurationItem')}} +
+ + + +
+ + +
+
+ * + {{$t('areaOfResponsibility')}} +
+ + + +
+ +
@@ -141,25 +180,6 @@ - -
-
- * - {{$t('areaOfResponsibility')}} -
- - - -
-
@@ -180,30 +200,52 @@
- -
* - {{$t('personLiable')}} + {{$t('closingDate')}}
- - +
+ + + + + + + + + + + + + + + + + + + + + + +
@@ -240,7 +282,44 @@ - + + +
+
+ * + {{$t('configurationItem')}} +
+ + + +
+ + +
+
+ * + {{$t('areaOfResponsibility')}} +
+ + + +
+ +
@@ -286,24 +365,6 @@ - -
-
- * - {{$t('areaOfResponsibility')}} -
- - - -
-
@@ -323,6 +384,26 @@
+ +
+
+ * + {{$t('closingDate')}} +
+ + + +
+ @@ -377,6 +458,7 @@ import uploadFile from '@/components/uploadFile/file' import { getAction, postAction, downloadFile, putAction } from '@/api/manage' import { mapGetters } from 'vuex' + import moment from 'moment' export default { name: 'addModel', @@ -450,7 +532,17 @@ message: this.$t('personLiable') + this.$t('cannotEmpty'), trigger: 'change' } - ] + ], + endTime:[ + { + required: true, + message: this.$t('closingDate') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + configItem:[ + { required: true, message: this.$t('configurationItem') + this.$t('cannotEmpty'), trigger: 'change' }, + ], }, disabled: false, projectNameList: [], @@ -471,6 +563,18 @@ }, methods: { ...mapGetters(['userInfo']), + disabledDate(current) { + return current && current < moment().subtract(1, 'day') + }, + dateChange(item,index) { + if (index){ + this.formInline.dataList[index][item.db_field_name] = this.formInline.dataList[index][item.db_field_name] ? moment(this.formInline.dataList[index][item.db_field_name]).format('YYYY-MM-DD') : '' + + }else{ + this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : '' + + } + }, getDeliverableTree() { getAction('/sys/category/getDeliverableTree', {}).then((res) => { if (res.success) { diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue index 6d7f9cde3..0a6dcdd5b 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue @@ -17,19 +17,11 @@ {{$t('configurationItem')}}
- - - - {{ item.label }} - - - +
@@ -74,15 +66,20 @@
- {{$t('personLiable')}} + {{$t('typeOfDeliverables')}}
- +
@@ -91,25 +88,52 @@
- {{$t('typeOfDeliverables')}} + {{$t('closingDate')}}
- - - - - {{ item.label }} - - - + +
+ +
+
+ {{$t('CertificationProgress')}} +
+ + + +
+ + + + +
+
+ {{$t('remarks')}} +
+ + + +
+ @@ -122,7 +146,7 @@ export default { name: 'batSetting', - props: ['url'], + props: ['url','roleSwitchingCode'], components: { PersonnelSelection }, @@ -131,19 +155,36 @@ visible: false, confirmLoading: false, formInline: {}, - rules: {}, + rules: { + + }, ids: [], configurationItemList: [], engineeringInterfacePersonList: [], typeOfDeliverablesList: [], - name: '' + name: '', + DeliverableTreeList: [] } }, mounted() { }, methods: { + disabledDate(current) { + return current && current < moment().subtract(1, 'day') + }, + + getDeliverableTree() { + getAction('/sys/category/getDeliverableTree', {}).then((res) => { + if (res.success) { + this.DeliverableTreeList = res.result + } else { + this.DeliverableTreeList = [] + } + }) + }, edit(data, name) { this.visible = true + this.getDeliverableTree() this.$nextTick(() => { this.ids = data || [] this.formInline = {} @@ -163,12 +204,24 @@ }, handleOkOne() { let ids = JSON.parse(JSON.stringify(this.ids)) + let formInline = JSON.parse(JSON.stringify(this.formInline)) + Object.keys(formInline).forEach(res => { + if (formInline[res] && formInline[res] instanceof Array) { + formInline[res] = formInline[res].join(',') + } + }) let query = { ids: ids.join(','), - ...this.formInline + ...formInline } + let url = '' this.confirmLoading = true - postAction(this.url.setBatch, query).then((res) => { + if (this.name == this.$t('changeSetting')) { + url = '/project/projectCertificationInventoryEO/updateConfigItemBatch' + } else { + url = this.url.setBatch + } + postAction(url, query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index b3cacecb4..acb6c31bf 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -54,10 +54,10 @@ {{ $t('query') }} {{ $t('reset') }} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + + + + @@ -347,7 +347,7 @@ - + @@ -473,7 +473,51 @@ 'NA': 'notInvolvedColor', 'Not start': 'submittedColor' }, - fieldList: [], + fieldList: [ + { + type: 'string', + value: 'category', + text: this.$t('category') + }, + { + type: 'string', + value: 'inspectionItem', + text: this.$t('inspectionItems') + }, + { + type: '', + value: 'configItem', + text: this.$t('configurationItem'), + dictCode: 'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 + }, + { + type: 'string', + value: 'wvtaId', + text: 'WVTA ID' + }, + { + type: 'string', + value: 'serialNumber', + text: this.$t('standardNo') + }, + { + type: 'Personnel', + value: 'sdt', + valueName: 'sdtName', + text: this.$t('engineeringInterfacePerson') + }, + { + type: 'Personnel', + value: 'dutyPerson', + valueName: 'dutyPersonName', + text: this.$t('personLiable') + }, + { + type: 'date', + value: 'endTime', + text: this.$t('closingDate') + }, + ], disabled: false, queryParamQuery: {}, formInline: {}, @@ -538,7 +582,7 @@ { title: this.$t('configurationItem'), align: 'left', - dataIndex: 'configItem', + dataIndex: 'configItem_dictText', width: 180, ellipsis: true }, @@ -1187,6 +1231,8 @@ this.$message.success(this.$t('OperationSuccessful')) this.visibleRoleSwitching = false this.confirmLoadingRoleSwitching = false + this.selectedRowKeysList = [] + this.selectedRowKeys = [] this.getList() this.$emit('getRoleSwitch', this.roleSwitchingCode) } else { From 13e067941de18a0f4eb22f62cdf6cf063663f31a Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Mon, 13 Mar 2023 11:31:38 +0800 Subject: [PATCH 06/46] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95-=E6=A8=A1=E6=9D=BF=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ectCertificationInventoryEOController.java | 7 + ...rojectCertificationInventoryEOService.java | 10 ++ ...ctCertificationInventoryEOServiceImpl.java | 123 ++++++++++++++++++ 3 files changed, 140 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java index e391fdfbf..8534b2c3b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java @@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.project.entity.ProjectCertificationInventoryEO; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.service.IProjectCertificationInventoryEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -248,4 +249,10 @@ public class ProjectCertificationInventoryEOController extends JeroController updateConfigItemBatch(@RequestBody JSONObject json) { return this.projectCertificationInventoryEOService.updateConfigItemBatch(json); } + + @ApiOperation(value="项目库-认证清单表-模板下载", notes="项目库-认证清单表-模板下载") + @GetMapping(value = "/exportTemplate") + public void exportTemplate(ProjectCertificationInventoryEO projectCertificationInventoryEO, HttpServletResponse response, HttpServletRequest request) throws Exception { + projectCertificationInventoryEOService.exportTemplate(projectCertificationInventoryEO,response,request); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index 792c9ce16..8284f1efb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -12,6 +12,8 @@ import com.jero.modules.system.entity.SysRole; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -161,6 +163,14 @@ public interface IProjectCertificationInventoryEOService extends IService getStandNameAndItemName(List projectCertificationInventoryEOList); + /** + * 模板下载 + * @param projectCertificationInventoryEO + * @param response + * @param request + */ + void exportTemplate(ProjectCertificationInventoryEO projectCertificationInventoryEO, HttpServletResponse response, HttpServletRequest request); + /** * 批量修改配置项 * @param json diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index bd93b3bb0..e53099cd0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.project.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.aliyuncs.utils.IOUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -37,6 +38,15 @@ import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.todoCenter.service.IProcessInfoEOService; import com.jero.modules.wkflow.enums.FlowTypeEnum; +import org.apache.poi.hssf.usermodel.HSSFCellStyle; +import org.apache.poi.hssf.usermodel.HSSFRichTextString; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.util.CellRangeAddress; import org.apache.shiro.SecurityUtils; import org.springframework.beans.BeanUtils; import org.apache.commons.collections4.CollectionUtils; @@ -45,7 +55,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.io.File; import java.io.IOException; +import java.io.OutputStream; import java.util.*; import java.util.stream.Collectors; @@ -54,6 +66,9 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * @Description: 项目库-认证清单表 * @Author: jero-boot @@ -88,6 +103,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(title.split(",")); + int index = 0; + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ + index = list.indexOf("认证进度") + 1; + }else{ + index = list.indexOf("Homologation Progress") + 1; + } + + //创建临时文件夹 + File nowFile = new File(filePath); + if (nowFile.exists()) { + nowFile.delete(); + } + nowFile.mkdirs(); + HSSFSheet sheet = workbook.createSheet("认证清单导入模板"); + sheet.setDefaultColumnWidth(16);//列宽 +// HSSFCellStyle cellStyle = workbook.createCellStyle(); +// cellStyle.setWrapText(true);//自动换行 +// cellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中 +// cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中 + + HSSFCellStyle cellStyleTemp = workbook.createCellStyle(); + cellStyleTemp.setWrapText(true);//自动换行 + + CellRangeAddress region = + new CellRangeAddress(1, 1, 0, 15); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列 + sheet.addMergedRegion(region); + String explain= ""; + if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ + explain = "填写说明\n" + + "1.导入数据从第三行开始\n" + + "2.所有带*号的字段必须填写\n"+ + "3.责任人,交付物类型,工程接口人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" + + "4.编号,责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" + + "5.类别,WVTA ID,检验项目,填写文本内容\n" + + "6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx"; + }else{ + explain = "Filling explanation\n" + + "1.Import data starts at the fourth line\n" + + "2.All fields marked with * must be filled in\n"+ + "3.Assignee,Deliverable Type,Deliverable Type,Eng. Interface,Fields are radio attributes that must match the corresponding field option in the system\n" + + "4.Standard No,Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" + + "5.Category,WVTA ID,Inspection Items,Fill in the text\n" + + "6.Deliverable Template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx"; + } + for(int i = 0; i < 2; i++){ + //表头 + Row row = sheet.createRow(i);//开始创建标题行 + String[] headerArr = title.split(","); + if(i == 0 ){ + for (int m = 0; m < headerArr.length; m++) { + if(m < index){ + row.createCell(m).setCellValue(headerArr[m]); + }else { + break; + } + } + }else { + short height = (short) (7 * 252); + row.setHeight((short) height); + Cell cell = row.createCell(0); + cell.setCellStyle(cellStyleTemp); + cell.setCellValue(new HSSFRichTextString(explain)); + } + } + response.setHeader("Content-Disposition", + "attachment; filename=\"" + fileOriName + ".xls"); + response.setContentType("application/force-download"); + response.flushBuffer(); + os = response.getOutputStream(); + workbook.write(os); + }catch (Exception e){ + e.printStackTrace(); + throw new JeroBootException("下载文件失败，请重试"); + }finally { + IOUtils.closeQuietly(os); + } + } + } From 624dd21fc55e0081d35a587b190b561ee55f708d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 13 Mar 2023 11:59:24 +0800 Subject: [PATCH 07/46] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4-=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModel.vue | 211 +++++++++++++----- .../certificationListMaintenance.vue | 1 + 2 files changed, 151 insertions(+), 61 deletions(-) diff --git a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue index a2a38a05f..a6769ebff 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue @@ -15,14 +15,22 @@
* - {{$t('regulationNo')}} + {{$t('regulationNo')}}
- - + + + + + {{ item.serialNumber}} + + +
@@ -32,12 +40,13 @@ * {{$t('areaOfResponsibility')}} - + + :triggerChange="false" :dictCode="'duty_territory'"/> @@ -49,9 +58,9 @@ * WVTA ID - + @@ -59,15 +68,12 @@
-
- {{$t('itemInformation')}} -
- - - - +
+ {{$t('itemInformation')}} + +
-
@@ -75,13 +81,14 @@ * {{$t('category')}}
- + + v-model="item.category" + :placeholder="$t('PleaseEnter')+$t('category')"/>
@@ -91,13 +98,10 @@ * {{$t('inspectionItems')}}
- - + + @@ -107,15 +111,40 @@
* - {{$t('Deliverables')}} + {{$t('configurationItem')}}
- - + + + +
+ + +
+
+ * + {{$t('typeOfDeliverables')}} +
+ +
@@ -132,6 +161,7 @@ @@ -246,12 +335,7 @@ export default { .header-text { font-size: 16px; - font-weight: bold; - margin-left: 15px; - /*border-bottom: 1px #d9d9d9 dashed;*/ - height: 30px; - margin-bottom: 30px; - display: flex; + font-weight: 500; } .drawer-bootom-button { @@ -266,4 +350,9 @@ export default { background: #fff; border-radius: 0 0 2px 2px; } + +.icon-text { + font-size: 16px; + margin-right: 4px; +} \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 348e013cb..d072fa068 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -266,6 +266,7 @@ export default { deleteBatch: '/authDummy/authDummyInventoryInfoEO/deleteBatch',//批量删除 editModel: '/authDummy/authDummyInventoryInfoEO/edit',//编辑 setBatch: '/authDummy/authDummyInventoryInfoEO/setBatch',//批量设置 + number: '/project/projectLawsInventoryEO/list', }, queryParam: {}, orderByField: '', From 6f0bb3545a338f92094ec279d08fa725081d81f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 13 Mar 2023 12:42:36 +0800 Subject: [PATCH 08/46] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4-=E6=B7=BB=E5=8A=A0(=E8=A1=A8=E5=8D=95=E9=AA=8C?= =?UTF-8?q?=E8=AF=81)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModel.vue | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue index a6769ebff..d843aa964 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue @@ -84,8 +84,8 @@ + {max: 300,message: $t('category') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'}]" + > @@ -98,7 +98,11 @@ * {{$t('inspectionItems')}} - + @@ -201,17 +205,6 @@ export default { trigger: 'blur' } ], - inspectionItem: [ - { required: true, - message: this.$t('inspectionItems') + this.$t('cannotEmpty'), - trigger: 'blur' - }, - { - max: 300, - message: this.$t('inspectionItems') + this.$t('cannotExceed') + 300 + this.$t('Characters'), - trigger: 'blur' - } - ], }, } }, From cb3258b0f75206e0c0acb8e2c908c0651e5e8035 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 13 Mar 2023 13:42:34 +0800 Subject: [PATCH 09/46] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=AF=A6=E6=83=85-=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AuthDummyInventoryInfoEOController.java | 6 +++--- .../authDummy/service/IAuthDummyInventoryInfoEOService.java | 2 +- .../service/impl/AuthDummyInventoryInfoEOServiceImpl.java | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java index 0ecf989cb..9d25e1d9e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java @@ -71,9 +71,9 @@ public class AuthDummyInventoryInfoEOController extends JeroController> queryList() { - List list = authDummyInventoryInfoEOService.queryList(); - return Result.OK(list); + public Result> queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req) { + List list = authDummyInventoryInfoEOService.queryList(authDummyInventoryInfoEO,req); + return Result.OK(authDummyInventoryInfoEO.getCut(),list); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java index 1528cc8c8..61c08e67b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java @@ -63,7 +63,7 @@ public interface IAuthDummyInventoryInfoEOService extends IService queryList(); + List queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req); /** * 复制 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index e3a17e1d7..5f7390b5d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -180,8 +180,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl queryList() { - return list(); + public List queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryInfoEO, req.getParameterMap()); + List authDummyInventoryInfoEOList = this.list(queryWrapper); + return authDummyInventoryInfoEOList; } @Override From 7d55c8077d3101ac663f757565793210bbf2baf1 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 13 Mar 2023 14:09:02 +0800 Subject: [PATCH 10/46] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=AF=A6=E6=83=85-=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthDummyInventoryInfoEOController.java | 6 ++- .../entity/AuthDummyInventoryInfoEO.java | 3 ++ .../IAuthDummyInventoryInfoEOService.java | 17 +++++++ .../AuthDummyInventoryInfoEOServiceImpl.java | 45 +++++++++++++++++++ 4 files changed, 69 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java index 9d25e1d9e..c490213c3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java @@ -59,7 +59,8 @@ public class AuthDummyInventoryInfoEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryInfoEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - IPage pageList = authDummyInventoryInfoEOService.page(page, queryWrapper); + IPage pageList = this.authDummyInventoryInfoEOService.page(page, queryWrapper); + this.authDummyInventoryInfoEOService.disposeData(pageList.getRecords(),authDummyInventoryInfoEO.getCut()); return Result.OK(pageList); } @@ -72,7 +73,8 @@ public class AuthDummyInventoryInfoEOController extends JeroController> queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req) { - List list = authDummyInventoryInfoEOService.queryList(authDummyInventoryInfoEO,req); + List list = this.authDummyInventoryInfoEOService.queryList(authDummyInventoryInfoEO,req); + this.authDummyInventoryInfoEOService.disposeData(list,authDummyInventoryInfoEO.getCut()); return Result.OK(authDummyInventoryInfoEO.getCut(),list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java index a140133ef..59943aef2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java @@ -91,6 +91,9 @@ public class AuthDummyInventoryInfoEO implements Serializable { @Excel(name = "责任领域", width = 15) @ApiModelProperty(value = "责任领域") private java.lang.String dutyTerritory; + @TableField(exist = false) + // 责任领域名称 + private String dutyTerritoryName; /**交付物*/ @Excel(name = "交付物", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java index 61c08e67b..1868b94ba 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.system.entity.SysCategory; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; @@ -103,4 +104,20 @@ public interface IAuthDummyInventoryInfoEOService extends IService datas, String cut); + + /** + * 获取责任领域名称 + * @param cut + * @param categoryList + * @param technologyTerritoryList + * @return + */ + String getTreeName(String cut, List categoryList, List technologyTerritoryList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index 5f7390b5d..0873d3289 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -28,10 +28,12 @@ import com.jero.modules.dummy.entity.DummyInventoryInfoEOEn; import com.jero.modules.dummy.service.impl.DummyLogEOServiceImpl; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.project.enums.ProjectInventoryFieldEnum; import com.jero.modules.split.common.FileUnZip; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.mapper.SysCategoryMapper; +import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import org.apache.commons.collections4.CollectionUtils; @@ -114,6 +116,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl datas, String cut) { + if(CollectionUtils.isNotEmpty(datas)){ + List categoryList = this.sysCategoryService.list(); + List sysDictItems = this.sysDictItemServiceImpl.getBaseMapper().selectItemsAll(); + + for (AuthDummyInventoryInfoEO data : datas) { + if(StringUtils.isNotEmpty(data.getDeliverableType())){ + String deliverableTypeName = this.getTreeName(cut, categoryList, Arrays.asList(data.getDeliverableType().split(","))); + data.setDeliverableTypeName(deliverableTypeName); + } + if(StringUtils.isNotEmpty(data.getDutyTerritory())){ + String dutyTerritoryName = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getDutyTerritory(),cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()); + data.setDutyTerritoryName(dutyTerritoryName); + } + } + + } + } + + @Override + public String getTreeName(String cut, List categoryList, List technologyTerritoryList) { + StringBuilder sb = new StringBuilder(); + for (String technologyTerritory : technologyTerritoryList) { + List collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList()); + if(collect.size() != 0){ + if (CutEnum.CN.getValue().equals(cut)) { + sb.append(collect.get(0).getName() + ","); + } else { + sb.append(collect.get(0).getEnName()+ ","); + } + } + } + String technologyTerritoryName = ""; + if (StringUtils.isNotBlank(sb)) { + technologyTerritoryName = sb.substring(0, sb.length() - 1); + } + return technologyTerritoryName; + } } From 510c80d736e55f69500b9f3c1a05634303c1de00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 13 Mar 2023 14:16:34 +0800 Subject: [PATCH 11/46] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationList/components/addModel.vue | 6 +- .../components/transferList.vue | 129 +++---- .../components/transferListvirtal.vue | 314 ++++++++++++++++++ .../components/certificationList/index.vue | 16 +- 4 files changed, 399 insertions(+), 66 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 3edbcd8c6..f5a011acc 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -20,12 +20,16 @@ - + {{ item.serialNumber}} diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue index 3198cb9d6..5e6100722 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue @@ -1,76 +1,84 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index acb6c31bf..f54d8afce 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -54,10 +54,10 @@ {{ $t('query') }} {{ $t('reset') }} - - - - + + + + @@ -516,7 +516,7 @@ type: 'date', value: 'endTime', text: this.$t('closingDate') - }, + } ], disabled: false, queryParamQuery: {}, @@ -762,7 +762,7 @@ if (this.roleSwitchingCode == 2) { this.preservationClick() } - this.replacePage() + this.getList() }, SizeChange(page, pageSize) { this.pageNo = 1 @@ -770,7 +770,7 @@ if (this.roleSwitchingCode == 2) { this.preservationClick() } - this.replacePage() + this.getList() }, searchQuery() { this.pageNo = 1 @@ -1129,8 +1129,8 @@ }, transferListForm() { this.pageNo = 1 - this.getList() this.selectedRowKeys = [] + this.getList() }, batSettingForm() { this.pageNo = 1 From d313c46f2b949ba0d035b9caea4157897fc963df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 13 Mar 2023 14:41:24 +0800 Subject: [PATCH 12/46] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4-=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/editModel.vue | 82 ++++++++++++++----- .../certificationListMaintenance.vue | 13 ++- 2 files changed, 70 insertions(+), 25 deletions(-) diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue index 4e35e6e15..3b92b6085 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue @@ -20,7 +20,7 @@ @@ -39,7 +39,7 @@ :disabled="disabled" :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')" :type="'select'" - :triggerChange="false"/> + :triggerChange="false" :dictCode="'duty_territory'"/> @@ -68,12 +68,10 @@ {{$t('category')}} - + @@ -84,12 +82,10 @@ {{$t('inspectionItems')}} - + @@ -99,15 +95,36 @@
* - {{$t('Deliverables')}} + {{$t('configurationItem')}}
- - + + + +
+ + +
+
+ * + {{$t('typeOfDeliverables')}} +
+ +
@@ -133,6 +150,7 @@ export default { confirmLoading: false, formInline: {}, disabled: false, + DeliverableTreeList: [], rules: { serialNumber: [ { @@ -179,6 +197,9 @@ export default { } } }, + mounted() { + this.getDeliverableTree() + }, methods: { handleCancel() { this.visible = false @@ -187,6 +208,9 @@ export default { this.visible = true this.$nextTick(() => { this.formInline = item || {} + if (this.formInline.deliverableType) { + this.formInline.deliverableType = this.formInline.deliverableType.split(',') + } this.$refs.ruleForm.clearValidate() }) }, @@ -194,6 +218,11 @@ export default { this.$refs.ruleForm.validate(valid => { if (valid) { let formInline = JSON.parse(JSON.stringify(this.formInline)) + Object.keys(formInline).forEach(res => { + if (formInline[res] && formInline[res] instanceof Array) { + formInline[res] = formInline[res].join(',') + } + }) this.confirmLoading = true postAction(this.url.editModel, formInline).then((res) => { if (res.success) { @@ -212,6 +241,15 @@ export default { } }) }, + getDeliverableTree() { + getAction('/sys/category/getDeliverableTree', {}).then((res) => { + if (res.success) { + this.DeliverableTreeList = res.result + } else { + this.DeliverableTreeList = [] + } + }) + }, } } diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index d072fa068..146338c82 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -286,6 +286,13 @@ export default { ellipsis: true, scopedSlots: { customRender: 'inspectionItems' } }, + { + title: this.$t('configurationItem'), + align: 'left', + dataIndex: 'configItem', + width: 150, + ellipsis: true, + }, { title: 'WVTA ID', align: 'left', @@ -303,14 +310,14 @@ export default { { title: this.$t('areaOfResponsibility'), align: 'left', - dataIndex: 'dutyTerritory', + dataIndex: 'dutyTerritoryName', width: 200, ellipsis: true, }, { - title: this.$t('Deliverables'), + title: this.$t('typeOfDeliverables'), align: 'left', - dataIndex: 'deliverable', + dataIndex: 'deliverableTypeName', width: 200, ellipsis: true, }, From aa9e8bc4e35cd79dd18c20af88b5dde4a50c2f35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 13 Mar 2023 15:16:56 +0800 Subject: [PATCH 13/46] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationListMaintenance.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 146338c82..492ea1eab 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -446,7 +446,7 @@ export default { }, //模板下载 handleModule() { - downloadFile(this.url.exportTemplate, this.$t('VirtualList') + this.$t('importTemplate') + '.xls', {}) + downloadFile(this.url.exportTemplate, this.$t('VirtualAuthenticationList') + this.$t('importTemplate') + '.xls', {}) }, //调取 // transferClick() { From 780d6996f00c74cc0cf006e52db00b9b3888a934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 13 Mar 2023 15:17:43 +0800 Subject: [PATCH 14/46] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E5=90=8D=E7=A7=B0a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + 2 files changed, 2 insertions(+) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 60c430cf0..a0c68e4cf 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -895,6 +895,7 @@ module.exports = { pleaseConformityVerification: 'Please complete the data of Conformity verification', virtualListDetails: 'Virtual List Details', virtualAuthenticationListDetails: 'Virtual Authentication List Details', + VirtualAuthenticationList: 'Virtual Authentication List', maintainVirtualList: 'Maintain Virtual List', certificationListMaintenance: 'Certification List Maintenance', reasonsForRejection: 'Reasons For Rejection', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index cde456b01..c8e9b2da5 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -907,6 +907,7 @@ module.exports = { pleaseConformityVerification: '请补全验证符合性确认的数据', virtualListDetails: '虚拟清单详情', virtualAuthenticationListDetails: '虚拟认证清单详情', + VirtualAuthenticationList: '虚拟认证清单', maintainVirtualList: '维护虚拟清单', certificationListMaintenance: '认证清单维护', reasonsForRejection: '驳回原因', From 9d82f5cac178d2043c45e6ffe0d9283fd1c5ea1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 13 Mar 2023 15:26:31 +0800 Subject: [PATCH 15/46] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4-?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationListMaintenance.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 492ea1eab..434cfca0a 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -260,7 +260,7 @@ export default { list: '/authDummy/authDummyInventoryInfoEO/page', logList: '',//更新log exportTemplate: '/authDummy/authDummyInventoryInfoEO/exportTemplate',//模板下载 - exportData: '',//导出 + exportData: '/authDummy/authDummyInventoryInfoEO/exportData',//导出 addModel: '/authDummy/authDummyInventoryInfoEO/add',//添加 copyInfo: '/authDummy/authDummyInventoryInfoEO/copyInfoByIds',//复制 deleteBatch: '/authDummy/authDummyInventoryInfoEO/deleteBatch',//批量删除 @@ -465,7 +465,7 @@ export default { ids: selectedRowKeys.join(','), dummyInventoryBaseId: this.$route.query.id } - downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualList') + '.zip', query, this.Deselect) + downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualAuthenticationList') + '.zip', query, this.Deselect) }, Deselect() { this.selectedRowKeys = [] From 7bdf3f377190d2497fff4704927bc22367db5021 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 13 Mar 2023 15:34:56 +0800 Subject: [PATCH 16/46] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E8=B0=83=E5=8F=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 16 ++++++++++------ .../components/transferListvirtal.vue | 6 +++--- .../components/certificationList/index.vue | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index a08943981..a75d0338e 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -325,13 +325,17 @@ CREATE TABLE `auth_dummy_content_change` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; --- 标签管理 增加认证清单-配置项数据 2023-03-13 未同步生产环境 -INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1635093263477002242', '认证清单-配置项', 'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4', '认证清单-配置项', 0, 'admin', '2023-03-13 09:39:47', NULL, NULL, NULL, NULL, 1, 0, '1', 1); - -INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093344389320705', '1635093263477002242', '配置1', '46c10455e29e4855bb7e5d653b11a51d', '开发环境假数据', 1, 1, 'admin', '2023-03-13 09:40:07', 'admin', '2023-03-13 09:40:46', 1, NULL, NULL, '0', 'pz1'); -INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093406049783810', '1635093263477002242', '配置2', '4718f8eef0434d079b970834a2b9dd69', '开发环境假数据', 2, 1, 'admin', '2023-03-13 09:40:21', 'admin', '2023-03-13 09:40:43', 1, NULL, NULL, '0', 'Pz2'); -INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093480922304513', '1635093263477002242', '配置3', 'd3dd928d93d74e07ad8fa31bffea9641', '开发环境假数据', 3, 1, 'admin', '2023-03-13 09:40:39', NULL, NULL, 1, NULL, NULL, '0', 'Pz3'); +-- 标签管理 增加认证清单-配置项数据 2023-03-13 未同步生产环境 （由于需求确认 认证清单-配置项为输入框，此数据暂时不用了。） +-- INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1635093263477002242', '认证清单-配置项', 'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4', '认证清单-配置项', 0, 'admin', '2023-03-13 09:39:47', NULL, NULL, NULL, NULL, 1, 0, '1', 1); +-- +-- INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093344389320705', '1635093263477002242', '配置1', '46c10455e29e4855bb7e5d653b11a51d', '开发环境假数据', 1, 1, 'admin', '2023-03-13 09:40:07', 'admin', '2023-03-13 09:40:46', 1, NULL, NULL, '0', 'pz1'); +-- INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093406049783810', '1635093263477002242', '配置2', '4718f8eef0434d079b970834a2b9dd69', '开发环境假数据', 2, 1, 'admin', '2023-03-13 09:40:21', 'admin', '2023-03-13 09:40:43', 1, NULL, NULL, '0', 'Pz2'); +-- INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1635093480922304513', '1635093263477002242', '配置3', 'd3dd928d93d74e07ad8fa31bffea9641', '开发环境假数据', 3, 1, 'admin', '2023-03-13 09:40:39', NULL, NULL, 1, NULL, NULL, '0', 'Pz3'); -- 认证虚拟清单明细表 增加字段 交付物类型 2023-03-13 未同步生产环境 ALTER TABLE `auth_dummy_inventory_info` ADD COLUMN `deliverable_type` varchar(255) NULL COMMENT '交付物类型' AFTER `deliverable`; + +-- 项目库-认证清单 修改交付物类型字段长度 2023-03-13 未同步生产环境 +ALTER TABLE `project_certification_inventory` + MODIFY COLUMN `deliverable_type` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物类型' AFTER `duty_person`; diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue index bccc92ecd..9416a4fd8 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue @@ -122,14 +122,14 @@ export default { { title: this.$t('areaOfResponsibility'), align: 'left', - dataIndex: 'dutyTerritory_dictText', + dataIndex: 'dutyTerritoryName', width: 200, ellipsis: true, }, { - title: this.$t('Deliverables'), + title: this.$t('typeOfDeliverables'), align: 'left', - dataIndex: 'deliverable', + dataIndex: 'deliverableTypeName', width: 200, ellipsis: true, }, diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index f54d8afce..48e38db06 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -582,7 +582,7 @@ { title: this.$t('configurationItem'), align: 'left', - dataIndex: 'configItem_dictText', + dataIndex: 'configItem', width: 180, ellipsis: true }, From c0f48f4e2870355aadec5f062aa97e5047155044 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 13 Mar 2023 16:09:15 +0800 Subject: [PATCH 17/46] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95-=E4=BF=AE=E6=94=B9=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=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_2nd_period.sql | 14 ++ ...CertificationInventoryLogEOController.java | 171 ++++++++++++++++++ .../ProjectCertificationInventoryLogEO.java | 86 +++++++++ ...jectCertificationInventoryLogEOMapper.java | 17 ++ ...ojectCertificationInventoryLogEOMapper.xml | 14 ++ ...ectCertificationInventoryLogEOService.java | 69 +++++++ ...ertificationInventoryLogEOServiceImpl.java | 101 +++++++++++ 7 files changed, 472 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryLogEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryLogEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCertificationInventoryLogEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCertificationInventoryLogEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index a75d0338e..33d5d12a0 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -339,3 +339,17 @@ ALTER TABLE `auth_dummy_inventory_info` -- 项目库-认证清单 修改交付物类型字段长度 2023-03-13 未同步生产环境 ALTER TABLE `project_certification_inventory` MODIFY COLUMN `deliverable_type` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物类型' AFTER `duty_person`; + +-- 项目库-认证清单-修改历史表 2023-03-13 未同步生产环境 +CREATE TABLE `project_certification_inventory_log` ( + `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 '所属部门', + `content_cn` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作内容-中文', + `content_en` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作内容-英文', + `project_certification_inventory_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '认证清单数据id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB 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/ProjectCertificationInventoryLogEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryLogEOController.java new file mode 100644 index 000000000..48ccd5e70 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryLogEOController.java @@ -0,0 +1,171 @@ +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.ProjectCertificationInventoryLogEO; +import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService; +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: 2023-03-13 + * @Version: V1.0 + */ +@Api(tags="项目库-认证清单-修改历史表") +@RestController +@RequestMapping("/project/projectCertificationInventoryLogEO") +@Slf4j +public class ProjectCertificationInventoryLogEOController extends JeroController { + @Autowired + private IProjectCertificationInventoryLogEOService projectCertificationInventoryLogEOService; + + /** + * 分页列表查询 + * + * @param projectCertificationInventoryLogEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "项目库-认证清单-修改历史表-分页列表查询") + @ApiOperation(value="项目库-认证清单-修改历史表-分页列表查询", notes="项目库-认证清单-修改历史表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryLogEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + queryWrapper.orderByDesc("create_time"); + IPage pageList = projectCertificationInventoryLogEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "项目库-认证清单-修改历史表-列表查询") + @ApiOperation(value="项目库-认证清单-修改历史表-列表查询", notes="项目库-认证清单-修改历史表-列表查询") + @GetMapping(value = "/list") + public Result> queryList(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO,HttpServletRequest req) { + List list = projectCertificationInventoryLogEOService.queryList(projectCertificationInventoryLogEO,req); + return Result.OK(list); + } + + /** + * 添加 + * + * @param projectCertificationInventoryLogEO + * @return + */ + @AutoLog(value = "项目库-认证清单-修改历史表-添加") + @ApiOperation(value="项目库-认证清单-修改历史表-添加", notes="项目库-认证清单-修改历史表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO) { + projectCertificationInventoryLogEOService.add(projectCertificationInventoryLogEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param projectCertificationInventoryLogEO + * @return + */ + @AutoLog(value = "项目库-认证清单-修改历史表-编辑") + @ApiOperation(value="项目库-认证清单-修改历史表-编辑", notes="项目库-认证清单-修改历史表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO) { + projectCertificationInventoryLogEOService.editById(projectCertificationInventoryLogEO); + 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) { + projectCertificationInventoryLogEOService.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.projectCertificationInventoryLogEOService.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) { + ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = projectCertificationInventoryLogEOService.queryById(id); + if(projectCertificationInventoryLogEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectCertificationInventoryLogEO); + } + + /** + * 导出excel + * + * @param request + * @param projectCertificationInventoryLogEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO) { + return super.exportXls(request, projectCertificationInventoryLogEO, ProjectCertificationInventoryLogEO.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, ProjectCertificationInventoryLogEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryLogEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryLogEO.java new file mode 100644 index 000000000..ef28dc904 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryLogEO.java @@ -0,0 +1,86 @@ +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.TableField; +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: 2023-03-13 + * @Version: V1.0 + */ +@Data +@TableName("project_certification_inventory_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_certification_inventory_log对象", description="项目库-认证清单-修改历史表") +public class ProjectCertificationInventoryLogEO 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; + + /**操作内容-中文*/ + @Excel(name = "操作内容-中文", width = 15) + @ApiModelProperty(value = "操作内容-中文") + private java.lang.String contentCn; + + /**操作内容-英文*/ + @Excel(name = "操作内容-英文", width = 15) + @ApiModelProperty(value = "操作内容-英文") + private java.lang.String contentEn; + + /**认证清单数据id*/ + @Excel(name = "认证清单数据id", width = 15) + @ApiModelProperty(value = "认证清单数据id") + private java.lang.String projectCertificationInventoryId; + + @TableField(exist = false) + private String cut; + + /**操作内容回显**/ + @TableField(exist = false) + private String content; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCertificationInventoryLogEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCertificationInventoryLogEOMapper.java new file mode 100644 index 000000000..b39d78d97 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCertificationInventoryLogEOMapper.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.ProjectCertificationInventoryLogEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 项目库-认证清单-修改历史表 + * @Author: jero-boot + * @Date: 2023-03-13 + * @Version: V1.0 + */ +public interface ProjectCertificationInventoryLogEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCertificationInventoryLogEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCertificationInventoryLogEOMapper.xml new file mode 100644 index 000000000..13b06ba45 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCertificationInventoryLogEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java new file mode 100644 index 000000000..d52dfbe75 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java @@ -0,0 +1,69 @@ +package com.jero.modules.project.service; + +import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO; +import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @Description: 项目库-认证清单-修改历史表 + * @Author: jero-boot + * @Date: 2023-03-13 + * @Version: V1.0 + */ +public interface IProjectCertificationInventoryLogEOService extends IService { + + /** + * 保存 + * + * @param projectCertificationInventoryLogEO + * @return + */ + void add(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO); + + /** + * 更新 + * + * @param projectCertificationInventoryLogEO + * @return + */ + void editById(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectCertificationInventoryLogEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO, HttpServletRequest req); + + /** + * 批量添加认证清单明细操作历史信息 + * @param projectCertificationInventoryLogEOList + */ + void insertBatch(List projectCertificationInventoryLogEOList); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java new file mode 100644 index 000000000..a944077b1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java @@ -0,0 +1,101 @@ +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.ProjectCertificationInventoryLogEO; +import com.jero.modules.project.mapper.ProjectCertificationInventoryLogEOMapper; +import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService; +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: 2023-03-13 + * @Version: V1.0 + */ +@Service +public class ProjectCertificationInventoryLogEOServiceImpl extends ServiceImpl implements IProjectCertificationInventoryLogEOService { + + /** + * 保存 + * + * @param projectCertificationInventoryLogEO + * @return + */ + @Override + public void add(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO) { + Date now = new Date(); + projectCertificationInventoryLogEO.setCreateTime(now); + projectCertificationInventoryLogEO.setUpdateTime(now); + save(projectCertificationInventoryLogEO); + } + + /** + * 更新 + * + * @param projectCertificationInventoryLogEO + * @return + */ + @Override + public void editById(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO) { + Date now = new Date(); + projectCertificationInventoryLogEO.setUpdateTime(now); + saveOrUpdate(projectCertificationInventoryLogEO); + } + + /** + * 通过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 ProjectCertificationInventoryLogEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryLogEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); + List projectCertificationInventoryLogEOList = this.list(queryWrapper); + return projectCertificationInventoryLogEOList; + } + + @Override + public void insertBatch(List projectCertificationInventoryLogEOList) { + this.saveBatch(projectCertificationInventoryLogEOList); + } +} From acd8ea5d80c34bcce2b85c016b3198cfd7ada08e Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 13 Mar 2023 16:16:40 +0800 Subject: [PATCH 18/46] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2-=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryLogEOController.java | 5 +++-- ...ojectCertificationInventoryLogEOService.java | 7 +++++++ ...tCertificationInventoryLogEOServiceImpl.java | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryLogEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryLogEOController.java index 48ccd5e70..80a4e28a9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryLogEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryLogEOController.java @@ -55,7 +55,8 @@ public class ProjectCertificationInventoryLogEOController extends JeroController QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryLogEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); queryWrapper.orderByDesc("create_time"); - IPage pageList = projectCertificationInventoryLogEOService.page(page, queryWrapper); + IPage pageList = this.projectCertificationInventoryLogEOService.page(page, queryWrapper); + this.projectCertificationInventoryLogEOService.disposeData(pageList.getRecords(),projectCertificationInventoryLogEO.getCut()); return Result.OK(pageList); } @@ -68,7 +69,7 @@ public class ProjectCertificationInventoryLogEOController extends JeroController @ApiOperation(value="项目库-认证清单-修改历史表-列表查询", notes="项目库-认证清单-修改历史表-列表查询") @GetMapping(value = "/list") public Result> queryList(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO,HttpServletRequest req) { - List list = projectCertificationInventoryLogEOService.queryList(projectCertificationInventoryLogEO,req); + List list = this.projectCertificationInventoryLogEOService.queryList(projectCertificationInventoryLogEO,req); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java index d52dfbe75..750630d9a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java @@ -66,4 +66,11 @@ public interface IProjectCertificationInventoryLogEOService extends IService projectCertificationInventoryLogEOList); + + /** + * 处理数据 + * @param datas + * @param cut + */ + void disposeData(List datas, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java index a944077b1..3ff2f34b6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java @@ -1,10 +1,13 @@ package com.jero.modules.project.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO; import com.jero.modules.project.mapper.ProjectCertificationInventoryLogEOMapper; import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; @@ -91,6 +94,7 @@ public class ProjectCertificationInventoryLogEOServiceImpl extends ServiceImpl

queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryLogEO, req.getParameterMap()); queryWrapper.orderByDesc("create_time"); List projectCertificationInventoryLogEOList = this.list(queryWrapper); + this.disposeData(projectCertificationInventoryLogEOList,projectCertificationInventoryLogEO.getCut()); return projectCertificationInventoryLogEOList; } @@ -98,4 +102,17 @@ public class ProjectCertificationInventoryLogEOServiceImpl extends ServiceImpl

projectCertificationInventoryLogEOList) { this.saveBatch(projectCertificationInventoryLogEOList); } + + @Override + public void disposeData(List datas, String cut) { + if(CollectionUtils.isNotEmpty(datas)){ + for (ProjectCertificationInventoryLogEO data : datas) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + data.setContent(data.getContentCn()); + }else { + data.setContent(data.getContentEn()); + } + } + } + } } From 5d5420da3c11a5f0658c53bc21af376ce55a912d Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 13 Mar 2023 16:42:34 +0800 Subject: [PATCH 19/46] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E4=BA=A4=E4=BB=98=E7=89=A9=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ectCertificationInventoryEOController.java | 7 ++ ...rojectCertificationInventoryEOService.java | 7 ++ ...ctCertificationInventoryEOServiceImpl.java | 82 ++++++++++++++++++- 3 files changed, 95 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java index c39f416d7..441b76e83 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java @@ -262,4 +262,11 @@ public class ProjectCertificationInventoryEOController extends JeroController callAdd(@RequestBody JSONObject json) { return this.projectCertificationInventoryEOService.callAdd(json); } + + @AutoLog(value = "项目库-认证清单表-引用交付物") + @ApiOperation(value="项目库-认证清单表-引用交付物", notes="项目库-认证清单表-引用交付物") + @PostMapping(value = "/citeDeliverable") + public Result citeDeliverable(@RequestBody JSONObject json) { + return this.projectCertificationInventoryEOService.citeDeliverable(json); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index 3ceb6750f..0017c61ac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -184,4 +184,11 @@ public interface IProjectCertificationInventoryEOService extends IService callAdd(JSONObject json); + + /** + * 引用交付物 + * @param json + * @return + */ + Result citeDeliverable(JSONObject json); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 0cec4e40b..5a278e5fd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -18,9 +18,11 @@ import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.project.entity.ProjectCertificationInventoryEO; +import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.enums.*; +import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService; import com.jero.modules.project.service.IProjectRelatedPersonnelService; import com.jero.modules.system.enums.ProjectRoleEnum; import com.jero.modules.project.mapper.ProjectCertificationInventoryEOMapper; @@ -106,6 +108,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl ids) { QueryWrapper queryWrap = new QueryWrapper<>(); - queryWrap.lambda().eq(ProjectCertificationInventoryEO::getId,ids); + queryWrap.lambda().in(ProjectCertificationInventoryEO::getId,ids); List list = this.list(queryWrap); removeByIds(ids); @@ -218,6 +222,32 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); + for (ProjectCertificationInventoryEO certificationInventoryEO : projectCertificationInventoryEOList) { + StringBuilder contentCnSb = new StringBuilder(); + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); + contentCnSb.append("\"").append(certificationInventoryEO.getCategory()).append("\"").append(" "); + contentCnSb.append("\"").append(certificationInventoryEO.getInspectionItem()).append("\"").append(" "); + contentCnSb.append("\"").append(certificationInventoryEO.getConfigItem()).append("\"").append(" "); + contentCnSb.append("\"").append(certificationInventoryEO.getSerialNumber()).append("\"").append(" "); + + StringBuilder contentEnSb = new StringBuilder(); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added "); + contentEnSb.append("\"").append(certificationInventoryEO.getCategory()).append("\"").append(" "); + contentEnSb.append("\"").append(certificationInventoryEO.getInspectionItem()).append("\"").append(" "); + contentEnSb.append("\"").append(certificationInventoryEO.getConfigItem()).append("\"").append(" "); + contentEnSb.append("\"").append(certificationInventoryEO.getSerialNumber()).append("\""); + + + ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); + projectCertificationInventoryLogEO.setProjectCertificationInventoryId(certificationInventoryEO.getId()); + projectCertificationInventoryLogEO.setContentCn(contentCnSb.toString()); + projectCertificationInventoryLogEO.setContentEn(contentEnSb.toString()); + projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); + } + this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); } }catch (Exception ex){ throw new JeroBootException("添加失败！"); @@ -1819,7 +1849,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl citeDeliverable(JSONObject json) { + String projectCertificationInventoryIds = json.getString("projectCertificationInventoryIds"); + if(StringUtils.isEmpty(projectCertificationInventoryIds)){ + throw new JeroBootException("请选择需要引用的认证清单数据！"); + } + String projectLibraryId = json.getString("projectLibraryId"); + + String citeProjectLibraryId = json.getString("citeProjectLibraryId"); + if(StringUtils.isEmpty(citeProjectLibraryId)){ + throw new JeroBootException("请选择引用的项目！"); + } + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().in(ProjectCertificationInventoryEO::getId,projectCertificationInventoryIds.split(",")); + List projectCertificationInventoryEOList = this.list(queryWrapper); + + if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){ + QueryWrapper citeQueryWrapper = new QueryWrapper<>(); + citeQueryWrapper.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,citeProjectLibraryId); + citeQueryWrapper.lambda().eq(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); + List citeProjectCertificationInventoryEOList = this.list(queryWrapper); + + if(CollectionUtils.isNotEmpty(citeProjectCertificationInventoryEOList)){ + for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { + for (ProjectCertificationInventoryEO citeProjectCertificationInventoryEO : citeProjectCertificationInventoryEOList) { + // 匹配数据 类别、检验项目、配置项、标准编号、交付物类型完全一致，并且数据的状态为 审查完成 + boolean flag = ( + StringUtils.equals(projectCertificationInventoryEO.getCategory(),citeProjectCertificationInventoryEO.getCategory()) + && StringUtils.equals(projectCertificationInventoryEO.getInspectionItem(),citeProjectCertificationInventoryEO.getInspectionItem()) + && StringUtils.equals(projectCertificationInventoryEO.getConfigItem(),citeProjectCertificationInventoryEO.getConfigItem()) + && StringUtils.equals(projectCertificationInventoryEO.getSerialNumber(),citeProjectCertificationInventoryEO.getSerialNumber()) + && StringUtils.equals(projectCertificationInventoryEO.getDeliverableType(),citeProjectCertificationInventoryEO.getDeliverableType()) + ); + if(flag){ + projectCertificationInventoryEO.setDeliveryResult(citeProjectCertificationInventoryEO.getDeliveryResult()); + break; + } + } + } + + this.updateBatchById(projectCertificationInventoryEOList); + } + } + + return Result.OK("引用交付物成功！"); + } } From 2cfb86f12c0dc0f31e656276dacecc3ec3011253 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 13 Mar 2023 16:43:47 +0800 Subject: [PATCH 20/46] update --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 5a278e5fd..e65716614 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -376,7 +376,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl idList = Arrays.asList(ids.split(",")); @@ -404,7 +404,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Mon, 13 Mar 2023 16:44:59 +0800 Subject: [PATCH 21/46] update --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index e65716614..20e024375 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -469,7 +469,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Mon, 13 Mar 2023 17:06:32 +0800 Subject: [PATCH 22/46] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4-?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/batSetting.vue | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue b/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue index f0872d80d..781f55ac2 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue @@ -33,20 +33,20 @@

- {{$t('Deliverables')}} + {{$t('typeOfDeliverables')}}
- - - - - - - + +
@@ -56,7 +56,7 @@ From 0dcc9ea2acf7ea1607ddc9cd53d6015093c22028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 14 Mar 2023 09:23:23 +0800 Subject: [PATCH 23/46] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=BC=95=E7=94=A8=E4=BA=A4=E4=BB=98=E7=89=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationList/components/addModel.vue | 188 ++++++++++++------ .../components/batSetting.vue | 58 ++++-- .../components/modifyHistoryList.vue | 48 +++-- .../components/referenceDeliverablesList.vue | 60 ++---- .../components/certificationList/index.vue | 9 +- 5 files changed, 217 insertions(+), 146 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index f5a011acc..6ad43a1ef 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -107,13 +107,18 @@ - + + + + + + @@ -130,6 +135,7 @@ > @@ -190,17 +196,25 @@ * {{$t('engineeringInterfacePerson')}} - - + + + + {{ val.name}} + + + @@ -228,28 +242,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -297,11 +311,14 @@ class="itemModel" :prop="'configItem'" > - + + + + + + @@ -317,6 +334,7 @@ > @@ -375,16 +393,23 @@ * {{$t('engineeringInterfacePerson')}} - - + + + + {{ item.name}} + + + @@ -523,7 +548,7 @@ trigger: 'change' } ], - sdtName: [ + sdt: [ { required: true, message: this.$t('engineeringInterfacePerson') + this.$t('cannotEmpty'), @@ -537,16 +562,21 @@ trigger: 'change' } ], - endTime:[ + endTime: [ { required: true, message: this.$t('closingDate') + this.$t('cannotEmpty'), trigger: 'change' } ], - configItem:[ - { required: true, message: this.$t('configurationItem') + this.$t('cannotEmpty'), trigger: 'change' }, - ], + configItem: [ + { required: true, message: this.$t('configurationItem') + this.$t('cannotEmpty'), trigger: 'blur' }, + { + max: 300, + message: this.$t('configurationItem') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' + } + ] }, disabled: false, projectNameList: [], @@ -558,7 +588,8 @@ add: '/project/projectCertificationInventoryEO/batchAdd', edit: '/project/projectCertificationInventoryEO/edit', list: '/project/projectLawsInventoryEO/list' - } + }, + engineeringInterfacePersonList: [] } }, mounted() { @@ -570,11 +601,11 @@ disabledDate(current) { return current && current < moment().subtract(1, 'day') }, - dateChange(item,index) { - if (index){ + dateChange(item, index) { + if (index) { this.formInline.dataList[index][item.db_field_name] = this.formInline.dataList[index][item.db_field_name] ? moment(this.formInline.dataList[index][item.db_field_name]).format('YYYY-MM-DD') : '' - }else{ + } else { this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : '' } @@ -607,6 +638,9 @@ if (this.formInline.deliverableType) { this.formInline.deliverableType = this.formInline.deliverableType.split(',') } + if (value.dutyTerritory) { + this.queryPersonByProject(value.dutyTerritory) + } this.getRegulationNo() this.title = this.$t('edit') this.$nextTick(() => { @@ -635,6 +669,7 @@ url = this.url.add Action = postAction query.dataList.forEach(val => { + delete val.engineeringInterfacePersonList Object.keys(val).forEach(res => { if (val[res] && val[res] instanceof Array) { val[res] = val[res].join(',') @@ -726,8 +761,37 @@ let content = this.projectNameList.filter(res => { return res.id === value }) - this.formInline.bussDocumentLibraryId = content[0].id - this.formInline.serialNumber = content[0].serialNumber + if (content && content.length > 0) { + this.formInline.bussDocumentLibraryId = content[0].id + this.formInline.serialNumber = content[0].serialNumber + } + }, + handleChange(value) { + this.formInline.sdt = undefined + this.queryPersonByProject(this.formInline.dutyTerritory) + }, + dutyHandleChange(index) { + this.formInline.dataList[index].sdt = undefined + this.formInline = {... this.formInline} + this.queryPersonByProject(this.formInline.dataList[index].dutyTerritory, index) + }, + queryPersonByProject(row, index) { + let query = { + projectId: this.$route.query.id, + dutyTerritory: row + } + getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => { + if (res.success) { + if (this.formInline.id) { + this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人 + } else { + this.$nextTick(()=>{ + this.formInline.dataList[index].engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] + this.formInline = {...this.formInline} + }) + } + } + }) } } } diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue index 0a6dcdd5b..ff9ab2cfe 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue @@ -17,11 +17,15 @@ {{$t('configurationItem')}} - + + + + + + + @@ -33,6 +37,7 @@ @@ -50,13 +55,15 @@ - - {{ item.label }} + + {{ item.name }} @@ -122,17 +129,17 @@ -
-
+
+
{{$t('remarks')}} +
+ + +
- - - -
@@ -146,7 +153,7 @@ export default { name: 'batSetting', - props: ['url','roleSwitchingCode'], + props: ['url', 'roleSwitchingCode'], components: { PersonnelSelection }, @@ -155,9 +162,7 @@ visible: false, confirmLoading: false, formInline: {}, - rules: { - - }, + rules: {}, ids: [], configurationItemList: [], engineeringInterfacePersonList: [], @@ -270,6 +275,21 @@ }, dateChange(item) { this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : '' + }, + handleChange(value) { + this.formInline.sdt = undefined + this.queryPersonByProject(this.formInline.dutyTerritory) + }, + queryPersonByProject(row) { + let query = { + projectId: this.$route.query.id, + dutyTerritory: row + } + getAction('/project/projectRelatedPersonnel/queryPersonByProjectId', query).then((res) => { + if (res.success) { + this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人 + } + }) } } } diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/modifyHistoryList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/modifyHistoryList.vue index 316740189..32eb8dcaf 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/modifyHistoryList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/modifyHistoryList.vue @@ -40,54 +40,57 @@ diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue index 0cbf8c842..642b23e65 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue @@ -56,7 +56,7 @@
{{$t('cancel')}} - {{$t('determine')}} + {{$t('determine')}}
@@ -95,17 +95,19 @@ loading: false, pageNo: 1, pageSize: 10, - total: 0 + total: 0, + ids:'', } }, mounted() { }, methods: { - transferModel() { + transferModel(ids) { this.visible = true this.queryParam = {} this.selectedRowKeys = [] + this.ids = ids.join(',') this.replacePage() }, searchQuery() { @@ -151,49 +153,31 @@ }, handleCancel() { this.visible = false - this.$emit('visible') }, - handleSubmit(flag) { + handleSubmit() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { this.confirmLoading = true let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) - this.confirmLoading = false - this.$emit('transferListForm',selectedRowKeys.join(',')) - this.selectedRowKeys = [] - // postAction('project/projectLawsInventoryEO/add', { - // dummyInventoryBaseId: selectedRowKeys.join(','), - // projectLibraryId: this.$route.query.id, - // flag: flag - // }).then((res) => { - // if (res.success) { - // this.confirmLoading = false - // // this.$message.success(this.$t('OperationSuccessful')) - // // this.visible = false - // this.selectedRowKeys = [] - // this.$emit('transferListForm',selectedRowKeys.join(',')) - // } else { - // // if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') { - // // this.confirmLoading = false - // // this.getAdd() - // // return - // // } - // this.$message.warning(this.$t('operationFailed')) - // this.confirmLoading = false - // } - // }) + postAction('/project/projectCertificationInventoryEO/citeDeliverable', { + projectCertificationInventoryIds: this.ids, + projectLibraryId: this.$route.query.id, + citeProjectLibraryId: selectedRowKeys.join(',') + }).then((res) => { + if (res.success) { + this.confirmLoading = false + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.selectedRowKeys = [] + this.$emit('referenceDeliverablesListForm') + } else { + this.$message.warning(this.$t('operationFailed')) + this.confirmLoading = false + } + }) } else { this.$message.warning(this.$t('selectLeastOne')) } }, - getAdd() { - let _this = this - this.$confirm({ - content: _this.$t('TheDoesNotContainData'), - onOk() { - _this.handleSubmit('1') - } - }) - } } } diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 48e38db06..235e5a8be 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -485,10 +485,9 @@ text: this.$t('inspectionItems') }, { - type: '', + type: 'string', value: 'configItem', text: this.$t('configurationItem'), - dictCode: 'ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 }, { type: 'string', @@ -1161,8 +1160,8 @@ } }) }, - modifyHistoryClick() { - this.$refs.modifyHistoryRef.getList() + modifyHistoryClick(row) { + this.$refs.modifyHistoryRef.getList(row.id) }, getRoleByUserId(callback) { getAction('/project/projectCertificationInventoryEO/getRoleByUserId', { projectLibraryId: this.$route.query.id }).then((res) => { @@ -1263,7 +1262,7 @@ //引用交付物 referenceDeliverablesClick() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - this.$refs.referenceDeliverablesListRef.transferModel() + this.$refs.referenceDeliverablesListRef.transferModel(JSON.parse(JSON.stringify(this.selectedRowKeys))) } else { this.$message.warning(this.$t('selectLeastOne')) } From e077af041a9fc1cb03da67cff46aaaa462bc9457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 14 Mar 2023 09:35:55 +0800 Subject: [PATCH 24/46] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=BC=95=E7=94=A8=E4=BA=A4=E4=BB=98=E7=89=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/certificationList/index.vue | 177 +++++++++++------- 3 files changed, 115 insertions(+), 65 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index a0c68e4cf..a3cae3c90 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1432,4 +1432,6 @@ module.exports = { onlyDataSelected:'Only data with process status of task to be confirmed, result to be submitted and review to be returned can be selected', youCannotStatusListToBeReleasedAndApproved:'You cannot select data whose process status is list to be released and approved', batchmodify:'Whether to batch modify', + onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with the process status of list to be released and certification return can be selected' + } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index c8e9b2da5..94cd7224c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1534,4 +1534,5 @@ module.exports = { onlyDataSelected:'只能选择流程状态为任务待确认、结果待提交、审查退回的数据', youCannotStatusListToBeReleasedAndApproved:'不能选择流程状态为清单待发布、审查通过的数据', batchmodify:'是否批量修改', + onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据' } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 235e5a8be..a25062eba 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -355,41 +355,41 @@ - - - - - -
-
- * - {{ $t('TaskCutOffTime') }} -
- - - -
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0) { + let ids = [] + let notConditions = [] + for (let i = 0; i < this.selectedRowKeysList.length; i++) { + if (this.selectedRowKeysList[i].flowStatus == 'List to be released' || + this.selectedRowKeysList[i].flowStatus == 'Certification returned') { + ids.push(this.selectedRowKeysList[i].id) + } else { + notConditions.push(this.selectedRowKeysList[i].inspectionItem) + } + } + let data = '' + if (notConditions && notConditions.length > 0) { + data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataListReleasedAndCertificationReturnCanSelected') + } + if (ids && ids.length > 0) { + this.releaseData(ids, notConditions, data) + } else { + this.failedMessage(data) + } } else { - this.visible = true + this.$message.warning(this.$t('selectLeastOne')) } }, - handleOk() { - this.$refs.ruleForm.validate(valid => { - if (valid) { - let selectedRowKeys = [] - this.selectedRowKeysList.forEach(res => { - selectedRowKeys.push(res.id) - }) - let query = { - ids: selectedRowKeys.join(','), - projectLibraryId: this.$route.query.id, - ...this.formInline - } - this.confirmLoading = true - postAction('/project/projectCertificationInventoryEO/issue', query).then((res) => { + releaseData(ids, notConditions, data){ + let _this = this + this.$confirm({ + content: _this.$t('confirmRelease'), + onOk() { + postAction('/project/projectCertificationInventoryEO/issue', { + ids: ids.join(','), + projectLibraryId: _this.$route.query.id, + }).then((res) => { if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.selectedRowKeys = [] - this.confirmLoading = false - this.getList() + _this.$message.success(_this.$t('OperationSuccessful')) + _this.selectedRowKeys = [] + _this.selectedRowKeysList = [] + _this.getList() + if (notConditions && notConditions.length > 0) { + _this.failedMessage(data) + } } else { - this.$message.warning(res.message) - this.confirmLoading = false + _this.$message.warning(res.message) } - this.detailedSuccessList = [] }) } }) }, - handleCancel() { - this.formInline = {} - this.visible = false - }, + // handleOk() { + // this.$refs.ruleForm.validate(valid => { + // if (valid) { + // let selectedRowKeys = [] + // this.selectedRowKeysList.forEach(res => { + // selectedRowKeys.push(res.id) + // }) + // let query = { + // ids: selectedRowKeys.join(','), + // projectLibraryId: this.$route.query.id, + // ...this.formInline + // } + // this.confirmLoading = true + // postAction('/project/projectCertificationInventoryEO/issue', query).then((res) => { + // if (res.success) { + // this.$message.success(this.$t('OperationSuccessful')) + // this.visible = false + // this.selectedRowKeys = [] + // this.confirmLoading = false + // this.getList() + // } else { + // this.$message.warning(res.message) + // this.confirmLoading = false + // } + // this.detailedSuccessList = [] + // }) + // } + // }) + // }, + // handleCancel() { + // this.formInline = {} + // this.visible = false + // }, //撤回 withdrawClick() { From e6182a8b8d08760f42bbb001d1fa0066f8049c0c Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 14 Mar 2023 11:01:10 +0800 Subject: [PATCH 25/46] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F=E3=80=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8E=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E3=80=82?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 1 + ...ectCertificationInventoryEOController.java | 1 + .../ProjectCertificationInventoryLogEO.java | 9 + .../project/enums/OperatorTypeEnum.java | 3 + ...ectCertificationInventoryLogEOService.java | 6 + ...ctCertificationInventoryEOServiceImpl.java | 201 +++++++++++++++++- ...ertificationInventoryLogEOServiceImpl.java | 7 + 7 files changed, 227 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 33d5d12a0..3e845fa80 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -350,6 +350,7 @@ CREATE TABLE `project_certification_inventory_log` ( `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', `content_cn` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作内容-中文', `content_en` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作内容-英文', + `operator_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作类型', `project_certification_inventory_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '认证清单数据id', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB 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/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java index 441b76e83..ab88110b2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java @@ -59,6 +59,7 @@ public class ProjectCertificationInventoryEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = this.projectCertificationInventoryEOService.queryPage(queryWrapper,page,projectCertificationInventoryEO,cut); return Result.OK(cut,pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryLogEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryLogEO.java index ef28dc904..5908294bc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryLogEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryLogEO.java @@ -72,6 +72,11 @@ public class ProjectCertificationInventoryLogEO implements Serializable { @ApiModelProperty(value = "操作内容-英文") private java.lang.String contentEn; + /**操作类型*/ + @Excel(name = "操作类型", width = 15) + @ApiModelProperty(value = "操作类型") + private String operatorType; + /**认证清单数据id*/ @Excel(name = "认证清单数据id", width = 15) @ApiModelProperty(value = "认证清单数据id") @@ -83,4 +88,8 @@ public class ProjectCertificationInventoryLogEO implements Serializable { /**操作内容回显**/ @TableField(exist = false) private String content; + + /**操作类型名称**/ + @TableField(exist = false) + private String operatorTypeName; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index 0dfbf1750..49b977190 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -55,6 +55,9 @@ public enum OperatorTypeEnum { CERTIFICATION_INVENTORY_SDT_EXPEDITING("认证清单-接口人催办","certificationInventorySdtExpediting"), CERTIFICATION_INVENTORY_STUDIO_WITHDRAW("认证清单-studio撤回","certificationInventoryStudioWithdraw"), CERTIFICATION_INVENTORY_STUDIO_RESET("认证清单-studio重置流程","certificationInventoryStudioReset"), + CERTIFICATION_INVENTORY_EDIT("认证清单-编辑","certificationInventoryEdit"), + CERTIFICATION_INVENTORY_ADD("认证清单-添加","certificationInventoryAdd"), + CERTIFICATION_INVENTORY_CALL("认证清单-调取","certificationInventoryCall"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java index 750630d9a..f1183f035 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java @@ -73,4 +73,10 @@ public interface IProjectCertificationInventoryLogEOService extends IService datas, String cut); + + /** + * 根据认证清单idList删除历史数据 + * @param projectCertificationInventoryIdList + */ + void deleteByProjectCertificationInventoryIdList(List projectCertificationInventoryIdList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 20e024375..82d53df68 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -139,11 +139,173 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl editBeforeList = new ArrayList<>(); + ProjectCertificationInventoryEO editBefore = this.queryById(projectCertificationInventoryEO.getId()); + editBeforeList.add(editBefore); + List editAfterList = new ArrayList<>(); + editAfterList.add(projectCertificationInventoryEO); + this.setEditProjectCertificationInventoryLogEO(editBeforeList,editAfterList); + + Date now = new Date(); projectCertificationInventoryEO.setUpdateTime(now); saveOrUpdate(projectCertificationInventoryEO); } + /** + * 对比编辑前后 认证清单信息，设置修改历史日志 + * @param editBeforeList 编辑前 + * @param editAfterList 编辑后 + */ + public void setEditProjectCertificationInventoryLogEO(List editBeforeList,List editAfterList){ + if(CollectionUtils.isNotEmpty(editBeforeList) && CollectionUtils.isNotEmpty(editAfterList)){ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List projectCertificationInventoryLogEOList = new ArrayList<>(); + + for (ProjectCertificationInventoryEO editAfter : editAfterList) { + ProjectCertificationInventoryEO editBeforeById = editBeforeList.stream().filter(editBefore -> { + boolean flag = false; + if (StringUtils.equals(editBefore.getId(), editAfter.getId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()).get(0); + + if(!ObjectUtils.isEmpty(editBeforeById)){ + StringBuilder contentCnSb = new StringBuilder(); + StringBuilder contentEnSb = new StringBuilder(); + + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("将"); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" changes "); + + boolean saveFlag = false; + + if(!StringUtils.equals(editBeforeById.getSerialNumber(),editAfter.getSerialNumber())){ + contentCnSb.append("\"").append("法规编号").append("\""); + contentCnSb.append("由 "); + contentCnSb.append(editBeforeById.getSerialNumber()).append(" 修改为 ").append(editAfter.getSerialNumber()).append("，"); + + contentEnSb.append("\"").append("Regulation No").append("\""); + contentEnSb.append(editBeforeById.getSerialNumber()).append(" to ").append(editAfter.getSerialNumber()).append("，"); + saveFlag = true; + } + if(!StringUtils.equals(editBeforeById.getWvtaId(),editAfter.getWvtaId())){ + contentCnSb.append("\"").append("WVTA ID").append("\""); + contentCnSb.append("由 "); + contentCnSb.append(editBeforeById.getWvtaId()).append(" 修改为 ").append(editAfter.getWvtaId()).append("，"); + + contentEnSb.append("\"").append("WVTA ID").append("\""); + contentEnSb.append(editBeforeById.getWvtaId()).append(" to ").append(editAfter.getWvtaId()).append("，"); + saveFlag = true; + } + if(!StringUtils.equals(editBeforeById.getCategory(),editAfter.getCategory())){ + contentCnSb.append("\"").append("类别").append("\""); + contentCnSb.append("由 "); + contentCnSb.append(editBeforeById.getCategory()).append(" 修改为 ").append(editAfter.getCategory()).append("，"); + + contentEnSb.append("\"").append("Category").append("\""); + contentEnSb.append(editBeforeById.getCategory()).append(" to ").append(editAfter.getCategory()).append("，"); + saveFlag = true; + } + if(!StringUtils.equals(editBeforeById.getInspectionItem(),editAfter.getInspectionItem())){ + contentCnSb.append("\"").append("检验项目").append("\""); + contentCnSb.append("由 "); + contentCnSb.append(editBeforeById.getInspectionItem()).append(" 修改为 ").append(editAfter.getInspectionItem()).append("，"); + + contentEnSb.append("\"").append("Inspection Items").append("\""); + contentEnSb.append(editBeforeById.getInspectionItem()).append(" to ").append(editAfter.getInspectionItem()).append("，"); + saveFlag = true; + } + if(!StringUtils.equals(editBeforeById.getConfigItem(),editAfter.getConfigItem())){ + contentCnSb.append("\"").append("配置项").append("\""); + contentCnSb.append("由 "); + contentCnSb.append(editBeforeById.getConfigItem()).append(" 修改为 ").append(editAfter.getConfigItem()).append("，"); + + contentEnSb.append("\"").append("Configuration Item").append("\""); + contentEnSb.append(editBeforeById.getConfigItem()).append(" to ").append(editAfter.getConfigItem()).append("，"); + saveFlag = true; + } + if(!StringUtils.equals(editBeforeById.getDutyTerritory(),editAfter.getDutyTerritory())){ + contentCnSb.append("\"").append("责任领域").append("\""); + contentCnSb.append("由 "); + contentCnSb.append(editBeforeById.getDutyTerritory()).append(" 修改为 ").append(editAfter.getDutyTerritory()).append("，"); + + contentEnSb.append("\"").append("Responsible Field").append("\""); + contentEnSb.append(editBeforeById.getDutyTerritory()).append(" to ").append(editAfter.getDutyTerritory()).append("，"); + saveFlag = true; + } + if(!StringUtils.equals(editBeforeById.getDeliverableType(),editAfter.getDeliverableType())){ + contentCnSb.append("\"").append("交付物类型").append("\""); + contentCnSb.append("由 "); + contentCnSb.append(editBeforeById.getDeliverableType()).append(" 修改为 ").append(editAfter.getDeliverableType()).append("，"); + + contentEnSb.append("\"").append("Deliverable Type").append("\""); + contentEnSb.append(editBeforeById.getDeliverableType()).append(" to ").append(editAfter.getDeliverableType()).append("，"); + saveFlag = true; + } + if(!StringUtils.equals(editBeforeById.getDeliverableTemplate(),editAfter.getDeliverableTemplate())){ + contentCnSb.append("\"").append("交付物模板").append("\""); + contentCnSb.append("由 "); + contentCnSb.append(editBeforeById.getDeliverableTemplate()).append(" 修改为 ").append(editAfter.getDeliverableTemplate()).append("，"); + + contentEnSb.append("\"").append("Deliverable Template").append("\""); + contentEnSb.append(editBeforeById.getDeliverableTemplate()).append(" to ").append(editAfter.getDeliverableTemplate()).append("，"); + saveFlag = true; + } + if(!StringUtils.equals(editBeforeById.getSdt(),editAfter.getSdt())){ + contentCnSb.append("\"").append("工程接口人").append("\""); + contentCnSb.append("由 "); + contentCnSb.append(editBeforeById.getSdt()).append(" 修改为 ").append(editAfter.getSdt()).append("，"); + + contentEnSb.append("\"").append("Eng. Interface").append("\""); + contentEnSb.append(editBeforeById.getSdt()).append(" to ").append(editAfter.getSdt()).append("，"); + saveFlag = true; + } + String editBeforeEndTime = DateUtils.formatDate(editBeforeById.getEndTime()); + String editAfterEndTime = DateUtils.formatDate(editAfter.getEndTime()); + if(!StringUtils.equals(editBeforeEndTime,editAfterEndTime)){ + contentCnSb.append("\"").append("截止时间").append("\""); + contentCnSb.append("由 "); + contentCnSb.append(editBeforeEndTime).append(" 修改为 ").append(editAfterEndTime).append("，"); + + contentEnSb.append("\"").append("Due Date").append("\""); + contentEnSb.append(editBeforeEndTime).append(" to ").append(editAfterEndTime).append("，"); + saveFlag = true; + } + if(!StringUtils.equals(editBeforeById.getDutyPerson(),editAfter.getDutyPerson())){ + contentCnSb.append("\"").append("责任人").append("\""); + contentCnSb.append("由 "); + contentCnSb.append(editBeforeById.getDutyPerson()).append(" 修改为 ").append(editAfter.getDutyPerson()).append("，"); + + contentEnSb.append("\"").append("Assignee").append("\""); + contentEnSb.append(editBeforeById.getDutyPerson()).append(" to ").append(editAfter.getDutyPerson()).append("，"); + saveFlag = true; + } + + String contentCn = ""; + if(StringUtils.isNotEmpty(contentCnSb.toString())){ + contentCn = contentCnSb.toString().substring(0,contentCnSb.toString().length()-1); + } + String contentEn = ""; + if(StringUtils.isNotEmpty(contentEnSb.toString())){ + contentEn = contentEnSb.toString().substring(0,contentEnSb.toString().length()-1); + } + + if(saveFlag){ + ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); + projectCertificationInventoryLogEO.setProjectCertificationInventoryId(editAfter.getId()); + projectCertificationInventoryLogEO.setContentCn(contentCn); + projectCertificationInventoryLogEO.setContentEn(contentEn); + projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_EDIT.getValue()); + projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); + } + } + } + if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ + this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); + } + } + } + /** * 通过id删除 * @@ -157,6 +319,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl detailRemoveWrap = new QueryWrapper<>(); detailRemoveWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,id); this.processInfoDetailEOService.remove(detailRemoveWrap); + + this.projectCertificationInventoryLogEOService.deleteByProjectCertificationInventoryIdList(Arrays.asList(id.split(","))); } /** @@ -176,6 +340,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl authDummyInventoryInfoEOList = this.authDummyInventoryInfoEOService.list(authDummyInfoQueryWrap); if(CollectionUtils.isNotEmpty(authDummyInventoryInfoEOList)){ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List projectCertificationInventoryEOList = new ArrayList<>(); for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : authDummyInventoryInfoEOList) { ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = new ProjectCertificationInventoryEO(); @@ -1852,9 +2021,39 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); + for (ProjectCertificationInventoryEO certificationInventoryEO : projectCertificationInventoryEOList) { + StringBuilder contentCnSb = new StringBuilder(); + contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 "); + contentCnSb.append("\"").append(certificationInventoryEO.getCategory()).append("\"").append(" "); + contentCnSb.append("\"").append(certificationInventoryEO.getInspectionItem()).append("\"").append(" "); + contentCnSb.append("\"").append(certificationInventoryEO.getConfigItem()).append("\"").append(" "); + contentCnSb.append("\"").append(certificationInventoryEO.getSerialNumber()).append("\"").append(" "); + + StringBuilder contentEnSb = new StringBuilder(); + contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added "); + contentEnSb.append("\"").append(certificationInventoryEO.getCategory()).append("\"").append(" "); + contentEnSb.append("\"").append(certificationInventoryEO.getInspectionItem()).append("\"").append(" "); + contentEnSb.append("\"").append(certificationInventoryEO.getConfigItem()).append("\"").append(" "); + contentEnSb.append("\"").append(certificationInventoryEO.getSerialNumber()).append("\""); + + ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); + projectCertificationInventoryLogEO.setProjectCertificationInventoryId(certificationInventoryEO.getId()); + projectCertificationInventoryLogEO.setContentCn(contentCnSb.toString()); + projectCertificationInventoryLogEO.setContentEn(contentEnSb.toString()); + projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_CALL.getValue()); + projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); + } + this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); } return Result.OK("调取成功！"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java index 3ff2f34b6..4894c21b2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java @@ -115,4 +115,11 @@ public class ProjectCertificationInventoryLogEOServiceImpl extends ServiceImpl

projectCertificationInventoryIdList) { + QueryWrapper removeWrap = new QueryWrapper<>(); + removeWrap.lambda().in(ProjectCertificationInventoryLogEO::getProjectCertificationInventoryId,projectCertificationInventoryIdList); + this.remove(removeWrap); + } } From 18a9020aa037387ab9aad52869bd592438764f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 14 Mar 2023 14:00:26 +0800 Subject: [PATCH 26/46] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4-?= =?UTF-8?q?=E7=BC=96=E8=BE=91-=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/editModel.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue index 3b92b6085..5cca37107 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue @@ -187,6 +187,18 @@ export default { trigger: 'change' } ], + configItem: [ + { + required: true, + message: this.$t('configurationItem') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 300, + message: this.$t('configurationItem') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' + } + ], deliverable: [ { required: true, From bdf35f8c35317229ee0c783a639da4a7b3e7b4e9 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 14 Mar 2023 14:01:33 +0800 Subject: [PATCH 27/46] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E3=80=81=E6=B5=81=E7=A8=8B=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E3=80=81=E5=8F=91=E5=B8=83=E3=80=81=E6=92=A4=E5=9B=9E=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectCertificationInventoryEO.java | 13 +- .../project/enums/OperatorTypeEnum.java | 1 + ...ctCertificationInventoryEOServiceImpl.java | 165 +++++++++++++++--- 3 files changed, 149 insertions(+), 30 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java index c600ead2a..5f24d4222 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java @@ -95,6 +95,9 @@ public class ProjectCertificationInventoryEO implements Serializable { /**责任领域名称**/ @TableField(exist = false) private String dutyTerritoryName; + /**责任领域名称-英文**/ + @TableField(exist = false) + private String dutyTerritoryNameEn; /**交付物*/ @Excel(name = "交付物", width = 15) @@ -126,14 +129,20 @@ public class ProjectCertificationInventoryEO implements Serializable { @Excel(name = "交付物类型", width = 15) @ApiModelProperty(value = "交付物类型") private java.lang.String deliverableType; - @TableField(exist = false) // 交付物类型名称 + @TableField(exist = false) private String deliverableTypeName; + // 交付物类型名称-英文 + @TableField(exist = false) + private String deliverableTypeNameEn; /**交付物模板*/ @Excel(name = "交付物模板", width = 15) @ApiModelProperty(value = "交付物模板") private java.lang.String deliverableTemplate; + /**交付物模板名称**/ + @TableField(exist = false) + private String deliverableTemplateName; /**交付结果*/ @Excel(name = "交付结果", width = 15) @@ -151,8 +160,8 @@ public class ProjectCertificationInventoryEO implements Serializable { @Excel(name = "流程状态", width = 15) @ApiModelProperty(value = "流程状态") private java.lang.String flowStatus; - @TableField(exist = false) // 流程状态展示名称 + @TableField(exist = false) private String flowStatusName; /**报告编号*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index 49b977190..f317be5a2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -58,6 +58,7 @@ public enum OperatorTypeEnum { CERTIFICATION_INVENTORY_EDIT("认证清单-编辑","certificationInventoryEdit"), CERTIFICATION_INVENTORY_ADD("认证清单-添加","certificationInventoryAdd"), CERTIFICATION_INVENTORY_CALL("认证清单-调取","certificationInventoryCall"), + CERTIFICATION_INVENTORY_STUDIO_ISSUE("认证清单-studio发布","certificationInventoryStudioIssue"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 82d53df68..8eddd2cbd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -17,6 +17,8 @@ import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService; import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.project.entity.ProjectCertificationInventoryEO; import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO; import com.jero.modules.project.entity.ProjectLibraryBase; @@ -110,6 +112,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl editBeforeList = new ArrayList<>(); ProjectCertificationInventoryEO editBefore = this.queryById(projectCertificationInventoryEO.getId()); editBeforeList.add(editBefore); + this.disposeData(editBeforeList,CutEnum.CN.getValue()); List editAfterList = new ArrayList<>(); editAfterList.add(projectCertificationInventoryEO); + this.disposeData(editAfterList,CutEnum.CN.getValue()); this.setEditProjectCertificationInventoryLogEO(editBeforeList,editAfterList); Date now = new Date(); @@ -182,102 +188,153 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl deliverableTemplateFileInfos = this.ossFileService.getFileInfos(data.getDeliverableTemplate()); + if(CollectionUtils.isNotEmpty(deliverableTemplateFileInfos)){ + String deliverableTemplateNames = deliverableTemplateFileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); + data.setDeliverableTemplateName(deliverableTemplateNames); + } + } } } } @@ -566,12 +636,28 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); List processInfoDetailEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { // 将数据的状态更新为：清单待校核，更新截止时间。等待认证工程师进行操作。 projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); // projectCertificationInventoryEO.setEndTime(DateUtils.str2Date(endTime,DateUtils.date_sdf.get())); + + String contentCn = "\"" + currentUser.getUsername() + "\"" +"发布了认证清单"; + String contentEn = "\"" + currentUser.getUsername() + "\"" +" publishes the authentication list"; + ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); + projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); + projectCertificationInventoryLogEO.setContentCn(contentCn); + projectCertificationInventoryLogEO.setContentEn(contentEn); + projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_ISSUE.getValue()); + projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); + } + + if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ + this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); } String projectLibraryId = json.getString("projectLibraryId"); @@ -1552,6 +1638,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); + List certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); + String certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(",")); + String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -1599,6 +1688,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { // 把交付结果、截止日期清空，流程状态 设置为 清单待发布 LambdaUpdateWrapper updateWrap = new LambdaUpdateWrapper<>(); @@ -1607,10 +1698,28 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); if(CollectionUtils.isNotEmpty(certificationEngineerList)){ for (String certificationEngineerId : certificationEngineerIdList) { String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineerList,certificationEngineerId); From ff64c3c80927757053bbb6c1e82cef377a563e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 14 Mar 2023 15:11:50 +0800 Subject: [PATCH 28/46] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModel.vue | 29 +- .../components/codeNumber.vue | 355 ++++++++++++++++++ .../certificationListMaintenance.vue | 2 +- 3 files changed, 369 insertions(+), 17 deletions(-) create mode 100644 jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue diff --git a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue index d843aa964..177466863 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue @@ -18,19 +18,7 @@ {{$t('regulationNo')}}

- - - - {{ item.serialNumber}} - - - + @@ -135,12 +123,12 @@ {{$t('typeOfDeliverables')}} diff --git a/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue b/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue new file mode 100644 index 000000000..3ebb21254 --- /dev/null +++ b/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue @@ -0,0 +1,355 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 434cfca0a..f24b09b7f 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -261,7 +261,7 @@ export default { logList: '',//更新log exportTemplate: '/authDummy/authDummyInventoryInfoEO/exportTemplate',//模板下载 exportData: '/authDummy/authDummyInventoryInfoEO/exportData',//导出 - addModel: '/authDummy/authDummyInventoryInfoEO/add',//添加 + addModel: '/authDummy/authDummyInventoryInfoEO/batchAdd',//添加 copyInfo: '/authDummy/authDummyInventoryInfoEO/copyInfoByIds',//复制 deleteBatch: '/authDummy/authDummyInventoryInfoEO/deleteBatch',//批量删除 editModel: '/authDummy/authDummyInventoryInfoEO/edit',//编辑 From b7884dd28e9fd1a6f7de17eb31a5f9f932a59e07 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 14 Mar 2023 15:43:40 +0800 Subject: [PATCH 29/46] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=93=8D=E4=BD=9C=E5=A2=9E=E5=8A=A0=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E5=8E=86=E5=8F=B2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/enums/OperatorTypeEnum.java | 8 + ...ctCertificationInventoryEOServiceImpl.java | 139 +++++++++++++++++- 2 files changed, 139 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index f317be5a2..64d746a4f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -59,6 +59,14 @@ public enum OperatorTypeEnum { CERTIFICATION_INVENTORY_ADD("认证清单-添加","certificationInventoryAdd"), CERTIFICATION_INVENTORY_CALL("认证清单-调取","certificationInventoryCall"), CERTIFICATION_INVENTORY_STUDIO_ISSUE("认证清单-studio发布","certificationInventoryStudioIssue"), + CERTIFICATION_INVENTORY_INITIATING_TASK("认证清单-认证工程师发起任务","certificationInventoryInitiatingTask"), + CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK("认证清单-认证工程师退回至studio任务","certificationInventoryReturnedStudioTask"), + CERTIFICATION_INVENTORY_DUTY_PERSON_ACCEPT_TASK("认证清单-责任人接受任务","certificationInventoryDutyPersonAcceptTask"), + CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK("认证清单-责任人拒绝任务","certificationInventoryDutyPersonRejectTask"), + CERTIFICATION_INVENTORY_DUTY_PERSON_TRANSFER_TASK("认证清单-责任人转办任务","certificationInventoryDutyPersonTransferTask"), + CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK("认证清单-责任人提交任务","certificationInventoryDutyPersonSubmitTask"), + CERTIFICATION_INVENTORY_REVIEW_THROUGH("认证清单-认证工程师审核通过","certificationInventoryReviewThrough"), + CERTIFICATION_INVENTORY_REVIEW_RETURNED("认证清单-认证工程师审核退回","certificationInventoryReviewReturned"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 8eddd2cbd..666932732 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -1101,9 +1101,22 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()); + + String contentCn = "\"" + currentUser.getUsername() + "\"" +"审核退回"; + String contentEn = "\"" + currentUser.getUsername() + "\"" +" review and returned"; + ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); + projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); + projectCertificationInventoryLogEO.setContentCn(contentCn); + projectCertificationInventoryLogEO.setContentEn(contentEn); + projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue()); + projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); + } + + if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ + this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); } ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class); @@ -1153,8 +1166,23 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); + for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); + + String contentCn = "\"" + currentUser.getUsername() + "\"" +"审核通过"; + String contentEn = "\"" + currentUser.getUsername() + "\"" +" pass the audit"; + ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); + projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); + projectCertificationInventoryLogEO.setContentCn(contentCn); + projectCertificationInventoryLogEO.setContentEn(contentEn); + projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue()); + projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); + } + + if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ + this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); } ProjectLibraryBase projectLibraryBase = JSONObject.parseObject(JSONObject.toJSONString(json.get("projectLibraryBase")), ProjectLibraryBase.class); @@ -1311,6 +1339,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); List processInfoDetailEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); @@ -1320,6 +1349,19 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); + for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()); + + String contentCn = "\"" + currentUser.getUsername() + "\"" +"退回了任务信息"; + String contentEn = "\"" + currentUser.getUsername() + "\"" +" returned the task information"; + ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); + projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); + projectCertificationInventoryLogEO.setContentCn(contentCn); + projectCertificationInventoryLogEO.setContentEn(contentEn); + projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue()); + projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); + } + + if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ + this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); } try { @@ -1479,12 +1536,28 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl() { @Override public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) { - return p1.getEndTime().compareTo(p2.getEndTime()); + if(p1.getEndTime() != null && p2.getEndTime() != null){ + return p1.getEndTime().compareTo(p2.getEndTime()); + } + return 1; } }); + List projectCertificationInventoryLogEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue()); + + String contentCn = "\"" + currentUser.getUsername() + "\"" +"拒绝，流程退回至" + "\"" +studioEngineerUserInfo.get(0).getUsername()+"\""; + String contentEn = "\"" + currentUser.getUsername() + "\"" +" refuses, and the process returns to " + "\"" +studioEngineerUserInfo.get(0).getUsername()+"\""; + ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); + projectCertificationInventoryLogEO.setProjectCertificationInventoryId(projectCertificationInventoryEO.getId()); + projectCertificationInventoryLogEO.setContentCn(contentCn); + projectCertificationInventoryLogEO.setContentEn(contentEn); + projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue()); + projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); + } + if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ + this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); } Map standNameAndItemName = this.getStandNameAndItemName(projectCertificationInventoryEOList); @@ -1507,7 +1580,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl() { @Override public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) { - return p1.getEndTime().compareTo(p2.getEndTime()); + if(p1.getEndTime() != null && p2.getEndTime() != null){ + return p1.getEndTime().compareTo(p2.getEndTime()); + } + return 1; } }); Date endTime = projectCertificationInventoryEOList.get(0).getEndTime(); @@ -1553,6 +1629,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl idList = Arrays.asList(ids.split(",")); List flowStatusList = new ArrayList<>(); @@ -1574,6 +1651,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); // 给责任人分配待办中心的任务 List processInfoDetailEOList = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { @@ -1584,6 +1662,19 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl() { @Override public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) { - return p1.getEndTime().compareTo(p2.getEndTime()); + if(p1.getEndTime() != null && p2.getEndTime() != null){ + return p1.getEndTime().compareTo(p2.getEndTime()); + } + return 1; } }); @@ -1729,7 +1823,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl() { @Override public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) { - return p1.getEndTime().compareTo(p2.getEndTime()); + if(p1.getEndTime() != null && p2.getEndTime() != null){ + return p1.getEndTime().compareTo(p2.getEndTime()); + } + return 1; } }); Date endTime = projectCertificationInventoryEOList.get(0).getEndTime(); @@ -1778,6 +1875,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryLogEOList = new ArrayList<>(); projectCertificationInventoryEOList.forEach(certificationInventory -> { certificationInventory.setDutyPerson(transferUserId); + + String contentCn = "\"" + currentUser.getUsername() + "\"" +"将流程发送至" +"\""+ transferUserInfo.getUsername() + "\"办理" ; + String contentEn = "\"" + currentUser.getUsername() + "\"" +" sends the process to "+"\""+ transferUserInfo.getUsername() + "\" for handling" ; + ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO = new ProjectCertificationInventoryLogEO(); + projectCertificationInventoryLogEO.setProjectCertificationInventoryId(certificationInventory.getId()); + projectCertificationInventoryLogEO.setContentCn(contentCn); + projectCertificationInventoryLogEO.setContentEn(contentEn); + projectCertificationInventoryLogEO.setOperatorType(OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_TRANSFER_TASK.getValue()); + projectCertificationInventoryLogEOList.add(projectCertificationInventoryLogEO); }); + + if(CollectionUtils.isNotEmpty(projectCertificationInventoryLogEOList)){ + this.projectCertificationInventoryLogEOService.insertBatch(projectCertificationInventoryLogEOList); + } + this.updateBatchById(projectCertificationInventoryEOList); Collections.sort(projectCertificationInventoryEOList, new Comparator() { @Override public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) { - return p1.getEndTime().compareTo(p2.getEndTime()); + if(p1.getEndTime() != null && p2.getEndTime() != null){ + return p1.getEndTime().compareTo(p2.getEndTime()); + } + return 1; } }); @@ -1917,7 +2034,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl() { @Override public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) { - return p1.getEndTime().compareTo(p2.getEndTime()); + if(p1.getEndTime() != null && p2.getEndTime() != null){ + return p1.getEndTime().compareTo(p2.getEndTime()); + } + return 1; } }); Date endTime = certificationInventoryEOList.get(0).getEndTime(); @@ -1979,7 +2099,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl() { @Override public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) { - return p1.getEndTime().compareTo(p2.getEndTime()); + if(p1.getEndTime() != null && p2.getEndTime() != null){ + return p1.getEndTime().compareTo(p2.getEndTime()); + } + return 1; } }); Map standNameAndItemName = this.getStandNameAndItemName(value); From 6f3aea33bab0c072c84688bdf700a68b75f84276 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 14 Mar 2023 16:04:41 +0800 Subject: [PATCH 30/46] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=AD=97=E5=85=B8-=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=80=BC=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 16 ++++++++++++++++ .../jero/modules/system/entity/SysCategory.java | 5 +++++ .../system/enums/SysCategoryValueTypeEnum.java | 17 +++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysCategoryValueTypeEnum.java diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 3e845fa80..7a6de1b0b 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -354,3 +354,19 @@ CREATE TABLE `project_certification_inventory_log` ( `project_certification_inventory_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '认证清单数据id', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '项目库-认证清单-修改历史表' ROW_FORMAT = Dynamic; + +-- 分类字典表增加字段，认证清单-交付物类型使用 2023-03-14 未同步生产环境 +ALTER TABLE `sys_category` + ADD COLUMN `value_type` varchar(255) NULL COMMENT '值类型:值对应SysCategoryValueTypeEnum枚举类' AFTER `sort_order`; + +-- 增加标签管理数据 认证-交付物类型 2023-03-14 未同步生产环境 +INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1635543933669818369', '认证-交付物类型', 'ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2', NULL, 0, 'admin', '2023-03-14 15:30:35', NULL, NULL, NULL, NULL, 1, 0, '2', 30); +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635544016406659074', '0', 'testCn1', NULL, 'admin', '2023-03-14 15:30:55', 'admin', '2023-03-14 15:35:09', 'A01', '1635543933669818369', NULL, 'testEn1', NULL, 1, NULL, NULL, 1, NULL, 2); +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545079494950913', '0', '强检报告(附件)Cn', NULL, 'admin', '2023-03-14 15:35:09', 'admin', '2023-03-14 15:36:01', 'A01', '1635543933669818369', NULL, '强检报告(附件)En', NULL, 1, NULL, NULL, 0, NULL, 3); +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545194746036225', '0', 'CCC证书(附件)Cn', NULL, 'admin', '2023-03-14 15:35:36', NULL, NULL, 'A01', '1635543933669818369', NULL, 'CCC证书(附件)En', NULL, 1, NULL, NULL, 0, NULL, 1); +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545299360366594', '0', 'E-Mark(附件)Cn', NULL, 'admin', '2023-03-14 15:36:01', NULL, NULL, 'A01', '1635543933669818369', NULL, 'E-Mark(附件)En', NULL, 1, NULL, NULL, 0, NULL, 2); +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545372836184066', '0', '自我声明Cn', NULL, 'admin', '2023-03-14 15:36:19', NULL, NULL, 'A01', '1635543933669818369', NULL, '自我生命En', NULL, 1, NULL, NULL, 0, NULL, 4); +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545471297470465', '0', '自愿认证Cn', NULL, 'admin', '2023-03-14 15:36:42', NULL, NULL, 'A01', '1635543933669818369', NULL, '自愿认证En', NULL, 1, NULL, NULL, 0, NULL, 5); +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545540197302273', '0', '摸底报告Cn', NULL, 'admin', '2023-03-14 15:36:58', 'admin', '2023-03-14 15:37:20', 'A01', '1635543933669818369', NULL, '摸底报告En', NULL, 1, NULL, NULL, 0, NULL, 7); +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545630152540161', '0', '工程评估（文本）Cn', NULL, 'admin', '2023-03-14 15:37:20', NULL, NULL, 'A01', '1635543933669818369', NULL, '工程评估（文本）En', NULL, 1, NULL, NULL, 0, NULL, 6); +INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545748968783874', '0', 'N/A不填Cn', NULL, 'admin', '2023-03-14 15:37:48', NULL, NULL, 'A01', '1635543933669818369', NULL, 'N/A不填En', NULL, 1, NULL, NULL, 0, NULL, 8); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java index b80381fcd..520f57129 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java @@ -96,6 +96,11 @@ public class SysCategory implements Serializable,Comparable{ @Dict(dicCode = "attribute_type") private java.lang.String attributeType; + // 值对应SysCategoryValueTypeEnum枚举类 + @ApiModelProperty(value = "值类型 1附件 2文本 3不用填") + @Dict(dicCode = "value_type") + private java.lang.String valueType; + /**逻辑删除标识*/ @TableLogic public Integer delFlag; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysCategoryValueTypeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysCategoryValueTypeEnum.java new file mode 100644 index 000000000..dafb43d9e --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysCategoryValueTypeEnum.java @@ -0,0 +1,17 @@ +package com.jero.modules.system.enums; + +public enum SysCategoryValueTypeEnum { + + FILE("附件","file"), + TEXT("文本","text"), + NA("不用填","N/A") + ; + + String name; + String value; + + private SysCategoryValueTypeEnum(String name, String value) { + this.name = name; + this.value = value; + } +} From 457eccaeceb3d677268d72dd9c4438527f0bf77e Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 14 Mar 2023 16:32:19 +0800 Subject: [PATCH 31/46] update --- .../com/jero/modules/system/mapper/xml/SysCategoryMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml index fea081c16..cf2c45c7c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml @@ -19,7 +19,7 @@