修改考勤配置

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/hasor/HasorModule.java

@@ -55,7 +55,7 @@ public class HasorModule implements SpringModule {
         apiBinder.bindSpiListener(CompilerSpiListener.class, new CompilerSpiListener() {
                     @Override
                     public QIL compiler(ApiInfo apiInfo, String query, DataQL dataQL) throws IOException {
-                        query = "hint FRAGMENT_SQL_QUERY_BY_PAGE = true;\nhint FRAGMENT_SQL_QUERY_BY_PAGE_NUMBER_OFFSET = 1;\n " + query;
+                        query = "hint FRAGMENT_SQL_COLUMN_CASE=\"hump\"\n hint FRAGMENT_SQL_QUERY_BY_PAGE_NUMBER_OFFSET = 1 \n" + query;
                         return CompilerSpiListener.super.compiler(apiInfo, query, dataQL);
                     }
                 });

yanzhu-ui-vue3/src/views/manage/attendance_cfg/index.vue

@@ -2,19 +2,16 @@
     <div class="app-container">
         <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
             <el-form-item label="所属公司" prop="comId" v-if="1 == 2">
-        <el-input v-model="queryParams.comId" placeholder="请输入所属公司" clearable @keyup.enter="handleQuery"/>
+                <el-input v-model="queryParams.comId" placeholder="请输入所属公司" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="所属项目" prop="projectId">
-        <el-select :disabled="data.currentPrjId != ''" v-model="queryParams.projectId" placeholder="请选择所属项目" clearable style="width:192px;"
-          @change="handleQuery">
-          <el-option v-for="prj in data.projects" :key="prj.id" :label="prj.projectName" :value="prj.id">
-          </el-option>
+                <el-select :disabled="data.currentPrjId != ''" v-model="queryParams.projectId" placeholder="请选择所属项目" clearable style="width:192px;" @change="handleQuery">
+                    <el-option v-for="prj in data.projects" :key="prj.id" :label="prj.projectName" :value="prj.id"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="考勤厂商" prop="vendorsCode">
                 <el-select v-model="queryParams.vendorsCode" placeholder="请选择厂商" clearable @change="handleQuery" style="width:192px;">
-          <el-option v-for="dict in attendance_vendors" :key="dict.value" :label="dict.label" :value="dict.value">
-          </el-option>
+                    <el-option v-for="dict in attendance_vendors" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="启停状态" prop="enabled">
@@ -31,8 +28,7 @@
 
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd"
-          v-hasPermi="['manage:attendance_cfg:add']">新增</el-button>
+                <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['manage:attendance_cfg:add']">新增</el-button>
             </el-col>
             <!--
       <el-col :span="1.5">
@@ -60,9 +56,15 @@
                     <span style="color: var(--el-color-warning);">{{scope.row.vendorsName }}</span>
                 </template>
             </el-table-column>
-      <el-table-column label="实名制项目ID" align="center" prop="info.projectGuid" />
-      <el-table-column label="应用KEY" align="center" prop="info.AppKey" />
-      <el-table-column label="应用Secret" align="center" prop="info.AppSecret" />
+            <el-table-column label="实名制项目ID" align="center" prop="info.projectGuid">
+                <template #default="scope">{{ scope.row.info.projectGuid||scope.row.info.appProjectId}}</template>
+            </el-table-column>
+            <el-table-column label="应用KEY" align="center" prop="info.AppKey">
+                <template #default="scope">{{ scope.row.info.AppKey||scope.row.info.appId}}</template>
+            </el-table-column>
+            <el-table-column label="应用Secret" align="center" prop="info.AppSecret">
+                <template #default="scope">{{ scope.row.info.AppSecret||scope.row.info.secret}}</template>
+            </el-table-column>
             <el-table-column label="是否启用" align="center" prop="enabled">
                 <template #default="scope">
                     <el-switch v-model="scope.row.enabled" :active-value="1" @change="doUpdateRow(scope.row)" :inactive-value="0"></el-switch>
@@ -76,33 +78,26 @@
             <el-table-column label="添加用户" align="center" prop="createBy" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="240">
                 <template #default="scope">
-          <el-button link type="primary" icon="Football" @click="handleDeviceList(scope.row)"
-            v-hasPermi="['manage:attendance_cfg:edit']">设备列表</el-button>
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['manage:attendance_cfg:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['manage:attendance_cfg:remove']">删除</el-button>
+                    <el-button link type="primary" v-if="scope.row.vendorsCode=='uni'" icon="Football" @click="handleDeviceList(scope.row)" v-hasPermi="['manage:attendance_cfg:edit']">设备列表</el-button>
+                    <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:attendance_cfg:edit']">修改</el-button>
+                    <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:attendance_cfg:remove']">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改考勤配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body :close-on-click-modal="false"
-      :close-on-press-escape="false">
-      <el-form ref="attendance_cfgRef" :model="form" :rules="rules" label-width="100px">
+        <el-dialog :title="title" v-model="open" width="800px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
+            <el-form ref="attendance_cfgRef" :model="form" :rules="rules" label-width="100px" :key="data.formKey">
                 <el-form-item label="所属项目" prop="projectId">
                     <el-select :disabled="data.currentPrjId != ''||data.mode=='edit'" v-model="form.projectId" placeholder="请选择项目">
-            <el-option v-for="prj in data.projects" :key="prj.id" :label="prj.projectName" :value="prj.id">
-            </el-option>
+                        <el-option v-for="prj in data.projects" :key="prj.id" :label="prj.projectName" :value="prj.id"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="考勤厂商" prop="vendorsCode">
-          <el-select v-model="form.vendorsCode" placeholder="请选择厂商">
-            <el-option v-for="dict in attendance_vendors" :key="dict.value" :label="dict.label" :value="dict.value">
-            </el-option>
+                    <el-select v-model="form.vendorsCode" placeholder="请选择厂商" @change="vendorsCodeChange">
+                        <el-option v-for="dict in attendance_vendors" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
                     </el-select>
                 </el-form-item>
                 <template v-if="form.vendorsCode == 'uni'">
@@ -116,9 +111,20 @@
                         <el-input v-model="form.projectGuid" placeholder="请输入内容" />
                     </el-form-item>
                 </template>
+                <template v-if="form.vendorsCode=='gld' || form.vendorsCode=='jgw'">
+                    <el-form-item label="APPID" prop="appId">
+                        <el-input v-model="form.appId" placeholder="请输AppId" clearable />
+                    </el-form-item>
+                    <el-form-item label="Secret" prop="secret">
+                        <el-input v-model="form.secret" placeholder="请输Secret" clearable />
+                    </el-form-item>
+                    <el-form-item label="项目ID" prop="appProjectId">
+                        <el-input v-model="form.appProjectId" placeholder="请输项目ID" clearable />
+                    </el-form-item>
+                </template>
 
                 <el-form-item label="已启用" prop="enabled">
-          <el-switch v-model="form.enabled" :active-value="1" :inactive-value="0"/>
+                    <el-switch v-model="form.enabled" :active-value="1" :inactive-value="0" />
                 </el-form-item>
             </el-form>
             <template #footer>
@@ -133,27 +139,34 @@
 </template>
 
 <script setup name="Attendance_cfg">
-import { listAttendance_cfg, getAttendance_cfg, delAttendance_cfg, addAttendance_cfg, updateAttendance_cfg } from "@/api/manage/attendancecfg";
-import { findMyProjectList } from "@/api/publics";
+import {
+    listAttendance_cfg,
+    getAttendance_cfg,
+    delAttendance_cfg,
+    addAttendance_cfg,
+    updateAttendance_cfg,
+} from '@/api/manage/attendancecfg'
+import { findMyProjectList } from '@/api/publics'
 import useUserStore from '@/store/modules/user'
 import ubiDeviceDrawer from '../attendance_ubi_device/ubiDeviceDrawer.vue'
+import { reactive } from 'vue'
 const userStore = useUserStore()
-const { proxy } = getCurrentInstance();
-const { attendance_vendors } = proxy.useDict('attendance_vendors');
+const { proxy } = getCurrentInstance()
+const { attendance_vendors } = proxy.useDict('attendance_vendors')
 
-
-const attendance_cfgList = ref([]);
-const open = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-const title = ref("");
-const deviceDrawer=ref();
+const attendance_cfgList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+const deviceDrawer = ref()
 const data = reactive({
     form: {},
+    formKey: 0,
     queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -165,58 +178,98 @@ const data = reactive({
         state: null,
         isDel: null,
     },
-  rules: {
-    projectId: [{ required: true, trigger: ['blur', 'change'], message: "请选择所属项目" }],
-    vendorsCode: [{ required: true, trigger: ['blur', 'change'], message: "请选择考勤厂商" }],
-    AppKey: [{ required: true, trigger: ['blur', 'change'], message: "请输入应用KEY" }],
-    AppSecret: [{ required: true, trigger: ['blur', 'change'], message: "请输入应用Secret" }],
-    projectGuid: [{ required: true, trigger: ['blur', 'change'], message: "请输入项目Guid" }],
-  },
     projects: [],
     currentPrjId: '',
-  mode:'',
-});
+    mode: '',
+})
+let rules = reactive({
+    projectId: [{ required: true, trigger: ['blur', 'change'], message: '请选择所属项目' }],
+    vendorsCode: [{ required: true, trigger: ['blur', 'change'], message: '请选择考勤厂商' }],
+    AppKey: [{ required: true, trigger: ['blur', 'change'], message: '请输入应用KEY' }],
+    AppSecret: [{ required: true, trigger: ['blur', 'change'], message: '请输入应用Secret' }],
+    projectGuid: [{ required: true, trigger: ['blur', 'change'], message: '请输入项目Guid' }],
+})
+const { queryParams, form } = toRefs(data)
 
-const { queryParams, form, rules } = toRefs(data);
-
-function doUpdateRow(row){
-  updateAttendance_cfg(row).then(d=>{
-    proxy.$modal.msgSuccess("修改成功");
-  });
+function vendorsCodeChange() {
+    data.formKey++
+    if (form.value.vendorsCode == 'uni') {
+        rules = {
+            projectId: [{ required: true, trigger: ['blur', 'change'], message: '请选择所属项目' }],
+            vendorsCode: [{ required: true, trigger: ['blur', 'change'], message: '请选择考勤厂商' }],
+            AppKey: [{ required: true, trigger: ['blur', 'change'], message: '请输入应用KEY' }],
+            AppSecret: [{ required: true, trigger: ['blur', 'change'], message: '请输入应用Secret' }],
+            projectGuid: [{ required: true, trigger: ['blur', 'change'], message: '请输入项目Guid' }],
+        }
+    } else if (form.value.vendorsCode == 'jgw') {
+        rules = {
+            projectId: [{ required: true, trigger: 'blur', message: '请选择' }],
+            subDeptId: [{ required: true, trigger: 'blur', message: '请选择' }],
+            appId: [{ required: true, trigger: 'blur', message: '请输入' }],
+            secret: [{ required: true, trigger: 'blur', message: '请输入' }],
+            appProjectId: [{ required: true, trigger: 'blur', message: '请输入' }],
+            enabled: [{ required: true, trigger: 'blur', message: '请选择' }],
+            phone: [{ required: true, trigger: 'blur', message: '输入' }],
+        }
+    } else if (form.value.vendorsCode == 'gld') {
+        rules = {
+            projectId: [{ required: true, trigger: 'blur', message: '请选择' }],
+            subDeptId: [{ required: true, trigger: 'blur', message: '请选择' }],
+            appId: [{ required: true, trigger: 'blur', message: '请输入' }],
+            secret: [{ required: true, trigger: 'blur', message: '请输入' }],
+            appProjectId: [{ required: true, trigger: 'blur', message: '请输入' }],
+            enabled: [{ required: true, trigger: 'blur', message: '请选择' }],
+        }
+    } else {
+        rules = {
+            projectId: [{ required: true, trigger: 'blur', message: '请选择' }],
+            subDeptId: [{ required: true, trigger: 'blur', message: '请选择' }],
+            appId: [{ required: true, trigger: 'blur', message: '请输入' }],
+            secret: [{ required: true, trigger: 'blur', message: '请输入' }],
+            appProjectId: [{ required: true, trigger: 'blur', message: '请输入' }],
+            appTenantId: [{ required: true, trigger: 'blur', message: '请输入' }],
+            enabled: [{ required: true, trigger: 'blur', message: '请选择' }],
+        }
+    }
+}
+function doUpdateRow(row) {
+    updateAttendance_cfg(row).then((d) => {
+        proxy.$modal.msgSuccess('修改成功')
+    })
 }
 
 /**设备列表 */
-function handleDeviceList(row){
-  deviceDrawer.value.showDrawer(row);
+function handleDeviceList(row) {
+    deviceDrawer.value.showDrawer(row)
 }
 /** 查询项目列表 */
 function getProjectList() {
-  findMyProjectList({ pageNum: 1, pageSize: 100 }).then(response => {
-    data.projects = response.rows;
+    findMyProjectList({ pageNum: 1, pageSize: 100 }).then((response) => {
+        data.projects = response.rows
         if (userStore.currentPrjId) {
             queryParams.value.projectId = userStore.currentPrjId
-      data.currentPrjId = userStore.currentPrjId;
+            data.currentPrjId = userStore.currentPrjId
         }
-  });
+    })
 }
 
 /** 查询考勤配置列表 */
 function getList() {
-  loading.value = true;
-  listAttendance_cfg(queryParams.value).then(response => {
-    attendance_cfgList.value = (response.rows||[]).map(it=>{
-      it.info=proxy.$tryToJson(it.vendorsParameter);
-      return it;
-    });
-    total.value = response.total;
-    loading.value = false;
-  });
+    loading.value = true
+    listAttendance_cfg(queryParams.value).then((response) => {
+        attendance_cfgList.value = (response.rows || []).map((it) => {
+            it.info = proxy.$tryToJson(it.vendorsParameter)
+            return it
+        })
+        total.value = response.total
+        loading.value = false
+    })
 }
 
 // 取消按钮
 function cancel() {
-  open.value = false;
-  reset();
+    open.value = false
+    reset()
 }
 
 // 表单重置
@@ -237,101 +290,132 @@ function reset() {
         createBy: null,
         createTime: null,
         updateBy: null,
-    updateTime: null
-  };
-  proxy.resetForm("attendance_cfgRef");
+        updateTime: null,
+    }
+    proxy.resetForm('attendance_cfgRef')
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1;
-  getList();
+    queryParams.value.pageNum = 1
+    getList()
 }
 
 /** 重置按钮操作 */
 function resetQuery() {
-  proxy.resetForm("queryRef");
-  handleQuery();
+    proxy.resetForm('queryRef')
+    handleQuery()
 }
 
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.id);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
+    ids.value = selection.map((item) => item.id)
+    single.value = selection.length != 1
+    multiple.value = !selection.length
 }
 
 /** 新增按钮操作 */
 function handleAdd() {
-  data.mode="add"
-  reset();
-  open.value = true;
-  title.value = "添加考勤配置";
+    data.mode = 'add'
+    reset()
+    open.value = true
+    title.value = '添加考勤配置'
 }
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  data.mode="edit"
-  reset();
+    data.mode = 'edit'
+    reset()
     const _id = row.id || ids.value
