diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 3a32c5b11..8e78d8f34 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -1,28 +1,28 @@ -- 二期一阶段的表变更,必须添加的固定数据以sql形式放到此处 --- 项目库添加字段(项目版本,软件版本,说明)---------2022-10-18 未同步生产环境 +-- 项目库添加字段(项目版本,软件版本,说明)---------2022-10-18 已同步生产环境 ALTER TABLE `laws_weilai`.`project_library_base` ADD COLUMN `parent_id` varchar(255) NULL COMMENT '主项目id' AFTER `update_by`, ADD COLUMN `project_version` varchar(255) NULL COMMENT '项目版本' AFTER `parent_id`, ADD COLUMN `explanation` varchar(2000) NULL COMMENT '说明' AFTER `project_version`, ADD COLUMN `software_version` varchar(255) NULL COMMENT '软件版本' AFTER `explanation`; --- 项目库添加字段(排序)---------2022-10-18 未同步生产环境 +-- 项目库添加字段(排序)---------2022-10-18 已同步生产环境 ALTER TABLE `laws_weilai`.`project_library_base` ADD COLUMN `sort` varchar(255) NULL COMMENT '排序(用于置顶功能)' AFTER `software_version`, ADD COLUMN `flag` varchar(255) NULL COMMENT '置顶(flag为空的时候为置顶, flag为1的时候取消置顶)' AFTER `sort`; --- 认证参数列表添加字段--------2022-10-20 未同步生产环境 +-- 认证参数列表添加字段--------2022-10-20 已同步生产环境 ALTER TABLE `laws_weilai`.`params_manifest` ADD COLUMN `project_version` varchar(255) NULL COMMENT '相关项目版本' AFTER `params_template_name`, ADD COLUMN `explanation` varchar(2000) NULL COMMENT '说明' AFTER `project_version`; --- 项目库修改认证软件版本字段长度---------2022-11-01 未同步生产环境 +-- 项目库修改认证软件版本字段长度---------2022-11-01 已同步生产环境 ALTER TABLE `laws_weilai`.`project_library_base` MODIFY COLUMN `software_version` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '软件版本' AFTER `explanation`; --- 认证参数历史列表添加字段--------2022-11-02 未同步生产环境 +-- 认证参数历史列表添加字段--------2022-11-02 已同步生产环境 ALTER TABLE `laws_weilai`.`params_manifest_history` ADD COLUMN `project_version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关项目版本' AFTER `params_template_name`, ADD COLUMN `explanation` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `project_version`; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java index 5555c464b..7f042554b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java @@ -213,7 +213,8 @@ public class SysAnnouncementSendController { @GetMapping(value = "/getMyAnnouncementSend") public Result> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + String cut) { Result> result = new Result>(); LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String userId = sysUser.getId(); @@ -221,7 +222,7 @@ public class SysAnnouncementSendController { announcementSendModel.setPageNo((pageNo-1)*pageSize); announcementSendModel.setPageSize(pageSize); Page pageList = new Page(pageNo,pageSize); - pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel); + pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel,cut); result.setResult(pageList); result.setSuccess(true); return result; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java index 06cf4d4f9..fcb31c6e8 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java @@ -684,7 +684,7 @@ public class SysPermissionController { //项目参数任务 if(StringUtils.equals(permission.getId(), SysPermissionEnum.PROJECT_PARAMETER_TASKS.getId())){ boolean existTaskFlag = false; -// existTaskFlag = sysPermissionService.judgeToDo(); + existTaskFlag = sysPermissionService.judgeToDo(); meta.put("existTask",existTaskFlag); } json.put("meta", meta); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml index c47d88995..25952a57c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml @@ -72,6 +72,9 @@ and sa.msg_content LIKE concat(concat('%',#{announcementSendModel.msgContent}),'%') + + + and sa.msg_content_cn LIKE concat(concat('%',#{announcementSendModel.msgContentCn}),'%') order by sas.read_flag,sa.send_time desc diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java index d80d113d5..c58cc1973 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java @@ -23,7 +23,7 @@ public interface ISysAnnouncementSendService extends IService getMyAnnouncementSendPage(Page page,AnnouncementSendModel announcementSendModel); + public Page getMyAnnouncementSendPage(Page page,AnnouncementSendModel announcementSendModel,String cut); List getMessageUnreadList(); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java index c9f62b243..d6e3fbc3b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import javax.annotation.Resource; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; import com.jero.modules.system.entity.SysAnnouncementSend; import com.jero.modules.system.mapper.SysAnnouncementSendMapper; @@ -34,7 +35,11 @@ public class SysAnnouncementSendServiceImpl extends ServiceImpl getMyAnnouncementSendPage(Page page, - AnnouncementSendModel announcementSendModel) { + AnnouncementSendModel announcementSendModel,String cut) { + if(CutEnum.CN.getValue().equals(cut)){ + announcementSendModel.setMsgContentCn(announcementSendModel.getMsgContent()); + announcementSendModel.setMsgContent(null); + } return page.setRecords(sysAnnouncementSendMapper.getMyAnnouncementSendList(page, announcementSendModel)); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index 1fc8997c5..2c220de0c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -128,8 +128,8 @@ pm.state as state, pm.project_id as project_id, pm.create_time as create_time, - pm.project_version as project_version, - concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.version) as project_name + pm.version as version, + concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.project_version) as project_name from params_manifest pm left join project_library_base as plb on plb.id = pm.project_id left join project_name_info as pni on plb.project_name_id = pni.id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java index e3ef18811..b985f82ea 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java @@ -22,9 +22,9 @@ public class ParamsManifestTodoCenterEO { private String title; /** - * 相关项目版本 + * 相关清单版本 */ - private String projectVersion; + private String version; /** * 待发起数量 包括状态:待发起收集,变更,工程接口人退回 diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue index 0233fec30..52298ebb1 100644 --- a/jero-web/src/components/tools/HeaderNotice.vue +++ b/jero-web/src/components/tools/HeaderNotice.vue @@ -15,9 +15,9 @@ diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue index 61d4e96ee..7c008db5a 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue @@ -4,7 +4,7 @@ - + @@ -13,6 +13,7 @@