任务执行时间

governance/src/main/java/com/hungraim/ltc/governance/controller/SrvTaskController.java

@@ -80,10 +80,10 @@ public class SrvTaskController {
     @RequestMapping("/getSrvTaskDetailList")
     public Result<Page<SrvTaskDetailVO>> getSrvTaskDetailList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
                                                               Integer srvOrganId, String disableName, String disableTel,
-                                                              String empName, String certifNum, @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
+                                                              String empName, String certifNum,String srvDate, @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
                                                               String status, String modeId) {
         Page<SrvTaskDetailVO> page = new Page<>(pageNum, pageSize);
-        page = srvTaskService.getSrvTaskDetailList(page, srvOrganId, disableName, disableTel, empName, certifNum, startTime, endTime, status, modeId);
+        page = srvTaskService.getSrvTaskDetailList(page, srvOrganId, disableName, disableTel, empName, certifNum, srvDate,startTime, endTime, status, modeId);
         return Result.success(page);
     }
 

governance/src/main/java/com/hungraim/ltc/governance/dao/SrvTaskMapper.java

@@ -17,7 +17,7 @@ public interface SrvTaskMapper extends BaseMapper<ChSrvTask> {
 
     Page<SrvTaskVO> getSrvTaskList(Page<SrvTaskVO> page, @Param("srvOrganId") Long srvOrganId,@Param("disableName") String disableName,@Param("disableTel") String disableTel,@Param("taskStatus") String taskStatus);
 
-    Page<SrvTaskDetailVO> getSrvTaskDetailList(Page<SrvTaskDetailVO> page, Integer organId, String disableName, String disableTel, String empName, String certifNum, Date startTime, Date endTime, String status, String modeId);
+    Page<SrvTaskDetailVO> getSrvTaskDetailList(Page<SrvTaskDetailVO> page, Integer organId, String disableName, String disableTel, String empName, String certifNum,String srvDate, Date startTime, Date endTime, String status, String modeId);
 
     List<SrvTaskInfoVO> getSrvTaskInfoList(String programId);
 

governance/src/main/java/com/hungraim/ltc/governance/service/SrvTaskService.java

@@ -25,7 +25,7 @@ public interface SrvTaskService {
 
     Page<OrganEmpVO> getSrvOrganEmpList(Page<OrganEmpVO> page, String organId, String name, String certiType, String certifNum);
 
-    Page<SrvTaskDetailVO> getSrvTaskDetailList(Page<SrvTaskDetailVO> page, Integer organId, String disableName, String disableTel, String empName, String certifNum, Date startTime, Date endTime, String status, String modeId);
+    Page<SrvTaskDetailVO> getSrvTaskDetailList(Page<SrvTaskDetailVO> page, Integer organId, String disableName, String disableTel, String empName, String certifNum, String srvDate, Date startTime, Date endTime, String status, String modeId);
 
     /**
      * 新增或者修改服务计划

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvTaskServiceImpl.java

@@ -73,8 +73,8 @@ public class SrvTaskServiceImpl implements SrvTaskService {
      * @param modeId      服务方式
      */
     @Override
-    public Page<SrvTaskDetailVO> getSrvTaskDetailList(Page<SrvTaskDetailVO> page, Integer organId, String disableName, String disableTel, String empName, String certifNum, Date startTime, Date endTime, String status, String modeId) {
-        return srvTaskMapper.getSrvTaskDetailList(page, organId, disableName, disableTel, empName, certifNum, startTime, endTime, status, modeId);
+    public Page<SrvTaskDetailVO> getSrvTaskDetailList(Page<SrvTaskDetailVO> page, Integer organId, String disableName, String disableTel, String empName, String certifNum, String srvDate, Date startTime, Date endTime, String status, String modeId) {
+        return srvTaskMapper.getSrvTaskDetailList(page, organId, disableName, disableTel, empName, certifNum, srvDate,startTime, endTime, status, modeId);
     }
 
     /**

governance/src/main/resources/com/hungraim/ltc/governance/mapper/SrvTaskMapper.xml

@@ -134,12 +134,15 @@
             <if test="certifNum != null and certifNum != ''">
                 and emp.certif_num = #{certifNum}
             </if>
-            <if test="startTime != null">
+            <if test="srvDate != null and srvDate != ''">
+                and to_char(detail.SRV_DATE,'yyyy-MM-dd') = #{srvDate}
+            </if>
+    <!--        <if test="startTime != null">
                 and detail.SRV_DATE &gt;= #{startTime}
             </if>
             <if test="endTime != null">
                 and detail.SRV_DATE &lt;= #{endTime}
-            </if>
+            </if>-->
             <if test="status != null and status != ''">
                 and detail.status = #{status}
             </if>