Merge remote-tracking branch 'origin/master'

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LogBasicServiceImpl.java

@@ -204,8 +204,16 @@
     */
    @Override
    public String exportLogs(LogQueryCriteriaDTO dto) throws PLException{
        BaseResult logListByContion = this.getLogListByContion(dto);
        Collection<LogInfoDTO> logList = logListByContion.getData();
        VciBaseUtil.alertNotNull(dto,"日志查询参数对象");
        List<String> userNameList = userQueryServiceI.queryUserNameByRoleType(dto.getRoleType());
        dto.setUserNameList(userNameList);
        String querySql = getSQL(dto);
        //全查询
        if(dto.getPageSize() == -1){
            long sumLogRows = platformClientUtil.getLogService().getSumLogRows(querySql);
            dto.setPageSize((int) sumLogRows);
        }
        LogInfo[] logList = platformClientUtil.getLogService().getLogListByContion(dto.getPageNo(),dto.getPageSize(),querySql);

        //界面没传名称，使用默认导出名称
        String exportFileName = "日志导出_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss");
@@ -233,15 +241,15 @@
        }else{
            //先按照属性类型排序，不同属性类型导出的数据乱的效果
            AtomicInteger i = new AtomicInteger();
            logList.stream().forEach(log->{
                excelDataList.add(new WriteExcelData(i.get() +1,0, log.getUsername()));
                excelDataList.add(new WriteExcelData(i.get() +1,1, log.getTruename()));
                excelDataList.add(new WriteExcelData(i.get() +1,2, log.getUserIp()));
                excelDataList.add(new WriteExcelData(i.get() +1,3, log.getModuleName()));
                excelDataList.add(new WriteExcelData(i.get() +1,4, log.getType()));
                excelDataList.add(new WriteExcelData(i.get() +1,5, log.getDate()));
                excelDataList.add(new WriteExcelData(i.get() +1,6, log.getLogType()));
                excelDataList.add(new WriteExcelData(i.get() +1,7, log.getResult()));
            Arrays.stream(logList).forEach(log->{
                excelDataList.add(new WriteExcelData(i.get() +1,0, log.username));
                excelDataList.add(new WriteExcelData(i.get() +1,1, log.truename));
                excelDataList.add(new WriteExcelData(i.get() +1,2, log.userIp));
                excelDataList.add(new WriteExcelData(i.get() +1,3, log.moduleName));
                excelDataList.add(new WriteExcelData(i.get() +1,4, log.type));
                excelDataList.add(new WriteExcelData(i.get() +1,5, log.date));
                excelDataList.add(new WriteExcelData(i.get() +1,6, log.logType));
                excelDataList.add(new WriteExcelData(i.get() +1,7, log.result));
                i.getAndIncrement();
            });
        }

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java

@@ -955,7 +955,7 @@
        prmItemDO.setItemHrefConf(prmItemDO.getItemHrefConf());//超链接配置
        prmItemDO.setItemTips(prmItemDTO.getItemTips());
        prmItemDO.setItemTrim(prmItemDTO.getItemTrim());
        prmItemDO.setItemDateFormat(prmItemDTO.getItemDateFormat());
        //prmItemDO.setItemDateFormat(prmItemDTO.getItemDateFormat());
        prmItemDO.setItemCtrlDisplyCondition(prmItemDTO.getItemCtrlDisplyCondition());////控制显示条件
        prmItemDO.setItemEditableProgram(prmItemDTO.getItemEditableProgram());
        prmItemDO.setItemEditCondition(prmItemDTO.getItemEditCondition());

 Source/plt-web/plt-web-ui/src/api/system/log/logBasic.js

@@ -49,9 +49,9 @@
export const exportLog = (params) => {
  return request({
    url: '/api/loginBasicController/exportLogs',
    method: 'get',
    headers: {'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'},
    method: 'POST',
    headers: {'Content-Type': 'application/json;charset=UTF-8'},
    responseType: 'blob',
    params
    data: params
  })
}