费控字段添加

hx-account/src/main/java/com/fjhx/account/controller/cost/CostControlController.java

@@ -0,0 +1,71 @@
+package com.fjhx.account.controller.cost;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.cost.dto.CostControlDto;
+import com.fjhx.account.entity.cost.dto.CostControlSelectDto;
+import com.fjhx.account.entity.cost.vo.CostControlVo;
+import com.fjhx.account.service.cost.CostControlService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 费控 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@RestController
+@RequestMapping("/costControl")
+public class CostControlController {
+
+    @Autowired
+    private CostControlService costControlService;
+
+    /**
+     * 费控分页
+     */
+    @PostMapping("/page")
+    public Page<CostControlVo> page(@RequestBody CostControlSelectDto dto) {
+        return costControlService.getPage(dto);
+    }
+
+    /**
+     * 费控明细
+     */
+    @PostMapping("/detail")
+    public CostControlVo detail(@RequestBody BaseSelectDto dto) {
+        return costControlService.detail(dto.getId());
+    }
+
+    /**
+     * 费控新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody CostControlDto costControlDto) {
+        costControlService.add(costControlDto);
+    }
+
+    /**
+     * 费控编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody CostControlDto costControlDto) {
+        costControlService.edit(costControlDto);
+    }
+
+    /**
+     * 费控删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        costControlService.delete(dto.getId());
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/controller/cost/CostControlDetailController.java

@@ -0,0 +1,20 @@
+package com.fjhx.account.controller.cost;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 费控明细 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@RestController
+@RequestMapping("/costControlDetail")
+public class CostControlDetailController {
+
+
+}

hx-account/src/main/java/com/fjhx/account/entity/cost/dto/CostControlDetailDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.cost.dto;
+
+import com.fjhx.account.entity.cost.po.CostControlDetail;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 费控明细新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class CostControlDetailDto extends CostControlDetail {
+
+}

hx-account/src/main/java/com/fjhx/account/entity/cost/dto/CostControlDetailSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.cost.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 费控明细列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class CostControlDetailSelectDto extends BaseSelectDto {
+
+}

hx-account/src/main/java/com/fjhx/account/entity/cost/dto/CostControlDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.cost.dto;
+
+import com.fjhx.account.entity.cost.po.CostControl;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 费控新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class CostControlDto extends CostControl {
+
+}

hx-account/src/main/java/com/fjhx/account/entity/cost/dto/CostControlSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.cost.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 费控列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class CostControlSelectDto extends BaseSelectDto {
+
+}

hx-account/src/main/java/com/fjhx/account/entity/cost/po/CostControl.java

@@ -0,0 +1,101 @@
+package com.fjhx.account.entity.cost.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 费控
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+@TableName("cost_control")
+public class CostControl extends BasePo {
+
+    /**
+     * 交易类型10收入20支出
+     */
+    private Integer tradeType;
+
+    /**
+     * 费用类型
+     */
+    private String costType;
+
+    /**
+     * 记账凭证号
+     */
+    private String voucherNo;
+
+    /**
+     * 申请时间
+     */
+    private String applyTime;
+
+    /**
+     * 流水号
+     */
+    private String code;
+
+    /**
+     * 物流公司id
+     */
+    private String logisticsCompanyId;
+
+    /**
+     * 是否提交凭证
+     */
+    private String isVoucher;
+
+    /**
+     * 所属中心
+     */
+    private String companyId;
+
+    /**
+     * 所属部门
+     */
+    private String deptId;
+
+    /**
+     * 申请人id
+     */
+    private String applyUserId;
+
+    /**
+     * 是否预付
+     */
+    private String isAdvance;
+
+    /**
+     * 合计金额
+     */
+    private String amount;
+
+    /**
+     * 是否公户转出
+     */
+    private String isPublicTransfer;
+
+    /**
+     * 开户名
+     */
+    private String accountName;
+
+    /**
+     * 开户行
+     */
+    private String accountBank;
+
+    /**
+     * 开户账号
+     */
+    private String accountNumber;
+
+}

