自助检索修改

src/main/java/com/bowintek/practice/model/SrTag.java

@@ -5,6 +5,8 @@ public class SrTag {
 
     private String tagName;
 
+    private Integer disOrder;
+
     public String getTagId() {
         return tagId;
     }
@@ -20,4 +22,12 @@ public class SrTag {
     public void setTagName(String tagName) {
         this.tagName = tagName == null ? null : tagName.trim();
     }
+
+    public Integer getDisOrder() {
+        return disOrder;
+    }
+
+    public void setDisOrder(Integer disOrder) {
+        this.disOrder = disOrder;
+    }
 }

src/main/java/com/bowintek/practice/model/SrTagExample.java

@@ -243,6 +243,66 @@ public class SrTagExample {
             addCriterion("tagName not between", value1, value2, "tagName");
             return (Criteria) this;
         }
+
+        public Criteria andDisOrderIsNull() {
+            addCriterion("disOrder is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisOrderIsNotNull() {
+            addCriterion("disOrder is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisOrderEqualTo(Integer value) {
+            addCriterion("disOrder =", value, "disOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisOrderNotEqualTo(Integer value) {
+            addCriterion("disOrder <>", value, "disOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisOrderGreaterThan(Integer value) {
+            addCriterion("disOrder >", value, "disOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisOrderGreaterThanOrEqualTo(Integer value) {
+            addCriterion("disOrder >=", value, "disOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisOrderLessThan(Integer value) {
+            addCriterion("disOrder <", value, "disOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisOrderLessThanOrEqualTo(Integer value) {
+            addCriterion("disOrder <=", value, "disOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisOrderIn(List<Integer> values) {
+            addCriterion("disOrder in", values, "disOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisOrderNotIn(List<Integer> values) {
+            addCriterion("disOrder not in", values, "disOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisOrderBetween(Integer value1, Integer value2) {
+            addCriterion("disOrder between", value1, value2, "disOrder");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisOrderNotBetween(Integer value1, Integer value2) {
+            addCriterion("disOrder not between", value1, value2, "disOrder");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/resources/generatorConfig.xml

@@ -120,6 +120,6 @@
             <columnOverride column="StandardMajorID" javaType="java.lang.Integer" jdbcType="INTEGER" />
             <table schema="" tableName="Sys_Log"><property name="useActualColumnNames" value="true"/></table>
         </table>-->
-        <table schema="" tableName="sr_subjectfield"><property name="useActualColumnNames" value="true"/></table>
+        <table schema="" tableName="sr_tag"><property name="useActualColumnNames" value="true"/></table>
     </context>
 </generatorConfiguration>

src/main/resources/mapping/SrTagMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="BaseResultMap" type="com.bowintek.practice.model.SrTag">
     <id column="tagId" jdbcType="VARCHAR" property="tagId" />
     <result column="tagName" jdbcType="VARCHAR" property="tagName" />
+    <result column="disOrder" jdbcType="INTEGER" property="disOrder" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -64,7 +65,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    tagId, tagName
+    tagId, tagName, disOrder
   </sql>
   <select id="selectByExample" parameterType="com.bowintek.practice.model.SrTagExample" resultMap="BaseResultMap">
     select
@@ -97,8 +98,10 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.bowintek.practice.model.SrTag">
-    insert into sr_tag (tagId, tagName)
-    values (#{tagId,jdbcType=VARCHAR}, #{tagName,jdbcType=VARCHAR})
+    insert into sr_tag (tagId, tagName, disOrder
+      )
+    values (#{tagId,jdbcType=VARCHAR}, #{tagName,jdbcType=VARCHAR}, #{disOrder,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.bowintek.practice.model.SrTag">
     insert into sr_tag
@@ -109,6 +112,9 @@
       <if test="tagName != null">
         tagName,
       </if>
+      <if test="disOrder != null">
+        disOrder,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="tagId != null">
@@ -117,6 +123,9 @@
       <if test="tagName != null">
         #{tagName,jdbcType=VARCHAR},
       </if>
+      <if test="disOrder != null">
+        #{disOrder,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bowintek.practice.model.SrTagExample" resultType="java.lang.Long">
@@ -134,6 +143,9 @@
       <if test="row.tagName != null">
         tagName = #{row.tagName,jdbcType=VARCHAR},
       </if>
+      <if test="row.disOrder != null">
+        disOrder = #{row.disOrder,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -142,7 +154,8 @@
   <update id="updateByExample" parameterType="map">
     update sr_tag
     set tagId = #{row.tagId,jdbcType=VARCHAR},
-      tagName = #{row.tagName,jdbcType=VARCHAR}
+      tagName = #{row.tagName,jdbcType=VARCHAR},
+      disOrder = #{row.disOrder,jdbcType=INTEGER}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -153,12 +166,16 @@
       <if test="tagName != null">
         tagName = #{tagName,jdbcType=VARCHAR},
       </if>
+      <if test="disOrder != null">
+        disOrder = #{disOrder,jdbcType=INTEGER},
+      </if>
     </set>
     where tagId = #{tagId,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.bowintek.practice.model.SrTag">
     update sr_tag
-    set tagName = #{tagName,jdbcType=VARCHAR}
+    set tagName = #{tagName,jdbcType=VARCHAR},
+      disOrder = #{disOrder,jdbcType=INTEGER}
     where tagId = #{tagId,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/mapping/cquery/TagCQuery.xml

@@ -15,6 +15,6 @@
             group by sf.tagId
         )stag on tag.tagId=stag.tagId
         where 1=1
-        order by tag.tagName
+        order by tag.disOrder
     </select>
 </mapper>

vue/src/components/basic/query/drag-where.vue

@@ -1,19 +1,11 @@
 <template>
-  <div class="query-area"
-       @dragover.prevent=""
-       @dragenter.prevent="handleDragOver($event)"
-       @drop="handleDrop($event)"
-       @dragleave="handleDragleave($event)"
-  >
+  <div class="query-area">
     <template v-for="(it, index) in tagList">
       <div class="query-area-item"
            :class="((this.index == index?'query-area-item-active':'') + (convertDataType(tagList[index])==2?' query-area-item-time':''))"
-           draggable="true"
-           @dragstart="childDragstart($event, index)"
-           @dragenter.prevent="childDragEnter($event, index)"
-           @dragleave="childDragleave($event, index)">
+     >
         <div class="query-area-header">
-          <div class="query-area-item-title" @click="handleDisplay(index)">
+          <div class="query-area-item-title">
             {{ it.displayName ? it.displayName : it.fieldName }}
           </div>
           <div class="query-area-item-close" @click="childDelete(index)" v-show="it.isFixed!=1">

vue/src/components/basic/query/select-field.vue

@@ -80,6 +80,7 @@ export default defineComponent({
           it.value1 = select.value1;
           it.value2 = select.value2;
           it.operation = select.operation;
+          it.fieldAlias =select.fieldAlias;
         }
       })
       fieldList.value.filter(x => x.isFixed == 1).forEach(x => x.checked = true);

vue/src/views/query/index.vue

@@ -20,8 +20,6 @@
           <template
             #title="{ title, key, subId, fieldCode, fieldId, fieldName, fieldAlias, dataType, subjectName, queryType, dictionaryCode }">
             <div v-if="(fieldAlias)" class="query-index-tree-item"
-                 draggable="true"
-                 @dragstart="onDragStart($event,{subId, fieldCode, fieldId, fieldName, fieldAlias, dataType, subjectName, queryType, dictionaryCode})"
             >{{ title }}
             </div>
             <div v-else class="query-index-tree-item">{{ title }}</div>
@@ -289,12 +287,6 @@ export default defineComponent({
       });
     }
 
-    const onDragStart = (event, obj) => {
-      event.dataTransfer.setData("dragData", "-");
-      obj.tempFeildId = new Date().getTime() + '';
-      window["dragData"] = obj;
-      console.log("onDragStart", obj);
-    }
     const getSubjectTree = async function () {
       //loading.value = true;
       subjectTrees.value.data = await get('temp/getSubjectTree', {tabName: subjectTrees.value.searchStr});
@@ -344,25 +336,6 @@ export default defineComponent({
       subjectTrees.value.selectedKeys.push(rtn.temp.subId);
     }
 
-    const onChangeMeasure = (list, obj) => {
-      console.log("onChangeMeasure", arguments, list, obj);
-      formState.value.measures = list;
-      displayReader();
-      checkSubjectId(obj);
-    }
-    const onChangeWhere = (list, obj) => {
-      console.log("onChangeWhere", arguments, list, obj);
-      formState.value.wheres = list;
-      displayReader();
-      checkSubjectId(obj);
-    }
-    const onChangeBase = (list, obj) => {
-      console.log("onChangeBase", arguments, list, obj);
-      formState.value.bases = list;
-      displayReader();
-      checkSubjectId(obj);
-    }
-
     const onDisplayChange = (pagination) => {
       //视图发起数据查询，如翻页
       console.log("onDisplayChange", pagination);
@@ -380,19 +353,6 @@ export default defineComponent({
       (displayChartYbar.value as any).reader();
     }
 
-    const checkSubjectId = (obj) => {
-      if (formState.value.temp.subId == null && obj != null) {
-        formState.value.temp.subId = obj.subId;
-        formState.value.sub.subId = obj.subId;
-        formState.value.sub.subjectName = obj.subjectName;
-      }
-      if (formState.value.bases.length + formState.value.measures.length + formState.value.wheres.length <= 0) {
-        formState.value.temp.subId = null;
-        formState.value.sub.subId = null;
-        formState.value.sub.subjectName = '';
-      }
-      console.log("formState.value.temp.subId", formState.value.temp.subId)
-    }
 
     const labelCol = {style: {width: '100px'}};
     return {
@@ -410,11 +370,6 @@ export default defineComponent({
       displayChartLine,
       displayChartYbar,
       tabChange,
-      onChangeMeasure,
-      onChangeWhere,
-      onChangeBase,
-      onDragStart,
-      checkSubjectId,
       getQuery,
       getTemp,
       getExcel,