feat: 工作任务与日志模块增加查询条件

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

@@ -9,11 +9,12 @@ import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.taskAndLog.DoTaskService;
 import com.hz.employmentsite.util.DateUtils;
 import com.hz.employmentsite.util.ExcelHelper;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskUserVo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskVo;
-import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
@@ -36,9 +37,11 @@ public class DoTaskController {
                                 @RequestParam(required = false) String name, @RequestParam(required = false) String startTime,
                                 @RequestParam(required = false) String endTime, @RequestParam(required = false) String finishStartTime,
                                 @RequestParam(required = false) String finishEndTime, @RequestParam(required = false) String regionCode,
-                                @RequestParam(required = false) String streetCode, @RequestParam(required = false) String workTypeId,@RequestParam(required = false)Integer taskStatus)
+                                @RequestParam(required = false) String streetCode, @RequestParam(required = false) String workTypeId,
+                                @RequestParam(required = false) Integer taskStatus, @RequestParam(required = false) Date startDate,
+                                @RequestParam(required = false) Date endDate)
     {
-        PageInfo<DoTaskVo> result = doTaskService.getList(pageIndex, pageSize, doTaskIDList,name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId,taskStatus);
+        PageInfo<DoTaskVo> result = doTaskService.getList(pageIndex, pageSize, doTaskIDList, name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId, taskStatus, startDate, endDate);
         return RespGenerstor.success(result);
     }
 
@@ -107,9 +110,11 @@ public class DoTaskController {
                                @RequestParam(required = false) String name, @RequestParam(required = false) String startTime,
                                @RequestParam(required = false) String endTime, @RequestParam(required = false) String finishStartTime,
                                @RequestParam(required = false) String finishEndTime, @RequestParam(required = false) String regionCode,
-                               @RequestParam(required = false) String streetCode, @RequestParam(required = false) String workTypeId, @RequestParam(required = false) Integer taskStatus) throws Exception {
+                               @RequestParam(required = false) String streetCode, @RequestParam(required = false) String workTypeId,
+                               @RequestParam(required = false) Integer taskStatus, @RequestParam(required = false) Date startDate,
+                               @RequestParam(required = false) Date endDate) throws Exception {
 
-        PageInfo<DoTaskVo> result = doTaskService.getList(pageIndex, pageSize, doTaskIDList, name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId,taskStatus);
+        PageInfo<DoTaskVo> result = doTaskService.getList(pageIndex, pageSize, doTaskIDList, name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId, taskStatus, startDate, endDate);
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);
         } else {

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

@@ -14,10 +14,7 @@ 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;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 @RestController
 @RequestMapping(value = "/api/taskAndLog/doWork")
@@ -45,8 +42,11 @@ public class DoWorkController {
                                 @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);
+                                @RequestParam(required = false) String userId,
+                                @RequestParam(required = false) String siteID,
+                                @RequestParam(required = false) Date startDate,
+                                @RequestParam(required = false) Date endDate) {
+        PageInfo<DoWorkVo> result = doWorkService.getList(pageIndex, pageSize, doWorkIDList, userName, workStartDate, workEndDate, doTypeID, regionCode, streetCode, userId, siteID, startDate, endDate);
         return RespGenerstor.success(result);
     }
 
