diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml index 08b40af8..56e5cdd9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml @@ -7,16 +7,14 @@ ${ew.sqlSelect} from ( select id,'1' as resource_type,CONCAT_WS(' ',standard_number,standard_name) AS standard_name,create_time, - case when standard_class = 'GB' then 1 - when standard_class = 'GB/T' then 2 - when standard_class = 'JT' then 3 - when standard_class = 'QC/T' then 4 - when standard_class = 'HJ' then 5 + case when standard_class = 'UN' then 1 + when standard_class = 'EU' then 2 + when standard_class = 'GB' then 3 + when standard_class = 'GB/T' then 4 else 8 end as standard_type_order, - case when standard_state = 5 then 2 - when standard_state = 6 then 1 - when standard_state = 7 then 3 + case when standard_state = 1 then 1 + when standard_state = 7 then 2 else 4 end as standard_state_order, standard_class,dynamic_type,applicable_vehicle,type,standard_state,null as standard_code,null as grade_classification, @@ -25,14 +23,10 @@ and standard_state != 7 - - and standard_state != 7 - union all - select id,'3' as resource_type,CONCAT_WS(' ',standard_number,standard_name) AS standard_name,create_time,6 as standard_type_order, - case when standard_state = 5 then 2 - when standard_state = 6 then 1 - when standard_state = 7 then 3 + select id,'3' as resource_type,CONCAT_WS(' ',standard_number,standard_name) AS standard_name,create_time,9 as standard_type_order, + case when standard_state = 1 then 1 + when standard_state = 7 then 2 else 4 end as standard_state_order, null,null,null,null,standard_state,standard_code,null as grade_classification,implementation_date diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java index 51b3fdaa..7ff7d6f2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java @@ -861,11 +861,11 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { m3.put("standard_state_order.keyword",mAsc3); sort.add(m3); - Map m33 = new HashMap<>(); - Map mDesc44 = new HashMap<>(); - mDesc44.put(order,"desc"); - m33.put("release_date",mDesc44); - sort.add(m33); +// Map m33 = new HashMap<>(); +// Map mDesc44 = new HashMap<>(); +// mDesc44.put(order,"desc"); +// m33.put("release_date",mDesc44); +// sort.add(m33); Map m4 = new HashMap<>(); Map mDesc4 = new HashMap<>(); @@ -928,7 +928,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { } String implementationDate = "implementationDate"; if(map.containsKey(implementationDate) && !Objects.isNull(map.get(implementationDate))){ - map.put(implementationDate,new SimpleDateFormat(YYYY_MM_DD).format(Long.parseLong(map.get(implementationDate).toString()))); + String date = new SimpleDateFormat(YYYY_MM_DD).format(Long.parseLong(map.get(implementationDate).toString())); + map.put(implementationDate,!Objects.equals(date,"1900-01-01") ? date : "-"); } String createTime = "createTime"; if(map.containsKey(createTime) && !Objects.isNull(map.get(createTime))){ @@ -1673,18 +1674,16 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { obj.setTitle(lawsDomesticStandard.getStandardNumber() + " " + lawsDomesticStandard.getStandardName()); obj.setResourceType(resourceType); switch (lawsDomesticStandard.getStandardClass()){ - case "GB": obj.setStandardTypeOrder("1");break; - case "GB/T": obj.setStandardTypeOrder("2");break; - case "JT": obj.setStandardTypeOrder("3");break; - case "QC/T": obj.setStandardTypeOrder("4");break; - case "HJ": obj.setStandardTypeOrder("5");break; + case "UN": obj.setStandardTypeOrder("1");break; + case "EU": obj.setStandardTypeOrder("2");break; + case "GB": obj.setStandardTypeOrder("3");break; + case "GB/T": obj.setStandardTypeOrder("4");break; default: obj.setStandardTypeOrder("8");break; } switch (lawsDomesticStandard.getStandardState()){ - case "5": obj.setStandardStateOrder("2");break; - case "6": obj.setStandardStateOrder("1");break; - case "7": obj.setStandardStateOrder("3");break; - default: obj.setStandardStateOrder("4");break; + case "1": obj.setStandardStateOrder("1");break; + case "7": obj.setStandardStateOrder("2");break; + default: obj.setStandardStateOrder("3");break; } obj.setImplementationDate(lawsDomesticStandard.getImplementationDate()); obj.setCreateTime(lawsDomesticStandard.getCreateTime()); @@ -1828,12 +1827,10 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { obj.setId(lawsEnterpriseStandard.getId()); obj.setTitle(lawsEnterpriseStandard.getStandardNumber() + " " + lawsEnterpriseStandard.getStandardName()); obj.setResourceType(resourceType); - obj.setStandardTypeOrder("6"); - + obj.setStandardTypeOrder("9"); switch (lawsEnterpriseStandard.getStandardState()){ - case "5": obj.setStandardStateOrder("2");break; - case "6": obj.setStandardStateOrder("1");break; - case "7": obj.setStandardStateOrder("3");break; + case "1": obj.setStandardStateOrder("1");break; + case "7": obj.setStandardStateOrder("2");break; default: obj.setStandardStateOrder("4");break; } obj.setImplementationDate(lawsEnterpriseStandard.getImplementationDate()); diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index 43be091e..a13f878d 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -591,3 +591,11 @@ feishu: get_userinfo_by_code: ${feishu.base_url}/authen/v1/access_token # 飞书单点登录地址 sign_login_in: ${feishu.base_url}/authen/v1/index?redirect_uri={REDIRECT_URI}&app_id=${feishu.app_id}&state=feishu + # 飞书PC端待办地址 + promoter_pc_link: ${feishu.redirect_prefix}/workCenter/processCenter/processCenter + # 飞书PC端发起流程地址 + review_pc_link: ${feishu.redirect_prefix}/workCenter/processCenter/processCenter + # 飞书app端待办地址 + promoter_mobile_link: ${feishu.redirect_prefix}/workCenter/processCenter/processCenter + # 飞书app端发起流程地址 + review_mobile_link: ${feishu.redirect_prefix}/workCenter/processCenter/processCenter