From f9e2193a063f6d76280bac9111e9bd3b4d6b5157 Mon Sep 17 00:00:00 2001 From: gaosong Date: Wed, 20 Dec 2023 09:10:05 +0800 Subject: [PATCH 01/77] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E5=8F=98=E6=9B=B4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/collect/service/impl/ParamsManifestEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 5c94ddde5..2eaa16b45 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -859,6 +859,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl Date: Wed, 20 Dec 2023 14:06:40 +0800 Subject: [PATCH 02/77] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93-=E6=A0=87=E5=87=86=E4=BD=93?= =?UTF-8?q?=E7=B3=BB=EF=BC=88=E4=B8=8B=E6=8B=89=E5=A4=9A=E9=80=89=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DocumentSearchServiceImpl.java | 57 ++++++++++++------- 1 file changed, 37 insertions(+), 20 deletions(-) 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 e84e8c595..9e50070d3 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 @@ -197,7 +197,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { Map mapTwo = (Map) map.get("mapTwo"); JSONArray must = new JSONArray(); //处理首次查询条件 - if (ObjectUtils.isNotEmpty(mapOne)) { + if (ObjectUtils.isNotEmpty(mapOne)) { queryCondition(mapOne, inputFieldList, otherFieldList,dateFieldList, must); } //处理二次查询条件 @@ -423,27 +423,44 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { for (Map.Entry entry : otherMap.entrySet()) { String key = entry.getKey(); String value = (String) entry.getValue(); - if("technology_territory".equals(key) && ObjectUtils.isNotEmpty(value)){ - JSONArray should = new JSONArray(); + if(StringUtils.isNotBlank(value)){ + if("technology_territory".equals(key) && ObjectUtils.isNotEmpty(value)){ + JSONArray should = new JSONArray(); - List> mapList = new ArrayList<>(); - for (String s : value.split(",")) { - Map map = new HashMap(); - map.put(key,"*"+s+"*"); - Map map1 = new HashMap<>(); - map1.put("wildcard",map); - should.add(map1); + List> mapList = new ArrayList<>(); + for (String s : value.split(",")) { + Map map = new HashMap(); + map.put(key,"*"+s+"*"); + Map map1 = new HashMap<>(); + map1.put("wildcard",map); + should.add(map1); + } + JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, should); + must.add(jsonObject); + }else if("standard_system".equals(key) && ObjectUtils.isNotEmpty(value)){ + JSONArray should = new JSONArray(); + + List> mapList = new ArrayList<>(); + for (String s : value.split(",")) { + Map map = new HashMap(); + map.put("query",s); + Map map1 = new HashMap<>(); + map1.put(key,map); + Map map2 = new HashMap<>(); + map2.put("match",map1); + should.add(map2); + } + JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, should); + must.add(jsonObject); + }else{ + Map map = new HashMap<>(); + Map queryMap = new HashMap<>(); + Map queryMapTemp = new HashMap<>(); + queryMapTemp.put("query", value); + queryMap.put(key, queryMapTemp); + map.put("match",queryMap); + must.add(map); } - JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, should); - must.add(jsonObject); - }else{ - Map map = new HashMap<>(); - Map queryMap = new HashMap<>(); - Map queryMapTemp = new HashMap<>(); - queryMapTemp.put("query", value); - queryMap.put(key, queryMapTemp); - map.put("match",queryMap); - must.add(map); } } } From 12f8decf16e251c6240a5eea2a05764435db4234 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 21 Dec 2023 10:06:49 +0800 Subject: [PATCH 03/77] =?UTF-8?q?=E6=B3=95=E8=A7=84=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E5=BE=85=E5=8A=9E=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=EF=BC=88=E8=BF=87=E6=BB=A4=E6=8E=89=E9=A1=B9=E7=9B=AE=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E5=8F=96=E6=B6=88=E7=9A=84=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/enums/YesOrNoEnum.java | 4 +- .../modules/system/enums/DicCodeEnum.java | 1 + .../mapper/ProcessInfoEOMapper.java | 10 +- .../mapper/xml/ProcessInfoEOMapper.xml | 212 +++++++++++++++++- .../impl/ProcessInfoEOServiceImpl.java | 19 +- .../modules/todoCenter/vo/ProcessInfoVO.java | 3 + 6 files changed, 242 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java index 2b56f4dd2..d224e58a8 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java @@ -7,7 +7,9 @@ package com.jero.common.constant.enums; */ public enum YesOrNoEnum { NO("否","NO","0"), - YES("是","YES","1"); + YES("是","YES","1"), + CANCEL("取消","",""), + ; String name; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java index f0f6d460a..b04c520eb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java @@ -9,6 +9,7 @@ public enum DicCodeEnum { PROBLEM_TYPE("问题类型","1697066042058821634","wen4_ti2_lei4_xing2"), PROBLEM_PRIORITY("问题优先级","1716030928484503553","wen4_ti2_you1_xian1_ji2"), CERTIFICATION_PROGRESS("认证清单-认证进度","1524311122804346881","certification_progress"), + PROJECT_STATUS("项目状态","78bda155fe380b3b3f17551e88c284c6","project_status"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoEOMapper.java index f83950d1c..2ab22bd54 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoEOMapper.java @@ -1,12 +1,13 @@ package com.jero.modules.todoCenter.mapper; -import java.util.Map; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.todoCenter.entity.ProcessInfoEO; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.todoCenter.vo.ProcessInfoVO; +import java.util.List; +import java.util.Map; + /** * @Description: 流程信息表 * @Author: jero-boot @@ -30,6 +31,9 @@ public interface ProcessInfoEOMapper extends BaseMapper { */ IPage queryProjectProcessTodoTaskListList(IPage page,Map params); + + List queryProjectProcessTodoTaskList(IPage page, Map params); + /** * 查询法规评估流程分页列表 * @param page diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml index 317cdd972..19d5c11b1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml @@ -230,7 +230,8 @@ plb.studio_engineer, plb.project_version, plb.parent_id, - plb.platform + plb.platform, + plb.project_status FROM process_info pi LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id @@ -325,7 +326,214 @@ plb.studio_engineer, plb.project_version, plb.parent_id, - plb.platform + plb.platform, + plb.project_status + FROM + process_info pi + LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id + LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id + LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id + LEFT JOIN project_laws_inventory pli ON pi.project_laws_inventory_id = pli.id + WHERE + ( + pi.id IN ( + SELECT + pid.process_info_id + FROM + process_info_detail pid + where pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus} + ) + ) + AND pi.flow_type IN + + #{item} + + )temp + + order by + temp.end_time IS NULL, + temp.end_time, + temp.project_name IS NULL, + temp.project_name, + standard_info IS NULL, + standard_info, + flow_type_show_order_by + ASC + +