员工工资

mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/mysql/user/AdminUserMapper.java

@@ -63,16 +63,17 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
 
         String span =  "0";
         if(reqVO.getYearMonth()!=null){
-            LocalDate date1 = LocalDate.of(new Integer(reqVO.getYearMonth().substring(0,3)), new Integer(reqVO.getYearMonth().substring(4,5)), 1);
+            LocalDate date1 = LocalDate.of(new Integer(reqVO.getYearMonth().substring(0,4)), new Integer(reqVO.getYearMonth().substring(4,6)), 1);
             LocalDate date2 = LocalDate.of(LocalDate.now().getYear(), LocalDate.now().getMonth(), 1);
             long monthsBetween = ChronoUnit.MONTHS.between(
                     date1.withDayOfMonth(1),
                     date2.withDayOfMonth(1)
             );
+            span = monthsBetween+"";
         }
 
         query.selectAll(AdminUserDO.class)
-                .select("a.year_mont,b.projectCode,b.external_code,sd.name as deptName")
+                .select("a.year_mont as yearMonth,b.projectCode,b.external_code,sd.name as deptName")
                 .select("ifnull(sum(" +
                         "case when exists(select id from base_process_setting where user_id=b.owner and procedure_id=b.procedure_id and salary_type='HourWage') " +
                         "then (select price from base_process_setting where user_id=b.owner and procedure_id=b.procedure_id and salary_type='HourWage' limit 1)*b.workTime " +

mes-ui/mes-ui-admin-vue3/src/views/biz/Statement/wage.vue

@@ -12,9 +12,9 @@
         :inline="true"
         label-width="100px"
       >
-        <el-form-item label="工号/姓名" prop="customerName">
+        <el-form-item label="工号/姓名" prop="nickname">
           <el-input
-            v-model="queryParams.customerName"
+            v-model="queryParams.nickname"
             placeholder="请输入工号/姓名"
             clearable
             @keyup.enter="handleQuery"
@@ -30,18 +30,18 @@
             class="!w-240px"
           />
         </el-form-item>
-        <el-form-item label="销售订单号" prop="projectCode">
+        <el-form-item label="销售订单号" prop="externalCode">
           <el-input
-            v-model="queryParams.projectCode"
+            v-model="queryParams.externalCode"
             placeholder="请输入生产订单号"
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
           />
         </el-form-item>
-         <el-form-item label="所属年月" prop="projectCode">
+         <el-form-item label="所属年月" prop="yearMonth">
           <el-input
-            v-model="queryParams.projectCode"
+            v-model="queryParams.yearMonth"
             placeholder="请输入所属年月"
             clearable
             @keyup.enter="handleQuery"
@@ -67,13 +67,13 @@
         class="hl-table"
       >
         <el-table-column fixed label="序号" type="index" width="60" align="center" />
-        <el-table-column label="工号" align="center" prop="workshopcode" />
-        <el-table-column label="姓名" align="center" prop="workshopName" />
-        <el-table-column label="生产订单号" align="center" prop="workshopName" />
-        <el-table-column label="销售订单号" align="center" prop="workshopName" />
-        <el-table-column label="订单归属部门" align="center" prop="workshopName" />
-        <el-table-column label="所属年月" align="center" prop="workshopName" />
-        <el-table-column label="工资" align="center" prop="workshopName" />
+        <el-table-column label="工号" align="center" prop="username" />
+        <el-table-column label="姓名" align="center" prop="nickname" />
+        <el-table-column label="生产订单号" align="center" prop="projectCode" />
+        <el-table-column label="销售订单号" align="center" prop="externalCode" />
+        <el-table-column label="订单归属部门" align="center" prop="deptName" />
+        <el-table-column label="所属年月" align="center" prop="yearMonth" />
+        <el-table-column label="工资" align="center" prop="salary" />
       </el-table>
       <!-- 分页 -->
       <Pagination
@@ -92,7 +92,8 @@ import download from '@/utils/download'
 import * as ProcessDesignApi from '@/api/biz/processdesign'
 import { useCommonStateWithOut } from '@/store/modules/common'
 import { DICT_TYPE } from '@/utils/dict'
-import WorkshopSelect from '@/views/biz/hlvuestyle/workshopSelect.vue'
+import * as UserApi from '@/api/system/user'
+// import WorkshopSelect from '@/views/biz/hlvuestyle/workshopSelect.vue'
 
 defineOptions({ name: 'ProcessDesign3D' })
 
@@ -107,17 +108,10 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  workshopId: undefined,
-  planCode: undefined,
   projectCode:undefined,
-  processDesignTypeList: ['BLUEPRINT_3D', 'BLUEPRINT_2D', 'BLUEPRINT_WORKBLANK'],
-  customerName: undefined,
-  projectName: undefined,
-  businessLine: undefined,
-  property: undefined,
-  projectSubName: undefined,
-  threeDimOwnerName: undefined,
-  isOverview: true
+  nickname:undefined,
+  externalCode:undefined,
+  yearMonth:undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -126,8 +120,10 @@ const exportLoading = ref(false) // 导出的加载中
 const getList = async () => {
   loading.value = true
   try {
-    const data = await ProcessDesignApi.getProcessDesignPage(queryParams)
+    const data = await UserApi.getUsersalaryPage(queryParams)
     list.value = data.list
+    console.log(list.value);
+    
     total.value = data.total
   } finally {
     loading.value = false