WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'fix_bug_first_stage' 到 'master'

Browse Source 
Fix bug first stage

查看合并请求 laws-nio/laws-weilai!80
This commit is contained in:
肖文钰
2022-07-12 19:45:03 +08:00
parent 023776ab7c a039627f75
commit db7432fcfa
8 changed files with 107 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java
+7 -5
View File
@@ -11,7 +11,9 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -80,11 +82,11 @@ public class NcrTrackController {
* @param request
* @param ncrTrackVO
*/
@RequestMapping(value = "/exportData")
@RequestMapping(value = "/exportData",method = RequestMethod.POST)
@RequiresPermissions("ncrTrack:exportData")
public void exportData(HttpServletResponse response,
HttpServletRequest request,
NcrTrackVO ncrTrackVO) {
@RequestBody NcrTrackVO ncrTrackVO) {
iNcrTrackService.exportData(response,request, ncrTrackVO);
}
@@ -93,11 +95,11 @@ public class NcrTrackController {
* @param request
* @param ncrTrackVO
*/
@RequestMapping(value = "/exportDataInfo")
@RequestMapping(value = "/exportDataInfo",method = RequestMethod.POST)
@RequiresPermissions("ncrTrack:exportDataInfo")
public void exportDataInfo(HttpServletResponse response,
HttpServletRequest request,
NcrTrackVO ncrTrackVO) {
HttpServletRequest request,
@RequestBody NcrTrackVO ncrTrackVO) {
iNcrTrackService.exportData(response,request, ncrTrackVO);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+3 -6
View File
@@ -241,12 +241,10 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
List<NcrTrackVO> trackVOListTemp = new ArrayList<>();
String idJson = ncrTrackVO.getNcrTrackVOList();
if(StringUtils.isNotBlank(idJson)){
List<NcrTrackVO> ncrTrackVOList = JSONObject.parseArray(idJson, NcrTrackVO.class);
List<NcrTrackVO> ncrTrackVOListTemp = ncrTrackVO.getNcrTrackVOList();
//导出数据过滤(列表中选取多条进行导出的时候,用任务清单id和流程类型作为条件进行数据过滤)
if(ObjectUtils.allNotNull(ncrTrackVOList)){
for (NcrTrackVO trackVO : ncrTrackVOList) {
if(ObjectUtils.allNotNull(ncrTrackVOListTemp)){
for (NcrTrackVO trackVO : ncrTrackVOListTemp) {
List<NcrTrackVO> collect = trackVOList.stream()
.filter(e -> trackVO.getId().equals(e.getId()) && trackVO.getFlowType().equals(e.getFlowType()))
.collect(Collectors.toList());
@@ -255,7 +253,6 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
}
}
}
}
if(trackVOListTemp.size() != 0){
return trackVOListTemp;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
+2 -2
View File
@@ -1,7 +1,6 @@
package com.jero.modules.project.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -10,6 +9,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -119,7 +119,7 @@ public class NcrTrackVO implements Serializable {
//验证问题类型 verify_flow_task_status
private String verifyFlowTaskStatus;
private String ncrTrackVOList;
private List<NcrTrackVO> ncrTrackVOList = new ArrayList<>();
//以下字段跳转适用(还有项目库id)
jero-web/src/api/manage.js
+87 -1
View File
@@ -134,7 +134,14 @@ export function downFile(url, parameter) {
responseType: 'blob'
})
}
export function downFilePost(url, parameter) {
return axios({
url: url,
data: parameter,
method: 'post',
responseType: 'blob'
})
}
/**
* 下载文件
* @param url 文件路径
@@ -226,6 +233,85 @@ export function downloadFile(url, fileName, parameter, callback) {
})
}
export function downloadFilePost(url, fileName, parameter, callback) {
let langCn = localStorage.language
// 默认中文
let isTrue
if (langCn == 'en-us') {
isTrue = true
} else if (langCn == 'zh-cn') {
isTrue = false
}
index.showDrawer({
loading: true,
isTrue: isTrue
})
return downFilePost(url, parameter).then((data) => {
let fileReader = new FileReader()
fileReader.onload = function(event) {
try {
let jsonData = JSON.parse(event.target.result)
if (jsonData.message.includes('token')) {
index.showDrawer({
loading: false,
isTrue: isTrue
})
Modal.error({
title: '登录已过期',
content: '很抱歉，登录已过期，请重新登录',
okText: '重新登录',
mask: false,
onOk: () => {
store.dispatch('Logout').then(() => {
Vue.ls.remove(ACCESS_TOKEN)
try {
let path = window.document.location.pathname
if (path != '/' && path.indexOf('/user/login') == -1) {
window.location.reload()
}
} catch (e) {
window.location.reload()
}
})
}
})
} else {
if (!jsonData.success) {
index.showDrawer({
loading: false,
isTrue: isTrue
})
Vue.prototype['$message'].warning(jsonData.message)
}
}
} catch (e) {
if (!data || data.size === 0) {
Vue.prototype['$message'].warning('文件下载失败')
return
}
if (typeof window.navigator.msSaveBlob !== 'undefined') {
window.navigator.msSaveBlob(new Blob([data]), fileName)
} else {
let url = window.URL.createObjectURL(new Blob([data]))
let link = document.createElement('a')
link.style.display = 'none'
link.href = url
link.setAttribute('download', fileName)
document.body.appendChild(link)
link.click()
document.body.removeChild(link) //下载完成移除元素
window.URL.revokeObjectURL(url) //释放掉blob对象
}
index.showDrawer({
loading: false,
isTrue: isTrue
})
callback && callback()
}
}
fileReader.readAsText(data)
})
}
/**
* 文件上传 用于富文本上传图片
* @param url
jero-web/src/views/documentTools/virtualList/components/addModel.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template>
<a-drawer
title="添加"
:title="$t('add')"
:maskClosable="false"
:width="1000"
placement="right"
jero-web/src/views/projectManagement/components/nonConformance.vue
+3 -3
View File
@@ -82,7 +82,7 @@
</template>
<script>
import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
import { getAction, postAction, downloadFile, deleteAction,downloadFilePost } from '@/api/manage'
import store from '@/store/'
export default {
@@ -214,9 +214,9 @@
let query = {
...this.queryParam,
projectLibraryId: this.$route.query.id,
ncrTrackVOList: JSON.stringify(this.content)
ncrTrackVOList: this.content
}
downloadFile(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
downloadFilePost(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
},
getList() {
let query = {
jero-web/src/views/projectManagement/components/transferList.vue
+1 -1
View File
@@ -36,7 +36,7 @@
:scroll="{x: 1000}"
:data-source="dataList"
:pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
:loading="loading">
</a-table>
jero-web/src/views/projectManagement/projectNonConformance/index.vue
+3 -3
View File
@@ -182,7 +182,7 @@
</template>
<script>
import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
import { getAction, postAction, downloadFile, deleteAction ,downloadFilePost} from '@/api/manage'
import PersonnelSelection from '@/components/PersonnelSelection/index'
import store from '@/store/'
@@ -354,9 +354,9 @@
handleExport() {
let query = {
...this.queryParam,
ncrTrackVOList: JSON.stringify(this.content)
ncrTrackVOList: this.content
}
downloadFile(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
downloadFilePost(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
},
Deselect() {
this.selectedRowKeys = []