yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

服务指令-删除无用代码和公用类，仓库/后勤生成数据池工单测试

This commit is contained in:
曹磊 2026-01-19 17:55:00 +08:00
parent b7d5462ce9
commit cce3d0531d
16 changed files with 33 additions and 1223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/ServiceOrderApi.java
View File

@ -33,9 +33,6 @@ public class ServiceOrderApi {
if(StringUtils.isBlank(directiveOrderEntity.getNuId())){ if(StringUtils.isBlank(directiveOrderEntity.getNuId())){
return Result.error("参数错误，请选择正确的护理单元"); return Result.error("参数错误，请选择正确的护理单元");
} }
// if(StringUtils.isBlank(careOrdersEntityDto.getCustomerId())){
// return Result.error("参数错误，请选择正确的客户信息");
// }
IPage<DirectiveOrderEntity> pageList = directiveOrderApi.queryOrderList(pageNo, pageSize, directiveOrderEntity,req); IPage<DirectiveOrderEntity> pageList = directiveOrderApi.queryOrderList(pageNo, pageSize, directiveOrderEntity,req);
return Result.OK(pageList); return Result.OK(pageList);
} }

161
nursing-unit-common/src/main/java/com/nu/entity/CareOrdersEntity.java
View File

@ -1,161 +0,0 @@
package com.nu.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* @Description: 服务指令工单主表
* @Author: caolei
* @Date: 2025-11-14
* @Version: V1.0
*/
@Data
public class CareOrdersEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
private String id;
/**数据池子表ID*/
private String poolId;
/**主表id*/
private String bizId;
/**护理单元id*/
private String nuId;
/**护理单元名称*/
private String nuName;
/**客户id*/
private String elderId;
/**客户姓名*/
private String elderName;
/**员工ID*/
private String employeeId;
/**员工姓名*/
private String employeeName;
/**服务指令id*/
private String directiveId;
/**服务指令名称*/
private String directiveName;
/**指令类型ID*/
private String cycleTypeId;
/**指令类型*/
private String cycleType;
/**周期值*/
private String cycleValue;
/**服务指令图片大图*/
private String previewFile;
/**服务指令图片大图-网络地址*/
private String netPreviewFile;
/**服务指令图片小图*/
private String previewFileSmall;
/**服务指令图片小图-网络地址*/
private String netPreviewFileSmall;
/**指令音频文件*/
private String mp3File;
/**指令音频文件-网络地址*/
private String netMp3File;
/**指令视频文件*/
private String mp4File;
/**指令视频文件-网络地址*/
private String netMp4File;
/**服务时长（分钟）*/
private String serviceDuration;
/**服务描述*/
private String serviceContent;
/**指令包id*/
private String packageId;
/**指令包名称*/
private String packageName;
/**是否是服务指令包 Y是 N否*/
private String izPackage;
/**开始时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**结束时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**实际开始时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date beginTime;
/**实际结束时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date finishTime;
/**是否开始 Y是 N否*/
private String izStart;
/**是否完成 Y是 N否*/
private String izFinish;
/**创建人*/
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**更新人*/
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**是否删除 0未删除 1删除*/
private String delFlag;
/**接单上限*/
@TableField(exist = false)
private Integer orderCap;
/**最大时间*/
@TableField(exist = false)
private Date maxTime;
/**单次*/
@TableField(exist = false)
private Integer orderNum;
/**总服务时长*/
@TableField(exist = false)
private Integer totalDuration;
/**总服务收益*/
@TableField(exist = false)
private BigDecimal totalComPrice;
/**是否空闲 1空闲 0非空闲*/
@TableField(exist = false)
private Integer izFree;
/**员工身上挂载的工单数，未完成工单即为挂单*/
@TableField(exist = false)
private Integer ownCn;
/**员工id集合逗号分隔*/
@TableField(exist = false)
private String employeeIds;
/**服务指令id集合逗号分隔*/
@TableField(exist = false)
private String directiveIds;
/**优先级 数值越高优先级越高*/
//空闲状态提高3级 指定护理员提高2级
@TableField(exist = false)
private Integer level;
/**工单类型 1待执行 2已执行 3已完成 4已过期 5待执行或者已执行未完成 空是全部*/
@TableField(exist = false)
private String workType;
}

137
nursing-unit-common/src/main/java/com/nu/entity/CareOrdersSubEntity.java
View File

@ -1,137 +0,0 @@
package com.nu.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Description: 服务指令工单子表
* @Author: caolei
* @Date: 2025-11-13
* @Version: V1.0
*/
@Data
public class CareOrdersSubEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
private String id;
/**单号*/
private String orderNo;
/**主表id*/
private String mainId;
/**护理单元id*/
private String nuId;
/**护理单元名称*/
private String nuName;
/**客户id*/
private String elderId;
/**客户姓名*/
private String elderName;
/**员工ID*/
private String employeeId;
/**员工姓名*/
private String employeeName;
/**分类标签id*/
private String instructionTagId;
/**分类标签*/
private String instructionTagName;
/**服务类别id*/
private String categoryId;
/**服务类别名称*/
private String categoryName;
/**服务类型id*/
private String typeId;
/**服务类型名称*/
private String typeName;
/**服务指令id*/
private String directiveId;
/**服务指令名称*/
private String directiveName;
/**指令类型ID*/
private String cycleTypeId;
/**指令类型*/
private String cycleType;
/**周期值*/
private String cycleValue;
/**服务指令图片大图*/
private String previewFile;
/**服务指令图片大图-网络地址*/
private String netPreviewFile;
/**服务指令图片小图*/
private String previewFileSmall;
/**服务指令图片小图-网络地址*/
private String netPreviewFileSmall;
/**指令音频文件*/
private String mp3File;
/**指令音频文件-网络地址*/
private String netMp3File;
/**指令视频文件*/
private String mp4File;
/**指令视频文件-网络地址*/
private String netMp4File;
/**服务时长（分钟）*/
private String serviceDuration;
/**服务描述*/
private String serviceContent;
/**收费价格*/
private BigDecimal tollPrice;
/**提成价格*/
private BigDecimal comPrice;
/**实际提成价格*/
private BigDecimal realComPrice;
/**指令包id*/
private String packageId;
/**指令包名称*/
private String packageName;
/**是否是服务指令包 Y是 N否*/
private String izPackage;
/**开始时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**结束时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**实际开始时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date beginTime;
/**实际结束时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date finishTime;
/**是否开始 Y是 N否*/
private String izStart;
/**是否完成 Y是 N否*/
private String izFinish;
/**创建人*/
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**更新人*/
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**是否删除 0未删除 1删除*/
private String delFlag;
/**PAD路径*/
private String padPath;
private String tplinkPath;
private String manuallyPicPath;
private String manuallyMp4Path;
}

