From b74d60f69332f3c4e488cb8b1831bfded937c5d4 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 21 Mar 2024 09:59:04 +0800 Subject: [PATCH] =?UTF-8?q?#fix=20=E4=BC=98=E5=8C=96=E7=A7=91=E5=AE=A4?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=82=E5=B8=B8=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=97=AE=E8=AF=8A=E5=8D=A1=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../talkonlineweb/controller/DepartController.java | 67 ++++++++++++++-------- .../talkonlineweb/controller/OrderController.java | 16 +++--- 2 files changed, 51 insertions(+), 32 deletions(-) diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java index 8f05056..5e1141e 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java @@ -1,6 +1,8 @@ package com.lyms.talkonlineweb.controller; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,6 +12,8 @@ import com.lyms.talkonlineweb.result.BaseResponse; import com.lyms.talkonlineweb.service.*; import com.lyms.talkonlineweb.util.Constant; import com.lyms.talkonlineweb.util.JwtUtils; +import com.lyms.talkonlineweb.util.StringUtil; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; import org.springframework.validation.annotation.Validated; @@ -83,7 +87,7 @@ public class DepartController { * @return */ @PostMapping("saveDepart") - @TokenRequired + // @TokenRequired public BaseResponse saveDepart(@RequestBody LymsHdepart depart, BindingResult result){ BaseResponse baseResponse=new BaseResponse(); baseResponse.setErrormsg(""); @@ -105,33 +109,46 @@ public class DepartController { return baseResponse; } - boolean f=lymsHdepartService.saveOrUpdate(depart); + boolean f; + if (hid==0){ + f=lymsHdepartService.save(depart); + }else { + f=lymsHdepartService.updateById(depart); + } - Map param=new HashMap(); - param.put("did",depart.getDid()); - lymsDepartillService.removeByMap(param); + if (f){ + if (depart.getDid()!=null){ + Map param=new HashMap(); + param.put("did",depart.getDid()); + lymsDepartillService.removeByMap(param); + } - String[] iArr={}; - if(depart.getIlls()!=null){ - iArr=depart.getIlls().split(","); - } - String[] iArrName={}; - if(depart.getIllsName()!=null){ - iArrName=depart.getIllsName().split(","); - } - List departillList=new ArrayList<>(); - for (int i = 0; i < iArr.length; i++) { - LymsDepartill departill=new LymsDepartill(); - departill.setDid(depart.getDid()); - departill.setIid(Integer.parseInt(iArr[i])); - departill.setIname(iArrName[i]); - departillList.add(departill); - } - if (CollectionUtils.isNotEmpty(departillList)){ - lymsDepartillService.saveBatch(departillList); + String[] iArr={}; + if(StringUtil.isNotEmpty(depart.getIlls())){ + iArr=depart.getIlls().split(","); + } + String[] iArrName={}; + if(StringUtil.isNotEmpty(depart.getIllsName())){ + iArrName=depart.getIllsName().split(","); + } + List departillList=new ArrayList<>(); + if (iArr.length>0){ + for (int i = 0; i < iArr.length; i++) { + LymsDepartill departill=new LymsDepartill(); + departill.setDid(depart.getDid()); + departill.setIid(Integer.parseInt(iArr[i])); + departill.setIname(iArrName[i]); + departillList.add(departill); + } + } + + if (CollectionUtils.isNotEmpty(departillList)){ + lymsDepartillService.saveBatch(departillList); + } + //保存操作记录 + lymsLogsCrud(depart,hid); } - //保存操作记录 - lymsLogsCrud(depart,hid); + baseResponse.setErrorcode(f==true?0:1); return baseResponse; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java index 5b0044d..9d61986 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java @@ -223,16 +223,18 @@ public class OrderController { @GetMapping("queryOrderLimit") @TokenRequired public BaseResponse queryOrderLimit(Integer pid,Integer pcid){ - QueryWrapper query = new QueryWrapper<>(); + QueryWrapper query = new QueryWrapper<>(); query.eq("pid",pid); - query.eq("pcid",pcid); - query.orderByDesc("end_time"); + //query.eq("pcid",pcid); + query.eq("status",1); + query.orderByDesc("service_end_time"); query.last(" limit 1"); - LymsTcard lymsTcard = lymsTcardService.getOne(query); - if(lymsTcard != null){ + //LymsTcard lymsTcard = lymsTcardService.getOne(query); + LymsOrder lymsOrder= lymsOrderService.getOne(query); + if(lymsOrder != null){ Map m = new HashMap<>(); - m.put("expireDate",DateUtil.getDateTime(lymsTcard.getEndTime(),DateUtil.YYYY_MM_DD)); - m.put("expireDays",DateUtil.daysBetween(new Date(),lymsTcard.getEndTime())+""); + m.put("expireDate",DateUtil.getDateTime(lymsOrder.getServiceEndTime(),DateUtil.YYYY_MM_DD)); + m.put("expireDays",DateUtil.daysBetween(new Date(),lymsOrder.getServiceEndTime())+""); return BaseResponse.ok().setObject(m); }else{ return BaseResponse.error("未查询到就诊卡"); -- 1.8.3.1