功能调整

value

2024-04-30 f5f08c542b4ecf240a3dace0b79afe15d18aeab1

功能调整

 data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java

@@ -164,7 +164,6 @@
            String name = dataReportingMapper.getUserNameById(map1.get("userId"));
            registrantCountDto.setName2(name);
        }
        ;
        String department = dataReportingMapper.getUserDepartmentById(map1.get("userId"));
        registrantCountDto.setDepartment(department);
        map.put("body", dataReportingMapper.selectRegistrantCountDtoPageList(page, QueryWrappers.queryWrappers(registrantCountDto), registrantCountDto.getStartTime(), registrantCountDto.getEndTime()));
@@ -232,7 +231,8 @@
                    .eq(DataReporting::getName, dataReporting.getName())
                    .eq(DataReporting::getAccountConsumption, dataReporting.getAccountConsumption())
                    .eq(DataReporting::getShowNum, dataReporting.getShowNum())
                    .eq(DataReporting::getClick, dataReporting.getClick()));
                    .eq(DataReporting::getClick, dataReporting.getClick())
                    .last("limit 1"));
            if (BeanUtil.isNotEmpty(dataReporting1)) {
                dataReporting.setId(dataReporting1.getId());
                dataReportingMapper.updateById(dataReporting);

 data-server/src/main/resources/mapper/DataReportingMapper.xml

@@ -79,7 +79,7 @@
        create_user
        from data_reporting
        where create_time >= #{startTime} and create_time <= #{endTime}
        group by department,product, date_format(create_time, '%Y-%m')
        group by department,product,name2,date_format(create_time, '%Y-%m')
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}