计算完成一半

ruoyi-admin/src/main/java/org/dromara/web/controller/InvoiceSettingController.java

@@ -0,0 +1,105 @@
+package org.dromara.web.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.web.domain.vo.InvoiceSettingVo;
+import org.dromara.web.domain.bo.InvoiceSettingBo;
+import org.dromara.web.service.IInvoiceSettingService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 发票设置
+ *
+ * @author Huanyi
+ * @date 2025-08-11
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/web/setting")
+public class InvoiceSettingController extends BaseController {
+
+    private final IInvoiceSettingService invoiceSettingService;
+
+    /**
+     * 查询发票设置列表
+     */
+    @SaCheckPermission("web:setting:list")
+    @GetMapping("/list")
+    public TableDataInfo<InvoiceSettingVo> list(InvoiceSettingBo bo, PageQuery pageQuery) {
+        return invoiceSettingService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出发票设置列表
+     */
+    @SaCheckPermission("web:setting:export")
+    @Log(title = "发票设置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(InvoiceSettingBo bo, HttpServletResponse response) {
+        List<InvoiceSettingVo> list = invoiceSettingService.queryList(bo);
+        ExcelUtil.exportExcel(list, "发票设置", InvoiceSettingVo.class, response);
+    }
+
+    /**
+     * 获取发票设置详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("web:setting:query")
+    @GetMapping("/{id}")
+    public R<InvoiceSettingVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(invoiceSettingService.queryById(id));
+    }
+
+    /**
+     * 新增发票设置
+     */
+    @SaCheckPermission("web:setting:add")
+    @Log(title = "发票设置", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody InvoiceSettingBo bo) {
+        return toAjax(invoiceSettingService.insertByBo(bo));
+    }
+
+    /**
+     * 修改发票设置
+     */
+    @SaCheckPermission("web:setting:edit")
+    @Log(title = "发票设置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody InvoiceSettingBo bo) {
+        return toAjax(invoiceSettingService.updateByBo(bo));
+    }
+
+    /**
+     * 删除发票设置
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("web:setting:remove")
+    @Log(title = "发票设置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(invoiceSettingService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-admin/src/main/java/org/dromara/web/domain/InvoiceSetting.java

@@ -0,0 +1,59 @@
+package org.dromara.web.domain;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 发票设置对象 invoice_setting
+ *
+ * @author Huanyi
+ * @date 2025-08-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("invoice_setting")
+public class InvoiceSetting extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 收款人
+     */
+    private String payee;
+
+    /**
+     * 复核人
+     */
+    private String reviewer;
+
+    /**
+     * 开票人
+     */
+    private String drawer;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 开票人类型
+     * 1、固定人员名称
+     * 2、跟随账号名称
+     */
+    private Integer drawerType;
+
+}

ruoyi-admin/src/main/java/org/dromara/web/domain/bo/InvoiceSettingBo.java

@@ -0,0 +1,51 @@
+package org.dromara.web.domain.bo;
+
+import org.dromara.web.domain.InvoiceSetting;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 发票设置业务对象 invoice_setting
+ *
+ * @author Huanyi
+ * @date 2025-08-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InvoiceSetting.class, reverseConvertGenerate = false)
+public class InvoiceSettingBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 收款人
+     */
+    private String payee;
+
+    /**
+     * 复核人
+     */
+    private String reviewer;
+
+    /**
+     * 开票人
+     */
+    private String drawer;
+
+    /**
+     * 开票人类型
+     * 0、固定人员名称
+     * 1、跟随账号名称
+     */
+    private Integer drawerType;
+
+}

ruoyi-admin/src/main/java/org/dromara/web/domain/vo/ChargeRecordVo.java

@@ -171,5 +171,6 @@ public class ChargeRecordVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private Date createTime;
 
 }

ruoyi-admin/src/main/java/org/dromara/web/domain/vo/InvoiceSettingVo.java

