新增sop快捷搜索

sop-business/src/main/java/com/qmth/sop/business/bean/params/SopInfoListParam.java

@@ -24,6 +24,7 @@ import java.util.Objects;
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SopInfoListParam extends TBSopInfo implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "流程类型str")
@@ -78,12 +79,6 @@ public class SopInfoListParam extends TBSopInfo implements Serializable {
     @ApiModelProperty(value = "sop单号")
     String sopNo;
 
-    @ApiModelProperty(value = "快捷搜索")
-    List<String> quickSearch;
-
-    @ApiModelProperty(value = "快捷显示")
-    List<String> quickView;
-
     public FormWidgetMetadataOperation getFormWidgetMetadataOperation() {
         return formWidgetMetadataOperation;
     }
@@ -209,20 +204,4 @@ public class SopInfoListParam extends TBSopInfo implements Serializable {
     public void setSopNo(String sopNo) {
         this.sopNo = sopNo;
     }
-
-    public List<String> getQuickSearch() {
-        return quickSearch;
-    }
-
-    public void setQuickSearch(List<String> quickSearch) {
-        this.quickSearch = quickSearch;
-    }
-
-    public List<String> getQuickView() {
-        return quickView;
-    }
-
-    public void setQuickView(List<String> quickView) {
-        this.quickView = quickView;
-    }
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopQuickSearchServiceImpl.java

@@ -66,6 +66,7 @@ public class TBSopQuickSearchServiceImpl extends ServiceImpl<TBSopQuickSearchMap
         if (Objects.nonNull(contentType)) {
             tbSopQuickSearchQueryWrapper.lambda().eq(TBSopQuickSearch::getContentType, contentType);
         }
+        tbSopQuickSearchQueryWrapper.lambda().orderByAsc(TBSopQuickSearch::getName);
         return this.list(tbSopQuickSearchQueryWrapper);
     }
 
@@ -105,7 +106,7 @@ public class TBSopQuickSearchServiceImpl extends ServiceImpl<TBSopQuickSearchMap
                 Objects.requireNonNull(tbSopQuickSearch, "未找到sop快捷数据");
                 tbSopQuickSearch.updateInfo(sopQuickSearchParam);
             }
-            tbSopQuickSearchService.saveOrUpdate(tbSopQuickSearch);
+            return tbSopQuickSearchService.saveOrUpdate(tbSopQuickSearch);
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);
             if (e instanceof DuplicateKeyException) {

sop-business/src/main/resources/mapper/TBCrmDetailMapper.xml

@@ -7,5 +7,6 @@
         left join t_f_custom_flow_entity tfcfe on tfcfe.code = t.sop_no
         left join t_b_sop_info tbsi on tbsi.sop_no = t.sop_no
         where t.crm_no = #{crmNo}
+        order by t.course_name
     </select>
 </mapper>