Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

maven

昨天 4275b293cfc7779a20ccea30b2f773aff0fe06db

Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

 main-business/src/main/java/com/ruoyi/business/controller/ReceiptPaymentController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,83 @@
package com.ruoyi.business.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import com.ruoyi.business.dto.ReceiptPaymentDto;
import com.ruoyi.business.entity.ReceiptPayment;
import com.ruoyi.business.service.ReceiptPaymentService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

@RestController
@RequestMapping("/receiptPayment")
public class ReceiptPaymentController extends BaseController {

    @Autowired
    private ReceiptPaymentService receiptPaymentService;

    /**
     * åº”收台账新增
     * @param receiptPayment
     * @return
     */
    @PostMapping("/saveOrUpdate")
    public AjaxResult receiptPaymentSaveOrUpdate (@RequestBody ReceiptPayment receiptPayment) {
        receiptPaymentService.receiptPaymentSaveOrUpdate(receiptPayment);
        return AjaxResult.success();
    }

    /**
     * åº”收台账修改
     * @param receiptPayment
     * @return
     */
    @PostMapping("/update")
    public AjaxResult receiptPaymentUpdate (@RequestBody ReceiptPayment receiptPayment) {
        return AjaxResult.success(receiptPaymentService.receiptPaymentUpdate(receiptPayment));
    }

    /**
     * åº”收台账删除
     * @param ids
     * @return
     */
    @DeleteMapping("/del")
    public AjaxResult receiptPaymentDel (@RequestBody List<Integer> ids) {
        return AjaxResult.success(receiptPaymentService.receiptPaymentDel(ids));
    }

    /**
     * åº”收台账详情
     * @param id
     * @return
     */
    @GetMapping("/invoiceInfo")
    public AjaxResult invoiceInfo (Integer id) {
        return AjaxResult.success(receiptPaymentService.invoiceInfo(id));
    }

    /**
     * æŸ¥è¯¢åº”收记录
     */
    @GetMapping("/receiptPaymentHistoryListPage")
    public IPage<ReceiptPaymentDto> receiptPaymentHistoryListPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
        return receiptPaymentService.receiptPaymentHistoryListPage(page,receiptPaymentDto);
    }

    /**
     * æŸ¥è¯¢åº”收记录不分页
     */
    @GetMapping("/receiptPaymentHistoryListNoPage")
    public List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage(ReceiptPaymentDto receiptPaymentDto) {
        return receiptPaymentService.receiptPaymentHistoryListNoPage(receiptPaymentDto);
    }
}

 main-business/src/main/java/com/ruoyi/business/dto/ReceiptPaymentDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.ruoyi.business.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.business.entity.ReceiptPayment;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;

@Data
public class ReceiptPaymentDto extends ReceiptPayment {
    @Excel(name = "客户")
    private String customer;
    @Excel(name = "煤种")
    private String coal;

    @TableField(exist = false)
    @Excel(isExport = false)
    private String receiptPaymentDateStart;
    @TableField(exist = false)
    @Excel(isExport = false)
    private String receiptPaymentDateEnd;

}

 main-business/src/main/java/com/ruoyi/business/entity/ReceiptPayment.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,64 @@
package com.ruoyi.business.entity;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;

@Data
@TableName("receipt_payment")
public class ReceiptPayment {

    /**
     * åºå·
     */
    @TableId(type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "回款形式 0电汇1承兑")
    private String receiptPaymentType;

    @ApiModelProperty(value = "应收金额")
    private BigDecimal receiptPaymentAmount;

    @ApiModelProperty(value = "登记人")
    private String registrant;

    @ApiModelProperty(value = "销售记录表主键ID")
    private Integer salesRecordId;

    @ApiModelProperty(value = "来款日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate receiptPaymentDate;

    @ApiModelProperty(value = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "创建用户")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ApiModelProperty(value = "修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "修改用户")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @ApiModelProperty(value = "租户ID")
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

}

 main-business/src/main/java/com/ruoyi/business/mapper/ReceiptPaymentMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
package com.ruoyi.business.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import com.ruoyi.business.dto.ReceiptPaymentDto;
import com.ruoyi.business.dto.SalesRecordDto;
import com.ruoyi.business.entity.ReceiptPayment;
import org.apache.ibatis.annotations.Param;

import java.math.BigDecimal;
import java.util.List;

public interface ReceiptPaymentMapper extends BaseMapper<ReceiptPayment> {

    /**
     * æŸ¥è¯¢å·²ç»ç»‘定发票的开票台账
     * @param page
     * @param receiptPaymentDto
     * @return
     */
    IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, @Param("receiptPaymentDto") ReceiptPaymentDto receiptPaymentDto);

    /**
     * å¼€ç¥¨å°è´¦è¯¦æƒ…
     * @param id
     * @return
     */
    SalesRecordDto invoiceInfo(Integer id);



    /**
     * æŸ¥è¯¢å›žæ¬¾è®°å½•ä¸åˆ†é¡µ
     */
    List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage( @Param("params") ReceiptPaymentDto receiptPaymentDto);

}

