fix: app工作日志按登录用户进行查询

h5app/src/views/pages/work/log/list.vue

@@ -118,17 +118,21 @@ import {deleteWorkLog, getWorkLogList} from '@/api/workLog';
 import BEmpty from "@/components/empty.vue";
 import dayjs from "dayjs";
 import {chevronForwardOutline,buildOutline,trashOutline} from 'ionicons/icons';
+import {useUserStore} from "@/store/modules/user";
 
 export default defineComponent({
   name: 'WorkLogList',
   components: {IonIcon, BEmpty},
   setup() {
+    const userStore = useUserStore();
+    const userInfo = ref(userStore.getUserInfo);
     const searchParamsState = reactive({
       pageIndex: 1,
       pageSize: 10,
       total:0,
       workStartDate: '',
-      workEndDate: ''
+      workEndDate: '',
+      userId: undefined
     })
     const loading = ref(true);
     const dataList = ref<any>([]);
@@ -192,9 +196,9 @@ export default defineComponent({
 
     const loadData = async function () {
       loading.value = true;
+      searchParamsState.userId = userInfo.value.userID;
       const result: any = await getWorkLogList(searchParamsState);
       dataList.value = dataList.value.concat(result.list);
-      console.log("dataList",dataList.value);
       searchParamsState.total = result.total;
       loading.value = false;
     }

src/main/java/com/hz/employmentsite/controller/taskAndLog/DoWorkController.java

@@ -1,7 +1,6 @@
 package com.hz.employmentsite.controller.taskAndLog;
 
 import com.github.pagehelper.PageInfo;
-import com.hz.employmentsite.filter.exception.BaseErrorEnum;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.mapper.PcSiteUserMapper;
@@ -13,6 +12,7 @@ import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 import com.hz.employmentsite.vo.taskAndLog.RecordsCountVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -36,10 +36,17 @@ public class DoWorkController {
 
     @ResponseBody
     @GetMapping("/getList")
-    public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize, @RequestParam(required = false) List<String> doWorkIDList,
-                                @RequestParam(required = false) String userName,@RequestParam(required = false) String workStartDate,  @RequestParam(required = false) String workEndDate,
-                                @RequestParam(required = false) Integer doTypeID, @RequestParam(required = false) String regionCode,@RequestParam(required = false) String streetCode){
-        PageInfo<DoWorkVo> result = doWorkService.getList(pageIndex, pageSize,doWorkIDList, userName, workStartDate,workEndDate,doTypeID,regionCode,streetCode);
+    public BaseResponse getList(@RequestParam("pageIndex") int pageIndex,
+                                @RequestParam("pageSize") int pageSize,
+                                @RequestParam(required = false) List<String> doWorkIDList,
+                                @RequestParam(required = false) String userName,
+                                @RequestParam(required = false) String workStartDate,
+                                @RequestParam(required = false) String workEndDate,
+                                @RequestParam(required = false) Integer doTypeID,
+                                @RequestParam(required = false) String regionCode,
+                                @RequestParam(required = false) String streetCode,
+                                @RequestParam(required = false) String userId) {
+        PageInfo<DoWorkVo> result = doWorkService.getList(pageIndex, pageSize, doWorkIDList, userName, workStartDate, workEndDate, doTypeID, regionCode, streetCode, userId);
         return RespGenerstor.success(result);
     }
 
@@ -72,7 +79,7 @@ public class DoWorkController {
                                @RequestParam(required = false) List<String> doWorkIDList,
                                @RequestParam(required = false) String userName,@RequestParam(required = false) String workStartDate,  @RequestParam(required = false) String workEndDate,
                                @RequestParam(required = false) Integer doTypeID, @RequestParam(required = false) String regionCode,@RequestParam(required = false) String streetCode) throws Exception{
-        PageInfo<DoWorkVo> result = doWorkService.getList(pageIndex, pageSize,doWorkIDList, userName, workStartDate,workEndDate,doTypeID,regionCode,streetCode);
+        PageInfo<DoWorkVo> result = doWorkService.getList(pageIndex, pageSize, doWorkIDList, userName, workStartDate, workEndDate, doTypeID, regionCode, streetCode, null);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
         data.setTitles(Arrays.asList(new String[]{"序号","姓名"," ", "日志类型", "工作情况","所属县区","所属街道"}));
         int i = 0;

src/main/java/com/hz/employmentsite/mapper/cquery/DoWorkCQuery.java

@@ -2,10 +2,16 @@ package com.hz.employmentsite.mapper.cquery;
 
 import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 public interface DoWorkCQuery {
-    List<DoWorkVo> getList(@Param("doWorkIDList")String doWorkIDList, @Param("userName")String userName,
-                           @Param("workStartDate")String workStartDate, @Param("workEndDate")String workEndDate,
-                           @Param("doTypeID")Integer doTypeID, @Param("regionCode")String regionCode, @Param("streetCode")String streetCode);
+    List<DoWorkVo> getList(@Param("doWorkIDList") String doWorkIDList,
+                           @Param("userName") String userName,
+                           @Param("workStartDate") String workStartDate,
+                           @Param("workEndDate") String workEndDate,
+                           @Param("doTypeID") Integer doTypeID,
+                           @Param("regionCode") String regionCode,
+                           @Param("streetCode") String streetCode,
+                           @Param("userId") String userId);
 }

src/main/java/com/hz/employmentsite/services/impl/taskAndLog/DoWorkImpl.java

@@ -13,7 +13,9 @@ import com.hz.employmentsite.vo.taskAndLog.RecordsCountVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service("DoWorkService")
 public class DoWorkImpl implements DoWorkService {
@@ -28,11 +30,11 @@ public class DoWorkImpl implements DoWorkService {
     private PcDoworkMapper pcDoworkMapper;
 
     @Override
-    public PageInfo<DoWorkVo> getList(int pageIndex, int pageSize, List<String> doWorkIDList, String userName, String workStartDate, String workEndDate, Integer doTypeID, String regionCode, String streetCode) {
-            PageHelper.startPage(pageIndex, pageSize);
-            List<DoWorkVo> list = doWorkCQuery.getList(stringUtils.ListToInSql(doWorkIDList), userName, workStartDate, workEndDate, doTypeID, regionCode, streetCode);
-            PageInfo<DoWorkVo> result = new PageInfo(list);
-            return result;
+    public PageInfo<DoWorkVo> getList(int pageIndex, int pageSize, List<String> doWorkIDList, String userName, String workStartDate, String workEndDate, Integer doTypeID, String regionCode, String streetCode, String userId) {
+        PageHelper.startPage(pageIndex, pageSize);
+        List<DoWorkVo> list = doWorkCQuery.getList(stringUtils.ListToInSql(doWorkIDList), userName, workStartDate, workEndDate, doTypeID, regionCode, streetCode, userId);
+        PageInfo<DoWorkVo> result = new PageInfo(list);
+        return result;
     }
 
     @Override
@@ -42,7 +44,7 @@ public class DoWorkImpl implements DoWorkService {
         }
         List<String> ids = new ArrayList<>();
         ids.add(doWorkID);
-        DoWorkVo model = doWorkCQuery.getList(stringUtils.ListToInSql(ids),null,null,null,null,null,null).stream().findFirst().orElse(null);
+        DoWorkVo model = doWorkCQuery.getList(stringUtils.ListToInSql(ids), null, null, null, null, null, null, null).stream().findFirst().orElse(null);
         return model;
     }
 

src/main/java/com/hz/employmentsite/services/service/taskAndLog/DoWorkService.java

@@ -7,7 +7,10 @@ import com.hz.employmentsite.vo.taskAndLog.RecordsCountVo;
 import java.util.List;
 
 public interface DoWorkService {
-    PageInfo<DoWorkVo> getList(int pageIndex, int pageSize, List<String> doWorkIDList, String userName, String workStartDate, String workEndDate, Integer doTypeID, String regionCode, String streetCode);
+    PageInfo<DoWorkVo> getList(int pageIndex, int pageSize, List<String> doWorkIDList,
+                               String userName, String workStartDate, String workEndDate,
+                               Integer doTypeID, String regionCode, String streetCode,
+                               String userId);
 
     DoWorkVo get(String doWorkID);
 

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

@@ -41,5 +41,8 @@
         <if test="streetCode!='' and streetCode!=null">
             and street.code = #{streetCode}
         </if>
+        <if test="userId!='' and userId!=null">
+            and workLog.createUserID = #{userId}
+        </if>
     </select>
 </mapper>