hx-account/src/main/java/com/fjhx/account/entity/cost/po/CostControlDetail.java

@@ -0,0 +1,151 @@
+package com.fjhx.account.entity.cost.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 费控明细
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+@TableName("cost_control_detail")
+public class CostControlDetail extends BasePo {
+
+    /**
+     * 付款说明
+     */
+    private String remark;
+
+    /**
+     * 供应商
+     */
+    private String supplierId;
+
+    /**
+     * 收款单位
+     */
+    private String payeeAccountId;
+
+    /**
+     * 申请备注
+     */
+    private String applyRemark;
+
+    /**
+     * 抵扣工资月份
+     */
+    private String deductionMonth;
+
+    /**
+     * 本期应付
+     */
+    private String currentPayable;
+
+    /**
+     * 本期应付（抵扣后）
+     */
+    private String currentPayableDeduction;
+
+    /**
+     * 记账科目
+     */
+    private String accountSubjectsId;
+
+    /**
+     * 记账金额
+     */
+    private String money;
+
+    /**
+     * 快递公司
+     */
+    private String logisticsCompanyId;
+
+    /**
+     * 开票税点
+     */
+    private String invoiceTaxPoint;
+
+    /**
+     * 结存预付款_含税
+     */
+    private String balancePrepaidTax;
+
+    /**
+     * 结存预付款
+     */
+    private String balancePrepaid;
+
+    /**
+     * 帐期
+     */
+    private String accountPeriod;
+
+    /**
+     * 本账期金额
+     */
+    private String accountPeriodAmount;
+
+    /**
+     * 本账期金额_含税
+     */
+    private String accountPeriodAmountTax;
+
+    /**
+     * 本账期调整金额
+     */
+    private String accountPeriodAdjustAmount;
+
+    /**
+     * 本期预付款_含税
+     */
+    private String currentPrepaidTax;
+
+    /**
+     * 本期预付款
+     */
+    private String currentPrepaid;
+
+    /**
+     * 抵扣预付款_含税
+     */
+    private String deductionPrepaidTax;
+
+    /**
+     * 抵扣预付款
+     */
+    private String deductionPrepaid;
+
+    /**
+     * 店铺id
+     */
+    private String shopId;
+
+    /**
+     * 费用类型
+     */
+    private String costType;
+
+    /**
+     * 刷单时间
+     */
+    private String brushingTime;
+
+    /**
+     * 推广费类型
+     */
+    private String promotionFeeType;
+
+    /**
+     * 税费
+     */
+    private String taxation;
+
+}

hx-account/src/main/java/com/fjhx/account/entity/cost/vo/CostControlDetailVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.cost.vo;
+
+import com.fjhx.account.entity.cost.po.CostControlDetail;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 费控明细列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class CostControlDetailVo extends CostControlDetail {
+
+}

hx-account/src/main/java/com/fjhx/account/entity/cost/vo/CostControlVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.cost.vo;
+
+import com.fjhx.account.entity.cost.po.CostControl;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 费控列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class CostControlVo extends CostControl {
+
+}

hx-account/src/main/java/com/fjhx/account/mapper/cost/CostControlDetailMapper.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.mapper.cost;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.account.entity.cost.po.CostControlDetail;
+
+
+/**
+ * <p>
+ * 费控明细 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+public interface CostControlDetailMapper extends BaseMapper<CostControlDetail> {
+
+}

hx-account/src/main/java/com/fjhx/account/mapper/cost/CostControlMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.account.mapper.cost;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.cost.po.CostControl;
+import com.fjhx.account.entity.cost.vo.CostControlVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 费控 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+public interface CostControlMapper extends BaseMapper<CostControl> {
+
+    /**
+     * 费控分页
+     */
+    Page<CostControlVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<CostControl> wrapper);
+
+}

