Merge remote-tracking branch 'origin/master'

# Conflicts:
#	vue/src/views/query/index.vue

src/main/java/com/bowintek/practice/controller/TempController.java

@@ -40,8 +40,9 @@ public class TempController {
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse<PageInfo<SaerchtempVo>> getList(@RequestParam("page") int page, @RequestParam("rows") int rows,
-                                                        String tempNo, String tempName) throws Exception {
-        PageInfo<SaerchtempVo> result = tempService.getList(page, rows, tempNo, tempName, null);
+                                                        String tempNo, String tempName, String beiginDate,
+                                                        String endDate) throws Exception {
+        PageInfo<SaerchtempVo> result = tempService.getList(page, rows, tempNo, tempName, beiginDate, endDate, null);
         return RespGenerstor.success(result);
     }
 
@@ -69,19 +70,19 @@ public class TempController {
             rtnObject.put("sqlString", sqlStringResult.getMainSqlString());
             rtnObject.put("cntString", sqlStringResult.getCountSqlStrimg());
 
-            List<Map<String,Object>> rows = genSqlStringService.getListBySqlString(sqlStringResult.getMainSqlString());
+            List<Map<String, Object>> rows = genSqlStringService.getListBySqlString(sqlStringResult.getMainSqlString());
             rtnObject.put("rows", rows);
             int total = genSqlStringService.getIntBySqlString(sqlStringResult.getCountSqlStrimg(), "CNT");
             rtnObject.put("total", total);
             rtnObject.put("code", 0);
-        }
-        catch (Exception ex){
+        } catch (Exception ex) {
             rtnObject.put("errString", "生成查询语句错误：" + ex.getMessage());
             rtnObject.put("code", -1);
             ex.printStackTrace();
         }
         return RespGenerstor.success(rtnObject);
     }
