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

修改查询返回值，并去掉无用的表

This commit is contained in:
yangjun 2025-09-09 16:11:23 +08:00
parent cbdea5912c
commit 5200d5cc8e
13 changed files with 15 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/customerDirective/controller/NuCustomerDirectiveController.java
View File

@ -1,180 +0,0 @@
package com.nu.modules.customerDirective.controller;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.util.oConvertUtils;
import com.nu.modules.customerDirective.entity.NuCustomerDirective;
import com.nu.modules.customerDirective.service.INuCustomerDirectiveService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
* @Description: 客户配置服务指令
* @Author: jeecg-boot
* @Date: 2025-09-04
* @Version: V1.0
*/
@Api(tags="客户配置服务指令")
@RestController
@RequestMapping("/customerDirective/nuCustomerDirective")
@Slf4j
public class NuCustomerDirectiveController extends JeecgController<NuCustomerDirective, INuCustomerDirectiveService> {
@Autowired
private INuCustomerDirectiveService nuCustomerDirectiveService;
/**
* 分页列表查询
*
* @param nuCustomerDirective
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "客户配置服务指令-分页列表查询")
@ApiOperation(value="客户配置服务指令-分页列表查询", notes="客户配置服务指令-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<NuCustomerDirective>> queryPageList(NuCustomerDirective nuCustomerDirective,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<NuCustomerDirective> queryWrapper = QueryGenerator.initQueryWrapper(nuCustomerDirective, req.getParameterMap());
Page<NuCustomerDirective> page = new Page<NuCustomerDirective>(pageNo, pageSize);
IPage<NuCustomerDirective> pageList = nuCustomerDirectiveService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param nuCustomerDirective
* @return
*/
@AutoLog(value = "客户配置服务指令-添加")
@ApiOperation(value="客户配置服务指令-添加", notes="客户配置服务指令-添加")
@RequiresPermissions("customerDirective:nu_customer_directive:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody NuCustomerDirective nuCustomerDirective) {
nuCustomerDirectiveService.save(nuCustomerDirective);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param nuCustomerDirective
* @return
*/
@AutoLog(value = "客户配置服务指令-编辑")
@ApiOperation(value="客户配置服务指令-编辑", notes="客户配置服务指令-编辑")
@RequiresPermissions("customerDirective:nu_customer_directive:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody NuCustomerDirective nuCustomerDirective) {
nuCustomerDirectiveService.updateById(nuCustomerDirective);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "客户配置服务指令-通过id删除")
@ApiOperation(value="客户配置服务指令-通过id删除", notes="客户配置服务指令-通过id删除")
@RequiresPermissions("customerDirective:nu_customer_directive:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
nuCustomerDirectiveService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "客户配置服务指令-批量删除")
@ApiOperation(value="客户配置服务指令-批量删除", notes="客户配置服务指令-批量删除")
@RequiresPermissions("customerDirective:nu_customer_directive:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.nuCustomerDirectiveService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "客户配置服务指令-通过id查询")
@ApiOperation(value="客户配置服务指令-通过id查询", notes="客户配置服务指令-通过id查询")
@GetMapping(value = "/queryById")
public Result<NuCustomerDirective> queryById(@RequestParam(name="id",required=true) String id) {
NuCustomerDirective nuCustomerDirective = nuCustomerDirectiveService.getById(id);
if(nuCustomerDirective==null) {
return Result.error("未找到对应数据");
}
return Result.OK(nuCustomerDirective);
}
/**
* 导出excel
*
* @param request
* @param nuCustomerDirective
*/
@RequiresPermissions("customerDirective:nu_customer_directive:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, NuCustomerDirective nuCustomerDirective) {
return super.exportXls(request, nuCustomerDirective, NuCustomerDirective.class, "客户配置服务指令");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("customerDirective:nu_customer_directive:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, NuCustomerDirective.class);
}
}

121
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/customerDirective/entity/NuCustomerDirective.java
View File

@ -1,121 +0,0 @@
package com.nu.modules.customerDirective.entity;
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 org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 客户配置服务指令
* @Author: jeecg-boot
* @Date: 2025-09-04
* @Version: V1.0
*/
@Data
@TableName("nu_customer_directive")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_customer_directive对象", description="客户配置服务指令")
public class NuCustomerDirective implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
/**createBy*/
@ApiModelProperty(value = "createBy")
private String createBy;
/**createTime*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "createTime")
private Date createTime;
/**updateBy*/
@ApiModelProperty(value = "updateBy")
private String updateBy;
/**updateTime*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "updateTime")
private Date updateTime;
/**客户id*/
@Excel(name = "客户id", width = 15)
@ApiModelProperty(value = "客户id")
private String customerId;
/**服务指令*/
@Excel(name = "服务指令", width = 15)
@ApiModelProperty(value = "服务指令")
private String directiveId;
/**服务开始时间*/
@Excel(name = "服务开始时间", width = 15)
@ApiModelProperty(value = "服务开始时间")
private String serverStartTime;
/**服务结束时间*/
@Excel(name = "服务结束时间", width = 15)
@ApiModelProperty(value = "服务结束时间")
private String serverEndTime;
/**服务时长*/
@Excel(name = "服务时长", width = 15)
@ApiModelProperty(value = "服务时长")
private String serviceDuration;
/**是否参与医保报销 0不报销 1报销*/
@Excel(name = "是否参与医保报销 0不报销 1报销", width = 15)
@ApiModelProperty(value = "是否参与医保报销 0不报销 1报销")
private String izReimbursement;
/**是否参与机构优惠 0不参与 1参与*/
@Excel(name = "是否参与机构优惠 0不参与 1参与", width = 15)
@ApiModelProperty(value = "是否参与机构优惠 0不参与 1参与")
private String izPreferential;
/**收费价格*/
@Excel(name = "收费价格", width = 15)
@ApiModelProperty(value = "收费价格")
private BigDecimal tollPrice;
/**提成价格*/
@Excel(name = "提成价格", width = 15)
@ApiModelProperty(value = "提成价格")
private BigDecimal comPrice;
/**分类标签*/
@Excel(name = "分类标签", width = 15)
@ApiModelProperty(value = "分类标签")
private String instructionTagId;
/**服务类别*/
@Excel(name = "服务类别", width = 15)
@ApiModelProperty(value = "服务类别")
private String categoryId;
/**服务类型*/
@Excel(name = "服务类型", width = 15)
@ApiModelProperty(value = "服务类型")
private String typeId;
/**周期类型 1日常护理 2周期护理 3即时护理*/
@Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15)
@ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理")
private String cycleType;
/**医保报销比例*/
@Excel(name = "医保报销比例", width = 15)
@ApiModelProperty(value = "医保报销比例")
private String reimbursementBl;
/**机构优惠比例*/
@Excel(name = "机构优惠比例", width = 15)
@ApiModelProperty(value = "机构优惠比例")
private String preferentialBl;
/**服务指令名称*/
@Excel(name = "服务指令名称", width = 15)
@ApiModelProperty(value = "服务指令名称")
private String directiveName;
}

17
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/customerDirective/mapper/NuCustomerDirectiveMapper.java
View File

@ -1,17 +0,0 @@
package com.nu.modules.customerDirective.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.customerDirective.entity.NuCustomerDirective;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 客户配置服务指令
* @Author: jeecg-boot
* @Date: 2025-09-04
* @Version: V1.0
*/
public interface NuCustomerDirectiveMapper extends BaseMapper<NuCustomerDirective> {
}

5
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/customerDirective/mapper/xml/NuCustomerDirectiveMapper.xml
View File

@ -1,5 +0,0 @@
<?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.customerDirective.mapper.NuCustomerDirectiveMapper">
</mapper>

14
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/customerDirective/service/INuCustomerDirectiveService.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.customerDirective.service;
import com.nu.modules.customerDirective.entity.NuCustomerDirective;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 客户配置服务指令
* @Author: jeecg-boot
* @Date: 2025-09-04
* @Version: V1.0
*/
public interface INuCustomerDirectiveService extends IService<NuCustomerDirective> {
}

19
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/customerDirective/service/impl/NuCustomerDirectiveServiceImpl.java
View File

@ -1,19 +0,0 @@
package com.nu.modules.customerDirective.service.impl;
import com.nu.modules.customerDirective.entity.NuCustomerDirective;
import com.nu.modules.customerDirective.mapper.NuCustomerDirectiveMapper;
import com.nu.modules.customerDirective.service.INuCustomerDirectiveService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 客户配置服务指令
* @Author: jeecg-boot
* @Date: 2025-09-04
* @Version: V1.0
*/
@Service
public class NuCustomerDirectiveServiceImpl extends ServiceImpl<NuCustomerDirectiveMapper, NuCustomerDirective> implements INuCustomerDirectiveService {
}

1
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java
View File

@ -140,6 +140,7 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
cameraInfoList = new ArrayList<>();
}
cameraInfoList.add(cameraInfoDto);
nuBaseInfoApiDto.setCameraInfo(cameraInfoList);
}
});
//赋值老人信息