@@ -77,11 +77,15 @@ public class DoWorkController {
     @GetMapping("export")
     public BaseResponse export(HttpServletResponse response, @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) throws Exception{
-        PageInfo<DoWorkVo> result = doWorkService.getList(pageIndex, pageSize, doWorkIDList, userName, workStartDate, workEndDate, doTypeID, regionCode, streetCode, null);
+                               @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 siteID,
+                               @RequestParam(required = false) Date startDate,
+                               @RequestParam(required = false) Date endDate) throws Exception {
+        PageInfo<DoWorkVo> result = doWorkService.getList(pageIndex, pageSize, doWorkIDList, userName, workStartDate, workEndDate, doTypeID, regionCode, streetCode, null, siteID, startDate, endDate);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
-        data.setTitles(Arrays.asList(new String[]{"序号","姓名"," ", "日志类型", "工作情况","所属县区","所属街道"}));
+        data.setTitles(Arrays.asList(new String[]{"序号", "姓名", " ", "日志类型", "工作情况", "所属县区", "所属街道"}));
         int i = 0;
         List<List<Object>> rowsData = new ArrayList();
         for (DoWorkVo item : result.getList()) {

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

@@ -1,16 +1,19 @@
 package com.hz.employmentsite.mapper.cquery;
 
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskUserVo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskVo;
-import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
 import java.util.List;
 
 public interface DoTaskCQuery {
     List<DoTaskVo> getList(@Param("doTaskIDList") String doTaskIDList, @Param("name") String name, @Param("startTime") String startTime, @Param("endTime") String endTime,
                            @Param("finishStartTime") String finishStartTime, @Param("finishEndTime") String finishEndTime,
                            @Param("regionCode") String regionCode, @Param("streetCode") String streetCode,
-                           @Param("workTypeId") String workTypeId, @Param("taskStatus") Integer taskStatus);
+                           @Param("workTypeId") String workTypeId, @Param("taskStatus") Integer taskStatus,
+                           @Param("startDate") Date startDate, @Param("endDate") Date endDate);
 
     List<DoTaskVo> getListByUserID(@Param("siteUserID") String siteUserID,@Param("doTaskID") String doTaskID,@Param("taskName")String taskName);
 

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

@@ -3,6 +3,7 @@ package com.hz.employmentsite.mapper.cquery;
 import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 public interface DoWorkCQuery {
@@ -13,5 +14,8 @@ public interface DoWorkCQuery {
                            @Param("doTypeID") Integer doTypeID,
                            @Param("regionCode") String regionCode,
                            @Param("streetCode") String streetCode,
-                           @Param("userId") String userId);
+                           @Param("userId") String userId,
+                           @Param("siteID") String siteID,
+                           @Param("startDate") Date startDate,
+                           @Param("endDate") Date endDate);
 }

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

@@ -9,9 +9,9 @@ import com.hz.employmentsite.mapper.cquery.DoTaskCQuery;
 import com.hz.employmentsite.model.*;
 import com.hz.employmentsite.services.service.taskAndLog.DoTaskService;
 import com.hz.employmentsite.util.StringUtils;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskUserVo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskVo;
-import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -39,10 +39,14 @@ public class DoTaskImpl implements DoTaskService {
     private PcDotaskUserMapper doTaskUserMapper;
 
     @Override
-    public PageInfo<DoTaskVo> getList(Integer page, Integer rows,List<String> doTaskIDList, String name, String startTime, String endTime, String finishStartTime, String finishEndTime, String regionCode, String streetCode, String workTypeId,Integer taskStatus) {
+    public PageInfo<DoTaskVo> getList(Integer page, Integer rows, List<String> doTaskIDList,
+                                      String name, String startTime, String endTime,
+                                      String finishStartTime, String finishEndTime, String regionCode,
+                                      String streetCode, String workTypeId, Integer taskStatus,
+                                      Date startDate, Date endDate) {
         try {
             PageHelper.startPage(page, rows);
-            List<DoTaskVo> list = doTaskCQuery.getList(stringUtils.ListToInSql(doTaskIDList), name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId,taskStatus);
+            List<DoTaskVo> list = doTaskCQuery.getList(stringUtils.ListToInSql(doTaskIDList), name, startTime, endTime, finishStartTime, finishEndTime, regionCode, streetCode, workTypeId, taskStatus, startDate, endDate);
             PageInfo<DoTaskVo> result = new PageInfo(list);
             return result;
         } catch (Exception e) {
@@ -90,7 +94,7 @@ public class DoTaskImpl implements DoTaskService {
         }
         List<String> ids = new ArrayList<>();
         ids.add(id);
-        return doTaskCQuery.getList(stringUtils.ListToInSql(ids), null, null, null, null, null, null, null, null,null).stream().findFirst().orElse(null);
+        return doTaskCQuery.getList(stringUtils.ListToInSql(ids), null, null, null, null, null, null, null, null, null, null, null).stream().findFirst().orElse(null);
     }
 
     @Override

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

@@ -30,9 +30,12 @@ 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, String userId) {
+    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, String siteID, Date startDate, Date endDate) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<DoWorkVo> list = doWorkCQuery.getList(stringUtils.ListToInSql(doWorkIDList), userName, workStartDate, workEndDate, doTypeID, regionCode, streetCode, userId);
+        List<DoWorkVo> list = doWorkCQuery.getList(stringUtils.ListToInSql(doWorkIDList), userName, workStartDate, workEndDate, doTypeID, regionCode, streetCode, userId, siteID, startDate, endDate);
         PageInfo<DoWorkVo> result = new PageInfo(list);
         return result;
     }
@@ -44,7 +47,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, null).stream().findFirst().orElse(null);
+        DoWorkVo model = doWorkCQuery.getList(stringUtils.ListToInSql(ids), null, null, null, null, null, null, null, null, null, null).stream().findFirst().orElse(null);
         return model;
     }
 

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

@@ -1,16 +1,16 @@
 package com.hz.employmentsite.services.service.taskAndLog;
 
 import com.github.pagehelper.PageInfo;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskUserVo;
 import com.hz.employmentsite.vo.taskAndLog.DoTaskVo;
-import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 
 import java.util.Date;
 import java.util.List;
 
 public interface DoTaskService {
     PageInfo<DoTaskVo> getList(Integer page, Integer rows, List<String> doTaskIDList, String name, String startTime, String endTime, String finishStartTime, String finishEndTime,
-                               String regionCode, String streetCode, String workTypeId,Integer taskStatus);
+                               String regionCode, String streetCode, String workTypeId, Integer taskStatus, Date startDate, Date endDate);
 
     PageInfo<DoTaskVo> getMyTasks(Integer page, Integer rows,String doTaskID,String taskName, String userID);
 

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

@@ -4,13 +4,14 @@ import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 import com.hz.employmentsite.vo.taskAndLog.RecordsCountVo;
 
+import java.util.Date;
 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,
-                               String userId);
+                               String userId, String siteID, Date startDate, Date endDate);
 
     DoWorkVo get(String doWorkID);
 

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