@@ -0,0 +1,63 @@
+package org.dromara.web.domain.vo;
+
+import org.dromara.web.domain.InvoiceSetting;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 发票设置视图对象 invoice_setting
+ *
+ * @author Huanyi
+ * @date 2025-08-11
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = InvoiceSetting.class)
+public class InvoiceSettingVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 收款人
+     */
+    @ExcelProperty(value = "收款人")
+    private String payee;
+
+    /**
+     * 复核人
+     */
+    @ExcelProperty(value = "复核人")
+    private String reviewer;
+
+    /**
+     * 开票人
+     */
+    @ExcelProperty(value = "开票人")
+    private String drawer;
+
+    /**
+     * 开票人类型
+     * 1、固定人员名称
+     * 2、跟随账号名称
+     */
+    @ExcelProperty(value = "开票人类型")
+    private Integer drawerType;
+    
+}

ruoyi-admin/src/main/java/org/dromara/web/mapper/InvoiceSettingMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.web.mapper;
+
+import org.dromara.web.domain.InvoiceSetting;
+import org.dromara.web.domain.vo.InvoiceSettingVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 发票设置Mapper接口
+ *
+ * @author Huanyi
+ * @date 2025-08-11
+ */
+public interface InvoiceSettingMapper extends BaseMapperPlus<InvoiceSetting, InvoiceSettingVo> {
+
+}

ruoyi-admin/src/main/java/org/dromara/web/service/IInvoiceSettingService.java

