FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master

Browse Source
This commit is contained in:
zhangyanduan
2022-07-13 14:44:53 +08:00
parent e42fbce67e ffa12e7357
commit f3544694e2
3 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java
+5 -1
View File
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.sf.jsqlparser.statement.replace.Replace;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -45,7 +46,10 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
wrapper.like(StringUtils.isNotBlank(askQuestions.getAppendixName()),"APPENDIX_NAME",askQuestions.getAppendixName());
wrapper.like(StringUtils.isNotBlank(askQuestions.getProblemDescription()),"PROBLEM_DESCRIPTION",askQuestions.getProblemDescription());
wrapper.eq(StringUtils.isNotBlank(askQuestions.getQuestioner()),"QUESTIONER",askQuestions.getQuestioner());
wrapper.like(StringUtils.isNotBlank(askQuestions.getStandardEncdoing()),"STANDARD_ENCDOING",askQuestions.getStandardEncdoing());
if (StringUtils.isNotBlank(askQuestions.getStandardEncdoing())) {
wrapper.and(Q -> wrapper.like("STANDARD_ENCDOING", askQuestions.getStandardEncdoing().replace(" ", " "))
.or().like("STANDARD_ENCDOING", askQuestions.getStandardEncdoing()));
}
wrapper.like(StringUtils.isNotBlank(askQuestions.getStandardName()),"STANDARD_NAME",askQuestions.getStandardName());
wrapper.eq(StringUtils.isNotBlank(askQuestions.getStandardId()),"STANDARD_ID",askQuestions.getStandardId());
wrapper.orderByDesc("QUESTION_TIME");
adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml
+3
View File
@@ -27,6 +27,9 @@
<if test="flieM.treeId != null and flieM.treeId != ''">
and zd.id=#{flieM.treeId}
</if>
<if test="flieM.id != null and flieM.id != ''">
and fm.id=#{flieM.id}
</if>
<if test="flieM.dataType != null and flieM.dataType != ''">
AND fm.data_type like concat('%',#{flieM.dataType},'%')
</if>
doc/sql/20220713_数据.sql
+23
View File
@@ -0,0 +1,23 @@
====新增的菜单数据====
INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('07ba9d907841a62a18267198da3873b1', NULL, '左侧树删除', '32143ffassgabyabayg', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('0b95246d8ad2da6c54381deffa3d0fa2', NULL, '左侧树修改', '32143ffassgabyabayg', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('1cae70abf414bacc33f3ed794cdfa903', NULL, '资料中心删除', '32143ffassgabyabayg', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('32143ffassgabyabayg', NULL, '资料中心', NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('39784f04404cdf50891e9d033f6373c3', NULL, '资料中心查询', '32143ffassgabyabayg', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('45db41d367f474e10a7ae5dbe8cb0f6e', NULL, '资料中心新增', '32143ffassgabyabayg', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('d9698737e801822ab8f96dbcd47b7d62', NULL, '资料中心修改', '32143ffassgabyabayg', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `foton_slrs`.`sar_menu`(`ID`, `SOR_DIVIDE`, `MENU_NAME`, `PARENT_ID`, `PARENT_IDS`, `LEVEL`, `DISPLAY_SEQ`, `HREF`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `REMARKS`) VALUES ('e9e80920563325fa7f6e91213ee98466', NULL, '左侧树新增', '32143ffassgabyabayg', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL);
UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '左侧树删除', `PARENT_ID` = '32143ffassgabyabayg', `PARENT_IDS` = NULL, `LEVEL` = 2, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = '07ba9d907841a62a18267198da3873b1';
UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '左侧树修改', `PARENT_ID` = '32143ffassgabyabayg', `PARENT_IDS` = NULL, `LEVEL` = 2, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = '0b95246d8ad2da6c54381deffa3d0fa2';
UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '资料中心删除', `PARENT_ID` = '32143ffassgabyabayg', `PARENT_IDS` = NULL, `LEVEL` = 2, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = '1cae70abf414bacc33f3ed794cdfa903';
UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '资料中心', `PARENT_ID` = NULL, `PARENT_IDS` = NULL, `LEVEL` = 1, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = '32143ffassgabyabayg';
UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '资料中心查询', `PARENT_ID` = '32143ffassgabyabayg', `PARENT_IDS` = NULL, `LEVEL` = 2, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = '39784f04404cdf50891e9d033f6373c3';
UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '资料中心新增', `PARENT_ID` = '32143ffassgabyabayg', `PARENT_IDS` = NULL, `LEVEL` = 2, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = '45db41d367f474e10a7ae5dbe8cb0f6e';
UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '资料中心修改', `PARENT_ID` = '32143ffassgabyabayg', `PARENT_IDS` = NULL, `LEVEL` = 2, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = 'd9698737e801822ab8f96dbcd47b7d62';
UPDATE `foton_slrs`.`sar_menu` SET `SOR_DIVIDE` = NULL, `MENU_NAME` = '左侧树新增', `PARENT_ID` = '32143ffassgabyabayg', `PARENT_IDS` = NULL, `LEVEL` = 2, `DISPLAY_SEQ` = NULL, `HREF` = NULL, `VALID_FLAG` = NULL, `CREATION_TIME` = NULL, `MODIFY_TIME` = NULL, `REMARKS` = NULL WHERE `ID` = 'e9e80920563325fa7f6e91213ee98466';