 main-business/src/main/java/com/ruoyi/business/other/service/impl/TempFileServiceImpl.java

@@ -38,10 +38,10 @@
    @Autowired
    private CommonFileMapper commonFileMapper;

    @Value("${file.upload-dir}")
//    @Value("${file.upload-dir}")
    private String uploadDir;

    @Value("${file.temp-dir}")
//    @Value("${file.temp-dir}")
    private String tempDir;

    // ä¸Šä¼ åˆ°ä¸´æ—¶ç›®å½•

 main-business/src/main/java/com/ruoyi/business/service/ReceiptPaymentService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
package com.ruoyi.business.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.business.dto.ReceiptPaymentDto;
import com.ruoyi.business.dto.SalesRecordDto;
import com.ruoyi.business.entity.ReceiptPayment;
import jakarta.servlet.http.HttpServletResponse;

import java.math.BigDecimal;
import java.util.List;
import java.util.Map;

public interface ReceiptPaymentService {

    /**
     * å›žæ¬¾ç™»è®°æ–°å¢ž
     * @param receiptPayment
     * @return
     */
    int receiptPaymentSaveOrUpdate(ReceiptPayment receiptPayment);

    /**
     * å›žæ¬¾ç™»è®°ä¿®æ”¹
     * @param receiptPayment
     * @return
     */
    int receiptPaymentUpdate(ReceiptPayment receiptPayment);

    /**
     * å›žæ¬¾ç™»è®°åˆ é™¤
     * @param ids
     * @return
     */
    int receiptPaymentDel(List<Integer> ids);

    /**
     * å¼€ç¥¨å°è´¦è¯¦æƒ…
     * @param id
     * @return
     */
    SalesRecordDto invoiceInfo(Integer id);

    /**
     * æŸ¥è¯¢å›žæ¬¾è®°å½•åˆ†é¡µ
     */
    IPage<ReceiptPaymentDto> receiptPaymentHistoryListPage(Page page, ReceiptPaymentDto receiptPaymentDto);

    /**
     * æŸ¥è¯¢å›žæ¬¾è®°å½•ä¸åˆ†é¡µ
     */
    List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage(ReceiptPaymentDto receiptPaymentDto);

}

 main-business/src/main/java/com/ruoyi/business/service/impl/ReceiptPaymentServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,87 @@
package com.ruoyi.business.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.business.dto.ReceiptPaymentDto;
import com.ruoyi.business.dto.SalesRecordDto;
import com.ruoyi.business.entity.ReceiptPayment;
import com.ruoyi.business.entity.SalesRecord;
import com.ruoyi.business.mapper.ReceiptPaymentMapper;
import com.ruoyi.business.mapper.SalesRecordMapper;
import com.ruoyi.business.service.ReceiptPaymentService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.YearMonth;
import java.util.*;
import java.util.stream.Collectors;

@Service
public class ReceiptPaymentServiceImpl extends ServiceImpl<ReceiptPaymentMapper, ReceiptPayment> implements ReceiptPaymentService {

    @Autowired
    private ReceiptPaymentMapper receiptPaymentMapper;
    @Autowired
    private SalesRecordMapper salesRecordMapper;

    /**
     * å›žæ¬¾ç™»è®°æ–°å¢ž
     * @param receiptPayment
     * @return
     */
    @Override
    public int receiptPaymentSaveOrUpdate(ReceiptPayment receiptPayment) {
        SalesRecord salesRecord = salesRecordMapper.selectById(receiptPayment.getSalesRecordId());
        if (ObjectUtils.isEmpty(salesRecord)){
            throw new RuntimeException("销售记录不存在");
        }
        return receiptPaymentMapper.insert(receiptPayment);
    }