@@ -42,7 +42,17 @@
         <if test="taskStatus != null and taskStatus != ''">
             and task.taskStatus = #{taskStatus}
         </if>
-            order by task.createTime desc
+        <if test="startDate != null and endDate == null">
+            and task.CreateTime <![CDATA[ >= ]]> #{startDate}
+        </if>
+        <if test="endDate != null and startDate == null">
+            and task.CreateTime <![CDATA[ <= ]]> #{endDate}
+        </if>
+        <if test="startDate != null and endDate != null">
+            and task.CreateTime <![CDATA[ >= ]]> #{startDate}
+            and task.CreateTime <![CDATA[ <= ]]> #{endDate}
+        </if>
+        order by task.createTime desc
     </select>
 
     <select id="getListByUserID" resultType="com.hz.employmentsite.vo.taskAndLog.DoTaskVo">

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

@@ -48,6 +48,19 @@
         <if test="userId!='' and userId!=null">
             and workLog.createUserID = #{userId}
         </if>
+        <if test="siteID != null and siteID != ''">
+            and siteUser.siteId = #{siteID}
+        </if>
+        <if test="startDate != null and endDate == null">
+            and workLog.CreateTime <![CDATA[ >= ]]> #{startDate}
+        </if>
+        <if test="endDate != null and startDate == null">
+            and workLog.CreateTime <![CDATA[ <= ]]> #{endDate}
+        </if>
+        <if test="startDate != null and endDate != null">
+            and workLog.CreateTime <![CDATA[ >= ]]> #{startDate}
+            and workLog.CreateTime <![CDATA[ <= ]]> #{endDate}
+        </if>
         order by workLog.createTime desc
     </select>
 </mapper>

vue/src/views/jobUserManager/jobuser/index.vue

