打卡

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChDisabDetailAccounts.java

@@ -26,12 +26,14 @@ public class ChDisabDetailAccounts implements Serializable {
     private Long accountsDetailId;
 
     private Long accountsId;
-
+    /**
+     * 失能人员id
+     */
     private String disabInfoId;
     /**
      * 护理机构id
      */
-    private String srvOrganId;
+        private String srvOrganId;
 
     /**
      * 创建时间

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChPunchDetailsVO.java

+package com.hungraim.ltc.pojo.entity.account;
+
+import com.hungraim.ltc.pojo.entity.disable.ChServiceTypeDetailed;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ChPunchDetailsVO {
+
+    /**
+     * 护理机构
+     */
+   private String srvOrganName;
+    /**
+     * 护理机构
+     */
+    private String organTypeName;
+
+    /**
+     * 护理机构
+     */
+    private List<ChServiceTypeDetailed> projectNames;
+    /**
+     *
+     */
+}

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

@@ -18,5 +18,26 @@ public class ChSrvTaskDetailVo {
     private Date sevStarTime;
 
     private Date sevEndTime;
+    /**
+     * 护理机构id
+     */
+    private String srvOrganId;
+    /**
+     * 护理机构名称
+     */
+    private Integer srvOrganName;
+    /**
+     * 失能人员id
+     */
+    private String disabInfoId;
+    /**
+     * 失能人员姓名
+     */
+    private Date realName;
+    /**
+     * 失能人员身份证件号码
+     */
+    private Date certiCode;
+
 
 }

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

@@ -7,6 +7,7 @@ import com.hungraim.ltc.governance.service.*;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
+import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
 import com.hungraim.ltc.pojo.vo.disable.ChrSrvVo;
 import com.hungraim.ltc.pojo.vo.disable.SearchDisableSimpleVo;
 import com.hungraim.ltc.pojo.vo.governance.*;
@@ -42,6 +43,7 @@ public class BuildBedController {
     @Autowired
     private IRemoveBedService removeBedService;
 
+
     /**
      * 建床管理列表
      */
@@ -276,5 +278,50 @@ public class BuildBedController {
         IPage<SearchDisableSimpleVo> searchDisableSimpleVoIPage = sendService.buildBedSearchByRealName(pageNum, pageSize, srvOrganId, realName);
         return Result.success(searchDisableSimpleVoIPage);
     }
+
+    /**
+     * 打卡查询
+     * @param empId
+     * @return
+     */
+    @GetMapping("/chSrvTaskDetailQuery")
+    public Result  chSrvTaskDetailQuery(Integer pageNum, Integer pageSize,Long empId){
+        Page<ChSrvTaskDetailVo> page = new Page<>(pageNum, pageSize);
+        page = buildBedService.chSrvTaskDetailQuery(page,empId);
+        if(page.getSize()>0){
+            return Result.success(page);
+        }else {
+            return Result.failed(ResultCode.SRV_ORGAN_NOT_QUERY);
+        }
+    }
+
+    /**
+     * 打卡查询
+     * @param
+     * @return
+     */
+    @GetMapping("/chPunchDetailsQuery")
+    public Result  chPunchDetailsQuery(Long taskDetailId,String userName){
+         buildBedService.chPunchDetailsQuery(taskDetailId);
+
+            return Result.success(page);
+
+    }
+
+    /**
+     *  删除打卡数据
+     * @param taskDetailId
+     * @param userName
+     * @return
+     */
+    @PostMapping("/chSrvTaskDetailDelete")
+    public Result  chSrvTaskDetailDelete(Long taskDetailId,String userName){
+        int srv = buildBedService.chSrvTaskDetailDelete(taskDetailId,userName);
+        if(srv>0){
+            return Result.success();
+        }else {
+            return Result.failed("删除失败");
+        }
+    }
 }
 

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

+package com.hungraim.ltc.governance.dao;
+
+public interface BuildBedAttachs {
+}

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

@@ -3,6 +3,7 @@ package com.hungraim.ltc.governance.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
 import com.hungraim.ltc.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
@@ -25,4 +26,5 @@ public interface BuildBedMapper extends BaseMapper<ChSrvBuildBed> {
                                  String srvmodename, String area, String city,
                                  String certicode, String applystatus, int pageNum, int pageSize);
 
+    Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page, Long empId);
 }

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

 package com.hungraim.ltc.governance.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
