diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 69fe0390a..717bc3c7d 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1084,3 +1084,8 @@ COMMENT='清单确认-拒绝原因表' ROW_FORMAT=DYNAMIC ; +-- 增加 中国台湾 国旗数据 2022-09-06 +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('28', NULL, NULL, NULL, NULL, NULL, '中国台湾', 'Tai Wan China', NULL, '/jero-boot/nationalFlag/TaiWanChina.png'); +-- 增加 中国台湾 数据字典数据 2022-09-06 +INSERT INTO `laws_weilai`.`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 ('1567085557701386242', '1493782108399820801', '中国台湾', '96d49ba5797d4791906ce2baee87d4bc', '中国台湾', 1, 1, 'admin', '2022-09-06 17:41:27', 'admin', '2022-09-06 17:41:35', 1, NULL, NULL, '0', 'Tai Wan China'); + diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index dc48bf546..086cbddee 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -95,6 +95,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/sys/common/download/**", "anon");//文件预览 filterChainDefinitionMap.put("/sys/split/file/**", "anon");//图片预览 filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件 + filterChainDefinitionMap.put("/document/bussDocumentLibraryEO/updateES", "anon");//编辑ES数据 filterChainDefinitionMap.put("/", "anon"); filterChainDefinitionMap.put("/doc.html", "anon"); filterChainDefinitionMap.put("/**/*.js", "anon"); @@ -155,6 +156,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/lark/larkEventSubscriptionConfig", "anon"); //飞书调用接口，事件订阅配置。 filterChainDefinitionMap.put("/lark/larkCardMessageConfig", "anon"); //飞书调用接口，卡片消息配置。 filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口 + filterChainDefinitionMap.put("/project/projectTaskInventoryConditionAssessmentEO/initConditionAssessment", "anon"); // 初始化项目当前状态数据接口 // 添加自己的过滤器并且取名为jwt Map filterMap = new HashMap(1); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 56c3395e4..22b76897a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2250,7 +2250,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); @@ -2360,8 +2366,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldDate = fieldDateList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); //处理时间类型 @@ -5737,11 +5746,17 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl entry : map.entrySet()) { String key = entry.getKey(); - String value = (String) entry.getValue(); - if (dbFieldName.equals(key)) { - List files = oSSFileAll.stream().filter(e -> StringUtils.isNotBlank(value) && value.equals(e.getConnectId())).collect(Collectors.toList()); - if (files.size() != 0) { - result.addAll(files); + if(!"create_time".equals(key) + && !"update_time".equals(key) + && !"issue_time".equals(key) + && !"implement_time".equals(key) + && !"xin1_che1_xing2_shi2_shi1_ri4_qi1".equals(key)){ + String value = (String) entry.getValue(); + if (dbFieldName.equals(key)) { + List files = oSSFileAll.stream().filter(e -> StringUtils.isNotBlank(value) && value.equals(e.getConnectId())).collect(Collectors.toList()); + if (files.size() != 0) { + result.addAll(files); + } } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java index 197e40252..ad06d8cf6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java @@ -195,4 +195,15 @@ public class ConditionAssessmentEOController extends JeroController addOrUpdateConditionAssessmentBatch(@RequestBody ConditionAssessmentVO conditionAssessmentVO) { return conditionAssessmentEOService.addOrUpdateBatch(conditionAssessmentVO); } + + /** + * 初始化当前项目状态评估数据 （法规清单在项目状态评估表中没有的） + */ + @AutoLog(value = "任务清单-项目状态评估表-初始化当前项目状态评估数据") + @ApiOperation(value="任务清单-项目状态评估表-初始化当前项目状态评估数据", notes="任务清单-项目状态评估表-初始化当前项目状态评估数据") + @GetMapping(value = "/initConditionAssessment") + public Result initConditionAssessment(@RequestParam Map params) { + this.conditionAssessmentEOService.initConditionAssessment(params); + return Result.OK("初始化数据成功！"); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java index ff5ad39bd..da659aaea 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java @@ -98,4 +98,10 @@ public interface IConditionAssessmentEOService extends IService addOrUpdateBatch(ConditionAssessmentVO conditionAssessmentVO); + + /** + * 初始化项目当前状态数据 + * @param params + */ + void initConditionAssessment(Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java index 2f28cb299..a09f4568d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java @@ -5,14 +5,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ConditionAssessmentEO; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectTaskInventoryEO; +import com.jero.modules.project.enums.CurrentProjectStatusEnum; import com.jero.modules.project.enums.ProjectRoleEnum; import com.jero.modules.project.mapper.ConditionAssessmentEOMapper; import com.jero.modules.project.service.IConditionAssessmentEOService; +import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.project.vo.ConditionAssessmentVO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; @@ -27,6 +31,9 @@ import java.util.stream.Collectors; @Service public class ConditionAssessmentEOServiceImpl extends ServiceImpl implements IConditionAssessmentEOService { + @Autowired + private IProjectLawsInventoryEOService projectLawsInventoryEOService; + /** * 保存 * @@ -317,4 +324,42 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl params) { + String projectLibraryId = (String) params.get("projectLibraryId"); + + QueryWrapper lawsInventoryQueryWrapper = new QueryWrapper<>(); + if(StringUtils.isNotEmpty(projectLibraryId)){ + //如果项目库id不为空，只处理这一个项目下的数据。 + lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + } + List lawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryQueryWrapper); + if(CollectionUtils.isNotEmpty(lawsInventoryEOList)){ + QueryWrapper conditionAssessmentQueryWrapper = new QueryWrapper<>(); + List conditionAssessmentEOList = this.baseMapper.selectList(conditionAssessmentQueryWrapper); + + //过滤出，没有项目当前状态数据的法规清单数据 + lawsInventoryEOList = lawsInventoryEOList.stream().filter(lawsInventory -> { + boolean flag = true; + for (ConditionAssessmentEO conditionAssessmentEO : conditionAssessmentEOList) { + if(StringUtils.equals(lawsInventory.getId(),conditionAssessmentEO.getProjectLawsInventoryId())){ + flag = false; + break; + } + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(lawsInventoryEOList)){ + for (ProjectLawsInventoryEO lawsInventory : lawsInventoryEOList) { + ConditionAssessmentEO conditionAssessmentEO = new ConditionAssessmentEO(); + conditionAssessmentEO.setRoleCode(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue()); + conditionAssessmentEO.setProjectLawsInventoryId(lawsInventory.getId()); + conditionAssessmentEO.setConditionAssessment(CurrentProjectStatusEnum.BLUE.getValue()); + this.addOrUpdate(conditionAssessmentEO); + } + } + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 8b96ccbf8..a3082a93e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -1519,7 +1519,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { list1.add(""); mapTemp.put("pre_tags", list); mapTemp.put("post_tags", list1); - mapTemp.put("fragment_size", 280);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 + mapTemp.put("fragment_size", 500);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 mapTemp.put("type", "plain"); mapHighlight.put(key, mapTemp); diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png index 2c4a076c2..f93a94a0e 100644 Binary files a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/EU.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/EU.png index af12bb40c..95e991b4d 100644 Binary files a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/EU.png and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/EU.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Japan.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Japan.png index 06c061beb..17c432e77 100644 Binary files a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Japan.png and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Japan.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Malaysia.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Malaysia.png index b5031a0b6..8984e1e0c 100644 Binary files a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Malaysia.png and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Malaysia.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/NewZealand.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/NewZealand.png index a523fa526..5017e0e90 100644 Binary files a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/NewZealand.png and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/NewZealand.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Singapore.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Singapore.png index 7ef158e4f..677405518 100644 Binary files a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Singapore.png and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Singapore.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/SouthKorea.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/SouthKorea.png index 37cd978e8..4488706da 100644 Binary files a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/SouthKorea.png and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/SouthKorea.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/TaiWanChina.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/TaiWanChina.png new file mode 100644 index 000000000..c9634bd83 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/TaiWanChina.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UAE.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UAE.png index d14615a6c..b67dfe4c6 100644 Binary files a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UAE.png and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UAE.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UK.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UK.png index 7119c8dd0..fdb6d62a4 100644 Binary files a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UK.png and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UK.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/US.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/US.png index d3c69746f..907c74a59 100644 Binary files a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/US.png and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/US.png differ diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0f184b54f..2173516e1 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1283,4 +1283,6 @@ module.exports = { rejectReason:'Reject Reason', collectionLegislativeComments:'Collection of Legislative Comments', regulatoryAndTechnicalAssessment:'Regulatory and technical assessment', + listConfirmationRejectionReason:'List confirmation rejection reason', + taskConfirmationRejectionReason:'Task confirmation rejection reason' } \ 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 45c33af9a..c602b27d6 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -834,7 +834,7 @@ module.exports = { feedbackMessage: '反馈意见', result: '结果', opinion: '意见', - operationNode: '操作节点', + OperationNode: '操作节点', selectInquiry: '选择询问人', sendBack: '退回', taskConfirmationProcess: '任务确认流程', @@ -1385,5 +1385,6 @@ module.exports = { rejectReason:'拒绝原因', collectionLegislativeComments:'法规意见收集', regulatoryAndTechnicalAssessment:'法规技术评估', - + listConfirmationRejectionReason:'清单确认驳回原因', + taskConfirmationRejectionReason:'任务确认驳回原因' } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 5c87ec0af..0b67d2eaf 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -12,43 +12,6 @@
- - -
-
- * - {{$t('displayPermission')}} -
- - - - - {{ item.name}} - - - - -
- - -
-
- * - {{$t('authorizedUser')}} -
- - - -
- -
@@ -106,25 +69,55 @@
- {{$t('standardNo')}} + * + {{$t('displayPermission')}}
- - + + + + + {{ item.name}} + + + + +
+ + +
+
+ * + {{$t('authorizedUser')}} +
+ +
- + {{$t('standardNo')}}
- - {{$t('bringInDocumentInformation')}} - + + + + {{$t('bringInDocumentInformation')}} + +
@@ -584,6 +577,26 @@ margin-top: 4px; } + .box-button-index { + height: 38px; + margin-top: 2px; + width: 120px; + overflow: hidden; + padding: 0 0; + float: right; + text-align: center; + } + + ::v-deep .box-button-index span { + display: inline-block; + width: 100px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + margin-top: 4px; + text-align: center; + } + .submit-button { width: 100%; margin-top: 20px; @@ -612,4 +625,11 @@ overflow: hidden; word-break: break-word; } + + .box-input-index { + width: calc(100% - 130px); + display: inline-block; + height: 38px; + margin-right: 10px; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 50ee8e69f..5c8328c34 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -18,6 +18,7 @@