打卡

apply/apply-service/src/main/java/com/hungraim/ltc/controller/SrvOrganController.java

@@ -8,6 +8,7 @@ import com.hungraim.ltc.pojo.entity.SysConfig.ChFndSrvOrganLevel;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvEmpCate;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvEmpType;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
+import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
 import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpListVo;
 import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpVo;
 import com.hungraim.ltc.pojo.vo.disable.SrvOrganListVo;
@@ -42,6 +43,9 @@ public class SrvOrganController {
 
     private final SrvEmpCateService srvEmpCateService;
 
+
+
+
     /**
      * 分页查询护理机构列表
      *
@@ -284,8 +288,8 @@ public class SrvOrganController {
     }
 
    @GetMapping("/chSrvTaskDetailQuery")
-    public Result  chSrvTaskDetailQuery(long empid){
-       List<ChSrvTaskDetail> chSrvTaskDetails = srvOrganEmpService.chSrvTaskDetailQuery(empid);
+    public Result  chSrvTaskDetailQuery(Long empId){
+       List<ChSrvTaskDetailVo> chSrvTaskDetails = srvOrganEmpService.chSrvTaskDetailQuery(1L);
        if(chSrvTaskDetails.size()>0&& !chSrvTaskDetails.isEmpty()){
            return Result.success(chSrvTaskDetails);
        }else {
@@ -299,10 +303,10 @@ public class SrvOrganController {
      * @param userName
      * @return
      */
-    @PostMapping("/chSrvTaskDetailQuery")
-    public Result  chSrvTaskDetailDelete(long taskDetailId,String userName){
-        boolean srv = srvOrganEmpService.chSrvTaskDetailDelete(taskDetailId,userName);
-        if(srv){
+    @PostMapping("/chSrvTaskDetailDelete")
+    public Result  chSrvTaskDetailDelete(Long taskDetailId,String userName){
+        int srv = srvOrganEmpService.chSrvTaskDetailDelete(279,"admin");
+        if(srv>0){
             return Result.success();
         }else {
             return Result.failed("删除失败");
@@ -312,4 +316,5 @@ public class SrvOrganController {
 
 
 
+
 }

apply/apply-service/src/main/java/com/hungraim/ltc/dao/ChSrvOrganEmpMapper.java

@@ -12,6 +12,9 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+/**
+ * @author MQ
+ */
 @Mapper
 @Repository
 public interface ChSrvOrganEmpMapper extends BaseMapper<ChSrvOrganEmp> {
@@ -32,17 +35,5 @@ public interface ChSrvOrganEmpMapper extends BaseMapper<ChSrvOrganEmp> {
 
     List<SrvOrganEmpExportVo> getSrvOrganEmpExportList(List<Long> organIds, String empName, String srvOrganName, String certifNum, Short isLock, Short empType);
 
-    /**
-     *  打卡记录
-     * @param empid
-     * @return
-     */
-    List<ChSrvTaskDetail> chSrvTaskDetailQuery(long empid);
 
-    /**
-     * 删除数据
-     * @param taskDetailId
-     * @return
-     */
-    boolean chSrvTaskDetailDelete(long taskDetailId);
 }
\ No newline at end of file

apply/apply-service/src/main/java/com/hungraim/ltc/dao/ChSrvTaskDetailDeleteMapper.java

@@ -5,10 +5,13 @@ import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetailDelete;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author mq
  */
 @Mapper
 @Repository
 public interface ChSrvTaskDetailDeleteMapper extends BaseMapper<ChSrvTaskDetailDelete> {
+
 }
\ No newline at end of file

apply/apply-service/src/main/java/com/hungraim/ltc/dao/ChSrvTaskDetailMapper.java

@@ -2,13 +2,26 @@ package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
+import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author mq
  */
 @Mapper
 @Repository
 public interface ChSrvTaskDetailMapper extends BaseMapper<ChSrvTaskDetail> {
+
+    /**
+     *  打卡记录
+     * @param empId
+     * @return
+     */
+    List<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Long empId);
+
 }
+
+

apply/apply-service/src/main/java/com/hungraim/ltc/service/SrvOrganEmpService.java

@@ -2,6 +2,7 @@ package com.hungraim.ltc.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
+import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
 import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpListVo;
 import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpVo;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -67,7 +68,7 @@ public interface SrvOrganEmpService {
     Workbook srvOrganExport(Long organId, Boolean isInvolveChild, String empName, String srvOrganName, String certifNum,
                             Short isLock, Short empType);
 
-    List<ChSrvTaskDetail> chSrvTaskDetailQuery(long empid);
+    List<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Long empId);
 
-    boolean chSrvTaskDetailDelete(long taskDetailId,String userName);
+    int chSrvTaskDetailDelete(long taskDetailId,String userName);
 }

apply/apply-service/src/main/resources/mapper/ChSrvTaskDetailMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ltc.governance.dao.ChSrvTaskDetailMapper">
+<mapper namespace="com.hungraim.ltc.dao.ChSrvTaskDetailMapper">
   <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail">
     <id column="TASK_DETAIL_ID" jdbcType="DECIMAL" property="taskDetailId" />
     <result column="SRV_TASK_ID" jdbcType="DECIMAL" property="srvTaskId" />
@@ -56,16 +56,20 @@
     AUDIT_RESULT, AUDIT_REMARK, AUDIT_DATE, ILLEGAL_TYPE, ILLEGAL_REMARK, ILLEGALRE_EMP, 
     ILLEGALRE_NAME, ILLEGALRE_TIME, ACCOUNT_SIGN, TASK_DETAIL_TYPE
   </sql>
-  <select id="chSrvTaskDetailQuery" resultType="com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail">
+
+  <select id="chSrvTaskDetailQuery" resultType="com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo">
     SELECT
-      decode(t.STATUS, '0', '未执行', '1', '执行中', '2', '已执行', '4', '已完成') AS "status",
+      t.TASK_DETAIL_ID taskDetailId,
+      m.EMP_NAME empName,
+      m.ORGAN_ID orgamId,
+      --t.STATUS status,
+      decode( t.STATUS, '0', '未执行', '1', '执行中', '2', '已执行', '4', '已完成' ) AS status,
       t.SRV_START_TIME sevStarTime,
-      t.SRV_END_TIME sevEndTime,
-      t.*
+      t.SRV_END_TIME sevEndTime
     FROM
-      ch_srv_task_detail t
-        LEFT JOIN ch_srv_task k ON t.SRV_TASK_ID = k.SRV_TASK_ID
-    WHERE
-      K.SRV_EMP_ID =#{empid}
+      CH_SRV_TASK_DETAIL t
+        LEFT JOIN  CH_SRV_TASK k ON t.SRV_TASK_ID = k.SRV_TASK_ID
+        LEFT JOIN  CH_SRV_ORGAN_EMP m ON m.EMP_ID = k.SRV_EMP_ID
+    WHERE m.EMP_ID = #{empId}
   </select>
 </mapper>
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvTaskDetailDelete.java

@@ -15,8 +15,8 @@ import java.util.Date;
  * @author mq
  */
 @Data
-@TableName("CH_SRV_TASK_DETAIL")
-@KeySequence("SEQ_CH_SRV_TASK_DETAIL")
+@TableName("CH_SRV_TASK_DETAIL_DELETE")
+@KeySequence("SEQ_CH_SRV_TASK_DETAIL_DELETE")
 public class ChSrvTaskDetailDelete implements Serializable {
     /**
      * 服务明细id

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/ChSrvTaskDetailVo.java

+package com.hungraim.ltc.pojo.vo.disable;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ChSrvTaskDetailVo {
+
+    private Long taskDetailId;
+
+    private String name;
+
+    private Integer orgamId;
+
+    private String status;
+
+    private Date sevStarTime;
+
+    private Date sevEndTime;
+
+}