diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index e31b0a1fc..f52e1d14e 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -928,7 +928,7 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Responsible Fi UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Filled by' WHERE `id` = 'a371f6d49781c0921a48f317d1ba69b6'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Eng. Interface' WHERE `id` = '58c3d5a50c86be19d5ab0cd5ac4d6d8b'; --- 国家国旗表 增加旗帜 2022-08-16 +-- 国家国旗表 增加旗帜 2022-08-16 已同步生产环境 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 ('14', NULL, NULL, NULL, NULL, NULL, '海湾地区', 'GCC', NULL, '/jero-boot/nationalFlag/GCC.png'); 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 ('15', NULL, NULL, NULL, NULL, NULL, '巴西', 'Brazil', NULL, '/jero-boot/nationalFlag/Brazil.png'); 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 ('16', NULL, NULL, NULL, NULL, NULL, '德国', 'Germany', NULL, '/jero-boot/nationalFlag/Germany.png'); @@ -946,15 +946,15 @@ INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_ti -- 删除之前的3中国香港 和8海湾地区 delete from country_national_flag where id in ('3','8'); --- 法规流程历史表增加字段 审批意见 2022-08-16 +-- 法规流程历史表增加字段 审批意见 2022-08-16 已同步生产环境 ALTER TABLE `laws_weilai`.`laws_process_history` ADD COLUMN `approval_opinion` varchar(2000) NULL COMMENT '审批意见' AFTER `flow_type`; ---- 用户表 删除工号唯一索引 2022-08-18 +--- 用户表 删除工号唯一索引 2022-08-18 已同步生产环境 ALTER TABLE `laws_weilai`.`sys_user` DROP INDEX `uniq_sys_user_work_no`; --- 工作流 流程表增加流程名称 英文字段 2022-08-19 +-- 工作流 流程表增加流程名称 英文字段 2022-08-19 已同步生产环境 ALTER TABLE `laws_weilai_wkflow`.`bus_process_name` ADD COLUMN `PRC_NAME_EN` varchar(255) NULL COMMENT '流程名称（英文）' AFTER `PROJECT_LAWS_INVENTORY_ID`; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 844f7bebe..881d10a4d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -772,6 +772,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); String dbFieldName = onlCgformField.getDbFieldName(); + if ("nio_number".equals(dbFieldName) || "params_name".equals(dbFieldName)) { + map.put("click3", true); + } if ("description".equals(dbFieldName)) { indexOfDescription = i; map.put("click2", true); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index 0f51306b6..b3367fda2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -21,6 +21,7 @@ import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.util.HttpRequestUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -565,69 +566,111 @@ public class FeishuServiceImpl implements IFeishuService { headerMap.put("Authorization", "Bearer " + token); headerMap.put("Content-Type", "application/json; charset=utf-8"); - String sendJson = " {\n" + - " \"config\": {\n" + - " \"wide_screen_mode\": true\n" + - " },\n" + + //参考：https://open.feishu.cn/tool/cardbuilder?from=openplantform_mcb_entrance + /*String sendJson = "{\n" + " \"header\": {\n" + + " \"template\": \"green\",\n" + " \"title\": {\n" + - " \"tag\": \"plain_text\",\n" + - " \"content\": \"点击下方的分类查看常见问题\"\n" + - " },\n" + - " \"template\": \"green\"\n" + + " \"content\": \"知识库分类负责人\",\n" + + " \"tag\": \"plain_text\"\n" + + " }\n" + + " },\n" + + " \"elements\": [\n" + + " {\n" + + " \"fields\": [\n" + + " {\n" + + " \"is_short\": true,\n" + + " \"text\": {\n" + + " \"content\": \"**\uD83D\uDC64 提交人：**\\n\",\n" + + " \"tag\": \"lark_md\"\n" + + " }\n" + + " }\n" + + " ],\n" + + " \"tag\": \"div\"\n" + + " }\n" + + " ]\n" + + "}";*/ + + String sendJson = "{\n" + + " \"header\": {\n" + + " \"template\": \"green\",\n" + + " \"title\": {\n" + + " \"content\": \"知识库分类负责人\",\n" + + " \"tag\": \"plain_text\"\n" + + " }\n" + " }\n" + "}"; JSONObject jsonObject = JSONObject.parseObject(sendJson); JSONArray elements = new JSONArray(); JSONObject element = new JSONObject(); - element.put("tag","action"); - element.put("layout","bisected"); + JSONArray fields = new JSONArray(); //获取分类 List problemKnowledgeBaseClassifyEOList = this.problemKnowledgeBaseClassifyEOService.list(); this.problemKnowledgeBaseClassifyEOService.disposeData(problemKnowledgeBaseClassifyEOList); - JSONArray actions = new JSONArray(); - - //组装推送过去的点击按钮 + //获取所有分类下的负责人信息 + List chargePersonUserIdList = new ArrayList<>(); for (ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO : problemKnowledgeBaseClassifyEOList) { - JSONObject buttonObject = new JSONObject(); - JSONObject text = new JSONObject(); - JSONObject value = new JSONObject(); - buttonObject.put("tag","button"); - - text.put("tag","plain_text"); - text.put("content",problemKnowledgeBaseClassifyEO.getProblemLabel() + " [" + problemKnowledgeBaseClassifyEO.getChargePersonIdName() + "]"); - value.put("chosen",problemKnowledgeBaseClassifyEO.getChargePersonId()); - - buttonObject.put("text",text); - buttonObject.put("type","primary"); - buttonObject.put("value",value); - actions.add(buttonObject); + if(StringUtils.isNotEmpty(problemKnowledgeBaseClassifyEO.getChargePersonId())){ + String chargePersonId = problemKnowledgeBaseClassifyEO.getChargePersonId(); + for (String chargePerson : chargePersonId.split(",")) { + chargePersonUserIdList.add(chargePerson); + } + } } - element.put("actions",actions); + if(CollectionUtils.isNotEmpty(chargePersonUserIdList)){ + List chargePersonUserList = this.sysUserService.querySysUserListByIdList(chargePersonUserIdList); + //组装推送过去的知识库负责人信息 + for (ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO : problemKnowledgeBaseClassifyEOList) { + JSONObject field = new JSONObject(); + JSONObject text = new JSONObject(); + StringBuilder atUserSb = new StringBuilder(); - elements.add(element); - jsonObject.put("elements",elements); - // 设置请求参数 - JSONObject paramsMap = new JSONObject(); - paramsMap.put("user_ids", userIds); - paramsMap.put("msg_type", "interactive"); - paramsMap.put("card", jsonObject); + if(StringUtils.isNotEmpty(problemKnowledgeBaseClassifyEO.getChargePersonId())){ + for (String chargePersonId : problemKnowledgeBaseClassifyEO.getChargePersonId().split(",")) { + for (SysUser sysUser : chargePersonUserList) { + if(StringUtils.equals(chargePersonId,sysUser.getId())){ + String thirdId = sysUser.getThirdId(); + atUserSb.append(""); + atUserSb.append(" "); + } + } + } + } - // 发送请求给飞书 - String response = null; - try { - response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString()); - } catch (IOException e) { - e.printStackTrace(); - } - // 获取返回结果 - JSONObject tokenJson = JSONObject.parseObject(response); - if(!tokenJson.get("code").toString().equals("0")) { - log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson); + text.put("content","问题标签：" + problemKnowledgeBaseClassifyEO.getProblemLabel() + "\n" + "责任人：" + atUserSb.toString()); + text.put("tag","lark_md"); + + field.put("is_short",true); + field.put("text",text); + fields.add(field); + } + + element.put("tag","div"); + element.put("fields",fields); + elements.add(element); + jsonObject.put("elements",elements); + // 设置请求参数 + JSONObject paramsMap = new JSONObject(); + paramsMap.put("user_ids", userIds); + paramsMap.put("msg_type", "interactive"); + paramsMap.put("card", jsonObject); + + // 发送请求给飞书 + String response = null; + try { + response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString()); + } catch (IOException e) { + e.printStackTrace(); + } + // 获取返回结果 + JSONObject tokenJson = JSONObject.parseObject(response); + if(!tokenJson.get("code").toString().equals("0")) { + log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson); + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index f1c728345..acb14a326 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -90,7 +90,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl addOrUpdateConditionAssessmentBatch(@RequestBody ConditionAssessmentVO conditionAssessmentVO) { + return conditionAssessmentEOService.addOrUpdateBatch(conditionAssessmentVO); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryEOController.java index 34920988e..a15ea842e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryEOController.java @@ -1,27 +1,27 @@ 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.alibaba.fastjson.JSONObject; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.project.entity.ProjectTaskInventoryEO; -import com.jero.modules.project.service.IProjectTaskInventoryEOService; 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.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ProjectTaskInventoryEO; +import com.jero.modules.project.service.IProjectTaskInventoryEOService; +import com.jero.modules.project.vo.ProjectTaskInventoryVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; 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; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** @@ -203,4 +203,32 @@ public class ProjectTaskInventoryEOController extends JeroController remindDispose(@RequestBody JSONObject jsonObject){ return this.projectTaskInventoryEOService.remindDispose(jsonObject); } + + /** + * 编辑 + * + * @param projectTaskInventoryVO + * @return + */ + @AutoLog(value = "项目库-任务清单表-批量维护进度") + @ApiOperation(value="项目库-任务清单表-批量维护进度", notes="项目库-任务清单表-批量维护进度") + @PostMapping(value = "/editBatch") + public Result editCertificationProgressBatch(@RequestBody ProjectTaskInventoryVO projectTaskInventoryVO) { + projectTaskInventoryEOService.editBatch(projectTaskInventoryVO); + return Result.OK("编辑成功!"); + } + + /** + * 认证进度和当前状态修改时，校验角色是否符合 + * + * @param projectTaskInventoryVO + * @return + */ + @AutoLog(value = "项目库-任务清单表-校验角色是否符合") + @ApiOperation(value="项目库-任务清单表-校验角色是否符合", notes="项目库-任务清单表-校验角色是否符合") + @PostMapping(value = "/verifyRoleCode") + public Result verifyRoleCode(@RequestBody ProjectTaskInventoryVO projectTaskInventoryVO) { + List msgList = projectTaskInventoryEOService.verifyRoleCode(projectTaskInventoryVO); + return Result.OK(msgList); + } } 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 b4ed25732..ff5ad39bd 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 @@ -1,11 +1,11 @@ package com.jero.modules.project.service; +import com.baomidou.mybatisplus.extension.service.IService; 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. ConditionAssessmentEO; -import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.project.entity.ProjectTaskInventoryEO; +import com.jero.modules.project.vo.ConditionAssessmentVO; import java.util.List; import java.util.Map; @@ -92,4 +92,10 @@ public interface IConditionAssessmentEOService extends IService> getProjectStatusAssessStatisticsGroupByTerritory(Map params); + + /** + * 任务清单-项目状态评估表-批量添加或修改 + * @param conditionAssessmentVO + */ + Result addOrUpdateBatch(ConditionAssessmentVO conditionAssessmentVO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java index 034acff8a..0ade9b8a2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java @@ -1,9 +1,10 @@ package com.jero.modules.project.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; import com.jero.modules.project.entity.ProjectTaskInventoryEO; -import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.project.vo.ProjectTaskInventoryVO; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -84,5 +85,21 @@ public interface IProjectTaskInventoryEOService extends IService projectLawsInventoryIds); + /** + * 批量更新认证进度 + * + * @param projectTaskInventoryVO + * @return + */ + void editBatch(ProjectTaskInventoryVO projectTaskInventoryVO); + + /** + * 校验角色是否符合 + * + * @param projectTaskInventoryVO + * @return + */ + List verifyRoleCode(ProjectTaskInventoryVO projectTaskInventoryVO); + void exportXls(HttpServletResponse response, HttpServletRequest request, ProjectTaskInventoryEO projectTaskInventoryEO); } 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 8f87663db..2f28cb299 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 @@ -1,6 +1,7 @@ package com.jero.modules.project.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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; @@ -8,6 +9,7 @@ import com.jero.modules.project.entity.ProjectTaskInventoryEO; 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.vo.ConditionAssessmentVO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -16,8 +18,6 @@ import org.springframework.stereotype.Service; import java.util.*; import java.util.stream.Collectors; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** * @Description: 任务清单-项目状态评估表 * @Author: jero-boot @@ -251,4 +251,70 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl addOrUpdateBatch(ConditionAssessmentVO conditionAssessmentVO) { + List projectLawsInventoryIdList = Arrays.asList(conditionAssessmentVO.getProjectLawsInventoryIds().split(",")); + List roleCodeListOld = Arrays.asList(conditionAssessmentVO.getRoleCodes().split(",")); + + + for (int i=0; i < projectLawsInventoryIdList.size(); i++) { + String projectLawsInventoryId = projectLawsInventoryIdList.get(i); + String roleCode = roleCodeListOld.get(i); + List roleCodeList = new ArrayList<>(); + List list = new ArrayList<>(); + + if (StringUtils.equals(roleCode, ProjectRoleEnum.REGULATI_ENGINEER.getValue())) { + roleCodeList.add(ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + + ConditionAssessmentEO regulatiEngineer = new ConditionAssessmentEO(); + regulatiEngineer.setProjectLawsInventoryId(projectLawsInventoryId); + regulatiEngineer.setConditionAssessment(conditionAssessmentVO.getConditionAssessment()); + regulatiEngineer.setRemark(conditionAssessmentVO.getRemark()); + regulatiEngineer.setRoleCode(ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + + list.add(regulatiEngineer); + + } else if (StringUtils.equals(roleCode, ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) { + roleCodeList.add(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); + + ConditionAssessmentEO homologationEngineer = new ConditionAssessmentEO(); + homologationEngineer.setProjectLawsInventoryId(projectLawsInventoryId); + homologationEngineer.setConditionAssessment(conditionAssessmentVO.getConditionAssessment()); + homologationEngineer.setRemark(conditionAssessmentVO.getRemark()); + homologationEngineer.setRoleCode(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); + + list.add(homologationEngineer); + + } else if (StringUtils.equals(roleCode, ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue())) { + roleCodeList.add(ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + roleCodeList.add(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); + + ConditionAssessmentEO regulatiEngineer = new ConditionAssessmentEO(); + regulatiEngineer.setProjectLawsInventoryId(projectLawsInventoryId); + regulatiEngineer.setConditionAssessment(conditionAssessmentVO.getConditionAssessment()); + regulatiEngineer.setRemark(conditionAssessmentVO.getRemark()); + regulatiEngineer.setRoleCode(ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + + ConditionAssessmentEO homologationEngineer = new ConditionAssessmentEO(); + homologationEngineer.setProjectLawsInventoryId(projectLawsInventoryId); + homologationEngineer.setConditionAssessment(conditionAssessmentVO.getConditionAssessment()); + homologationEngineer.setRemark(conditionAssessmentVO.getRemark()); + homologationEngineer.setRoleCode(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); + + list.add(regulatiEngineer); + list.add(homologationEngineer); + } + if(CollectionUtils.isNotEmpty(list)){ + QueryWrapper deleteWrapper = new QueryWrapper<>(); + deleteWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId); + deleteWrapper.lambda().in(ConditionAssessmentEO::getRoleCode,roleCodeList); + this.baseMapper.delete(deleteWrapper); + + saveBatch(list); + } + } + + return Result.ok(); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index 17c1d4e9c..9b8c9ac10 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -18,6 +18,7 @@ import com.jero.modules.project.service.IConditionAssessmentEOService; import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.project.service.IProjectTaskInventoryEOService; import com.jero.modules.project.util.SendMessageUtils; +import com.jero.modules.project.vo.ProjectTaskInventoryVO; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; @@ -459,6 +460,89 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl idList = Arrays.asList(projectTaskInventoryVO.getIds().split(",")); + + List updateEOList = new ArrayList<>(); + for (String id : idList) { + ProjectTaskInventoryEO updateEO = new ProjectTaskInventoryEO(); + updateEO.setId(id); + updateEO.setCertificationProgress(projectTaskInventoryVO.getCertificationProgress()); + updateEO.setCertificationProgressRemark(projectTaskInventoryVO.getCertificationProgressRemark()); + + Date now = new Date(); + updateEO.setUpdateTime(now); + + updateEOList.add(updateEO); + } + + updateBatchById(updateEOList); + } + + @Override + public List verifyRoleCode(ProjectTaskInventoryVO projectTaskInventoryVO) { + List projectLawsInventoryIdList = Arrays.asList(projectTaskInventoryVO.getProjectLawsInventoryIds().split(",")); + List roleCodeList = Arrays.asList(projectTaskInventoryVO.getRoleCodes().split(",")); + String cut = projectTaskInventoryVO.getCut(); + String operation = projectTaskInventoryVO.getOperation(); + + List> msgMapList = new ArrayList<>(); + for (int i=0; i < projectLawsInventoryIdList.size(); i++) { + String projectLawsInventoryId = projectLawsInventoryIdList.get(i); + String roleCode = roleCodeList.get(i); + ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOService.getById(projectLawsInventoryId); + + Map msgMap = new HashMap<>(); + if ("1".equals(operation)) { + if (! ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode)) { + msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber()); + + } + } else if ("2".equals(operation)) { + if (!(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode) + || ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode) + || ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue().equals(roleCode))) { + msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber()); + + } + } + + msgMapList.add(msgMap); + } + + return getMsg(msgMapList, cut, operation); + + } + + private List getMsg(List> msgMapList, String cut, String operation) { + List msgList = new ArrayList<>(); + + for (Map msgMap : msgMapList) { + String serialNumber = msgMap.get("serialNumber"); + StringBuilder stringBuilder = new StringBuilder(); + if ("1".equals(operation)) { + if (CutEnum.EN.getValue().equals(cut)) { + stringBuilder.append("Number ").append("").append(serialNumber).append("").append(", the current user can not maintain homologation progress."); + } else { + stringBuilder.append("编号").append("").append(serialNumber).append("").append(",当前用户没有维护认证进度权限。"); + } + + } else if("2".equals(operation)) { + if (CutEnum.EN.getValue().equals(cut)) { + stringBuilder.append("Number ").append("").append(serialNumber).append("").append(", the current user can not modify current status."); + } else { + stringBuilder.append("编号").append("").append(serialNumber).append("").append("当前用户没有修改状态权限。"); + } + + } + + msgList.add(stringBuilder.toString()); + } + + return msgList; + } + /** * 创建任务清单列表数据 * @param projectTaskInventoryEOList diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/ConditionAssessmentVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/ConditionAssessmentVO.java new file mode 100644 index 000000000..21bf266c1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/ConditionAssessmentVO.java @@ -0,0 +1,15 @@ +package com.jero.modules.project.vo; + +import lombok.Data; + +@Data +public class ConditionAssessmentVO { + + private String cut; + + // 当前状态 + private String projectLawsInventoryIds; + private String roleCodes; + private String conditionAssessment; + private String remark; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/ProjectTaskInventoryVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/ProjectTaskInventoryVO.java new file mode 100644 index 000000000..321895fd8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/ProjectTaskInventoryVO.java @@ -0,0 +1,18 @@ +package com.jero.modules.project.vo; + +import lombok.Data; + +@Data +public class ProjectTaskInventoryVO { + + private String cut; + + // 认证进度 + private String ids; + private String projectLawsInventoryIds; + private String roleCodes; + private String certificationProgress; + private String certificationProgressRemark; + + private String operation; // 1-维护进度，2-修改状态 +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index 1947159ab..c9f25752b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -146,7 +146,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl
- - - + + +
- + {{$t('NiONumber')}}
- - - - - - + +
- - - - - +
{{$t('ParameterName')}}
- - - - - - + +
- - - - - - {{ $t('query') }} - {{ $t('reset') }} - - - - +
{{$t('areaOfResponsibility')}}
- - - - - - + + :triggerChange='false' :dictCode="'duty_territory'"/>
- - - - - - - - - + + + {{ $t('query') }} + {{ $t('reset') }} + + - +
{{ $t('cancel') }} - {{ $t('submit') }} + {{ $t('submit') }}
\ No newline at end of file diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue index 953e9aaa2..69b6313b3 100644 --- a/jero-web/src/components/TaskCutOffTime/index.vue +++ b/jero-web/src/components/TaskCutOffTime/index.vue @@ -286,6 +286,9 @@ export default { } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue index b66553e89..422241c8f 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -56,14 +56,14 @@ - - + + + +
- + @@ -220,7 +220,9 @@ return words.replace(/\s/g, '') //这里是去除空格 }, getParagraphInfoList() { - let queryParamOne = Object.assign(this.queryParam, this.queryParamOne) + let queryParamIndex = JSON.parse(JSON.stringify(this.queryParam)) + let queryParamAdmin = JSON.parse(JSON.stringify(this.queryParamOne)) + let queryParamOne = Object.assign(queryParamIndex, queryParamAdmin) let queryParam = JSON.parse(JSON.stringify(queryParamOne)) Object.keys(queryParam).forEach(val => { if (queryParam[val] instanceof Array) { @@ -238,6 +240,11 @@ postAction(this.url.getParagraphInfoList, query).then((res) => { if (res.success) { this.conList = res.result.records + if (this.conList && this.conList.length > 0) { + this.conList.forEach(val => { + val.content = val.content.replace(//g, '') + }) + } this.total = res.result.total this.loading = false } else { @@ -482,4 +489,8 @@ overflow: hidden; text-overflow: ellipsis; } + ::v-deep p{ + margin: 0; + padding: 0; + } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index cc7d965e3..a630a7709 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -8,9 +8,9 @@
  • -
    -
    +
    + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/batchModel.vue b/jero-web/src/views/projectManagement/components/batchModel.vue new file mode 100644 index 000000000..34a3cb7fa --- /dev/null +++ b/jero-web/src/views/projectManagement/components/batchModel.vue @@ -0,0 +1,179 @@ + + + + + + \ No newline at end of file