hx-account/src/main/java/com/fjhx/account/service/cost/CostControlDetailService.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.service.cost;
+
+import com.fjhx.account.entity.cost.po.CostControlDetail;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 费控明细 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+public interface CostControlDetailService extends BaseService<CostControlDetail> {
+
+}

hx-account/src/main/java/com/fjhx/account/service/cost/CostControlService.java

@@ -0,0 +1,46 @@
+package com.fjhx.account.service.cost;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.cost.dto.CostControlDto;
+import com.fjhx.account.entity.cost.dto.CostControlSelectDto;
+import com.fjhx.account.entity.cost.po.CostControl;
+import com.fjhx.account.entity.cost.vo.CostControlVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 费控 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+public interface CostControlService extends BaseService<CostControl> {
+
+    /**
+     * 费控分页
+     */
+    Page<CostControlVo> getPage(CostControlSelectDto dto);
+
+    /**
+     * 费控明细
+     */
+    CostControlVo detail(Long id);
+
+    /**
+     * 费控新增
+     */
+    void add(CostControlDto costControlDto);
+
+    /**
+     * 费控编辑
+     */
+    void edit(CostControlDto costControlDto);
+
+    /**
+     * 费控删除
+     */
+    void delete(Long id);
+
+}

hx-account/src/main/java/com/fjhx/account/service/cost/impl/CostControlDetailServiceImpl.java

@@ -0,0 +1,21 @@
+package com.fjhx.account.service.cost.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.account.entity.cost.po.CostControlDetail;
+import com.fjhx.account.mapper.cost.CostControlDetailMapper;
+import com.fjhx.account.service.cost.CostControlDetailService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 费控明细 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Service
+public class CostControlDetailServiceImpl extends ServiceImpl<CostControlDetailMapper, CostControlDetail> implements CostControlDetailService {
+
+}

hx-account/src/main/java/com/fjhx/account/service/cost/impl/CostControlServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fjhx.account.service.cost.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.account.entity.cost.dto.CostControlDto;
+import com.fjhx.account.entity.cost.dto.CostControlSelectDto;
+import com.fjhx.account.entity.cost.po.CostControl;
+import com.fjhx.account.entity.cost.vo.CostControlVo;
+import com.fjhx.account.mapper.cost.CostControlMapper;
+import com.fjhx.account.service.cost.CostControlService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 费控 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Service
+public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostControl> implements CostControlService {
+
+    @Override
+    public Page<CostControlVo> getPage(CostControlSelectDto dto) {
+        IWrapper<CostControl> wrapper = getWrapper();
+        wrapper.orderByDesc("cc", CostControl::getId);
+        Page<CostControlVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public CostControlVo detail(Long id) {
+        CostControl CostControl = this.getById(id);
+        CostControlVo result = BeanUtil.toBean(CostControl, CostControlVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(CostControlDto costControlDto) {
+        this.save(costControlDto);
+    }
+
+    @Override
+    public void edit(CostControlDto costControlDto) {
+        this.updateById(costControlDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-account/src/main/resources/mapper/cost/CostControlDetailMapper.xml

@@ -0,0 +1,4 @@
+<?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.fjhx.account.mapper.cost.CostControlDetailMapper">
+</mapper>

hx-account/src/main/resources/mapper/cost/CostControlMapper.xml

@@ -0,0 +1,30 @@
+<?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.fjhx.account.mapper.cost.CostControlMapper">
+    <select id="getPage" resultType="com.fjhx.account.entity.cost.vo.CostControlVo">
+        select cc.id,
+               cc.trade_type,
+               cc.cost_type,
+               cc.voucher_no,
+               cc.apply_time,
+               cc.code,
+               cc.logistics_company_id,
+               cc.is_voucher,
+               cc.company_id,
+               cc.dept_id,
+               cc.apply_user_id,
+               cc.is_advance,
+               cc.amount,
+               cc.is_public_transfer,
+               cc.account_name,
+               cc.account_bank,
+               cc.account_number,
+               cc.create_user,
+               cc.create_time,
+               cc.update_user,
+               cc.update_time
+        from cost_control cc
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>