-  getAttendance_cfg(_id).then(response => {
-    let obj=response.data;
-    let info=proxy.$tryToJson(obj.vendorsParameter||"{}");    
-    form.value =obj;
-    form.value.AppKey=info.AppKey;
-    form.value.AppSecret=info.AppSecret;
-    form.value.projectGuid=info.projectGuid;
-    open.value = true;
-    title.value = "修改考勤配置";
-  });
+    getAttendance_cfg(_id).then((response) => {
+        let obj = response.data
+        let info = proxy.$tryToJson(obj.vendorsParameter || '{}')
+        form.value = obj
+        if (form.value.vendorsCode == 'uni') {
+            form.value.AppKey = info.AppKey
+            form.value.AppSecret = info.AppSecret
+            form.value.projectGuid = info.projectGuid
+        } else {
+            form.value.appId = info.appId
+            form.value.secret = info.secret
+            form.value.appProjectId = info.appProjectId
+            form.value.tenantId = info.tenantId
+            form.value.phone = info.phone
+        }
+        setTimeout(() => {
+            form.value.projectId = obj.projectId
+        }, 800)
+        open.value = true
+        title.value = '修改考勤配置'
+        vendorsCodeChange()
+    })
 }
 
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["attendance_cfgRef"].validate(valid => {
+    proxy.$refs['attendance_cfgRef'].validate((valid) => {
         if (valid) {
-      let objs=data.projects.filter(d=>d.id==form.value.projectId);
-      form.value.comId=objs.length>0?objs[0].comId:userStore.currentComId;
+            let objs = data.projects.filter((d) => d.id == form.value.projectId)
+            form.value.comId = objs.length > 0 ? objs[0].comId : userStore.currentComId
+            if (form.value.vendorsCode == 'uni') {
                 form.value.vendorsParameter = JSON.stringify({
                     AppKey: form.value.AppKey,
                     AppSecret: form.value.AppSecret,
                     projectGuid: form.value.projectGuid,
                 })
-      form.value.enabled = form.value.enabled;
-      if (form.value.id != null) {
-        updateAttendance_cfg(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功");
-          open.value = false;
-          getList();
-        });
             } else {
-        addAttendance_cfg(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功");
-          open.value = false;
-          getList();
-        });
+                let params = {
+                    appId: form.value.appId,
+                    secret: form.value.secret,
+                    appProjectId: form.value.appProjectId,
+                    tenantId: form.value.appTenantId,
+                    phone: form.value.phone,
+                }
+                form.value.vendorsParameter = JSON.stringify(params)
+            }
+            form.value.enabled = form.value.enabled
+            if (form.value.id != null) {
+                updateAttendance_cfg(form.value).then((response) => {
+                    proxy.$modal.msgSuccess('修改成功')
+                    open.value = false
+                    getList()
+                })
+            } else {
+                addAttendance_cfg(form.value).then((response) => {
+                    proxy.$modal.msgSuccess('新增成功')
+                    open.value = false
+                    getList()
+                })
             }
         }
-  });
+    })
 }
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const _ids = row.id || ids.value;
-  proxy.$modal.confirm('是否确认删除考勤配置编号为"' + _ids + '"的数据项？').then(function () {
-    return delAttendance_cfg(_ids);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => { });
+    const _ids = row.id || ids.value
+    proxy.$modal
+        .confirm('是否确认删除考勤配置编号为"' + _ids + '"的数据项？')
+        .then(function () {
+            return delAttendance_cfg(_ids)
+        })
+        .then(() => {
+            getList()
+            proxy.$modal.msgSuccess('删除成功')
+        })
+        .catch(() => {})
 }
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download('manage/attendance_cfg/export', {
-    ...queryParams.value
-  }, `attendance_cfg_${new Date().getTime()}.xlsx`)
+    proxy.download(
+        'manage/attendance_cfg/export',
+        {
+            ...queryParams.value,
+        },
+        `attendance_cfg_${new Date().getTime()}.xlsx`
+    )
 }
-getProjectList();
-getList();
+getProjectList()
+getList()
 </script>