修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CommonSysParameter.java

@@ -56,6 +56,10 @@ public class CommonSysParameter extends BaseModel<CommonSysParameter> {
      * 变量描述
      */
     private String constDescription;
+    /**
+     * 顺序
+     */
+    private int sort;
 
 
     @Override

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonSysParameterServiceImpl.java

@@ -30,7 +30,7 @@ public class CommonSysParameterServiceImpl extends ServiceImpl<CommonSysParamete
      */
     public List<CommonSysParameter> getInfo(String constId){
         List<CommonSysParameter> commonSysParameterList = this.selectList(new EntityWrapper<CommonSysParameter>()
-        .eq("const_id",constId));
+        .eq("const_id",constId).orderBy("sort"));
 //        Map<String, String> map = new HashMap<>();
 //        if(CollectionUtils.isNotEmpty(commonSysParameterList)){
 //            for(CommonSysParameter commonSysParameter : commonSysParameterList){

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -33,7 +33,7 @@
             AND (DATE_FORMAT(m.signing_date,"%Y%m%d") <=
             DATE_FORMAT(#{endDate},"%Y%m%d"))
         </if>
-        <if test="searchType != null and searchType != ''">
+        <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(m.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower( m.buyer) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower( m.seller) like lower(CONCAT('%',#{searchKeyWord},'%')))
@@ -85,7 +85,7 @@
             AND (DATE_FORMAT(m.signing_date,"%Y%m%d") &lt;=
             DATE_FORMAT(#{endDate},"%Y%m%d"))
         </if>
-        <if test="searchType != null and searchType != ''">
+        <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(m.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower( m.buyer) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower( m.seller) like lower(CONCAT('%',#{searchKeyWord},'%')))