+import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.util.Result;
@@ -22,4 +24,22 @@ public interface IBuildBedService extends IService<ChSrvBuildBed> {
      * @return 返回建床详情
      */
     BuildBedDetailVo getBuildBedDetail(Integer buildBedId);
+
+    /**
+     * 打卡查询
+     * @param page
+     * @param empId
+     * @return
+     */
+    Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page, Long empId);
+
+    /**
+     * 删除打卡数据
+     * @param taskDetailId
+     * @param userName
+     * @return
+     */
+    int chSrvTaskDetailDelete(Long taskDetailId, String userName);
+
+    void chPunchDetailsQuery(Long taskDetailId);
 }

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

@@ -4,9 +4,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hungraim.ltc.api.AttachFeignService;
 import com.hungraim.ltc.governance.dao.BuildBedMapper;
+import com.hungraim.ltc.governance.dao.ServiceTypeDetailedMapper;
 import com.hungraim.ltc.governance.service.IBuildBedService;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
+import com.hungraim.ltc.pojo.entity.disable.ChServiceTypeDetailed;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetailDelete;
+import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
@@ -19,6 +24,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -31,6 +37,8 @@ public class BuildBedServiceImpl extends ServiceImpl<BuildBedMapper, ChSrvBuildB
     private final BuildBedMapper buildBedMapper;
     private final AttachFeignService attachFeignService;
 
+    private final ServiceTypeDetailedMapper serviceTypeDetailed;
+
     @Override
     public Result searchOrgBed(BuildBedSearchReq req) {
         if (2 == req.getStatus()) {
@@ -71,6 +79,30 @@ public class BuildBedServiceImpl extends ServiceImpl<BuildBedMapper, ChSrvBuildB
         return buildBedDetailVo;
     }
 
+    @Override
+    public Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page, Long empId) {
+        return buildBedMapper.chSrvTaskDetailQuery(page,empId);
+    }
+
+    @Override
+    public int chSrvTaskDetailDelete(Long taskDetailId, String userName) {
+//        ChSrvTaskDetail chSrvTaskDetail = buildBedMapper.selectById(taskDetailId);
+//        ChSrvTaskDetailDelete chSrvTaskDetailDelete = new ChSrvTaskDetailDelete();
+//        BeanUtils.copyProperties(chSrvTaskDetail,chSrvTaskDetailDelete);
+//        chSrvTaskDetailDelete.setDeleteDate(new Date());
+//        chSrvTaskDetailDelete.setDeleteName(userName);
+//        buildBedMapper.insert(chSrvTaskDetailDelete);
+//        return buildBedMapper.deleteById(taskDetailId);
+        return buildBedMapper.deleteById(taskDetailId);
+    }
+
+    @Override
+    public void chPunchDetailsQuery(Long taskDetailId) {
+
+        //获取项目信息
+        List<ChServiceTypeDetailed> chServiceTypeDetaileds = serviceTypeDetailed.selectList(null);
+    }
+
     /**
      * 调用feign api来修改附件数据
      *

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

@@ -24,4 +24,34 @@
         </if>
         ORDER BY a.BUILD_BED_TIME DESC, a.CERTI_CODE DESC
     </select>
+
+    <select id="chSrvTaskDetailQuery" parameterType="com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo"
+            resultType="com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo">
+        SELECT
+        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,--服务结束时间
+        l.SRV_ORGAN_ID, --护理机构id
+        o.SRV_ORGAN_NAME,--"护理机构名称"
+        l.DISAB_INFO_ID, --失能人员id
+        info.REAL_NAME,--"失能人员姓名"
+        info.CERTI_CODE--"失能人员身份证件号码"
+        FROM
+        CH_SRV_TASK_DETAIL t
+        LEFT JOIN CH_DISAB_ACCOUNTS_DETAIL l ON t.TASK_DETAIL_ID = l.TASK_DETAIL_ID
+        LEFT JOIN CH_DISABLE_INFO info ON l.DISAB_INFO_ID=info.DISAB_INFO_ID
+        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
+        LEFT JOIN CH_SRV_ORGAN  o on o.SRV_ORGAN_ID = l.SRV_ORGAN_ID
+        AND l.SRV_ORGAN_ID =#{srvOrganId}   --护理机构id
+        AND l.DISAB_INFO_ID =#{disabInfoId}   --失能人员id
+        AND info.CERTI_CODE =#{certiCode}   --失能人员身份证件号码
+        AND t.SRV_START_TIME &gt;= TO_DATE(sevStarTime, 'yyyy-mm-dd')
+        AND t.SRV_END_TIME &lt;= TO_DATE(sevEndTime, 'yyyy-mm-dd')
+        AND m.EMP_ID = #{empId}
+    </select>
 </mapper>
\ No newline at end of file