代码提交

liusheng

2 天以前 406fd36d622b50005efb0f935f029e4bd5877f48

代码提交

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java

@@ -132,7 +132,7 @@
            wrappers.eq(ServiceFund::getJxrq, serviceFund.getJxrq());
        }
        // 添加 group by donorname
        wrappers.groupBy(ServiceFund::getDonorname);
//        wrappers.groupBy(ServiceFund::getDonorname);
        return this.list(wrappers);
    }


 ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml

@@ -167,10 +167,10 @@
        `service_donationwitness`.`create_by` AS `createby`,
        `service_donationwitness`.`create_time` AS `createtime`,
        `service_donationwitness`.`update_by` AS `updateby`,
        `service_donationwitness`.`update_time` AS `updatetime`
        `service_donationwitness`.`coordinator_in_operating` AS `coordinatorInOperating`
        `service_donationwitness`.`coordinator_out_operating` AS `coordinatorOutOperating`
        `service_donationwitness`.`coordinator_sign` AS `coordinatorSign`
        `service_donationwitness`.`update_time` AS `updatetime`,
        `service_donationwitness`.`coordinator_in_operating` AS `coordinatorInOperating`,
        `service_donationwitness`.`coordinator_out_operating` AS `coordinatorOutOperating`,
        `service_donationwitness`.`coordinator_sign` AS `coordinatorSign`,
        `service_donationwitness`.`coordinator_sign_time` AS `coordinatorSignTime`
        FROM
        `service_donatebaseinfo`

 ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml

@@ -151,9 +151,9 @@
        `service_relativesconfirmation`.`update_by` AS `updateBy`,
        `service_relativesconfirmation`.`update_time` AS `updateTime`,
        `service_relativesconfirmation`.`operatorno` AS `operatorno`,
        `service_relativesconfirmation`.`operatorname` AS `operatorname`
        `service_relativesconfirmation`.`nation` AS `nation`
        `service_relativesconfirmation`.`education` AS `education`
        `service_relativesconfirmation`.`operatorname` AS `operatorname`,
        `service_relativesconfirmation`.`nation` AS `nation`,
        `service_relativesconfirmation`.`education` AS `education`,
        `service_relativesconfirmation`.`work` AS `work`
    FROM