+
     @ResponseBody
     @PostMapping("/deletes")
     public BaseResponse delete(@RequestBody List<String> idList) {

src/main/java/com/bowintek/practice/mapper/cquery/TempCQuery.java

@@ -9,7 +9,7 @@ import java.util.HashMap;
 import java.util.List;
 
 public interface TempCQuery {
-    List<SaerchtempVo> getList(String tempNo, String tempName, String tempIdsString);
+    List<SaerchtempVo> getList(String tempNo, String tempName,String beiginDate,String endDate, String tempIdsString);
     List<HashMap<String,Object>> getListBySqlString(String sqlString);
     List<HashMap<String,Object>> getListToHashMap(String tempName);
     List<HashMap<String,Object>> getDictionaryToHashMap(List<String> codeList);

src/main/java/com/bowintek/practice/services/impl/TempServiceImpl.java

@@ -37,10 +37,10 @@ public class TempServiceImpl implements TempService {
 
     @Override
     public PageInfo<SaerchtempVo> getList(Integer page, Integer rows,
-                                          String tempNo, String tempName, List<String> idList) {
+                                          String tempNo, String tempName, String beiginDate,String endDate,List<String> idList) {
         PageHelper.startPage(page, rows);
 
-        List<SaerchtempVo> dataList = tempCQuery.getList(tempNo, tempName,
+        List<SaerchtempVo> dataList = tempCQuery.getList(tempNo, tempName, beiginDate, endDate,
                 stringUtils.ListToInSql(idList));
 
         PageInfo<SaerchtempVo> result = new PageInfo(dataList);

src/main/java/com/bowintek/practice/services/service/TempService.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 public interface TempService {
     PageInfo<SaerchtempVo> getList(Integer page, Integer rows,
-                                   String tempNo, String tempName, List<String> idList);
+                                   String tempNo, String tempName, String beiginDate,String endDate,List<String> idList);
     List<HashMap<String,Object>> getSubjectTree(String likeName);
     TempSaveResult saveTemp(TempObjectModel data, String userID);
     TempObjectModel getTemp(String tempId);

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

@@ -17,6 +17,12 @@
         <if test="tempNo!='' and tempNo!=null">
             and tmp.tempNo like Concat('%',#{tempNo},'%')
         </if>
+        <if test="beiginDate!='' and beiginDate!=null">
+            and tmp.createTime <![CDATA[ >= ]]> STR_TO_DATE(#{beiginDate},'%Y-%m-%d')
+        </if>
+        <if test="endDate!='' and endDate!=null">
+            and tmp.createTime  <![CDATA[ < ]]> DATE_ADD(STR_TO_DATE(#{endDate},'%Y-%m-%d'),interval  1 day)
+        </if>
         order by tmp.createTime desc
     </select>
 

vue/src/views/query/index.vue

@@ -136,16 +136,12 @@ import DragWhere from '@/components/basic/query/drag-where.vue'
 import DragBase from '@/components/basic/query/drag-base.vue'
 import DragMeasure from '@/components/basic/query/drag-measure.vue'
 import DisplayTable from '@/components/basic/query/display-table.vue'
-import DisplayChartBar from '@/components/basic/query/display-chart-bar.vue'
-import DisplayChartYbar from '@/components/basic/query/display-chart-ybar.vue'
-import DisplayChartLine from '@/components/basic/query/display-chart-line.vue'
 import {save, get} from "@/api/common";
 import type { TreeProps } from 'ant-design-vue';
 
 export default defineComponent({
   name: 'queryindex',
-  components: {DragWhere, DragBase, DragMeasure,DisplayTable,
-    DisplayChartBar, DisplayChartLine, DisplayChartYbar},
+  components: {DragWhere, DragBase, DragMeasure, DisplayTable},
   setup() {
     const route = useRoute();
     const expand = ref(false);
@@ -154,11 +150,7 @@ export default defineComponent({
     const base = ref<typeof DragBase>();
     const where = ref<typeof DragWhere>();
     const display = ref<typeof DisplayTable>();
-    const displayChartBar = ref<typeof DisplayChartBar>();
-    const displayChartLine = ref<typeof DisplayChartLine>();
-    const displayChartYbar = ref<typeof DisplayChartYbar>();
 
-    const activeTab = ref('1');
     const subjectTrees = ref({
       data :[] as TreeProps['treeData'],
       expandedKeys : [''],
@@ -188,25 +180,6 @@ export default defineComponent({
       sqlString : null
     });
 
-    const tabChange = (key) => {
-      console.log("tabChange", key);
-      if(key=="2") {
-        setTimeout(function (){
-          (displayChartBar.value as any).resize();
-        }, 100);
-      }
-      if(key=="3") {
-        setTimeout(function (){
-          (displayChartLine.value as any).resize();
-        }, 100);
-      }
-      if(key=="4") {
-        setTimeout(function (){
-          (displayChartYbar.value as any).resize();
-        }, 100);
-      }
-    }
-
     const onFinish = () => {
       if(formRef.value == undefined){
         return;
@@ -238,9 +211,6 @@ export default defineComponent({
         }
         //将数据给视图，视图组装并显示
         (display.value as any).setData(result);
-        (displayChartBar.value as any).setData(result);
-        (displayChartLine.value as any).setData(result);
-        (displayChartYbar.value as any).setData(result);
       });
     }
 
@@ -309,11 +279,8 @@ export default defineComponent({
 
     function displayReader(){
       //初始化视图显示
-      console.log("displayReader",display.value, displayChartBar.value);
+      console.log("displayReader",display.value);
       (display.value as any).reader();
-      (displayChartBar.value as any).reader();
-      (displayChartLine.value as any).reader();
-      (displayChartYbar.value as any).reader();
     }
 
     const checkSubjectId = (obj)=>{
@@ -341,12 +308,7 @@ export default defineComponent({
       measure,
       where,
       base,
-      activeTab,
       display,
-      displayChartBar,
-      displayChartLine,
-      displayChartYbar,
-      tabChange,
       onChangeMeasure,
       onChangeWhere,
       onChangeBase,
@@ -406,11 +368,6 @@ export default defineComponent({
   .query-index-table{
     flex-grow: 1;
   }
-  .query-index-tabs{
-    margin-left: 10px;
-    margin-right: 10px;
-    height: 100%;
-  }
   .tabs-view-content{
     padding: 0px;
   }

vue/src/views/query/table.vue

@@ -29,7 +29,7 @@
             name="tempNo"
             label="创建日期"
             :label-col="{span:6}">
-
+            <a-range-picker format="YYYY-MM-DD" :placeholder="['开始日期', '结束日期']" @change="onRangeChange"/>
           </a-form-item>
         </a-col>
         <a-col :span="6" style="text-align: left">
@@ -40,8 +40,14 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-radio-group v-model:value="viewModel" style="text-align: left">
-            <a-radio-button value="list">列表</a-radio-button>
-            <a-radio-button value="card">卡片</a-radio-button>
+            <a-radio-button value="list">
+              <UnorderedListOutlined/>
+              列表
+            </a-radio-button>
+            <a-radio-button value="card">
+              <TableOutlined/>
+              卡片
+            </a-radio-button>
           </a-radio-group>
           <a-button type="primary" html-type="button" @click="add">
             <template #icon>
@@ -80,6 +86,8 @@
                 </template>
               </a-popover>
               <a-row :gutter="[24,4]" @mouseover="item.visible=true" @mouseout="item.visible=false">
+                <a-col :span="10" class="col-text">模板编号：</a-col>
+                <a-col :span="12" class="col-content">{{ item.tempNo }}</a-col>
                 <a-col :span="10" class="col-text">维度：</a-col>
                 <a-col :span="12" class="col-content">{{ item.dimensionName }}</a-col>
                 <a-col :span="10" class="col-text">度量：</a-col>
@@ -140,7 +148,7 @@ export default defineComponent({
     const selectedRowKeys = ref([]);
     const viewModel = ref("card");
     const formState = reactive({
-      page: 1, rows: 10, tempName: '', tempNo: '', tempId: "", total: 0, isPostManage: true
+      page: 1, rows: 10, tempName: '', tempNo: '', tempId: "", beiginDate: '', endDate: '', total: 0, isPostManage: true
     });
     const columns: TableColumnsType = [
       {
@@ -186,7 +194,11 @@ export default defineComponent({
     const onFinish = () => {
       loadData();
     }
-
+    const onRangeChange = (dateString) => {
+      formState.beiginDate = dateString ? dateString[0].format("YYYY-MM-DD") : '';
+      formState.endDate = dateString ? dateString[1].format("YYYY-MM-DD") : '';
+      loadData();
+    };
     const loadData = async function () {
       loading.value = true;
       const result: any = await get('temp/getList', formState);
@@ -222,7 +234,7 @@ export default defineComponent({
       router,
       route,
       expand,
-      formRef,
+      formRef, onRangeChange,
       formState, viewModel, dayjs,
       columns, data, loading, selectedRowKeys,
       pagination,

vue/src/views/subject/fieldedit.vue

@@ -60,7 +60,7 @@
             </a-select>
           </a-form-item>
         </a-col>
-        <a-col :span="7" v-if="dataModel.queryTypeId==8">
+        <a-col :span="7" v-if="dataModel.queryTypeId==4">
           <a-form-item label="取数字典编码" name="dictionaryCode" :label-col="{span:7}"
                        :rules="[{ required: true, message: '请选择数据类型!' }]">
             <a-input v-model:value="dataModel.dictionaryCode" placeholder="">