代码提交

liusheng

2024-04-24 a894bc6373154d5cfd28b7f46df3c4cfa01a7b9b

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java

@@ -12,6 +12,7 @@
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IBaseOnlyvalueService;
@@ -548,6 +549,13 @@
        Boolean i = null;
        for (ServiceDonationwitness serviceDonationwitness : serviceDonationwitnessList) {
            log.info("捐献见证管理id是否为空 : {},基础表的id为 : {}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
            ServiceDonationwitness sd2 = new ServiceDonationwitness();
            sd2.setInfoid(serviceDonationwitness.getInfoid());
            sd2.setDel_flag(0);
            List<ServiceDonationwitness> serviceDonationwitnesses = serviceDonationwitnessService.queryList(sd2);
            if (!CollectionUtils.isEmpty(serviceDonationwitnesses)) {
                serviceDonationwitness.setId(serviceDonationwitnesses.get(0).getId());
            }
            if (serviceDonationwitness.getId() == null) {
                i = serviceDonationwitnessService.save(serviceDonationwitness);
            } else {

 ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeExpert.java

@@ -66,43 +66,43 @@
    /**
     * 卡号
     */
    @ApiModelProperty("卡号")
    @Excel(name = "卡号")
    @ApiModelProperty("银行帐号/卡号")
    @Excel(name = "银行帐号/卡号")
    private String bankcardno;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "卡号")
    @Excel(name = "税前金额")
    private BigDecimal pretaxamount;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "卡号")
    @Excel(name = "扣税金额")
    private BigDecimal taxamount;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "卡号")
    @Excel(name = "税后金额")
    private BigDecimal taxedamount;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "卡号")
    @Excel(name = "参与案例")
    private String donorname;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "卡号")
    @Excel(name = "所属单位")
    private String unitname;

}