@@ -0,0 +1,68 @@
+package org.dromara.web.service;
+
+import org.dromara.web.domain.vo.InvoiceSettingVo;
+import org.dromara.web.domain.bo.InvoiceSettingBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 发票设置Service接口
+ *
+ * @author Huanyi
+ * @date 2025-08-11
+ */
+public interface IInvoiceSettingService {
+
+    /**
+     * 查询发票设置
+     *
+     * @param id 主键
+     * @return 发票设置
+     */
+    InvoiceSettingVo queryById(Long id);
+
+    /**
+     * 分页查询发票设置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 发票设置分页列表
+     */
+    TableDataInfo<InvoiceSettingVo> queryPageList(InvoiceSettingBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的发票设置列表
+     *
+     * @param bo 查询条件
+     * @return 发票设置列表
+     */
+    List<InvoiceSettingVo> queryList(InvoiceSettingBo bo);
+
+    /**
+     * 新增发票设置
+     *
+     * @param bo 发票设置
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(InvoiceSettingBo bo);
+
+    /**
+     * 修改发票设置
+     *
+     * @param bo 发票设置
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(InvoiceSettingBo bo);
+
+    /**
+     * 校验并批量删除发票设置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-admin/src/main/java/org/dromara/web/service/impl/InvoiceSettingServiceImpl.java

@@ -0,0 +1,134 @@
+package org.dromara.web.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.web.domain.bo.InvoiceSettingBo;
+import org.dromara.web.domain.vo.InvoiceSettingVo;
+import org.dromara.web.domain.InvoiceSetting;
+import org.dromara.web.mapper.InvoiceSettingMapper;
+import org.dromara.web.service.IInvoiceSettingService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 发票设置Service业务层处理
+ *
+ * @author Huanyi
+ * @date 2025-08-11
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class InvoiceSettingServiceImpl implements IInvoiceSettingService {
+
+    private final InvoiceSettingMapper baseMapper;
+
+    /**
+     * 查询发票设置
+     *
+     * @param id 主键
+     * @return 发票设置
+     */
+    @Override
+    public InvoiceSettingVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询发票设置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 发票设置分页列表
+     */
+    @Override
+    public TableDataInfo<InvoiceSettingVo> queryPageList(InvoiceSettingBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<InvoiceSetting> lqw = buildQueryWrapper(bo);
+        Page<InvoiceSettingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的发票设置列表
+     *
+     * @param bo 查询条件
+     * @return 发票设置列表
+     */
+    @Override
+    public List<InvoiceSettingVo> queryList(InvoiceSettingBo bo) {
+        LambdaQueryWrapper<InvoiceSetting> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<InvoiceSetting> buildQueryWrapper(InvoiceSettingBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<InvoiceSetting> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(InvoiceSetting::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getPayee()), InvoiceSetting::getPayee, bo.getPayee());
+        lqw.eq(StringUtils.isNotBlank(bo.getReviewer()), InvoiceSetting::getReviewer, bo.getReviewer());
+        lqw.eq(StringUtils.isNotBlank(bo.getDrawer()), InvoiceSetting::getDrawer, bo.getDrawer());
+        return lqw;
+    }
+
+    /**
+     * 新增发票设置
+     *
+     * @param bo 发票设置
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(InvoiceSettingBo bo) {
+        InvoiceSetting add = MapstructUtils.convert(bo, InvoiceSetting.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改发票设置
+     *
+     * @param bo 发票设置
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(InvoiceSettingBo bo) {
+        InvoiceSetting update = MapstructUtils.convert(bo, InvoiceSetting.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(InvoiceSetting entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除发票设置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-admin/src/main/java/org/dromara/web/service/impl/ProductNutritionServiceImpl.java

@@ -177,13 +177,7 @@ public class ProductNutritionServiceImpl implements IProductNutritionService {
 
     @Override
     public TableDataInfo<ProductNutritionVo> listAll() {
-        List<ProductNutritionVo> dataList = baseMapper.selectVoList(Wrappers.lambdaQuery(ProductNutrition.class)
-            .select(ProductNutrition::getId, ProductNutrition::getProductName, ProductNutrition::getProductCategory,
-                ProductNutrition::getProductSpec, ProductNutrition::getProductSpecUnit, ProductNutrition::getPackageUnit,
-                ProductNutrition::getConfigSalePrice, ProductNutrition::getPackagePrice, ProductNutrition::getCalorie,
-                ProductNutrition::getDefaultUsage, ProductNutrition::getProductCode,
-                ProductNutrition::getProtein, ProductNutrition::getFat, ProductNutrition::getCarbohydrate)
-            .orderByDesc(ProductNutrition::getId));
+        List<ProductNutritionVo> dataList = baseMapper.selectVoList(Wrappers.lambdaQuery(ProductNutrition.class).orderByDesc(ProductNutrition::getId));
 
         if (CollUtil.isNotEmpty(dataList)) {
             Map<String, List<SysDictDataVo>> dictMap = dataService.selectGroupByType(

ruoyi-admin/src/main/resources/mapper/InvoiceSettingMapper.xml

@@ -0,0 +1,7 @@
+<?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="org.dromara.web.mapper.InvoiceSettingMapper">
+
+</mapper>

script/sql/biz/create.sql

@@ -444,3 +444,20 @@ CREATE TABLE `enteral_nutrition_template`
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_unicode_ci COMMENT ='肠内营养模板';
+
+CREATE TABLE `invoice_setting`
+(
+    `id`          bigint PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `tenant_id`            varchar(20) COLLATE utf8mb4_unicode_ci  DEFAULT '000000' COMMENT '租户编号',
+    `payee`       varchar(255) COMMENT '收款人',
+    `reviewer`    varchar(255) COMMENT '复核人',
+    `drawer`      varchar(255) COMMENT '开票人',
+    `del_flag`    char(1) COLLATE utf8mb4_unicode_ci     DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
+    `create_dept` bigint                                 DEFAULT NULL COMMENT '创建部门',
+    `create_by`   varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者',
+    `create_time` datetime                               DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_by`   varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者',
+    `update_time` datetime                               DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci COMMENT ='发票设置';

script/sql/biz/update.sql

@@ -19,3 +19,5 @@ ADD COLUMN signature_img VARCHAR(200) COMMENT '签名图片路径';
 
 ALTER TABLE `enteral_nutrition_template` ADD COLUMN `type` tinyint(1) COMMENT '处方类型';
 ALTER TABLE `enteral_nutrition_template` ADD COLUMN `template_type` tinyint(1) COMMENT '模板类型(0 个人模板; 1 基础公共模板)';
+
+ALTER TABLE `invoice_setting` ADD COLUMN `drawer_type` tinyint(1) COMMENT '开票人类型(0 固定人员名称; 1 跟随账号名称)';