Merge branch 'dev_nursing_records_20230214' into dev_ch_master

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

@@ -5,6 +5,7 @@ import com.hungraim.ltc.governance.service.SrvTaskService;
 import com.hungraim.ltc.pojo.vo.governance.*;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
+import com.hungraim.ltc.util.TokenParsingUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -159,10 +160,12 @@ public class SrvTaskController {
      * 补卡
      **/
     @PostMapping("/saveApplyCard")
-    public Result saveApplyCard(SrvPlanInputVO srvPlanInputVO){
+    public Result saveApplyCard(@RequestHeader("Authorization") String token,SrvPlanInputVO srvPlanInputVO){
         if (srvPlanInputVO.getDisabInfoId() == null) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
+        Integer userId = TokenParsingUtil.TokenParsing(token, "userId");
+        srvPlanInputVO.setAdmin(String.valueOf(userId));
         return   srvTaskService.saveApplyCard(srvPlanInputVO);
     }
 

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

@@ -276,7 +276,11 @@ public class SrvTaskServiceImpl implements SrvTaskService {
         List<ChSrvTaskDetail> chSrvTaskDetailList = chSrvTaskDetailMapper.selectList(new LambdaQueryWrapper<ChSrvTaskDetail>()
                 .eq(ChSrvTaskDetail::getSrvTaskId, srvPlanInputVO.getSrvTaskId())
                 .eq(ChSrvTaskDetail::getSrvDate, srvPlanInputVO.getSrvPlanTime()));
+        Long modeId = srvPlanInputVO.getModeId();
         if (CollectionUtil.isNotEmpty(chSrvTaskDetailList)) {
+            if(modeId == 3){
+                return Result.failed("手机app已有计划,不可重复生成");
+            }
             ChSrvTaskDetail chSrvTaskDetail = chSrvTaskDetailList.get(0);
             taskDetailId = chSrvTaskDetail.getTaskDetailId();
             List<ChSrvPlan> srvPlanList = chSrvPlanMapper.selectList(new LambdaQueryWrapper<ChSrvPlan>()
@@ -299,7 +303,7 @@ public class SrvTaskServiceImpl implements SrvTaskService {
             // 补卡标识
             chSrvTaskDetail.setIsClock((short) 1);
             chSrvTaskDetail.setClockReason(srvPlanInputVO.getClockReason());
-            chSrvTaskDetail.setClockOperator("admin");
+            chSrvTaskDetail.setClockOperator(srvPlanInputVO.getAdmin());
             chSrvTaskDetail.setFcd(new Date());
             int insert = chSrvTaskDetailMapper.insert(chSrvTaskDetail);
             if(insert == 0){