2
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBizCustomerInfo/controller/NuBizCustomerInfoController.java
View File

@ -102,7 +102,7 @@ public class NuBizCustomerInfoController extends JeecgController<NuBizCustomerIn
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody NuBizCustomerInfo nuBizCustomerInfo) {
nuBizCustomerInfoService.updateById(nuBizCustomerInfo);
return Result.OK("编辑成功!");
return Result.OK("操作成功!");
}
/**

4
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBizCustomerInfo/entity/NuBizCustomerInfo.java
View File

@ -41,7 +41,7 @@ public class NuBizCustomerInfo implements Serializable {
/**护理单元*/
@Excel(name = "护理单元", width = 15)
@ApiModelProperty(value = "护理单元")
@Dict(dicCode = "id",dicText = "nu_name",dictTable = "nu_base_info")
@Dict(dicCode = "nu_id",dicText = "nu_name",dictTable = "nu_base_info")
private java.lang.String nuId;
/**姓名*/
@Excel(name = "姓名", width = 15)
@ -50,7 +50,7 @@ public class NuBizCustomerInfo implements Serializable {
/**性别*/
@Excel(name = "性别", width = 15)
@ApiModelProperty(value = "性别")
// @Dict(dicCode = "sex")
@Dict(dicCode = "sex")
private java.lang.String customerSex;
/**年龄*/
@Excel(name = "年龄", width = 15)

2
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java
View File

@ -27,7 +27,7 @@ import lombok.experimental.Accessors;
* @Version: V1.0
*/
@Data
@TableName("nu_biz_nu_customer_server_care")
@TableName("nu_biz_nu_customer_server")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_nu_customer_server_care对象", description="护理单元客户配置服务指令")

1
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
View File

@ -52,6 +52,7 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
Map<String,Object> map = new HashMap<>();
map.put("id",par.getId());
map.put("directiveName",par.getDirectiveName());
map.put("categoryName",par.getCategoryName());
map.put("typeName",par.getTypeName());
map.put("tagName",par.getTagName());
map.put("startTime",par.getStartTime());

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml
View File

@ -17,6 +17,7 @@
<result property="startTimeStr" column="start_time_str" />
<result property="endTimeStr" column="end_time_str" />
<result property="instructionTagId" column="instruction_tag_id" />
<result property="totalDuration" column="total_duration" />
<!-- 关联的指令列表 -->
<collection property="directives" ofType="com.nu.modules.servicedirective.entity.ConfigServiceDirective">
<id property="id" column="directive_id" />
@ -94,6 +95,7 @@
dp.start_time_str,
dp.end_time_str,
dp.instruction_tag_id,
dp.total_duration,
csd.id AS directive_id,
csd.directive_name,
csd.category_id,

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/service/impl/DirectivePackageServiceImpl.java
View File

@ -26,13 +26,13 @@ public class DirectivePackageServiceImpl extends ServiceImpl<DirectivePackageMap
baseMapper.deleteDirectives(directivePackage);
baseMapper.saveDirectives(directivePackage);
//计算总时长
Long duration = 0l;
for (ConfigServiceDirective directive : directivePackage.getDirectives()) {
if(StringUtils.isNotBlank(directive.getServiceDuration())){
duration += Long.parseLong(directive.getServiceDuration());
}
}
baseMapper.updateTotalDurationInt(directivePackage.getId(),duration);
// Long duration = 0l;
// for (ConfigServiceDirective directive : directivePackage.getDirectives()) {
// if(StringUtils.isNotBlank(directive.getServiceDuration())){
// duration += Long.parseLong(directive.getServiceDuration());
// }
// }
// baseMapper.updateTotalDurationInt(directivePackage.getId(),duration);
}
@Override