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

服务指令-仓库矩阵语句调整

This commit is contained in:
曹磊 2026-01-20 15:46:48 +08:00
parent 7394ad2bda
commit d22b75f87c
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/entity/InvoicingDirectivePlan.java
View File

@ -5,7 +5,6 @@ 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 com.nu.modules.biz.plan.care.entity.CareDirectivePlanInstant;
import com.nu.modules.biz.plan.care.entity.ElderTagPlan;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@ -83,9 +82,6 @@ public class InvoicingDirectivePlan implements Serializable {
/**服务指令列表**/
@TableField(exist = false)
private List<InvoicingDirectivePlan> serverList;
/**即时服务指令列表**/
@TableField(exist = false)
private List<CareDirectivePlanInstant> instantList;
/**长者标签列表**/
@TableField(exist = false)
private List<ElderTagPlan> tagList;

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/mapper/xml/InvoicingDirectivePlanMapper.xml
View File

@ -113,7 +113,7 @@
WHEN plan.iz_package = 'Y' AND package.total_duration IS NOT NULL
THEN DATE_FORMAT(ADDTIME(STR_TO_DATE(plan.start_time, '%H:%i'),
SEC_TO_TIME(package.total_duration * 60)), '%H:%i')
ELSE NULL
ELSE '23:59'
END as end_time,
plan.create_by,
plan.create_time,

12
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/service/impl/InvoicingDirectivePlanServiceImpl.java
View File

@ -1,21 +1,15 @@
package com.nu.modules.biz.plan.invoicing.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.entity.InvoicingDirectiveEntity;
import com.nu.entity.InvoicingDirectiveInstantEntity;
import com.nu.modules.biz.datapool.service.IInvoicingDataPoolService;
import com.nu.modules.biz.plan.invoicing.entity.InvoicingDirectivePlan;
import com.nu.modules.biz.plan.invoicing.entity.InvoicingDirectivePlanInstant;
import com.nu.modules.biz.plan.invoicing.mapper.InvoicingDirectivePlanMapper;
import com.nu.modules.biz.plan.invoicing.service.IInvoicingDirectivePlanInstantService;
import com.nu.modules.biz.plan.invoicing.service.IInvoicingDirectivePlanService;
import com.nu.modules.invoicing.api.IInvoicingDirectivePlanApi;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -31,8 +25,6 @@ public class InvoicingDirectivePlanServiceImpl extends ServiceImpl<InvoicingDire
@Autowired
private IInvoicingDataPoolService dataPoolServiceImpl;
@Autowired
private IInvoicingDirectivePlanInstantService invoicingDirectivePlanInstantService;
@Override
public Map<String, Object> getPlanList(InvoicingDirectiveEntity invoicingDirectiveEntity) {
@ -74,7 +66,7 @@ public class InvoicingDirectivePlanServiceImpl extends ServiceImpl<InvoicingDire
//TODO 增加日志
//调用方法先删除数据池中的数据，再生成数据池中的数据
//todo 需要解开
// dataPoolServiceImpl.editDataPool(entity);
dataPoolServiceImpl.editDataPool(entity);
}
@Override
@ -84,7 +76,7 @@ public class InvoicingDirectivePlanServiceImpl extends ServiceImpl<InvoicingDire
String id = invoicingDirectivePlan.getId();
//调用方法删除数据池中的数据
//todo 需要解开
// dataPoolServiceImpl.deleteDataPool(invoicingDirectivePlan);
dataPoolServiceImpl.deleteDataPool(invoicingDirectivePlan);
baseMapper.deleteByIdPhysic(id);
//TODO 增加日志
}