服务指令计划获取及存储
This commit is contained in:
parent
973dadda74
commit
8d5c10ad84
|
|
@ -37,8 +37,8 @@ public class NuBizNuCustomerServerController extends JeecgController<NuBizNuCust
|
|||
//@AutoLog(value = "护理单元客户配置服务指令-分页列表查询")
|
||||
@ApiOperation(value="护理单元客户配置服务指令-分页列表查询", notes="护理单元客户配置服务指令-分页列表查询")
|
||||
@GetMapping(value = "/getNclist")
|
||||
public Result<List<Map<String,Object>>> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer) {
|
||||
List<Map<String,Object>> pageList = nuBizNuCustomerServerService.getNclist(nuBizNuCustomerServer);
|
||||
public Result<Map<String,Object>> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer) {
|
||||
Map<String,Object> pageList = nuBizNuCustomerServerService.getNclist(nuBizNuCustomerServer);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
|
|
@ -110,8 +110,8 @@ public class NuBizNuCustomerServerController extends JeecgController<NuBizNuCust
|
|||
@ApiOperation(value="护理单元客户配置服务指令-添加", notes="护理单元客户配置服务指令-添加")
|
||||
// @RequiresPermissions("NuBizNuCustomerServer:nu_biz_nu_customer_server:add")
|
||||
@PostMapping(value = "/addBatch")
|
||||
public Result<NuBizNuCustomerServer> addBatch(@RequestBody List<NuBizNuCustomerServer> serverList) {
|
||||
nuBizNuCustomerServerService.addBatch(serverList);
|
||||
public Result<NuBizNuCustomerServer> addBatch(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) {
|
||||
nuBizNuCustomerServerService.addBatch(nuBizNuCustomerServer);
|
||||
return Result.OK("操作成功");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,106 @@
|
|||
package com.nu.modules.NuBizNuCustomerServer.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 io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元客户配置长者标签
|
||||
* @Author: caolei
|
||||
* @Date: 2025-10-13
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("nu_biz_nu_customer_elder_tag")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="nu_biz_nu_customer_elder_tag对象", description="护理单元客户配置长者标签")
|
||||
public class NuBizNuCustomerElderTag implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**id*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private String id;
|
||||
/**护理单元id*/
|
||||
@Excel(name = "护理单元id", width = 15)
|
||||
@ApiModelProperty(value = "护理单元id")
|
||||
private String nuId;
|
||||
/**护理单元名称*/
|
||||
@Excel(name = "护理单元名称", width = 15)
|
||||
@ApiModelProperty(value = "护理单元名称")
|
||||
private String nuName;
|
||||
/**客户id*/
|
||||
@Excel(name = "客户id", width = 15)
|
||||
@ApiModelProperty(value = "客户id")
|
||||
private String customerId;
|
||||
/**客户姓名*/
|
||||
@Excel(name = "客户姓名", width = 15)
|
||||
@ApiModelProperty(value = "客户姓名")
|
||||
private String customerName;
|
||||
/**长者标签ID*/
|
||||
@Excel(name = "长者标签ID", width = 15)
|
||||
@ApiModelProperty(value = "长者标签ID")
|
||||
private String tagId;
|
||||
/**长者标签名称*/
|
||||
@Excel(name = "长者标签名称", width = 15)
|
||||
@ApiModelProperty(value = "长者标签名称")
|
||||
private String tagName;
|
||||
/**长者标签类型*/
|
||||
@Excel(name = "长者标签类型", width = 15)
|
||||
@ApiModelProperty(value = "长者标签类型")
|
||||
private String tagType;
|
||||
/**图标*/
|
||||
@Excel(name = "图标", width = 15)
|
||||
@ApiModelProperty(value = "图标")
|
||||
private java.lang.String pic;
|
||||
/**图标*/
|
||||
@Excel(name = "图标", width = 15)
|
||||
@ApiModelProperty(value = "图标")
|
||||
@TableField(exist = false)
|
||||
private java.lang.String netPic;
|
||||
/**焦点图标*/
|
||||
@Excel(name = "焦点图标", width = 15)
|
||||
@ApiModelProperty(value = "焦点图标")
|
||||
private java.lang.String picFocus;
|
||||
/**图标*/
|
||||
@Excel(name = "图标", width = 15)
|
||||
@ApiModelProperty(value = "图标")
|
||||
@TableField(exist = false)
|
||||
private java.lang.String netPicFocus;
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
/**创建日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private Date createTime;
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private String updateBy;
|
||||
/**更新日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private Date updateTime;
|
||||
/**所属部门*/
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
private String sysOrgCode;
|
||||
/**选中状态*/
|
||||
@TableField(exist = false)
|
||||
private String izSelected;
|
||||
}
|
||||
|
|
@ -4,10 +4,9 @@ import java.io.Serializable;
|
|||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import java.util.List;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import org.jeecg.common.constant.ProvinceCityArea;
|
||||
import org.jeecg.common.util.SpringContextUtils;
|
||||
import lombok.Data;
|
||||
|
|
@ -30,7 +29,7 @@ import lombok.experimental.Accessors;
|
|||
@TableName("nu_biz_nu_customer_server")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="nu_biz_nu_customer_server_care对象", description="护理单元客户配置服务指令")
|
||||
@ApiModel(value="nu_biz_nu_customer_server对象", description="护理单元客户配置服务指令")
|
||||
public class NuBizNuCustomerServer implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
@ -42,68 +41,78 @@ public class NuBizNuCustomerServer implements Serializable {
|
|||
@Excel(name = "护理单元id", width = 15)
|
||||
@ApiModelProperty(value = "护理单元id")
|
||||
private java.lang.String nuId;
|
||||
/**护理单元名称*/
|
||||
@Excel(name = "护理单元名称", width = 15)
|
||||
@ApiModelProperty(value = "护理单元名称")
|
||||
private java.lang.String nuName;
|
||||
/**客户id*/
|
||||
@Excel(name = "客户id", width = 15)
|
||||
@ApiModelProperty(value = "客户id")
|
||||
private java.lang.String customerId;
|
||||
/**客户姓名*/
|
||||
@Excel(name = "客户姓名", width = 15)
|
||||
@ApiModelProperty(value = "客户姓名")
|
||||
private java.lang.String customerName;
|
||||
/**服务类别id*/
|
||||
@Excel(name = "服务类别id", width = 15)
|
||||
@ApiModelProperty(value = "服务类别id")
|
||||
private java.lang.String categoryId;
|
||||
/**服务类别名称*/
|
||||
@Excel(name = "服务类别名称", width = 15)
|
||||
@ApiModelProperty(value = "服务类别名称")
|
||||
private java.lang.String categoryName;
|
||||
/**服务类型id*/
|
||||
@Excel(name = "服务类型id", width = 15)
|
||||
@ApiModelProperty(value = "服务类型id")
|
||||
private java.lang.String typeId;
|
||||
/**服务类型名称*/
|
||||
@Excel(name = "服务类型名称", width = 15)
|
||||
@ApiModelProperty(value = "服务类型名称")
|
||||
private java.lang.String typeName;
|
||||
/**服务指令id*/
|
||||
@Excel(name = "服务指令id", width = 15)
|
||||
@ApiModelProperty(value = "服务指令id")
|
||||
private java.lang.String directiveId;
|
||||
/**护理单元名称*/
|
||||
@Excel(name = "护理单元名称", width = 15)
|
||||
@ApiModelProperty(value = "护理单元名称")
|
||||
private java.lang.String nuName;
|
||||
/**客户姓名*/
|
||||
@Excel(name = "客户姓名", width = 15)
|
||||
@ApiModelProperty(value = "客户姓名")
|
||||
private java.lang.String customerName;
|
||||
/**服务类别名称*/
|
||||
@Excel(name = "服务类别名称", width = 15)
|
||||
@ApiModelProperty(value = "服务类别名称")
|
||||
private java.lang.String categoryName;
|
||||
/**服务类型名称*/
|
||||
@Excel(name = "服务类型名称", width = 15)
|
||||
@ApiModelProperty(value = "服务类型名称")
|
||||
private java.lang.String typeName;
|
||||
/**服务指令名称*/
|
||||
@Excel(name = "服务指令名称", width = 15)
|
||||
/**服务指令名称*/
|
||||
@Excel(name = "服务指令名称", width = 15)
|
||||
@ApiModelProperty(value = "服务指令名称")
|
||||
private java.lang.String directiveName;
|
||||
/**定位*/
|
||||
@Excel(name = "定位", width = 15)
|
||||
@ApiModelProperty(value = "定位")
|
||||
private java.lang.String positioning;
|
||||
/**服务标签名称*/
|
||||
@Excel(name = "服务标签名称", width = 15)
|
||||
@ApiModelProperty(value = "服务标签名称")
|
||||
private java.lang.String tagName;
|
||||
/**体型标签名称*/
|
||||
@Excel(name = "体型标签名称", width = 15)
|
||||
@ApiModelProperty(value = "体型标签名称")
|
||||
private java.lang.String bodyTagName;
|
||||
/**情绪标签名称*/
|
||||
@Excel(name = "情绪标签名称", width = 15)
|
||||
@ApiModelProperty(value = "情绪标签名称")
|
||||
private java.lang.String emotionTagName;
|
||||
/**周期类型ID*/
|
||||
@Excel(name = "周期类型ID", width = 15)
|
||||
@ApiModelProperty(value = "周期类型ID")
|
||||
private java.lang.String cycleTypeId;
|
||||
/**周期类型*/
|
||||
@Excel(name = "周期类型", width = 15)
|
||||
@ApiModelProperty(value = "周期类型")
|
||||
private java.lang.String cycleType;
|
||||
/**周期值*/
|
||||
@Excel(name = "周期值", width = 15)
|
||||
@ApiModelProperty(value = "周期值")
|
||||
private java.lang.String cycleValue;
|
||||
/**即时指令图标*/
|
||||
@ApiModelProperty(value = "即时指令图标")
|
||||
private java.lang.String immediateFile;
|
||||
/**即时指令焦点图标*/
|
||||
@ApiModelProperty(value = "即时指令图标")
|
||||
private java.lang.String immediateFileFocus;
|
||||
/**服务指令图片大图*/
|
||||
@ApiModelProperty(value = "服务指令图片大图")
|
||||
private java.lang.String previewFile;
|
||||
/**服务指令图片小图*/
|
||||
@ApiModelProperty(value = "服务指令图片小图")
|
||||
private java.lang.String previewFileSmall;
|
||||
/**定位*/
|
||||
@Excel(name = "定位", width = 15)
|
||||
@ApiModelProperty(value = "定位")
|
||||
private java.lang.String positioning;
|
||||
/**纵向定位*/
|
||||
@Excel(name = "纵向定位", width = 15)
|
||||
@ApiModelProperty(value = "纵向定位")
|
||||
private java.lang.String positioningLong;
|
||||
|
||||
|
||||
/**PAD端无线循环使用*/
|
||||
@Excel(name = "PAD端无线循环使用", width = 15)
|
||||
@ApiModelProperty(value = "PAD端无线循环使用")
|
||||
private java.lang.String tagName;
|
||||
/**开始时间*/
|
||||
@ApiModelProperty(value = "开始时间")
|
||||
private java.lang.String startTime;
|
||||
|
|
@ -129,4 +138,17 @@ public class NuBizNuCustomerServer implements Serializable {
|
|||
/**所属部门*/
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
private java.lang.String sysOrgCode;
|
||||
/**是否是服务指令包 0否 1是*/
|
||||
@ApiModelProperty(value = "是否是服务指令包")
|
||||
private java.lang.String izPackage;
|
||||
|
||||
/**服务指令列表**/
|
||||
@TableField(exist = false)
|
||||
private List<NuBizNuCustomerServer> serverList;
|
||||
/**即时服务指令列表**/
|
||||
@TableField(exist = false)
|
||||
private List<NuBizNuCustomerServerInstant> instantList;
|
||||
/**长者标签列表**/
|
||||
@TableField(exist = false)
|
||||
private List<NuBizNuCustomerElderTag> tagList;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,127 @@
|
|||
package com.nu.modules.NuBizNuCustomerServer.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 io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元客户配置服务指令即时指令
|
||||
* @Author: yangjun
|
||||
* @Date: 2025-03-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("nu_biz_nu_customer_server_instant")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="nu_biz_nu_customer_server_instant对象", description="护理单元客户配置服务指令即时指令")
|
||||
public class NuBizNuCustomerServerInstant implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**id*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private String id;
|
||||
/**护理单元id*/
|
||||
@Excel(name = "护理单元id", width = 15)
|
||||
@ApiModelProperty(value = "护理单元id")
|
||||
private String nuId;
|
||||
/**护理单元名称*/
|
||||
@Excel(name = "护理单元名称", width = 15)
|
||||
@ApiModelProperty(value = "护理单元名称")
|
||||
private String nuName;
|
||||
/**客户id*/
|
||||
@Excel(name = "客户id", width = 15)
|
||||
@ApiModelProperty(value = "客户id")
|
||||
private String customerId;
|
||||
/**客户姓名*/
|
||||
@Excel(name = "客户姓名", width = 15)
|
||||
@ApiModelProperty(value = "客户姓名")
|
||||
private String customerName;
|
||||
/**服务类别id*/
|
||||
@Excel(name = "服务类别id", width = 15)
|
||||
@ApiModelProperty(value = "服务类别id")
|
||||
private String categoryId;
|
||||
/**服务类别名称*/
|
||||
@Excel(name = "服务类别名称", width = 15)
|
||||
@ApiModelProperty(value = "服务类别名称")
|
||||
private String categoryName;
|
||||
/**服务类型id*/
|
||||
@Excel(name = "服务类型id", width = 15)
|
||||
@ApiModelProperty(value = "服务类型id")
|
||||
private String typeId;
|
||||
/**服务类型名称*/
|
||||
@Excel(name = "服务类型名称", width = 15)
|
||||
@ApiModelProperty(value = "服务类型名称")
|
||||
private String typeName;
|
||||
/**服务指令id*/
|
||||
@Excel(name = "服务指令id", width = 15)
|
||||
@ApiModelProperty(value = "服务指令id")
|
||||
private String directiveId;
|
||||
/**服务指令名称*/
|
||||
@Excel(name = "服务指令名称", width = 15)
|
||||
@ApiModelProperty(value = "服务指令名称")
|
||||
private String directiveName;
|
||||
/**即时指令图标*/
|
||||
@ApiModelProperty(value = "即时指令图标")
|
||||
private java.lang.String immediateFile;
|
||||
/**即时指令焦点图标*/
|
||||
@ApiModelProperty(value = "即时指令图标")
|
||||
private java.lang.String immediateFileFocus;
|
||||
/**服务指令图片大图*/
|
||||
@ApiModelProperty(value = "服务指令图片大图")
|
||||
private java.lang.String previewFile;
|
||||
/**服务指令图片小图*/
|
||||
@ApiModelProperty(value = "服务指令图片小图")
|
||||
private java.lang.String previewFileSmall;
|
||||
/**即时指令图标*/
|
||||
@ApiModelProperty(value = "即时指令图标")
|
||||
@TableField(exist = false)
|
||||
private java.lang.String netImmediateFile;
|
||||
/**即时指令焦点图标*/
|
||||
@ApiModelProperty(value = "即时指令图标")
|
||||
@TableField(exist = false)
|
||||
private java.lang.String netImmediateFileFocus;
|
||||
/**服务指令图片大图*/
|
||||
@ApiModelProperty(value = "服务指令图片大图")
|
||||
@TableField(exist = false)
|
||||
private java.lang.String netPreviewFile;
|
||||
/**服务指令图片小图*/
|
||||
@ApiModelProperty(value = "服务指令图片小图")
|
||||
@TableField(exist = false)
|
||||
private java.lang.String netPreviewFileSmall;
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
/**创建日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private Date createTime;
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private String updateBy;
|
||||
/**更新日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private Date updateTime;
|
||||
/**所属部门*/
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
private String sysOrgCode;
|
||||
/**是否是服务指令包 0否 1是*/
|
||||
@ApiModelProperty(value = "是否是服务指令包")
|
||||
private java.lang.String izPackage;
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
package com.nu.modules.NuBizNuCustomerServer.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元客户配置长者标签
|
||||
* @Author: caolei
|
||||
* @Date: 2025-10-13
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface NuBizNuCustomerElderTagMapper extends BaseMapper<NuBizNuCustomerElderTag> {
|
||||
List<NuBizNuCustomerElderTag> getElderTags(NuBizNuCustomerElderTag nuBizNuCustomerElderTag);
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
package com.nu.modules.NuBizNuCustomerServer.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元客户配置服务指令即时指令
|
||||
* @Author: caolei
|
||||
* @Date: 2025-10-13
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface NuBizNuCustomerServerInstantMapper extends BaseMapper<NuBizNuCustomerServerInstant> {
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerElderTagMapper">
|
||||
|
||||
<select id="getElderTags" resultType="com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag">
|
||||
select
|
||||
a.id as tagId,
|
||||
a.type as tagType,
|
||||
a.tag_name as tagName,
|
||||
a.pic as pic,
|
||||
a.pic_focus as picFocus,
|
||||
a.sys_org_code as sysOrgCode,
|
||||
(case when ifnull(b.id,'') = '' then '0' else '1' end) as izSelected
|
||||
from nu_elder_tag a
|
||||
left join nu_biz_nu_customer_elder_tag b
|
||||
on a.id = b.tag_id
|
||||
and b.nu_id = #{nuId}
|
||||
and b.customer_id = #{customerId}
|
||||
where type = #{tagType}
|
||||
and a.del_flag = '0'
|
||||
and a.iz_enabled = '0'
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerServerInstantMapper">
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
package com.nu.modules.NuBizNuCustomerServer.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元客户配置长者标签
|
||||
* @Author: caolei
|
||||
* @Date: 2025-10-13
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface INuBizNuCustomerElderTagService extends IService<NuBizNuCustomerElderTag> {
|
||||
List<NuBizNuCustomerElderTag> getElderTags(NuBizNuCustomerElderTag nuBizNuCustomerElderTag);
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
package com.nu.modules.NuBizNuCustomerServer.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元客户配置服务指令即时指令
|
||||
* @Author: caolei
|
||||
* @Date: 2025-10-13
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface INuBizNuCustomerServerInstantService extends IService<NuBizNuCustomerServerInstant> {
|
||||
|
||||
}
|
||||
|
|
@ -14,11 +14,11 @@ import java.util.Map;
|
|||
*/
|
||||
public interface INuBizNuCustomerServerService extends IService<NuBizNuCustomerServer> {
|
||||
|
||||
List<Map<String,Object>> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer);
|
||||
Map<String,Object> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer);
|
||||
|
||||
NuBizNuCustomerServer addNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer);
|
||||
|
||||
NuBizNuCustomerServer editNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer);
|
||||
|
||||
void addBatch(List<NuBizNuCustomerServer> serverList);
|
||||
void addBatch(NuBizNuCustomerServer nuBizNuCustomerServer);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
package com.nu.modules.NuBizNuCustomerServer.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag;
|
||||
import com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerElderTagMapper;
|
||||
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerElderTagService;
|
||||
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerInstantService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元客户配置服务指令即时指令
|
||||
* @Author: caolei
|
||||
* @Date: 2025-10-13
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class NuBizNuCustomerElderTagServiceImpl extends ServiceImpl<NuBizNuCustomerElderTagMapper, NuBizNuCustomerElderTag> implements INuBizNuCustomerElderTagService {
|
||||
public List<NuBizNuCustomerElderTag> getElderTags(NuBizNuCustomerElderTag nuBizNuCustomerElderTag){
|
||||
return baseMapper.getElderTags(nuBizNuCustomerElderTag);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
package com.nu.modules.NuBizNuCustomerServer.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant;
|
||||
import com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerServerInstantMapper;
|
||||
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerInstantService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元客户配置服务指令即时指令
|
||||
* @Author: caolei
|
||||
* @Date: 2025-10-13
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class NuBizNuCustomerServerInstantServiceImpl extends ServiceImpl<NuBizNuCustomerServerInstantMapper, NuBizNuCustomerServerInstant> implements INuBizNuCustomerServerInstantService {
|
||||
|
||||
}
|
||||
|
|
@ -1,9 +1,14 @@
|
|||
package com.nu.modules.NuBizNuCustomerServer.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
||||
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag;
|
||||
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer;
|
||||
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant;
|
||||
import com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerServerMapper;
|
||||
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerElderTagService;
|
||||
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerInstantService;
|
||||
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerService;
|
||||
import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceCategory;
|
||||
import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective;
|
||||
|
|
@ -11,6 +16,7 @@ import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType;
|
|||
import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceCategoryService;
|
||||
import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceDirectiveService;
|
||||
import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceTypeService;
|
||||
import com.nu.modules.sysconfig.ISysConfigApi;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
|
|
@ -33,10 +39,17 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
|
|||
private INuConfigServiceTypeService nuConfigServiceTypeService;
|
||||
@Autowired
|
||||
private INuConfigServiceDirectiveService nuConfigServiceDirectiveService;
|
||||
@Autowired
|
||||
private INuBizNuCustomerServerInstantService nuBizNuCustomerServerInstantService;
|
||||
@Autowired
|
||||
private INuBizNuCustomerElderTagService nuBizNuCustomerElderTagService;
|
||||
@Autowired
|
||||
private ISysConfigApi sysConfigApi;
|
||||
|
||||
@Override
|
||||
public List<Map<String,Object>> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer) {
|
||||
|
||||
public Map<String,Object> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer) {
|
||||
Map<String,Object> resMap = new HashMap<>();
|
||||
//服务指令计划
|
||||
QueryWrapper<NuBizNuCustomerServer> nuBizNuCustomerServerQueryWrapper = new QueryWrapper<>();
|
||||
nuBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getNuId()),"nu_id",nuBizNuCustomerServer.getNuId());
|
||||
nuBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getCustomerId()),"customer_id",nuBizNuCustomerServer.getCustomerId());
|
||||
|
|
@ -50,25 +63,142 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
|
|||
for(NuBizNuCustomerServer par : groupList){
|
||||
if(StringUtils.equals(groupPositioning1,par.getPositioning())){
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
map.put("nuId",nuBizNuCustomerServer.getNuId());
|
||||
map.put("customerId",nuBizNuCustomerServer.getCustomerId());
|
||||
map.put("directiveId",par.getId());
|
||||
map.put("directiveName",par.getDirectiveName());
|
||||
map.put("categoryName",par.getCategoryName());
|
||||
map.put("typeId",par.getTypeId());
|
||||
map.put("typeName",par.getTypeName());
|
||||
map.put("categoryId",par.getCategoryId());
|
||||
map.put("categoryName",par.getCategoryName());
|
||||
map.put("tagName",par.getTagName());
|
||||
map.put("startTime",par.getStartTime());
|
||||
map.put("endTime",par.getEndTime());
|
||||
map.put("cycleTypeId",par.getCycleType());
|
||||
map.put("cycleType",par.getCycleType());
|
||||
map.put("cycleValue",par.getCycleValue());
|
||||
map.put("positioningLong",par.getPositioningLong());
|
||||
map.put("positioning",par.getPositioning());
|
||||
map.put("nuId",nuBizNuCustomerServer.getNuId());
|
||||
map.put("customerId",nuBizNuCustomerServer.getCustomerId());
|
||||
map.put("izPackage",par.getIzPackage());
|
||||
if(nuBizNuCustomerServer.getImmediateFile()!=null){
|
||||
String immediateFile = getImageNetUrl(nuBizNuCustomerServer.getImmediateFile());
|
||||
map.put("immediateFile",nuBizNuCustomerServer.getImmediateFile());
|
||||
map.put("netImmediateFile",immediateFile);
|
||||
}else{
|
||||
map.put("immediateFile","");
|
||||
map.put("netImmediateFile","");
|
||||
}
|
||||
if(nuBizNuCustomerServer.getImmediateFileFocus()!=null){
|
||||
String immediateFileFocus = getImageNetUrl(nuBizNuCustomerServer.getImmediateFileFocus());
|
||||
map.put("immediateFileFocus",nuBizNuCustomerServer.getImmediateFileFocus());
|
||||
map.put("netImmediateFileFocus",immediateFileFocus);
|
||||
}else{
|
||||
map.put("immediateFileFocus","");
|
||||
map.put("netImmediateFileFocus","");
|
||||
}
|
||||
if(nuBizNuCustomerServer.getPreviewFile()!=null){
|
||||
String previewFile = getImageNetUrl(nuBizNuCustomerServer.getPreviewFile());
|
||||
map.put("previewFile",nuBizNuCustomerServer.getPreviewFile());
|
||||
map.put("netPreviewFile",previewFile);
|
||||
}else{
|
||||
map.put("previewFile","");
|
||||
map.put("netPreviewFile","");
|
||||
}
|
||||
if(nuBizNuCustomerServer.getPreviewFileSmall()!=null){
|
||||
String previewFileSmall = getImageNetUrl(nuBizNuCustomerServer.getPreviewFileSmall());
|
||||
map.put("previewFileSmall",nuBizNuCustomerServer.getPreviewFileSmall());
|
||||
map.put("netPreviewFileSmall",previewFileSmall);
|
||||
}else{
|
||||
map.put("previewFileSmall","");
|
||||
map.put("netPreviewFileSmall","");
|
||||
}
|
||||
childrenList.add(map);
|
||||
}
|
||||
}
|
||||
posMap.put("children",childrenList);
|
||||
allList.add(posMap);
|
||||
}
|
||||
return allList;
|
||||
resMap.put("serviceList",allList);//服务指令计划
|
||||
//即时指令
|
||||
QueryWrapper<NuBizNuCustomerServerInstant> instantQueryWrapper = new QueryWrapper<>();
|
||||
instantQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getNuId()),"nu_id",nuBizNuCustomerServer.getNuId());
|
||||
instantQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getCustomerId()),"customer_id",nuBizNuCustomerServer.getCustomerId());
|
||||
List<NuBizNuCustomerServerInstant> instantList = nuBizNuCustomerServerInstantService.list(instantQueryWrapper);
|
||||
for(NuBizNuCustomerServerInstant pari : instantList){
|
||||
if(pari.getImmediateFile()!=null){
|
||||
String immediateFile = getImageNetUrl(pari.getImmediateFile());
|
||||
pari.setNetImmediateFile(immediateFile);
|
||||
}else{
|
||||
pari.setImmediateFile("");
|
||||
pari.setNetImmediateFile("");
|
||||
}
|
||||
if(pari.getImmediateFileFocus()!=null){
|
||||
String immediateFileFocus = getImageNetUrl(pari.getImmediateFileFocus());
|
||||
pari.setNetImmediateFileFocus(immediateFileFocus);
|
||||
}else{
|
||||
pari.setImmediateFileFocus("");
|
||||
pari.setNetImmediateFileFocus("");
|
||||
}
|
||||
if(pari.getPreviewFile()!=null){
|
||||
String previewFile = getImageNetUrl(pari.getPreviewFile());
|
||||
pari.setNetPreviewFile(previewFile);
|
||||
}else{
|
||||
pari.setPreviewFile("");
|
||||
pari.setNetPreviewFile("");
|
||||
}
|
||||
if(pari.getPreviewFileSmall()!=null){
|
||||
String previewFileSmall = getImageNetUrl(pari.getPreviewFileSmall());
|
||||
pari.setNetPreviewFileSmall(previewFileSmall);
|
||||
}else{
|
||||
pari.setPreviewFileSmall("");
|
||||
pari.setNetPreviewFileSmall("");
|
||||
}
|
||||
}
|
||||
resMap.put("instantList",instantList);
|
||||
NuBizNuCustomerElderTag elderTag = new NuBizNuCustomerElderTag();
|
||||
//体型标签
|
||||
elderTag.setNuId(nuBizNuCustomerServer.getNuId());
|
||||
elderTag.setCustomerId(nuBizNuCustomerServer.getCustomerId());
|
||||
elderTag.setTagType("tx");
|
||||
List<NuBizNuCustomerElderTag> bodyTagList = nuBizNuCustomerElderTagService.getElderTags(elderTag);
|
||||
for(NuBizNuCustomerElderTag bt : bodyTagList){
|
||||
if(bt.getPic()!=null){
|
||||
String pic = getImageNetUrl(bt.getPic());
|
||||
bt.setNetPic(pic);
|
||||
}else{
|
||||
bt.setPic("");
|
||||
bt.setNetPic("");
|
||||
}
|
||||
if(bt.getPicFocus()!=null){
|
||||
String picFocus = getImageNetUrl(bt.getPicFocus());
|
||||
bt.setNetPicFocus(picFocus);
|
||||
}else{
|
||||
bt.setPicFocus("");
|
||||
bt.setNetPicFocus("");
|
||||
}
|
||||
}
|
||||
resMap.put("bodyTagList",bodyTagList);
|
||||
//情绪标签
|
||||
elderTag.setTagType("qx");
|
||||
List<NuBizNuCustomerElderTag> emotionTagList = nuBizNuCustomerElderTagService.getElderTags(elderTag);
|
||||
for(NuBizNuCustomerElderTag et : emotionTagList){
|
||||
if(et.getPic()!=null){
|
||||
String pic = getImageNetUrl(et.getPic());
|
||||
et.setNetPic(pic);
|
||||
}else{
|
||||
et.setPic("");
|
||||
et.setNetPic("");
|
||||
}
|
||||
if(et.getPicFocus()!=null){
|
||||
String picFocus = getImageNetUrl(et.getPicFocus());
|
||||
et.setNetPicFocus(picFocus);
|
||||
}else{
|
||||
et.setPicFocus("");
|
||||
et.setNetPicFocus("");
|
||||
}
|
||||
}
|
||||
resMap.put("emotionTagList",emotionTagList);
|
||||
return resMap;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -100,20 +230,72 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
|
|||
}
|
||||
|
||||
@Override
|
||||
public void addBatch(List<NuBizNuCustomerServer> serverList) {
|
||||
public void addBatch(NuBizNuCustomerServer nuBizNuCustomerServer) {
|
||||
//保存服务指令计划
|
||||
String nuId = nuBizNuCustomerServer.getNuId();
|
||||
String customerId = nuBizNuCustomerServer.getCustomerId();
|
||||
QueryWrapper<NuBizNuCustomerServer> nuBizNuCustomerServerQueryWrapper = new QueryWrapper<>();
|
||||
nuBizNuCustomerServerQueryWrapper.eq("nu_id",nuId);
|
||||
nuBizNuCustomerServerQueryWrapper.eq("customer_id",customerId);
|
||||
baseMapper.delete(nuBizNuCustomerServerQueryWrapper);
|
||||
List<NuBizNuCustomerServer> serverList = nuBizNuCustomerServer.getServerList();
|
||||
if(serverList.size()>0){
|
||||
NuBizNuCustomerServer nuBizNuCustomerServer = serverList.get(0);
|
||||
String nuId = nuBizNuCustomerServer.getNuId();
|
||||
String customerId = nuBizNuCustomerServer.getCustomerId();
|
||||
|
||||
QueryWrapper<NuBizNuCustomerServer> nuBizNuCustomerServerQueryWrapper = new QueryWrapper<>();
|
||||
nuBizNuCustomerServerQueryWrapper.eq("nu_id",nuId);
|
||||
nuBizNuCustomerServerQueryWrapper.eq("customer_id",customerId);
|
||||
baseMapper.delete(nuBizNuCustomerServerQueryWrapper);
|
||||
|
||||
for(NuBizNuCustomerServer par : serverList){
|
||||
par.setNuName(nuBizNuCustomerServer.getNuName());
|
||||
par.setCustomerName(nuBizNuCustomerServer.getCustomerName());
|
||||
baseMapper.insert(par);
|
||||
}
|
||||
}
|
||||
QueryWrapper<NuBizNuCustomerServerInstant> instantQueryWrapper = new QueryWrapper<>();
|
||||
instantQueryWrapper.eq("nu_id",nuId);
|
||||
instantQueryWrapper.eq("customer_id",customerId);
|
||||
nuBizNuCustomerServerInstantService.remove(instantQueryWrapper);
|
||||
List<NuBizNuCustomerServerInstant> instantList = nuBizNuCustomerServer.getInstantList();
|
||||
if(instantList.size()>0){
|
||||
for(NuBizNuCustomerServerInstant pari : instantList){
|
||||
pari.setNuName(nuBizNuCustomerServer.getNuName());
|
||||
pari.setCustomerName(nuBizNuCustomerServer.getCustomerName());
|
||||
nuBizNuCustomerServerInstantService.save(pari);
|
||||
}
|
||||
}
|
||||
|
||||
QueryWrapper<NuBizNuCustomerElderTag> tagQueryWrapper = new QueryWrapper<>();
|
||||
instantQueryWrapper.eq("nu_id",nuId);
|
||||
instantQueryWrapper.eq("customer_id",customerId);
|
||||
nuBizNuCustomerElderTagService.remove(tagQueryWrapper);
|
||||
List<NuBizNuCustomerElderTag> tagList = nuBizNuCustomerServer.getTagList();
|
||||
if(tagList.size()>0){
|
||||
for(NuBizNuCustomerElderTag tg : tagList){
|
||||
tg.setNuName(nuBizNuCustomerServer.getNuName());
|
||||
tg.setCustomerName(nuBizNuCustomerServer.getCustomerName());
|
||||
nuBizNuCustomerElderTagService.save(tg);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取管理平台静态资源路径
|
||||
* @return
|
||||
*/
|
||||
private String getOpeMediaAddress(){
|
||||
JSONObject json = sysConfigApi.getByKey("ope_media_address");
|
||||
if(json!=null){
|
||||
String configValue = json.getString("configValue");
|
||||
if(!configValue.endsWith("/")){
|
||||
configValue += "/";
|
||||
}
|
||||
return configValue;
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
private String getImageNetUrl(String imageUrl){
|
||||
String netUrl = "";
|
||||
String configValue = getOpeMediaAddress();
|
||||
if(!configValue.equals("")){
|
||||
netUrl = configValue + imageUrl;
|
||||
}
|
||||
return netUrl;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,22 +35,32 @@ public class NuConfigServiceDirective implements Serializable {
|
|||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private java.lang.String id;
|
||||
/**服务指令名称*/
|
||||
@Excel(name = "服务指令名称", width = 15)
|
||||
@ApiModelProperty(value = "服务指令名称")
|
||||
private java.lang.String directiveName;
|
||||
/**服务类别id*/
|
||||
@Excel(name = "服务类别id", width = 15)
|
||||
@ApiModelProperty(value = "服务类别id")
|
||||
private java.lang.String categoryId;
|
||||
/**服务类别*/
|
||||
@Excel(name = "服务类别", width = 15)
|
||||
@ApiModelProperty(value = "服务类别")
|
||||
@TableField(exist = false)
|
||||
private java.lang.String categoryName;
|
||||
/**服务类型id*/
|
||||
@Excel(name = "服务类型id", width = 15)
|
||||
@ApiModelProperty(value = "服务类型id")
|
||||
private java.lang.String typeId;
|
||||
/**服务类型*/
|
||||
@Excel(name = "服务类型", width = 15)
|
||||
@ApiModelProperty(value = "服务类型")
|
||||
@TableField(exist = false)
|
||||
private java.lang.String typeName;
|
||||
/**指令标签id*/
|
||||
@Excel(name = "指令标签id", width = 15)
|
||||
@ApiModelProperty(value = "指令标签id")
|
||||
private java.lang.String instructionTagId;
|
||||
/**服务指令名称*/
|
||||
@Excel(name = "服务指令名称", width = 15)
|
||||
@ApiModelProperty(value = "服务指令名称")
|
||||
private java.lang.String directiveName;
|
||||
/**收费价格*/
|
||||
@Excel(name = "收费价格", width = 15)
|
||||
@ApiModelProperty(value = "收费价格")
|
||||
|
|
@ -75,6 +85,11 @@ public class NuConfigServiceDirective implements Serializable {
|
|||
@Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15)
|
||||
@ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理")
|
||||
private java.lang.String cycleType;
|
||||
/**周期类型 1日常护理 2周期护理 3即时护理*/
|
||||
@Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15)
|
||||
@ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理")
|
||||
@TableField(exist = false)
|
||||
private java.lang.String cycleTypeName;
|
||||
/**排序*/
|
||||
@Excel(name = "排序", width = 15)
|
||||
@ApiModelProperty(value = "排序")
|
||||
|
|
@ -133,6 +148,16 @@ public class NuConfigServiceDirective implements Serializable {
|
|||
*/
|
||||
@ApiModelProperty(value = "即时指令图标")
|
||||
private java.lang.String immediateFileFocus;
|
||||
/**
|
||||
* 服务指令图片大图
|
||||
*/
|
||||
@ApiModelProperty(value = "服务指令图片大图")
|
||||
private java.lang.String previewFile;
|
||||
/**
|
||||
* 服务指令图片小图
|
||||
*/
|
||||
@ApiModelProperty(value = "服务指令图片小图")
|
||||
private java.lang.String previewFileSmall;
|
||||
//体型标签
|
||||
@TableField(exist = false)
|
||||
private String bodyTagName;
|
||||
|
|
|
|||
|
|
@ -3,47 +3,42 @@
|
|||
<mapper namespace="com.nu.modules.nuApiServiceCategory.mapper.NuConfigServiceDirectiveMapper">
|
||||
|
||||
<select id="selectList" resultType="com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective">
|
||||
select *
|
||||
from (SELECT csd.id AS id,
|
||||
csd.directive_name,
|
||||
csd.category_id,
|
||||
csd.type_id,
|
||||
csd.instruction_tag_id,
|
||||
csd.toll_price,
|
||||
csd.com_price,
|
||||
csd.iz_reimbursement,
|
||||
csd.iz_preferential,
|
||||
csd.charging_frequency,
|
||||
dict.item_text AS cycle_type,
|
||||
csd.service_content,
|
||||
csd.service_duration,
|
||||
csd.iz_enabled,
|
||||
csd.del_flag,
|
||||
csd.create_by,
|
||||
csd.create_time,
|
||||
csd.update_by,
|
||||
csd.update_time,
|
||||
csd.sys_org_code,
|
||||
csd.mp3_file,
|
||||
csd.mp4_file,
|
||||
csd.immediate_file as immediateFile,
|
||||
csd.immediate_file_focus as immediateFileFocus,
|
||||
cdt.tag_name as bodyTagName,
|
||||
cet.tag_name AS emotionTagName
|
||||
FROM nu_config_service_directive csd
|
||||
LEFT JOIN (select GROUP_CONCAT(c.tag_name) tag_name, b.directive_id
|
||||
from nu_directive_body_tag b
|
||||
LEFT JOIN nu_config_body_tag c on b.tag_id = c.id
|
||||
GROUP BY b.directive_id) cdt on csd.id = cdt.directive_id
|
||||
LEFT JOIN (select GROUP_CONCAT(c.tag_name) tag_name, b.directive_id
|
||||
from nu_directive_emotion_tag b
|
||||
LEFT JOIN nu_config_emotion_tag c on b.tag_id = c.id
|
||||
GROUP BY b.directive_id) cet on csd.id = cet.directive_id
|
||||
LEFT JOIN nu_config_service_type cst ON csd.type_id = cst.id
|
||||
LEFT JOIN (select * from sys_dict_item where dict_id = '1900374791386140674') dict
|
||||
on csd.cycle_type = dict.item_value) a
|
||||
${ew.customSqlSegment}
|
||||
|
||||
select * from (
|
||||
SELECT csd.id AS id,
|
||||
csd.directive_name,
|
||||
csd.instruction_tag_id,
|
||||
csd.category_id,
|
||||
csc.category_name as categoryName,
|
||||
csd.type_id,
|
||||
cst.type_name as typeName,
|
||||
csd.toll_price,
|
||||
csd.com_price,
|
||||
csd.iz_reimbursement,
|
||||
csd.iz_preferential,
|
||||
csd.charging_frequency,
|
||||
csd.cycle_type as cycleType,
|
||||
dict.item_text AS cycleTypeName,
|
||||
csd.service_content,
|
||||
csd.service_duration,
|
||||
csd.iz_enabled,
|
||||
csd.del_flag,
|
||||
csd.create_by,
|
||||
csd.create_time,
|
||||
csd.update_by,
|
||||
csd.update_time,
|
||||
csd.sys_org_code,
|
||||
csd.mp3_file,
|
||||
csd.mp4_file,
|
||||
csd.preview_file as previewFile,
|
||||
csd.preview_file_small as previewFileSmall,
|
||||
csd.immediate_file as immediateFile,
|
||||
csd.immediate_file_focus as immediateFileFocus
|
||||
FROM nu_config_service_directive csd
|
||||
LEFT JOIN nu_config_service_category csc ON csd.category_id = csc.id
|
||||
LEFT JOIN nu_config_service_type cst ON csd.type_id = cst.id
|
||||
LEFT JOIN (select * from sys_dict_item where dict_id = '1900374791386140674') dict on csd.cycle_type = dict.item_value
|
||||
) a
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -80,19 +80,44 @@ public class NuConfigServiceCategoryServiceImpl extends ServiceImpl<NuConfigServ
|
|||
directiceMap.put("id",directicePar.getId());
|
||||
directiceMap.put("title",directicePar.getDirectiveName());
|
||||
directiceMap.put("serviceDuration",directicePar.getServiceDuration());
|
||||
directiceMap.put("tagName",directicePar.getBodyTagName());
|
||||
directiceMap.put("cycleType",directicePar.getCycleType());
|
||||
directiceMap.put("categoryId",directicePar.getCategoryId());
|
||||
directiceMap.put("categoryName",directicePar.getCategoryName());
|
||||
directiceMap.put("typeId",directicePar.getTypeId());
|
||||
directiceMap.put("typeName",directicePar.getTypeName());
|
||||
directiceMap.put("cycleTypeId",directicePar.getCycleType());
|
||||
directiceMap.put("cycleType",directicePar.getCycleTypeName());
|
||||
directiceMap.put("izPackage","0");
|
||||
if(directicePar.getImmediateFile()!=null){
|
||||
String immediateFile = getImageNetUrl(directicePar.getImmediateFile());
|
||||
directiceMap.put("immediateFile",immediateFile);
|
||||
directiceMap.put("immediateFile",directicePar.getImmediateFile());
|
||||
directiceMap.put("netImmediateFile",immediateFile);
|
||||
}else{
|
||||
directiceMap.put("immediateFile","");
|
||||
directiceMap.put("netImmediateFile","");
|
||||
}
|
||||
if(directicePar.getImmediateFileFocus()!=null){
|
||||
String immediateFileFocus = getImageNetUrl(directicePar.getImmediateFileFocus());
|
||||
directiceMap.put("immediateFileFocus",immediateFileFocus);
|
||||
directiceMap.put("immediateFileFocus",directicePar.getImmediateFileFocus());
|
||||
directiceMap.put("netImmediateFileFocus",immediateFileFocus);
|
||||
}else{
|
||||
directiceMap.put("immediateFileFocus","");
|
||||
directiceMap.put("netImmediateFileFocus","");
|
||||
}
|
||||
if(directicePar.getPreviewFile()!=null){
|
||||
String previewFile = getImageNetUrl(directicePar.getPreviewFile());
|
||||
directiceMap.put("previewFile",directicePar.getPreviewFile());
|
||||
directiceMap.put("netPreviewFile",previewFile);
|
||||
}else{
|
||||
directiceMap.put("previewFile","");
|
||||
directiceMap.put("netPreviewFile","");
|
||||
}
|
||||
if(directicePar.getPreviewFileSmall()!=null){
|
||||
String previewFileSmall = getImageNetUrl(directicePar.getPreviewFileSmall());
|
||||
directiceMap.put("previewFileSmall",directicePar.getPreviewFileSmall());
|
||||
directiceMap.put("netPreviewFileSmall",previewFileSmall);
|
||||
}else{
|
||||
directiceMap.put("previewFileSmall","");
|
||||
directiceMap.put("netPreviewFileSmall","");
|
||||
}
|
||||
directiceMap.put("levle","3");
|
||||
directiceMapList.add(directiceMap);
|
||||
|
|
|
|||
|
|
@ -60,6 +60,13 @@ public class ElderTag implements Serializable {
|
|||
/**图标md5值*/
|
||||
@ApiModelProperty(value = "图标md5值")
|
||||
private java.lang.String picMd5;
|
||||
/**焦点图标*/
|
||||
@Excel(name = "焦点图标", width = 15)
|
||||
@ApiModelProperty(value = "焦点图标")
|
||||
private java.lang.String picFocus;
|
||||
/**图标md5值*/
|
||||
@ApiModelProperty(value = "图标md5值")
|
||||
private java.lang.String picFocusMd5;
|
||||
/**排序*/
|
||||
@Excel(name = "排序", width = 15)
|
||||
@ApiModelProperty(value = "排序")
|
||||
|
|
|
|||
Loading…
Reference in New Issue