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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-05-20 17:34:42 +08:00
parent 6b739a7780 8b7fe7d533
commit 9de55d1001
8 changed files with 166 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+109 -6
View File
@@ -13,9 +13,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.WebsocketConst;
import com.jero.common.constant.enums.*;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.constant.enums.IsMustEnum;
import com.jero.common.constant.enums.MessageTypeEnum;
import com.jero.common.constant.enums.ModuleEnum;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.es.JeroElasticsearchTemplate;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.query.QueryRuleEnum;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.DateUtils;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
@@ -30,6 +35,7 @@ import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
import com.jero.modules.document.service.IBussDocumentLibraryEOService;
import com.jero.modules.document.utils.ReadPdfUtil;
import com.jero.modules.document.utils.ReadWordUtil;
import com.jero.modules.document.vo.QueryConditionVO;
import com.jero.modules.domain.service.DomainUserRelService;
import com.jero.modules.feishu.service.IFeishuService;
import com.jero.modules.log.entity.BussLogEO;
@@ -42,7 +48,11 @@ import com.jero.modules.split.entity.SarFileSplitInfoEO;
import com.jero.modules.split.service.ISarFileSplitInfoService;
import com.jero.modules.subscribe.entity.OnlCgformSubscribe;
import com.jero.modules.subscribe.service.IOnlCgformSubscribeService;
import com.jero.modules.system.entity.*;
import com.jero.modules.system.entity.SysAnnouncement;
import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.entity.SysCategoryTreeVO;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.mapper.SysUserMapper;
import com.jero.modules.system.service.ISysAnnouncementService;
import com.jero.modules.system.service.ISysDepartService;
@@ -56,8 +66,20 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.hssf.usermodel.HSSFRichTextString;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.shiro.SecurityUtils;
@@ -73,11 +95,26 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
@@ -5009,4 +5046,70 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
return infoPage;
}
//高级搜索条件拼接
private void sqlJoint(List<QueryConditionVO> queryConditionVOList){
if(queryConditionVOList.size() != 0){
int count =0;
StringBuilder sb = new StringBuilder();
for (QueryConditionVO queryConditionVO : queryConditionVOList) {
String type = queryConditionVO.getType();//and或or
String rule = queryConditionVO.getRule();
String field = queryConditionVO.getField();
String val = queryConditionVO.getVal();
//如果查询字段对应的搜索条件值为空,则不作处理
if(StringUtils.isNotBlank(val)){
count ++;//从第二个查询条件开始拼接type(and或or)
sb.append(" " + field + " ");
//查询类型
String ruleTemp = queryType(rule);
sb.append(ruleTemp + " ");
//在..中(用in-->特殊处理)
if(val.contains(",")){
StringBuilder sbTemp = new StringBuilder();
for (String valTemp : val.split(",")) {
sbTemp.append("'" + valTemp +"' ,");
}
if(StringUtils.isNotBlank(sbTemp)){
String substring = sbTemp.substring(0, sbTemp.length() - 1);
sb.append(substring);
}
}else{
sb.append(val);
}
if(count > 1){
sb.append(type + " ");
}
}
}
}
}
public String queryType(String rule){
String value ="";
if(QueryRuleEnum.GT.getCondition().equals(rule)){
value = QueryRuleEnum.GT.getValue();
}else if(QueryRuleEnum.GE.getCondition().equals(rule)){
value = QueryRuleEnum.GE.getValue();
}else if(QueryRuleEnum.LT.getCondition().equals(rule)){
value = QueryRuleEnum.LT.getValue();
}else if(QueryRuleEnum.LE.getCondition().equals(rule)){
value = QueryRuleEnum.LE.getValue();
}else if(QueryRuleEnum.EQ.getCondition().equals(rule)){
value = QueryRuleEnum.EQ.getValue();
}else if(QueryRuleEnum.NE.getCondition().equals(rule)){
value = QueryRuleEnum.NE.getValue();
}else if(QueryRuleEnum.LIKE.getCondition().equals(rule)){
value = QueryRuleEnum.LIKE.getValue();
}else if(QueryRuleEnum.LEFT_LIKE.getCondition().equals(rule)){
value = QueryRuleEnum.LEFT_LIKE.getValue();
}else if(QueryRuleEnum.RIGHT_LIKE.getCondition().equals(rule)){
value = QueryRuleEnum.RIGHT_LIKE.getValue();
}else if(QueryRuleEnum.IN.getCondition().equals(rule)){
value = QueryRuleEnum.IN.getValue();
}
return value;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vo/QueryConditionVO.java
+22
View File
@@ -0,0 +1,22 @@
package com.jero.modules.document.vo;
import lombok.Data;
/**
* @description
* @date 2022/5/20 14:37
* @auth zhn
*/
@Data
public class QueryConditionVO {
//类型(and或or)
private String type;
//查询类型
private String rule;
//字段
private String field;
//字段值
private String val;
}
jero-web/src/common/lang/en-us.js
+1
View File
@@ -865,4 +865,5 @@ module.exports = {
pleaseConfirmationResults:'Please select the compliance status according to the engineering confirmation results',
pleaseReviewTask:'Please add the engineering confirmation information for this review task',
pleaseWillBeReturned:'Please reconfirm the project confirmation results and the review results of the responsible person. If they meet the requirements, they will be submitted, otherwise they will be returned',
pleaseSubmitStatus:'Please submit the data confirmed by the project in the confirmation status',
}
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -870,4 +870,5 @@ module.exports = {
pleaseConfirmationResults:'请根据工程确认结果选择符合性状态',
pleaseReviewTask:'请您添加对该条审查任务的工程确认信息',
pleaseWillBeReturned:'请对工程确认结果和责任人审查结果进行再次确认，若符合要求则进行提交，否则进行退回',
pleaseSubmitStatus:'请把工程确认的数据都点为确认状态进行提交',
}
jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+6 -7
View File
@@ -49,13 +49,12 @@
</span>
<span slot="operation" slot-scope="result">
<a class="text"
v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'dreDispose'"
:disabled="!result.createUser"
v-if="$route.query.TaskKey == 'zrrclrw' && result.createUser"
@click="edit(result,$t('edit'))">
{{$t('edit')}}
</a>
<a class="text"
v-if="$route.query.TaskKey == 'zrrclrw' && result.status"
v-if="$route.query.TaskKey == 'zrrclrw' && result.status && !result.createUser"
:disabled="!result.status"
@click="confirm(result)">
<span v-if="result.status == 'NotDone'">
@@ -66,13 +65,12 @@
</span>
</a>
<a class="text"
v-if="$route.query.TaskKey == 'zrrclrw'"
v-if="$route.query.TaskKey == 'zrrclrw' && result.status != 'haveDone' && !result.createUser"
@click="answerClick(result,$t('replyFromProjectContactPerson'))">
{{$t('answer')}}
</a>
<a class="text"
v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'dreDispose'"
:disabled="!result.createUser"
v-if="$route.query.TaskKey == 'zrrclrw' && result.createUser"
@click="deleted(result)">
{{$t('deleteLib')}}
</a>
@@ -434,7 +432,7 @@
{
title: this.$t('operation'),
align: 'left',
width: 300,
width: 160,
scopedSlots: { customRender: 'operation' }
}
],
@@ -616,6 +614,7 @@
}
this.formInline.userId = userId.join(',')
this.formInline.userName = userName.join(',')
this.formInline = {...this.formInline}
}
this.loadingTable = false
} else {
jero-web/src/views/processCenter/components/taskCirculationHistory.vue
-4
View File
@@ -46,26 +46,22 @@
title: this.$t('operationNode'),
dataIndex: 'name',
align: 'left',
width:'20%',
},
{
title: this.$t('Operator'),
dataIndex: 'assignee',
align: 'left',
width:'20%',
},
{
title: this.$t('result'),
dataIndex: 'reviewResult',
align: 'left',
width:'20%',
scopedSlots: { customRender: 'reviewResult' }
},
{
title: this.$t('opinion'),
dataIndex: 'approvalOpinion',
align: 'left',
width:'20%',
},
{
title: this.$t('operationTime'),
jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+17 -15
View File
@@ -260,21 +260,23 @@
if (this.$route.query.TaskKey == 'dreDispose') {
this.dreSubmit(res)
} else {
// let dataSource = this.$refs.engineeringConfirmationRef.dataSource
// let isTrue
// for (let i = 0; i < dataSource.length; i++) {
// if (dataSource[i].status == 'status' || !dataSource[i].status) {
// isTrue = true
// } else {
// isTrue = false
// this.$message.warning('')
// return
// }
// }
// if (isTrue) {
//
// }
this.completeTask(res)
if (this.$route.query.TaskKey == 'zrrclrw') {
let dataSource = this.$refs.engineeringConfirmationRef.dataSource
let isTrue
for (let i = 0; i < dataSource.length; i++) {
if (dataSource[i].status == 'haveDone' || !dataSource[i].status) {
isTrue = true
} else {
isTrue = false
this.$message.warning(this.$t('pleaseSubmitStatus'))
this.loading = false
return
}
}
if (isTrue) {
this.completeTask(res)
}
}
}
})
},
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+10 -10
View File
@@ -306,7 +306,7 @@ export default {
methods:{
// 判断是否有权限 认证工程师 待发起收集
// 添加 批量删除 下发收集 冻结配置 工程接口人列修改
permission() {
permissionmoAndinitiated() {
// 判断是否具有提交权限
// 认证工程师
// 定义开关 0为没有权限 1为有权限
@@ -429,9 +429,9 @@ export default {
},
// 下发收集
distributionAndCollection() {
// 先判断是否有权限
let permission = this.permission()
if(permission) {
// 先判断是否有权限 认证工程师 待发起收集
let permissionmoAndinitiated = this.permissionmoAndinitiated()
if(permissionmoAndinitiated) {
let _array = []
this.selectedRowKeysValue.forEach((item, index) => {
_array.push(item.id)
@@ -472,9 +472,9 @@ export default {
},
// 添加
handleAdd() {
// 先判断是否有权限
let permission = this.permission()
if(permission) {
// 先判断是否有权限 认证工程师 待发起收集
let permissionmoAndinitiated = this.permissionmoAndinitiated()
if(permissionmoAndinitiated) {
this.areaVisible = true
}
},
@@ -617,9 +617,9 @@ export default {
this.$refs.CollectionTabel.getTableListReset()
},
handleDel(){
// 先判断是否有权限
let permission = this.permission()
if(permission) {
// 先判断是否有权限 认证工程师 待发起收集
let permissionmoAndinitiated = this.permissionmoAndinitiated()
if(permissionmoAndinitiated) {
let param={
ids: this.selectedRowKeysArray
}