@@ -189,6 +189,7 @@ export default defineComponent({
       sexId: null,
       educationTypeId: null,
       emphasisTypeId: null,
+      siteID: "",
       startDate: "",
       endDate: "",
       regionCode: ""

vue/src/views/taskAndLog/dotask/index.vue

@@ -47,19 +47,6 @@
             </a-select>
           </a-form-item>
         </a-col>
-        <!--        <a-col :span="6">-->
-        <!--          <a-form-item :label-col="{span:6}" label="所属街道" name="streetCode">-->
-        <!--            <a-select-->
-        <!--              ref="select"-->
-        <!--              v-model:value="searchParams.streetCode"-->
-        <!--              :allow-clear="true"-->
-        <!--              :field-names="{ label: 'name', value: 'code' }"-->
-        <!--              :options="streetList"-->
-        <!--              @change="loadData"-->
-        <!--            >-->
-        <!--            </a-select>-->
-        <!--          </a-form-item>-->
-        <!--        </a-col>-->
         <a-col :span="6">
           <a-form-item :label-col="{span:6}" label="任务类型" name="workTypeId">
             <a-select
@@ -73,6 +60,15 @@
             </a-select>
           </a-form-item>
         </a-col>
+        <a-col :span="6">
+          <a-form-item label="登记时间" :label-col="{ span: 6 }" name="isAccomplish">
+            <a-date-picker v-model:value="searchParams.startDate" picker="date" value-format="YYYY-MM-DD"
+                           style="width: 130px;"/>
+            <label style="margin:10px;">-</label>
+            <a-date-picker v-model:value="searchParams.endDate" picker="date" value-format="YYYY-MM-DD"
+                           style="width: 130px"/>
+          </a-form-item>
+        </a-col>
       </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
@@ -133,7 +129,9 @@ export default defineComponent({
       finishEndTime: '',
       workTypeId: '',
       regionCode: '',
-      streetCode: ''
+      streetCode: '',
+      startDate: '',
+      endDate: ''
     });
     // 导出Excel查询参数
     const exportSearchParams = computed(() => {

vue/src/views/taskAndLog/dowork/index.vue

@@ -62,6 +62,30 @@
             </a-select>
           </a-form-item>
         </a-col>
+        <a-col :span="6">
+          <a-form-item :label-col="{span:6}" label="所属驿站" name="streetCode">
+            <a-select
+              ref="select"
+              v-model:value="searchParams.siteID"
+              :options="siteList"
+              :field-names="{ label: 'siteName', value: 'siteID' }"
+              :allow-clear="true"
+              @change="loadData"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row v-show="expand" :gutter="24">
+        <a-col :span="6">
+          <a-form-item :label-col="{span:6}" label="登记时间" name="regionCode">
+            <a-date-picker v-model:value="searchParams.startDate" picker="date" value-format="YYYY-MM-DD"
+                           style="width: 120px;"/>
+            <label style="margin:10px;">-</label>
+            <a-date-picker v-model:value="searchParams.endDate" picker="date" value-format="YYYY-MM-DD"
+                           style="width: 120px"/>
+          </a-form-item>
+        </a-col>
       </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
@@ -131,6 +155,7 @@ import {getPaginationTotalTitle} from "@/utils/common";
 import dayjs from 'dayjs';
 import CompanyTableCom from "@/views/companyService/company/CompanyTableCom.vue";
 import JobUserTableCom from "@/views/jobUserManager/jobuser/JobUserTableCom.vue";
+import {getSiteList} from "@/api/baseSettings/siteInfo";
 
 export default defineComponent({
   name: 'doTaskList',
@@ -148,7 +173,10 @@ export default defineComponent({
       workEndDate: '',
       doTypeID: null,
       regionCode: '',
-      streetCode: ''
+      streetCode: '',
+      siteID: "",
+      startDate: "",
+      endDate: ''
     });
     // 导出Excel查询参数
     const exportSearchParams = computed(() => {
@@ -194,6 +222,7 @@ export default defineComponent({
     const regionList = ref<SelectProps['options']>();
     const streetList = ref<SelectProps['options']>();
     const logTypeList = ref<SelectProps['options']>();
+    const siteList = ref<any>([]);
     const dataList = ref([]);
     // 企业数据表格对话框
     const companyTableComRef = ref();
@@ -210,7 +239,11 @@ export default defineComponent({
       // console.log('regionResult',regionResult);
       regionList.value = regionResult;
     }
-
+    const getAllSites = () => {
+      getSiteList({pageIndex: 1, pageSize: 9999}).then((result: any) => {
+        siteList.value = result.list;
+      })
+    }
     const changeRegion = async function () {
       if (searchParams.regionCode) {
         const streetResult: any = await getStreetCodeList(searchParams.regionCode);
@@ -348,11 +381,14 @@ export default defineComponent({
       onRecordsJobUserInfo,
       companyTableComRef,
       jobUserTableComRef,
-      exportSearchParams
+      exportSearchParams,
+      siteList,
+      getAllSites
     };
   },
   created() {
     this.loadData();
+    this.getAllSites();
   },
   activated() {
     if (history.state.params?.reload)