22
nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderSubEntity.java
View File

@ -1,18 +1,8 @@
package com.nu.entity; package com.nu.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@ -31,11 +21,11 @@ public class DirectiveOrderSubEntity implements Serializable {
private String id; private String id;
/**工单类型 1护理;2医疗:3仓库;4行政*/ /**工单类型 1护理;2医疗:3仓库;4行政*/
private String orderType; private String orderType;
/**单号*/
private String orderNo;
/**主表ID，nu_biz_nu_directive_order.id*/ /**主表ID，nu_biz_nu_directive_order.id*/
private String mainId; private String mainId;
/**数据池子表ID，nu_biz_nu_directive_data_pool_sub.id*/ /**数据池子表ID，nu_biz_nu_directive_data_pool_sub.id*/
private String poolSubId;
/**护理单元ID，nu_base_info.id*/
private String nuId; private String nuId;
/**护理单元名称*/ /**护理单元名称*/
private String nuName; private String nuName;
@ -112,8 +102,12 @@ public class DirectiveOrderSubEntity implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date endTime; private Date endTime;
/**实际开始时间*/ /**实际开始时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date beginTime; private Date beginTime;
/**实际结束时间*/ /**实际结束时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date finishTime; private Date finishTime;
/**是否开始 Y是 N否*/ /**是否开始 Y是 N否*/
private String izStart; private String izStart;
@ -122,10 +116,14 @@ public class DirectiveOrderSubEntity implements Serializable {
/**创建人*/ /**创建人*/
private String createBy; private String createBy;
/**创建日期*/ /**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
/**更新人*/ /**更新人*/
private String updateBy; private String updateBy;
/**更新日期*/ /**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime; private Date updateTime;
/**是否删除 0未删除 1删除*/ /**是否删除 0未删除 1删除*/
private String delFlag; private String delFlag;

162
nursing-unit-common/src/main/java/com/nu/entity/InvoicingOrdersEntity.java
View File

@ -1,162 +0,0 @@
package com.nu.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Description: 后勤类服务指令工单表
* @Author: caolei
* @Date: 2025-12-1
* @Version: V1.0
*/
@Data
public class InvoicingOrdersEntity implements Serializable {
/**id*/
private String id;
/**单号*/
private String orderNo;
/**数据池子表ID*/
private String poolId;
/**主表id*/
private String bizId;
/**护理单元id*/
private String nuId;
/**护理单元名称*/
private String nuName;
/**长者id*/
private String elderId;
/**长者姓名*/
private String elderName;
/**员工ID*/
private String employeeId;
/**员工姓名*/
private String employeeName;
/**服务指令id*/
private String directiveId;
/**服务指令名称*/
private String directiveName;
/**指令类型ID*/
private String cycleTypeId;
/**指令类型*/
private String cycleType;
/**周期值*/
private String cycleValue;
/**服务指令图片大图*/
private String previewFile;
/**服务指令图片大图-网络地址*/
private String netPreviewFile;
/**服务指令图片小图*/
private String previewFileSmall;
/**服务指令图片小图-网络地址*/
private String netPreviewFileSmall;
/**指令音频文件*/
private String mp3File;
/**指令音频文件-网络地址*/
private String netMp3File;
/**指令视频文件*/
private String mp4File;
/**指令视频文件-网络地址*/
private String netMp4File;
/**服务时长（分钟）*/
private String serviceDuration;
/**服务描述*/
private String serviceContent;
/**收费价格*/
private BigDecimal tollPrice;
/**提成价格*/
private BigDecimal comPrice;
/**实际提成价格*/
private BigDecimal realComPrice;
/**开始时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**结束时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**实际开始时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date beginTime;
/**开始员工*/
private String beginEmp;
/**实际结束时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date finishTime;
/**结束员工*/
private String finishEmp;
/**是否开始 Y是 N否*/
private String izStart;
/**是否完成 Y是 N否*/
private String izFinish;
/**是否回退 Y是 N否*/
private String izRollback;
/**创建人*/
private String createEmp;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**更新人*/
private String updateEmp;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**是否删除 0未删除 1删除*/
private String delFlag;
/**PAD路径*/
private String padPath;
/**接单上限*/
private Integer orderCap;
/**最大时间*/
private Date maxTime;
/**单次*/
private Integer orderNum;
/**总服务时长*/
private Integer totalDuration;
/**总服务收益*/
private BigDecimal totalComPrice;
/**是否空闲 1空闲 0非空闲*/
private Integer izFree;
/**员工身上挂载的工单数，未完成工单即为挂单*/
private Integer ownCn;
/**员工id集合逗号分隔*/
private String employeeIds;
/**服务指令id集合逗号分隔*/
private String directiveIds;
/**优先级 数值越高优先级越高*/
//空闲状态提高3级 指定护理员提高2级
private Integer level;
/**发起人ID*/
private String initiatorId;
/**发起人姓名*/
private String initiatorName;
/**流程指令编码*/
private String flowCode;
}

432
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java
View File

@ -16,7 +16,6 @@ import com.nu.modules.ConfigMaterial.service.IConfigMaterialCategoryService;
import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo; import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo;
import com.nu.modules.cgd.service.INuWarehouseMaterialCrkInfoService; import com.nu.modules.cgd.service.INuWarehouseMaterialCrkInfoService;
import com.nu.modules.elder.api.IElderInfoApi; import com.nu.modules.elder.api.IElderInfoApi;
import com.nu.modules.invoicing.api.IInvoicingQlOrdersApi;
import com.nu.modules.invoicing.api.IQinglingApi; import com.nu.modules.invoicing.api.IQinglingApi;
import com.nu.modules.nu.entity.NuInvoicingNuCrkLog; import com.nu.modules.nu.entity.NuInvoicingNuCrkLog;
import com.nu.modules.nu.entity.NuInvoicingNuKcsl; import com.nu.modules.nu.entity.NuInvoicingNuKcsl;
@ -270,18 +269,6 @@ public class QingLingServiceImpl implements IQinglingApi {
public Map<String, Object> submitQld(InvoicingQldGwcEntity dto) { public Map<String, Object> submitQld(InvoicingQldGwcEntity dto) {
Map<String, Object> result = Maps.newHashMap(); Map<String, Object> result = Maps.newHashMap();
if (StringUtils.isNotBlank(dto.getQldNo())) { if (StringUtils.isNotBlank(dto.getQldNo())) {
//检测是否已经开始服务
// {
// InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
// p_.setFlowCode("ql_sq");
// p_.setBizId(dto.getQldNo());
// Map<String,String> j = invoicingQlOrdersApi.izCanReSubmit(p_);
// if(!j.get("error_code").equals("0")){
// result.put("status", "faild");
// result.put("message", j.get("msg"));
// return result;
// }
// }
//检测是否可以正常提交 //检测是否可以正常提交
if (!invoicingQldLogService.opeNodeJudgeCanStatus(dto.getQldNo(), "3")) { if (!invoicingQldLogService.opeNodeJudgeCanStatus(dto.getQldNo(), "3")) {
@ -341,32 +328,6 @@ public class QingLingServiceImpl implements IQinglingApi {
result.put("result", ownService.queryQldByQldNo(dto.getQldNo())); result.put("result", ownService.queryQldByQldNo(dto.getQldNo()));
return result; return result;
} else { } else {
//检测 必须有新的指令 并且已经点击开始
{
//指令工单处判断是否允许提交
// InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
// p_.setFlowCode("ql_sq");
// p_.setNuId(dto.getNuId());
// p_.setElderId(dto.getElderId());
// Map<String,String> j = invoicingQlOrdersApi.izCanSubmit(p_);
// if(!j.get("error_code").equals("0")){
// result.put("status", "faild");
// result.put("message", j.get("msg"));
// return result;
// }
//检测通过了 继续检测对应护理单元是否有未完结请领单
// QueryWrapper<NuInvoicingQldMain> qw = new QueryWrapper<>();
// qw.eq("nu_id", dto.getNuId());
// qw.eq("elder_id", dto.getElderId());
// qw.in("status", "1", "3", "4");
// List<NuInvoicingQldMain> list = invoicingQldMainMapper.selectList(qw);
// if (!CollectionUtils.isEmpty(list)) {
// result.put("status", "faild");
// result.put("message", "有未完结请领单，暂时无法提交");
// return result;
// }
}
//购物车-提交 //购物车-提交
//当前购物车信息 //当前购物车信息
@ -511,15 +472,6 @@ public class QingLingServiceImpl implements IQinglingApi {
result.put("success", true); result.put("success", true);
result.put("message", "提交成功"); result.put("message", "提交成功");
// InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
// orderEntity.setFlowCode("ql_sq");//指令流程flow_code 看接口有标明
// orderEntity.setBizId(saveData.getQldNo());//请领单号
// orderEntity.setNuId(saveData.getNuId());
// orderEntity.setElderId(saveData.getElderId());//长者id
// orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
//修改指令工单中的业务单号
// invoicingQlOrdersApi.updateOrderBizId(orderEntity);
return result; return result;
} }
} }
@ -639,33 +591,6 @@ public class QingLingServiceImpl implements IQinglingApi {
dto.setElderId(one.getElderId()); dto.setElderId(one.getElderId());
String status = "2"; String status = "2";
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String nowStatus = one.getStatus();
//检测是否已经开始服务
// if ("3".equals(nowStatus)) {
// InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
// p_.setFlowCode("ql_sq");
// p_.setIzRollback("Y");
// p_.setBizId(dto.getQldNo());
// Map<String,String> j = invoicingQlOrdersApi.izCanGoOn(p_);
// if(!j.get("error_code").equals("0")){
// result.put("status", "faild");
// result.put("message", j.get("msg"));
// return result;
// }
// }
//检测是否可作废
// if ("1".equals(nowStatus)) {
// InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
// p_.setFlowCode("ql_ck");
// p_.setBizId(dto.getQldNo());
// Map<String,String> j = invoicingQlOrdersApi.izCanCancel(p_);
// if(!j.get("error_code").equals("0")){
// result.put("status", "faild");
// result.put("message", j.get("msg"));
// return result;
// }
// }
//日志表插记录 //日志表插记录
NuInvoicingQldLog logData = new NuInvoicingQldLog(); NuInvoicingQldLog logData = new NuInvoicingQldLog();
@ -683,20 +608,6 @@ public class QingLingServiceImpl implements IQinglingApi {
one.setZfBy(sysUser.getId());//作废人 one.setZfBy(sysUser.getId());//作废人
one.setZfTime(new Date());//作废时间 one.setZfTime(new Date());//作废时间
//服务指令流程-作废
InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
orderEntity.setBizId(dto.getQldNo());//请领单号
orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
// if ("1".equals(nowStatus)) {
// //已提交直接作废
// orderEntity.setFlowCode("ql_zf");//指令流程flow_code 看接口有标明
// invoicingQlOrdersApi.flowQlzf(orderEntity);
// }
// if ("3".equals(nowStatus)) {
// //回退单作废
// orderEntity.setFlowCode("ql_htzf");//指令流程flow_code 看接口有标明
// invoicingQlOrdersApi.flowQlzf(orderEntity);
// }
invoicingQldMainService.updateById(one); invoicingQldMainService.updateById(one);
result.put("success", true); result.put("success", true);
result.put("message", "作废成功"); result.put("message", "作废成功");
@ -739,19 +650,6 @@ public class QingLingServiceImpl implements IQinglingApi {
public Map<String, Object> confirmReceipt(InvoicingQldMainEntity dto) { public Map<String, Object> confirmReceipt(InvoicingQldMainEntity dto) {
Map<String, Object> result = Maps.newHashMap(); Map<String, Object> result = Maps.newHashMap();
//检测是否已经开始服务
// {
// InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
// p_.setFlowCode("ql_sh");
// p_.setBizId(dto.getQldNo());
// Map<String,String> j = invoicingQlOrdersApi.izCanGoOn(p_);
// if(!j.get("error_code").equals("0")){
// result.put("status", "faild");
// result.put("message", j.get("msg"));
// return result;
// }
// }
//检测是否可以正常收货 //检测是否可以正常收货
if (!invoicingQldLogService.opeNodeJudgeCanStatus(dto.getQldNo(), "4")) { if (!invoicingQldLogService.opeNodeJudgeCanStatus(dto.getQldNo(), "4")) {
result.put("success", false); result.put("success", false);
@ -946,18 +844,6 @@ public class QingLingServiceImpl implements IQinglingApi {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Map<String, Object> orderReturn(InvoicingQldMainEntity dto) { public Map<String, Object> orderReturn(InvoicingQldMainEntity dto) {
Map<String, Object> result = Maps.newHashMap(); Map<String, Object> result = Maps.newHashMap();
//检测是否已经开始服务
// {
// InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
// p_.setFlowCode("ql_ck");
// p_.setBizId(dto.getQldNo());
// Map<String,String> j = invoicingQlOrdersApi.izCanGoOn(p_);
// if(!j.get("error_code").equals("0")){
// result.put("status", "faild");
// result.put("message", j.get("msg"));
// return result;
// }
// }
//检测是否可以正常回退 //检测是否可以正常回退
if (!invoicingQldLogService.opeNodeJudgeCanStatus(dto.getQldNo(), "1,4")) { if (!invoicingQldLogService.opeNodeJudgeCanStatus(dto.getQldNo(), "1,4")) {
@ -1007,18 +893,6 @@ public class QingLingServiceImpl implements IQinglingApi {
public Map<String, Object> outbound(InvoicingQldMainEntity dto) { public Map<String, Object> outbound(InvoicingQldMainEntity dto) {
//出库一次只会有一个出库单了 //出库一次只会有一个出库单了
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
//检测是否已经开始服务
// {
// InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
// p_.setFlowCode("ql_ck");
// p_.setBizId(dto.getQldNo());
// Map<String,String> j = invoicingQlOrdersApi.izCanGoOn(p_);
// if(!j.get("error_code").equals("0")){
// map.put("status", "faild");
// map.put("message", j.get("msg"));
// return map;
// }
// }
//检测单子状态是否正确 //检测单子状态是否正确
if (!invoicingQldLogService.opeNodeJudgeCanStatus(dto.getQldNo(), "1")) { if (!invoicingQldLogService.opeNodeJudgeCanStatus(dto.getQldNo(), "1")) {
@ -1090,109 +964,7 @@ public class QingLingServiceImpl implements IQinglingApi {
map.put("message", "出库成功"); map.put("message", "出库成功");
return map; return map;
} }
//一次出库多个
// public Map<String, Object> outbound(InvoicingQldMainEntity dto) {
// Map<String, Object> map = new HashMap<>();
//
// //检测是否可以正常出库
// String[] qldNosArr = dto.getQldNo().split(",");
// //本次处理单号中 - 不可出库单号
// String cannotHandleQldNos = Arrays.stream(qldNosArr)
// .filter(qldNo -> !invoicingQldLogService.opeNodeJudgeCanStatus(qldNo, "1"))
// .collect(Collectors.joining(","));
// //检测库房物料数量是否满足请领需求
// {
// //出库物料汇总
// InvoicingQldQueryEntity q_ = new InvoicingQldQueryEntity();
// q_.setQldNo(dto.getQldNo());
// List<InvoicingQldInfoEntity> qldInfoList = invoicingQldInfoMapper.queryWlInfo(q_);
// //库房物料存量
// List<BlWarehouseMaterialInfo> kfnumList = warehouseMaterialInfoService.list();
// Map<String, String> qldWlNumMap = kfnumList.stream()
// .collect(Collectors.toMap(BlWarehouseMaterialInfo::getWlId, BlWarehouseMaterialInfo::getKcsl));
// StrBuilder errorWl = new StrBuilder();
// for (int i = 0; i < qldInfoList.size(); i++) {
// InvoicingQldInfoEntity item = qldInfoList.get(i);
// if (qldWlNumMap.get(item.getWlId()) == null || item.getQlNum() > Integer.parseInt(qldWlNumMap.get(item.getWlId()))) {
// //请领数量大于库房存量的
// if (errorWl.length() > 0) {
// errorWl.append("、");
// }
// errorWl.append(item.getMaterialInfo().getMaterialName());
// }
// }
// if (!errorWl.isEmpty()) {
// map.put("status", "faild");
// map.put("message", "以下物料库存不足，无法出库：" + errorWl);
// return map;
// }
// }
//
// //本次处理单号中 - 可正常出库单号
// String normalQldNos = Arrays.stream(qldNosArr)
// .filter(qldNo -> !cannotHandleQldNos.contains(qldNo))
// .collect(Collectors.joining(","));
// if (StringUtils.isBlank(normalQldNos)) {
// map.put("status", "faild");
// map.put("message", "单据错误，请刷新页面");
//// map.put("faildQldNos", cannotHandleQldNos);
// return map;
// }
//
// dto.setQldNo(normalQldNos);
// QueryWrapper<NuInvoicingQldMain> qw = new QueryWrapper<>();
// qw.in("qld_no", dto.getQldNo().split(","));
// List<NuInvoicingQldMain> list = invoicingQldMainService.list(qw);
// Map<String, NuInvoicingQldMain> qldMap = list.stream()
// .collect(Collectors.toMap(
// NuInvoicingQldMain::getQldNo,
// qld -> qld
// ));
// String status = "4";
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//
// //日志表插记录
// String[] qldNoArr = dto.getQldNo().split(",");
// int length = dto.getQldNo().split(",").length;
// List<NuInvoicingQldLog> logList = Lists.newArrayList();
// for (int i = 0; i < length; i++) {
// NuInvoicingQldLog logData = new NuInvoicingQldLog();
// logData.setQldNo(qldNoArr[i]);//请领单号
// logData.setStatus(status);//单子操作状态
// logData.setOpeBy(sysUser.getId());//操作人
// logData.setOpeTime(new Date());//操作时间
// logData.setNuId(qldMap.get(qldNoArr[i]).getNuId());//护理单元id
// logData.setElderId(qldMap.get(qldNoArr[i]).getElderId());//长者id
// logList.add(logData);
// }
// invoicingQldLogService.saveBatch(logList);
//
// //更新单子为出库
// NuInvoicingQldMain qldData = new NuInvoicingQldMain();
// qldData.setStatus(status);
// qldData.setIzYgRead("N");//员工改为未读
// qldData.setCkBy(sysUser.getId());//出库人
// qldData.setCkTime(new Date());//出库时间
// invoicingQldMainService.update(qldData, qw);
// map.put("status", "success");
// map.put("message", "出库成功");
//
// //出库-服务指令流程
// for (int i = 0; i < length; i++) {
// InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
// orderEntity.setFlowCode("ql_ck");//指令流程flow_code 看接口有标明
// orderEntity.setBizId(qldNoArr[i]);//请领单号
// orderEntity.setNuId(qldMap.get(qldNoArr[i]).getNuId());
//// orderEntity.setNuName(dto.getNuName());
// orderEntity.setElderId(qldMap.get(qldNoArr[i]).getElderId());//长者id
//// orderEntity.setElderName(dto.getElderName());//长者姓名
// orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
// orderEntity.setInitiatorName(sysUser.getRealname());//员工姓名
// invoicingQlOrdersApi.flowQlck(orderEntity);
// }
//
// return map;
// }
/** /**
* 请领单-调整物料数量 * 请领单-调整物料数量
@ -1246,206 +1018,4 @@ public class QingLingServiceImpl implements IQinglingApi {
return result; return result;
} }
// /**
// * 请领单-服务指令-开始服务
// *
// * @param dto
// * @return
// */
// @Override
// public Map<String, Object> startDirectiveServe(InvoicingQldQueryEntity dto) {
// //delete by caolei 2025-12-25
//// Map<String, String> result = Maps.newHashMap();
// //检测上一操作节点是否已完成（指动作完成，非点击了结束服务）
//// if (StringUtils.isNotBlank(dto.getQldNo())) {
//// //提交请领车时不做检测，beginOrder方法自带检测
//// QueryWrapper<NuInvoicingQldMain> mainQW = new QueryWrapper<>();
//// mainQW.eq("qld_no", dto.getQldNo());
//// NuInvoicingQldMain main = invoicingQldMainMapper.selectOne(mainQW);
////
//// QueryWrapper<NuInvoicingQldLog> logQW = new QueryWrapper<>();
//// logQW.eq("qld_no", dto.getQldNo());
//// logQW.orderByDesc("create_time");
//// List<NuInvoicingQldLog> logList = invoicingQldLogMapper.selectList(logQW);
////
//// //提交（回退后）
//// if ("1".equals(dto.getStatus())) {
//// if(!"3".equals(logList.get(0).getStatus())){
//// result.put("status", "faild");
//// result.put("message", "服务指令暂时无法开始");
//// return result;
//// }
//// }
//// //作废
//// if ("2".equals(dto.getStatus())) {
//// if(!"1".equals(logList.get(0).getStatus()) && !"3".equals(logList.get(0).getStatus())){
//// result.put("status", "faild");
//// result.put("message", "服务指令暂时无法开始");
//// return result;
//// }
//// }
//// //回退
//// if ("3".equals(dto.getStatus())) {
//// if(!"1".equals(logList.get(0).getStatus())){
//// result.put("status", "faild");
//// result.put("message", "服务指令暂时无法开始");
//// return result;
//// }
//// }
//// //出库
//// if ("4".equals(dto.getStatus())) {
//// if(!"1".equals(logList.get(0).getStatus())){
//// result.put("status", "faild");
//// result.put("message", "服务指令暂时无法开始");
//// return result;
//// }
//// }
//// //确认收货
//// if ("5".equals(dto.getStatus())) {
//// if(!"4".equals(logList.get(0).getStatus())){
//// result.put("status", "faild");
//// result.put("message", "服务指令暂时无法开始");
//// return result;
//// }
//// }
//// }
//
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
// p_.setId(dto.getId());//执行指令id
// p_.setInitiatorId(sysUser.getEmployessId());
// return invoicingOrdersApi.beginOrder(p_);
// }
// /**
// * 请领单-服务指令-结束服务
// *
// * @param dto
// * @return
// */
// @Override
// @Transactional(rollbackFor = Exception.class)
// public Map<String, Object> finishDirectiveServe(InvoicingQldQueryEntity dto) {
//// Map<String,String> map = new HashMap();
//// map.put("error_code","0");
//// map.put("msg","可以提交");
//// //获取工单，请领单，判断是否可完成
//// InvoicingOrdersEntity ioe = new InvoicingOrdersEntity();
//// ioe.setId(dto.getId());
//// InvoicingOrdersEntity entity = invoicingOrdersApi.getOrderInfo(ioe);
//// if(entity!=null){
//// String qldNo = entity.getBizId();//业务单号
//// if(qldNo!=null&&!qldNo.equals("")){
//// //获取请领单
//// QueryWrapper<NuInvoicingQldMain> qw = new QueryWrapper<>();
//// qw.eq("qld_no", qldNo);
//// NuInvoicingQldMain main = invoicingQldMainService.getOne(qw);
//// if (main != null) {
//// map = this.izCanFinish(entity.getFlowCode(),main.getStatus());
//// if(!map.get("error_code").equals("0")){
//// return map;
//// }
//// //满足完成条件
//// //完成
//// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//// InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
//// p_.setId(dto.getId());
//// p_.setInitiatorId(sysUser.getEmployessId());
//// map = invoicingOrdersApi.finishOrder(p_);
//// if(!map.get("error_code").equals("0")){
//// return map;
//// }
//// //生成新单据
//// createNextOrder(entity,main);
//// }else{
//// map.put("error_code","1");
//// map.put("msg","请领单不存在");
//// return map;
//// }
//// }else{
//// map.put("error_code","1");
//// map.put("msg","请先提交请领单");
//// return map;
//// }
//// }else{
//// map.put("error_code","1");
//// map.put("msg","工单不存在");
//// return map;
//// }
//// return map;
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
// p_.setId(dto.getId());
// p_.setInitiatorId(sysUser.getEmployessId());
// return invoicingOrdersApi.finishOrder(p_);
// }
// /**
// * 判断是否可结束工单
// *
// * @return
// */
// private Map<String, String> izCanFinish(String flowCode, String status) {
// Map<String, String> map = new HashMap();
// map.put("error_code", "0");
// map.put("msg", "可以结束");
// //完成结束判断算法：
// //一、申请可完成 flowCode=ql_sq，完成时只有2种判断，1、业务单号qldNo不为空 ；2、已提交status=1
// //二、出库可完成 flowCode=ql_ck，完成时只有2种判断，1、已出库status=4 ；2、已回退status=3
// //三、收货可完成 flowCode=ql_sh，完成时只有1种判断，1、已收货status=5
// //不考虑作废情况，作废时会将ql_sq的工单状态恢复成最原始状态，判断算法使用根据一、申请可完成
// //一、申请可完成判断
// if (flowCode.equals("ql_sq")) {
// if (!status.equals("1")) {
// map.put("error_code", "1");
// map.put("msg", "请先提交请领单");
// }
// }
// //二、出库可完成判断
// if (flowCode.equals("ql_ck")) {
// if (status.equals("3") || status.equals("4")) {
// } else {
// map.put("error_code", "1");
// map.put("msg", "请先出库或回退");
// }
// }
// //三、收货可完成判断
// if (flowCode.equals("ql_sh")) {
// if (!status.equals("5")) {
// map.put("error_code", "1");
// map.put("msg", "请先收货");
// }
// }
// return map;
// }
//
// /**
// * 生成下一服务指令工单
// */
// private void createNextOrder(InvoicingOrdersEntity entity, NuInvoicingQldMain main) {
// String flowCode = entity.getFlowCode();
// String status = main.getStatus();
// InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
// orderEntity.setFlowCode(flowCode);//ql_sq
// orderEntity.setBizId(main.getQldNo());//请领单号
// orderEntity.setNuId(main.getNuId());//护理单元id
// orderEntity.setElderId(main.getElderId());//长者id
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// orderEntity.setInitiatorId(sysUser.getEmployessId());//提交人id
// //生成请领下一步服务指令
// if (flowCode.equals("ql_sq")) {
// invoicingQlOrdersApi.flowQlsq(orderEntity);
// }
// if (flowCode.equals("ql_ck")) {
// //生成出库下一步服务指令
// if (status.equals("4")) {
// invoicingQlOrdersApi.flowQlck(orderEntity);
// }
// //生成回退下一步服务指令
// if (status.equals("3")) {
// invoicingQlOrdersApi.flowQlht(orderEntity);
// }
// }
// }
} }

100
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java
View File

@ -131,33 +131,6 @@ public class ThdServiceImpl implements ITuiHuoApi {
return nuKcslMapper.thdNuMaterialList(dto); return nuKcslMapper.thdNuMaterialList(dto);
} }
// @Override
// @Transactional(rollbackFor = Exception.class)
// public Map<String, Object> startDirectiveServe(InvoicingThdMainEntity dto) {
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
//// orderEntity.setFlowCode("dyth_cksh");//指令流程flow_code 看接口有标明
// orderEntity.setId(dto.getId());//退货指令id
// orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
// Map<String, Object> result = invoicingOrdersApi.beginOrder(orderEntity);
// //delete by caolei 2025-12-25
//// if ("0".equals(result.get("error_code"))) {
//// InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
//// p_.setId(dto.getId());
//// InvoicingOrdersEntity v_ = invoicingThOrdersApi.getOrderInfo(p_);
//// String mainId = v_.getPoolId();//退货主表id
//// //将状态改为已开始
//// UpdateWrapper<NuInvoicingThdMain> thUW = new UpdateWrapper<>();
//// thUW.eq("id", mainId);
//// NuInvoicingThdMain m = new NuInvoicingThdMain();
//// m.setId(mainId);
//// m.setStatus("1");
//// thdMainMapper.updateById(m);
//// }
// return result;
// }
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Map<String, Object> startServe(InvoicingThdMainEntity dto) { public Map<String, Object> startServe(InvoicingThdMainEntity dto) {
@ -272,15 +245,6 @@ public class ThdServiceImpl implements ITuiHuoApi {
Map<String, Object> result = Maps.newHashMap(); Map<String, Object> result = Maps.newHashMap();
result.put("success", true); result.put("success", true);
result.put("message", "入库成功"); result.put("message", "入库成功");
// //指令工单处判断是否允许提交
// InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
// p_.setPoolId(dto.getId());
// Map<String,String> j = invoicingThOrdersApi.izCanSubmit(p_);
// if(!j.get("error_code").equals("0")){
// result.put("status", "nodeError");
// result.put("message", j.get("msg"));
// return result;
// }
//查询主表信息 //查询主表信息
QueryWrapper<NuInvoicingThdMain> qw = new QueryWrapper<>(); QueryWrapper<NuInvoicingThdMain> qw = new QueryWrapper<>();
@ -538,16 +502,6 @@ public class ThdServiceImpl implements ITuiHuoApi {
} }
} }
// InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
// orderEntity.setPoolId(dto.getId());//退货主表id 入库时会根据更新为对应退货单号（入库时才生成的退货单号）
// orderEntity.setBizId(main.getThdNo());
// orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
//delete by caolei 2025-12-25
// orderEntity.setNuId(main.getNuId());//护理单元id
// orderEntity.setElderId(main.getElderId());//长者id
// orderEntity.setFlowCode("dyth_cksh");//指令流程flow_code 看接口有标明
// invoicingThOrdersApi.updateOrderBizId(orderEntity);
//服务指令工单业务日志 //服务指令工单业务日志
DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity(); DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
qgdInfoEntityDto.setBizTypeCode("THD-RK");// 业务类型编码 qgdInfoEntityDto.setBizTypeCode("THD-RK");// 业务类型编码
@ -559,50 +513,6 @@ public class ThdServiceImpl implements ITuiHuoApi {
return result; return result;
} }
// @Override
// @Transactional(rollbackFor = Exception.class)
// public Map<String, Object> finishDirectiveServe(InvoicingThdMainEntity dto) {
//// Map<String, Object> r_ = Maps.newHashMap();
//// InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
//// p_.setId(dto.getId());
//// InvoicingOrdersEntity v_ = invoicingThOrdersApi.getOrderInfo(p_);
//// if (v_ == null || StringUtils.isBlank(v_.getPoolId())) {
//// r_.put("success", false);
//// r_.put("message", "工单不存在");
//// return r_;
//// }
//// String mainId = v_.getPoolId();//退货单id
//// //查询当前状态
//// QueryWrapper<NuInvoicingThdMain> qw = new QueryWrapper<>();
//// qw.eq("id", mainId);
//// NuInvoicingThdMain main = thdMainMapper.selectOne(qw);
////
//// //检测是否已入库
//// if (main == null || !"1".equals(main.getStatus())) {
//// r_.put("success", false);
//// r_.put("message", "退货单未入库");
//// return r_;
//// }
//
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
//// orderEntity.setFlowCode("dyth_cksh");//指令流程flow_code 看接口有标明
// orderEntity.setId(dto.getId());//退货指令的id
//// orderEntity.setBizId(main.getThdNo());
// orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
// Map<String, Object> result = invoicingOrdersApi.finishOrder(orderEntity);
//// if ("0".equals(result.get("error_code"))) {
//// //将状态改为已开始
//// UpdateWrapper<NuInvoicingThdMain> thUW = new UpdateWrapper<>();
//// thUW.eq("id", mainId);
//// NuInvoicingThdMain m = new NuInvoicingThdMain();
//// m.setId(mainId);
//// m.setStatus("3");
//// thdMainMapper.updateById(m);
//// }
// return result;
// }
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Map<String, Object> finishServe(InvoicingThdMainEntity dto) { public Map<String, Object> finishServe(InvoicingThdMainEntity dto) {
@ -686,16 +596,6 @@ public class ThdServiceImpl implements ITuiHuoApi {
logData.setElderId(main.getElderId());//长者id logData.setElderId(main.getElderId());//长者id
thdLogMapper.insert(logData); thdLogMapper.insert(logData);
// InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
// orderEntity.setFlowCode("dyth_cksh");//指令流程flow_code 看接口有标明
// orderEntity.setPoolId(main.getId());//退货主表id 入库时会根据更新为对应退货单号（入库时才生成的退货单号）
// orderEntity.setNuId(dto.getNuId());
//// orderEntity.setNuName(dto.getNuName());
// orderEntity.setElderId(dto.getElderId());//长者id
//// orderEntity.setElderName(dto.getElderName());//长者姓名
// orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
// orderEntity.setInitiatorName(sysUser.getRealname());//员工姓名
// invoicingThOrdersApi.flowDythCksh(orderEntity);
return map; return map;
} }

41
nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingOrdersApi.java
View File

@ -1,41 +0,0 @@
package com.nu.modules.invoicing.api;
import com.nu.entity.InvoicingDirectiveEntity;
import com.nu.entity.InvoicingOrdersEntity;
import org.jeecg.common.api.vo.Result;
import java.util.Map;
/**
* @Description: 仓库类服务指令工单主表 作废
* @Author: zmy
* @Date: 2025-12-2
* @Version: V1.0
*/
public interface IInvoicingOrdersApi {
// /**
// * 获取指令工单信息
// * @param invoicingOrdersEntity
// */
// InvoicingOrdersEntity getOrderInfo(InvoicingOrdersEntity invoicingOrdersEntity);
// /**
// * 点击开始
// * @param invoicingOrdersEntity
// */
// Map<String,Object> beginOrder(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 点击完成
// * @param invoicingOrdersEntity
// */
// Map<String,Object> finishOrder(InvoicingOrdersEntity invoicingOrdersEntity);
// /**
// * 根据工单id查询工单信息+对应服务指令信息
// * @param id
// * @return
// */
// InvoicingDirectiveEntity selectInfoById(String id);
}

35
nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingPdOrdersApi.java
View File

@ -1,35 +0,0 @@
package com.nu.modules.invoicing.api;
import com.nu.entity.InvoicingOrdersEntity;
import org.jeecg.common.api.vo.Result;
import java.util.Map;
/**
* @Description: 仓库类服务指令盘点工单 作废
* @Author: caolei
* @Date: 2025-12-29
* @Version: V1.0
*/
public interface IInvoicingPdOrdersApi {
// /**
// * 获取工单信息
// * @param invoicingOrdersEntity
// * @return
// */
// InvoicingOrdersEntity getOrderInfo(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 是否可提交
// * @param invoicingOrdersEntity
// */
// Result<String> izCanAdd(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 单元退货-提交时修改业务单号
// * @param invoicingOrdersEntity
// */
// void updateOrderBizId(InvoicingOrdersEntity invoicingOrdersEntity);
}

76
nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingQlOrdersApi.java
View File

@ -1,76 +0,0 @@
package com.nu.modules.invoicing.api;
import com.nu.entity.InvoicingOrdersEntity;
import java.util.Map;
/**
* @Description: 仓库类服务指令请领工单 作废
* @Author: caolei
* @Date: 2025-12-25
* @Version: V1.0
*/
public interface IInvoicingQlOrdersApi {
// /**
// * 请领是否可提交
// * @param invoicingOrdersEntity
// */
// Map<String,String> izCanSubmit(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 请领是否可重新提交
// * @param invoicingOrdersEntity
// */
// Map<String,String> izCanReSubmit(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 请领是否可继续
// * @param invoicingOrdersEntity
// */
// Map<String,String> izCanGoOn(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 请领是否可作废
// * @param invoicingOrdersEntity
// */
// Map<String,String> izCanCancel(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 流程中提交时修改业务单号
// * @param invoicingOrdersEntity
// */
// void updateOrderBizId(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 请领流程-获取指令工单信息
// * @param invoicingOrdersEntity
// */
// InvoicingOrdersEntity getQlOrderInfo(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 请领流程-请领申请 ql_sq
// * @param invoicingOrdersEntity
// */
// void flowQlsq(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 请领流程-出库 ql_ck
// * @param invoicingOrdersEntity
// */
// void flowQlck(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 请领流程-回退 ql_ht
// * @param invoicingOrdersEntity
// */
// void flowQlht(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 请领流程-作废 ql_zf
// * @param invoicingOrdersEntity
// */
// void flowQlzf(InvoicingOrdersEntity invoicingOrdersEntity);
}

40
nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingThOrdersApi.java
View File

@ -1,40 +0,0 @@
package com.nu.modules.invoicing.api;
import com.nu.entity.InvoicingOrdersEntity;
import java.util.Map;
/**
* @Description: 仓库类服务指令退货工单 作废
* @Author: caolei
* @Date: 2025-12-25
* @Version: V1.0
*/
public interface IInvoicingThOrdersApi {
// /**
// * 获取工单信息
// * @param invoicingOrdersEntity
// * @return
// */
// InvoicingOrdersEntity getOrderInfo(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 单元退货-仓库收货 dyth_cksh
// * @param invoicingOrdersEntity
// */
// void flowDythCksh(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 是否可提交
// * @param invoicingOrdersEntity
// */
// Map<String,String> izCanSubmit(InvoicingOrdersEntity invoicingOrdersEntity);
//
// /**
// * 单元退货-提交时修改业务单号
// * @param invoicingOrdersEntity
// */
// void updateOrderBizId(InvoicingOrdersEntity invoicingOrdersEntity);
}

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/job/LogisticsDataPoolJob.java
View File

@ -10,7 +10,7 @@ import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
/** /**
* 指令计划批量生成到指令池-行政指令 * 指令计划批量生成到指令池-后勤指令
*/ */
@Slf4j @Slf4j
public class LogisticsDataPoolJob implements Job { public class LogisticsDataPoolJob implements Job {
@ -20,7 +20,7 @@ public class LogisticsDataPoolJob implements Job {
@Override @Override
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
log.error("DataPoolJob:{}-{}", DateUtils.now(),"行政类指令计划批量生成到指令池开始"); log.error("DataPoolJob:{}-{}", DateUtils.now(),"后勤类指令计划批量生成到指令池开始");
Result<?> result = service.generateDataPoolBatch(); Result<?> result = service.generateDataPoolBatch();
log.error("DataPoolJob:{}-{}", DateUtils.now(),result.getMessage()); log.error("DataPoolJob:{}-{}", DateUtils.now(),result.getMessage());
} }

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/InvoicingDataPoolMapper.xml
View File

@ -14,7 +14,7 @@
CONCAT(CURDATE(), ' ',STR_TO_DATE(a.start_time, '%H:%i')) as startTime, CONCAT(CURDATE(), ' ',STR_TO_DATE(a.start_time, '%H:%i')) as startTime,
a.opt_time as optTime, a.opt_time as optTime,
a.opt_count as optCount a.opt_count as optCount
from nu_biz_nu_invoicing_directive_plan from nu_biz_nu_invoicing_directive_plan a
<where> <where>
<if test="nuId != null and nuId != ''"> <if test="nuId != null and nuId != ''">
AND nu_id = #{nuId} AND nu_id = #{nuId}
@ -43,7 +43,7 @@
CONCAT(CURDATE(), ' ',STR_TO_DATE(a.start_time, '%H:%i')) as startTime, CONCAT(CURDATE(), ' ',STR_TO_DATE(a.start_time, '%H:%i')) as startTime,
a.opt_time as optTime, a.opt_time as optTime,
a.opt_count as optCount a.opt_count as optCount
from nu_biz_nu_invoicing_directive_plan from nu_biz_nu_invoicing_directive_plan a
where id = #{id} where id = #{id}
</select> </select>

7
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/LogisticsDataPoolMapper.xml
View File

@ -14,14 +14,11 @@
CONCAT(CURDATE(), ' ',STR_TO_DATE(a.start_time, '%H:%i')) as startTime, CONCAT(CURDATE(), ' ',STR_TO_DATE(a.start_time, '%H:%i')) as startTime,
a.opt_time as optTime, a.opt_time as optTime,
a.opt_count as optCount a.opt_count as optCount
from nu_biz_nu_logistics_directive_plan from nu_biz_nu_logistics_directive_plan a
<where> <where>
<if test="nuId != null and nuId != ''"> <if test="nuId != null and nuId != ''">
AND nu_id = #{nuId} AND nu_id = #{nuId}
</if> </if>
<if test="elderId != null and elderId != ''">
AND elder_id = #{elderId}
</if>
<if test="directiveId != null and directiveId != ''"> <if test="directiveId != null and directiveId != ''">
AND directive_id = #{directiveId} AND directive_id = #{directiveId}
</if> </if>
@ -46,7 +43,7 @@
CONCAT(CURDATE(), ' ',STR_TO_DATE(a.start_time, '%H:%i')) as startTime, CONCAT(CURDATE(), ' ',STR_TO_DATE(a.start_time, '%H:%i')) as startTime,
a.opt_time as optTime, a.opt_time as optTime,
a.opt_count as optCount a.opt_count as optCount
from nu_biz_nu_logistics_directive_plan from nu_biz_nu_logistics_directive_plan a
where id = #{id} where id = #{id}
</select> </select>

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/LogisticsDataPoolServiceImpl.java
View File

@ -17,7 +17,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* @Description: 服务指令数据池管理-行政类 * @Description: 服务指令数据池管理-后勤类
* @Author: caolei * @Author: caolei
* @Date: 2026-1-6 * @Date: 2026-1-6
* @Version: V1.0 * @Version: V1.0

22
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/job/CareSubDownTplinkJob.java
View File

@ -34,32 +34,32 @@ public class CareSubDownTplinkJob implements Job {
QueryWrapper<DirectiveOrderSub> queryWrapper = new QueryWrapper<>(); QueryWrapper<DirectiveOrderSub> queryWrapper = new QueryWrapper<>();
queryWrapper.isNull("tplink_path"); queryWrapper.isNull("tplink_path");
queryWrapper.eq("iz_finish","Y"); queryWrapper.eq("iz_finish","Y");
List<DirectiveOrderSub> careOrdersSubList = careOrdersSubService.list(queryWrapper); List<DirectiveOrderSub> directiveOrderSubList = careOrdersSubService.list(queryWrapper);
for (DirectiveOrderSub careOrdersSubEntity : careOrdersSubList){ for (DirectiveOrderSub directiveOrderSubEntity : directiveOrderSubList){
try { try {
String serviceDuration = careOrdersSubEntity.getServiceDuration(); String serviceDuration = directiveOrderSubEntity.getServiceDuration();
if(!StringUtils.isBlank(serviceDuration)){ if(!StringUtils.isBlank(serviceDuration)){
Date beginTime = careOrdersSubEntity.getBeginTime(); Date beginTime = directiveOrderSubEntity.getBeginTime();
Date finishTime = careOrdersSubEntity.getFinishTime(); Date finishTime = directiveOrderSubEntity.getFinishTime();
long diffInMillis = Math.abs(finishTime.getTime() - beginTime.getTime()); long diffInMillis = Math.abs(finishTime.getTime() - beginTime.getTime());
long diffMinutes = TimeUnit.MILLISECONDS.toMinutes(diffInMillis); long diffMinutes = TimeUnit.MILLISECONDS.toMinutes(diffInMillis);
long sj = Long.parseLong(serviceDuration); long sj = Long.parseLong(serviceDuration);
if(diffMinutes>sj){ if(diffMinutes>sj){
finishTime = new Date(finishTime.getTime() + Math.abs(sj/2) * 60 * 1000); finishTime = new Date(finishTime.getTime() + Math.abs(sj/2) * 60 * 1000);
} }
String nuId = careOrdersSubEntity.getNuId(); String nuId = directiveOrderSubEntity.getNuId();
String startTime = DateUtils.formatDate(careOrdersSubEntity.getBeginTime(),"yyyy-MM-dd HH:mm:ss"); String startTime = DateUtils.formatDate(directiveOrderSubEntity.getBeginTime(),"yyyy-MM-dd HH:mm:ss");
String endTime = DateUtils.formatDate(finishTime,"yyyy-MM-dd HH:mm:ss"); String endTime = DateUtils.formatDate(finishTime,"yyyy-MM-dd HH:mm:ss");
System.out.println("nuId:"+nuId); System.out.println("nuId:"+nuId);
System.out.println("startTime:"+startTime); System.out.println("startTime:"+startTime);
System.out.println("endTime:"+endTime); System.out.println("endTime:"+endTime);
String resultTplink = tplinkService.zdyTplinkVideo(nuId,startTime,endTime); String resultTplink = tplinkService.zdyTplinkVideo(nuId,startTime,endTime);
if(!StringUtils.equals("error",resultTplink)){ if(!StringUtils.equals("error",resultTplink)){
careOrdersSubEntity.setTplinkPath(resultTplink); directiveOrderSubEntity.setTplinkPath(resultTplink);
careOrdersSubService.updateById(careOrdersSubEntity); careOrdersSubService.updateById(directiveOrderSubEntity);
}else{ }else{
careOrdersSubEntity.setTplinkPath("error"); directiveOrderSubEntity.setTplinkPath("error");
careOrdersSubService.updateById(careOrdersSubEntity); careOrdersSubService.updateById(directiveOrderSubEntity);
} }
} }
} catch (Exception e) { } catch (Exception e) {