xiaoyong931011
2020-08-13 dc1525939b089774d2cc99901df0751f0c94c9cd
20200813
3 files modified
27 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/dataMonitoring/entity/DataMonitoringEntity.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/dataMonitoring/service/impl/DataMonitoringServiceImpl.java 21 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/dataMonitoring/dataMonitoringList.html 1 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/dataMonitoring/entity/DataMonitoringEntity.java
@@ -70,5 +70,10 @@
     */
    @TableField(exist = false)
    private String isTest;
    /**
     * 姓名
     */
    @TableField(exist = false)
    private String realName;
}
src/main/java/com/xcong/excoin/modules/dataMonitoring/service/impl/DataMonitoringServiceImpl.java
@@ -21,7 +21,9 @@
import com.xcong.excoin.modules.dataMonitoring.entity.DataMonitoringEntity;
import com.xcong.excoin.modules.dataMonitoring.mapper.DataMonitoringMapper;
import com.xcong.excoin.modules.dataMonitoring.service.DataMonitoringService;
import com.xcong.excoin.modules.member.entity.MemberAuthenticationEntity;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.mapper.MemberAuthenticationMapper;
import com.xcong.excoin.modules.member.mapper.MemberMapper;
import com.xcong.excoin.modules.trademanage.entity.ContractHoldOrderEntity;
import com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity;
@@ -40,11 +42,30 @@
    
    private final MemberMapper memberMapper;
    private final MemberAuthenticationMapper memberAuthenticationMapper;
    @Override
    public IPage<DataMonitoringEntity> findDataMonitoringListInPage(DataMonitoringEntity dataMonitoringEntity,
            QueryRequest request) {
        Page<DataMonitoringEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<DataMonitoringEntity> DataMonitoringEntitys = dataMonitoringMapper.findDataMonitoringListInPage(page, dataMonitoringEntity);
        List<DataMonitoringEntity> records = DataMonitoringEntitys.getRecords();
        if(CollUtil.isNotEmpty(records)) {
            for(DataMonitoringEntity DataMonitoringEntity :records) {
                Long memberId = DataMonitoringEntity.getMemberId();
                Map<String, Object> columnMap = new HashMap<>();
                columnMap.put("member_id", memberId);
                List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );
                if(selectByMap != null && selectByMap.size() > 0) {
                    MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);
                    String firstName = memberAuthenticationEntity.getFirstName();
                    String secondName = memberAuthenticationEntity.getSecondName();
                    String realName = firstName + secondName;
                    DataMonitoringEntity.setRealName(realName);
                }
            }
        }
        return DataMonitoringEntitys;
    }
src/main/resources/templates/febs/views/modules/dataMonitoring/dataMonitoringList.html
@@ -135,6 +135,7 @@
                cols: [[
                    {field: 'phone', title: '电话', minWidth: 80,align:'left'},
                    {field: 'email', title: '邮箱', minWidth: 80,align:'left'},
                    {field: 'realName', title: '姓名', minWidth: 100,align:'left'},
                    {field: 'reward', title: '总盈亏', minWidth: 80,align:'left'},
                    {field: 'count', title: '当天订单总数', minWidth: 80,align:'left'},
                    {field: 'countOut', title: '不符合条件的订单数量', minWidth: 100,align:'left'},