    /**
     * å›žæ¬¾ç™»è®°ä¿®æ”¹
     * @param receiptPayment
     * @return
     */
    @Override
    public int receiptPaymentUpdate(ReceiptPayment receiptPayment) {
        return receiptPaymentMapper.updateById(receiptPayment);
    }

    /**
     * å›žæ¬¾ç™»è®°åˆ é™¤
     * @param ids
     * @return
     */
    @Override
    public int receiptPaymentDel(List<Integer> ids) {
        LambdaQueryWrapper<ReceiptPayment> delQuery = new LambdaQueryWrapper<>();
        delQuery.in(ReceiptPayment::getId, ids);
        return receiptPaymentMapper.delete(delQuery);
    }

    @Override
    public SalesRecordDto invoiceInfo(Integer id) {
        return receiptPaymentMapper.invoiceInfo(id);
    }

    @Override
    public IPage<ReceiptPaymentDto> receiptPaymentHistoryListPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
        return receiptPaymentMapper.bindInvoiceNoRegPage(page, receiptPaymentDto);
    }

    @Override
    public List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage(ReceiptPaymentDto receiptPaymentDto) {
        return receiptPaymentMapper.receiptPaymentHistoryListNoPage(receiptPaymentDto);
    }

}

 main-business/src/main/resources/mapper/ReceiptPaymentMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
<?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.ruoyi.business.mapper.ReceiptPaymentMapper">

    <select id="invoiceInfo" resultType="com.ruoyi.business.dto.SalesRecordDto">
        SELECT
            T1.*,
            T3.coal
        FROM
            sales_record T1
        LEFT JOIN customer T2 ON T1.customer_id = T2.id
        LEFT JOIN coal_info T3 ON T1.coal_id = T3.id
        WHERE T1.id = #{id}
    </select>
    <select id="bindInvoiceNoRegPage" resultType="com.ruoyi.business.dto.ReceiptPaymentDto">
        SELECT
            T1.*,
            T2.customer,
            T3.coal
        FROM
            receipt_payment T1
        LEFT JOIN sales_record T2 ON T1.sales_record_id = T2.id
        LEFT JOIN coal_info T3 ON T2.coal_id = T3.id
        where 1=1
        <if test="receiptPaymentDto.customer != null and receiptPaymentDto.customer != ''">
            and T2.customer like concat('%',#{receiptPaymentDto.customer},'%')
        </if>
        <if test="receiptPaymentDto.coal != null and receiptPaymentDto.coal != ''">
            and T3.coal like concat('%',#{receiptPaymentDto.coal},'%')
        </if>
        <if test="receiptPaymentDto.receiptPaymentDateStart != null and receiptPaymentDto.receiptPaymentDateEnd != ''">
            and T1.receipt_payment_date between to_timestamp(#{receiptPaymentDto.receiptPaymentDateStart}, 'yyyy-MM-dd HH24:mi:ss') AND
            to_timestamp(#{receiptPaymentDto.receiptPaymentDateEnd}, 'yyyy-MM-dd HH24:mi:ss')
        </if>
    </select>
    <select id="receiptPaymentHistoryListNoPage" resultType="com.ruoyi.business.dto.ReceiptPaymentDto">
        SELECT
            T1.*,
            T2.customer,
            T3.coal
        FROM
            receipt_payment T1
                LEFT JOIN sales_record T2 ON T1.sales_record_id = T2.id
                LEFT JOIN coal_info T3 ON T2.coal_id = T3.id
        where 1=1
        <if test="receiptPaymentDto.customer != null and receiptPaymentDto.customer != ''">
            and T2.customer like concat('%',#{receiptPaymentDto.customer},'%')
        </if>
        <if test="receiptPaymentDto.coal != null and receiptPaymentDto.coal != ''">
            and T3.coal like concat('%',#{receiptPaymentDto.coal},'%')
        </if>
        <if test="receiptPaymentDto.receiptPaymentDateStart != null and receiptPaymentDto.receiptPaymentDateEnd != ''">
            and T1.receipt_payment_date between to_timestamp(#{receiptPaymentDto.receiptPaymentDateStart}, 'yyyy-MM-dd HH24:mi:ss') AND
            to_timestamp(#{receiptPaymentDto.receiptPaymentDateEnd}, 'yyyy-MM-dd HH24:mi:ss')
        </if>
    </select>


</mapper>