FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
396572590@qq.com
2022-06-27 17:21:01 +08:00
parent e1a3fd6239 fb0c1bbc61
commit 3213e37979
34 changed files with 595 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java
+39 -39
View File
@@ -69,45 +69,45 @@ public class ProcessTimer {
public void urging() {
if(isNotScheduled){
log.info("=================================自动催办定时任务启动=====================================");
List<BusProcessName> busProcessNames = workFlowFeignClient.queryBusProcessNameForEnd(null);
if (null != busProcessNames && 0 < busProcessNames.size()) {
for (BusProcessName busProcessName : busProcessNames) {
String type = busProcessName.getPrcType();
Integer typeInt = 99;
if (StringUtils.isNotEmpty(type)) {
typeInt = Integer.valueOf(type);
}
type = chooseType(typeInt, type);
UserEO userEO = userEOService.selectByPrimaryKey(busProcessName.getCreatUserName());
String[] array = userEO.getEmail().split(",");
String overTime = busProcessName.getOverTime();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
Date dateTime = null;
Integer num = 3;
try {
dateTime = simpleDateFormat.parse(overTime);
Date now = new Date();
long daysBetween = (dateTime.getTime() - now.getTime() + 1000000) / (60 * 60 * 24 * 1000);
num = Integer.valueOf(String.valueOf(daysBetween));
} catch (ParseException e) {
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'");
try {
dateTime = simpleDateFormat1.parse(overTime);
Date now = new Date();
long daysBetween = (dateTime.getTime() - now.getTime() + 1000000) / (60 * 60 * 24 * 1000);
num = Integer.valueOf(String.valueOf(daysBetween));
} catch (ParseException e1) {
e.getMessage();
}
}
String msg = "您好，[" + busProcessName.getPrcNum() + "]-[" + busProcessName.getPrcName() + "] 您有待办任务未及时办理，距离截至日期还有[" + String.valueOf(num) + "]天 请及时办理，请登录全球标准法规管理系统 ( http://39.98.140.126:10005/#/login ) 办理：链接 ( http://39.98.140.126:10005/#/processCenter?tabsName=ProcessCenter ) 。\n" +
" ——来自 全球标准法规管理系统";
String title = "GSRM——【待办任务】[" + type + "] 您有未完成的待办任务";
mailUtil.sendMsgFeign(array, title, msg);
}
}
// List<BusProcessName> busProcessNames = workFlowFeignClient.queryBusProcessNameForEnd(null);
// if (null != busProcessNames && 0 < busProcessNames.size()) {
// for (BusProcessName busProcessName : busProcessNames) {
// String type = busProcessName.getPrcType();
// Integer typeInt = 99;
// if (StringUtils.isNotEmpty(type)) {
// typeInt = Integer.valueOf(type);
// }
// type = chooseType(typeInt, type);
//
// UserEO userEO = userEOService.selectByPrimaryKey(busProcessName.getCreatUserName());
// String[] array = userEO.getEmail().split(",");
// String overTime = busProcessName.getOverTime();
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
// Date dateTime = null;
// Integer num = 3;
// try {
// dateTime = simpleDateFormat.parse(overTime);
// Date now = new Date();
// long daysBetween = (dateTime.getTime() - now.getTime() + 1000000) / (60 * 60 * 24 * 1000);
// num = Integer.valueOf(String.valueOf(daysBetween));
// } catch (ParseException e) {
// SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'");
// try {
// dateTime = simpleDateFormat1.parse(overTime);
// Date now = new Date();
// long daysBetween = (dateTime.getTime() - now.getTime() + 1000000) / (60 * 60 * 24 * 1000);
// num = Integer.valueOf(String.valueOf(daysBetween));
// } catch (ParseException e1) {
// e.getMessage();
// }
// }
//
// String msg = "您好，[" + busProcessName.getPrcNum() + "]-[" + busProcessName.getPrcName() + "] 您有待办任务未及时办理，距离截至日期还有[" + String.valueOf(num) + "]天 请及时办理，请登录全球标准法规管理系统 ( http://39.98.140.126:10005/#/login ) 办理：链接 ( http://39.98.140.126:10005/#/processCenter?tabsName=ProcessCenter ) 。\n" +
// " ——来自 全球标准法规管理系统";
// String title = "GSRM——【待办任务】[" + type + "] 您有未完成的待办任务";
// mailUtil.sendMsgFeign(array, title, msg);
// }
// }
log.info("=================================自动催办定时任务结束=====================================");
}
}
adc-da-jwtLogin/src/main/java/com/adc/da/login/exception/SysRuntimeExceptionHandler.java
+1 -1
View File
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
* <p>
* Created at 2020/8/6 5:03 下午
*/
@RestControllerAdvice
//@RestControllerAdvice
public class SysRuntimeExceptionHandler {
@ExceptionHandler(TokenRuntimeException.class)
adc-da-jwtLogin/src/main/java/com/adc/da/login/exception/TokenRuntimeException.java
+1 -1
View File
@@ -12,7 +12,7 @@ import lombok.Data;
* Created at 2020/8/6 4:58 下午
*/
@Data
public class TokenRuntimeException extends RuntimeException{
public class TokenRuntimeException extends Exception{
private String code = "401";
private String msg;
adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
+2
View File
@@ -54,6 +54,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
addInterceptor.excludePathPatterns("/api/att/attFile/upload");
addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel");
addInterceptor.excludePathPatterns("/api/lawss/sarLawsInfo/exportStandardsInfoExcel");
// 提供自动发起复审流程 复审数据
addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStandState/getSarBussionessStandStateProcessList");
//pcms项目数据下发开放接口
addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/save");
addInterceptor.excludePathPatterns("/api/sar-stand-project-team/save");
adc-da-main/src/main/java/com/adc/da/main/advice/AdcDaBaseExceptionAdvice.java
+14 -2
View File
@@ -13,11 +13,23 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import java.util.HashSet;
import java.util.Set;
@Slf4j
@ControllerAdvice
@Order(value=4)
public class AdcDaBaseExceptionAdvice {
private static Set<String> errMsg = new HashSet<>();
static {
errMsg.add("token已过期");
errMsg.add("未登录");
errMsg.add("token解析错误");
errMsg.add("员工不存在");
}
@ResponseStatus(HttpStatus.OK)
@ExceptionHandler(AdcDaBaseException.class)
@@ -34,8 +46,8 @@ public class AdcDaBaseExceptionAdvice {
log.error(exception.getMessage(), exception);
// TODO 在数据库中记录程序异常，这个地方的异常是未处理的异常，需要管理员查看并进行处理以防重复出现
if(exception.getStackTrace() != null){
if("token已过期".equals(exception.getMessage())){
return Result.error(ResponseMessageCodeEnum.ERROR_TOKEN.getCode(), "token已过期，请重新登录");
if(errMsg.contains(exception.getMessage())){
return Result.error(ResponseMessageCodeEnum.ERROR_TOKEN.getCode(), "token无效，请登录");
}
}
return Result.error(ResponseMessageCodeEnum.ERROR.getCode(), "程序异常，请重试。如果重复出现请联系管理员处理！");
adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java
+4 -1
View File
@@ -18,6 +18,7 @@ import com.adc.da.search.entity.SarAdvanceSearchVO;
import com.adc.da.search.entity.SeniorSearchInfoEO;
import com.adc.da.search.service.ElasticsearchService;
import com.adc.da.search.service.SearchCenterService;
import com.adc.da.search.util.ElasticsearchConstant;
import com.adc.da.util.IOUtils;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
@@ -117,7 +118,9 @@ public class SearchCenterController extends BaseController<Map<String, Object>>
} else {
if (searchInfoEO.getQueryStatus() != null && StringUtils.isNotBlank(searchInfoEO.getQueryStatus()) && searchInfoEO.getQueryStatus().equals("advancedSearch") && null != searchInfoEO.getSelectValue() && StringUtils.isNotBlank(searchInfoEO.getSelectValue())) {
result = searchCenterService.searchSarBykey(searchInfoEO);
}else {
}else if("titleSearch".equals(searchInfoEO.getSelectType())){
result = searchCenterService.searchSarConditionBykeyTitle(searchInfoEO);
}else{
result = searchCenterService.searchSarConditionBykey(searchInfoEO);
}
// 非动态消息的需要查询为我推荐
adc-da-search/src/main/java/com/adc/da/search/service/SearchCenterService.java
+2
View File
@@ -13,6 +13,8 @@ public interface SearchCenterService {
List<Map<String, Object>> searchSarConditionBykey(SeniorSearchInfoEO searchInfoEO) throws Exception;
List<Map<String, Object>> searchSarConditionBykeyTitle(SeniorSearchInfoEO searchInfoEO) throws Exception;
/**
* 查询结果集searchResponse装换成List形式
* @param searchResponse 需要转换的数据
adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+125 -32
View File
@@ -203,6 +203,115 @@ public class SearchCenterServiceImpl implements SearchCenterService {
return result;
}
@Override
public List<Map<String, Object>> searchSarConditionBykeyTitle(SeniorSearchInfoEO searchInfoEO) throws Exception {
//判断是否高级查询 isHight = true（searchInfoEO.getIsHigh()为空）时，证明不是高级查询
boolean isHight = StringUtils.isBlank(searchInfoEO.getIsHigh());
List<Map<String, Object>> result = new ArrayList<>();
SearchRequestBuilder searchRequestBuilder;
BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
BoolQueryBuilder boolQueryShould = QueryBuilders.boolQuery();
BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery();
updateIndex(searchInfoEO.getSelectIndex());
String sortField1 = "";
String sortField2 = "";
String sortField3 = "";
if("laws".equals(searchInfoEO.getSelectIndex())){
sortField1 = "lawsNumber";
sortField2 = "lawsYear";
sortField3 = "lawsType.keyword";
}else {
sortField1 = "standNumber";
sortField2 = "standYear";
sortField3 = "standSort.keyword";
}
searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex())
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
.setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize())
.addSort(new ScoreSortBuilder().order(SortOrder.DESC))
.addSort("standSortOrder", SortOrder.ASC)
.addSort(sortField1, SortOrder.ASC)
.addSort(sortField2, SortOrder.DESC)
.addSort(sortField3, SortOrder.ASC)
.addSort("issue_time_data", SortOrder.DESC)
.setSize(searchInfoEO.getPageSize());
if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue()) && StringUtils.isBlank(searchInfoEO.getIsHigh())){
QueryBuilder multiQueryBuilder;
switch (searchInfoEO.getSelectIndex()){
case "stand":
boolQueryShould
.should(QueryBuilders.wildcardQuery("standSort.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1005f))
.should(QueryBuilders.termQuery("standNumber", searchInfoEO.getSelectValue().toUpperCase()).boost(1004f))
.should(QueryBuilders.wildcardQuery("standYear.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1003f))
.should(QueryBuilders.wildcardQuery("nameshow.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1002f))
.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f))
.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(999f));
break;
case "laws":
boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("lawsName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("lawsNo.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("lawsEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*"));
break;
case "bussstand":
boolQueryShould
.should(QueryBuilders.wildcardQuery("standSort.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1005f))
.should(QueryBuilders.termQuery("standNumber", searchInfoEO.getSelectValue().toUpperCase()).boost(1004f))
.should(QueryBuilders.wildcardQuery("standYear.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1003f))
.should(QueryBuilders.wildcardQuery("nameshow.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1002f))
.should(QueryBuilders.wildcardQuery("stand_code.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f))
.should(QueryBuilders.wildcardQuery("stand_code.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(999F));
break;
default: break;
}
}
if(boolQueryShould!=null){
boolQueryBuilder.must(QueryBuilders.matchQuery("validFlag", 0));
if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){
if (StringUtils.isNotBlank(searchInfoEO.getType())) {
boolQueryShould.must(QueryBuilders.wildcardQuery("type.keyword", "*"+searchInfoEO.getType()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getStandType()) && StringUtils.isNotBlank(searchInfoEO.getSelectIndex())) {
if(searchInfoEO.getSelectIndex().equals("bussstand")){
boolQueryShould.must(QueryBuilders.wildcardQuery("type.keyword", "*"+searchInfoEO.getStandType()+"*"));
}else {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*"));
}
}
if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getTextStatus())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatus.keyword", "*"+searchInfoEO.getTextStatus()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getLawsSyqy())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("lawsSyqy.keyword", "*"+searchInfoEO.getLawsSyqy()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getLawsSycx())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("lawsSycx.keyword", "*"+searchInfoEO.getLawsSycx()+"*"));
}
boolQueryBuilder.must(boolQueryShould);
}else {
if ("stand".equals(searchInfoEO.getSelectIndex()) && StringUtils.isNotBlank(searchInfoEO.getStandType())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*"));
}
boolQueryBuilder.must(boolQueryShould);
}
searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true);
// 获取查询到的结果
result = countStandSearchResult(searchRequestBuilder,searchInfoEO);
}
return result;
}
// 条件
@Override
public List<Map<String, Object>> searchSarConditionBykey(SeniorSearchInfoEO searchInfoEO) throws Exception {
@@ -259,30 +368,16 @@ public class SearchCenterServiceImpl implements SearchCenterService {
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryShould.should(rangeQueryBuilder);
}
// boolQueryShould.should(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("standNatureName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("textStatusName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("isRelateAccessName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.matchPhraseQuery("content", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*"));
boolQueryShould.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*"));
break;
case "laws":
// boolQueryShould.should(QueryBuilders.wildcardQuery("lawsTypeName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("lawsName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("lawsNo.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("issueCompany.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("lawsTextStateName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("isRelateAccessName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("lawsYearName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("lawsBulletin.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("lawsLabel.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("lawsRemark.keyword", "*"+searchInfoEO.getSelectValue()+"*"));
boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("lawsName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("lawsNo.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("lawsEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*"));
if (isRqFormat(searchInfoEO.getSelectValue())) {
Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
@@ -295,12 +390,10 @@ public class SearchCenterServiceImpl implements SearchCenterService {
}
break;
case "bussstand":
// boolQueryShould.should(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
// .should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getSelectValue()+"*"));
boolQueryShould.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("nameshow.keyword", "*"+searchInfoEO.getSelectValue()+"*"));
if (isRqFormat(searchInfoEO.getSelectValue())) {
Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
@@ -798,14 +891,14 @@ public class SearchCenterServiceImpl implements SearchCenterService {
String[] lawsStr = null;
String[] bussstandStr = null;
if (StringUtils.isNotBlank(searchInfoEO.getSelectType()) && "titleSearch".equals(searchInfoEO.getSelectType())){
standStr = new String[]{"numbershow","nameshow"};
standStr = new String[]{"numbershow","nameshow","standNumber"};
lawsStr = new String[]{"lawsNo","lawsName"};
bussstandStr = new String[]{"numbershow","nameshow"};
}else {
standStr = new String[]{"content", "standEnName", "standNatureName",
standStr = new String[]{"standEnName", "standNatureName","standNumber",
"textStatusName", "isRelateAccessName", "numbershow","nameshow", "standSystem", "NYLXCLASS", "CLLX"};
lawsStr = new String[]{"content", "lawsEnName","lawsName", "lawsNo", "issueCompany", "lawsTextState", "lawsSyqy", "lawsSycx", "isRelateAccess", "lawsNotisyncNum", "lawsBulletin", "lawsLabel", "lawsRemark"};
bussstandStr = new String[]{"content", "stand_code", "standEnName", "nameshow", "standstateshow", "numbershow", "textStatusBuss", "textStatusBussName", "NYLXCLASS", "CLLX"};
lawsStr = new String[]{"lawsEnName","lawsName", "lawsNo", "issueCompany", "lawsTextState", "lawsSyqy", "lawsSycx", "isRelateAccess", "lawsNotisyncNum", "lawsBulletin", "lawsLabel", "lawsRemark"};
bussstandStr = new String[]{"stand_code", "standEnName", "nameshow", "standstateshow", "numbershow", "textStatusBuss", "textStatusBussName", "NYLXCLASS", "CLLX"};
for (String field : fieldList) {
// 关键字查询属性字段
String keyWordField2 = field + "Name";
adc-da-search/src/main/java/com/adc/da/search/util/ElasticsearchConstant.java
+15
View File
@@ -14,4 +14,19 @@ public class ElasticsearchConstant {
public static final String SUCCESS_DELETED = "DELETED";
//删除过程中未找到对应数据返回结果
public static final String HAVE_NOT_FOUND= "NOT_FOUND";
//字符串转换为小写
public static String exChangeLower(String str){
//把一个字符串中的大写转为小写
String real = "";
for(int i=0;i<str.length();i++){
//如果是大写
if(!(str.substring(i, i+1).equals(str.substring(i, i+1).toLowerCase()))){
real += str.substring(i, i+1).toLowerCase();
}else{
real += str.substring(i, i+1);
}
}
return real;
}
}
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+7 -8
View File
@@ -6,7 +6,6 @@ import com.adc.da.scheduled.dao.SarStandardItemDao;
import com.adc.da.scheduled.dao.SarStandardWarningDao;
import com.adc.da.scheduled.entity.TermDTO;
import com.adc.da.slrs.ActivityDatas.entity.DataList;
import com.adc.da.slrs.processModel.utils.TrainFormDate;
import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
@@ -22,8 +21,6 @@ import com.adc.da.sys.service.IDicTypeEOService;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -35,17 +32,12 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
import java.lang.reflect.InvocationTargetException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@EnableScheduling
@@ -133,6 +125,13 @@ public class ScheduledJob {
logger.info("========================================================================================================");
//删除不在预警范围的标准
int remove = sarStandardWarningDao.autoCancelWarning();
log.info("开始修整"+new Date()+"!");
try {
Thread.sleep(20000);
} catch (InterruptedException e) {
e.printStackTrace();
}
log.info("结束修整"+new Date()+"!");
logger.info("取消" + remove + "条预警");
//预警期限(当前日期至3个月后)
adc-da-slrs/src/main/java/com/adc/da/scheduled/WarningSchedulingTasks.java
+29
View File
@@ -0,0 +1,29 @@
package com.adc.da.scheduled;
import com.adc.da.common.GetBeanUtil;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Slf4j
public class WarningSchedulingTasks implements Runnable{
Logger logger = LoggerFactory.getLogger(WarningSchedulingTasks.class);
private ScheduledJob scheduledJob;
public WarningSchedulingTasks() {
scheduledJob= GetBeanUtil.getApplicationContext().getBean(ScheduledJob.class);
}
@Override
public void run() {
try{
Thread.sleep(2000);
scheduledJob.warningSchedulingTasks();
}catch(Exception e){
logger.info(e.getMessage());
}
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+14
View File
@@ -35,6 +35,8 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport;
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew;
import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService;
import com.adc.da.slrs.sarResource.entity.TsResource;
import com.adc.da.slrs.sarResource.service.ITsResourceService;
import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
@@ -48,6 +50,7 @@ import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
import com.adc.da.sys.constant.ValueStateEnum;
import com.adc.da.sys.dao.DicTypeEODao;
import com.adc.da.sys.entity.DicTypeEO;
import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService;
import com.adc.da.sys.util.LoginUserUtil;
import com.adc.da.util.UUIDUtils;
@@ -1564,6 +1567,17 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if (value1 != null && value1.toString().equals("\"null\"")){
entry.setValue("");
}
if("TXLBBUSS".equals(name)){
String value = entry.getValue().toString();
QueryWrapper wrapper = new QueryWrapper();
wrapper.eq("REPLACE(MENU_NAME,' ','')",value.trim());
wrapper.like("PARENT_IDS","aaaaaaaaaaaaaaaaaaaaaa");
List<SarMenuStandard> list = iSarMenuStandardService.list(wrapper);
if(!list.isEmpty()){
newMap.put(name+"MenuId",list.get(0).getId());
}
}
if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) {
String value = entry.getValue().toString();
String selVal = InitStandAttrUtil.selectFieldMapBuss.get(name);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java
+13
View File
@@ -4,6 +4,7 @@ package com.adc.da.slrs.sarBussionessStandState.controller;
import com.adc.da.http.PageInfo;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarBussionessStandState.entity.ModelData;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService;
import com.adc.da.util.LoginUserUtil;
@@ -12,6 +13,7 @@ import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
import io.swagger.annotations.Api;
@@ -36,6 +38,17 @@ public class SarBussionessStandStateController extends BaseController<SarBussion
@Autowired
private ISarBussionessStandStateService bussionessStandStateService;
/**
* 查询当天企标复审列表
* @param page 标准信息
* @return
*/
@ApiOperation(value = "|SarBussionessStandState|查询当天企标复审")
@PostMapping("/getSarBussionessStandStateProcessList")
public List<ModelData> getSarBussionessStandStateProcessList(SarBussionessStandStatePage page){
return bussionessStandStateService.getSarBussionessStandStateProcessList(page);
}
/**
* 自定义分页复审流程查询列表
* @param page 标准信息
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java
+3
View File
@@ -1,5 +1,6 @@
package com.adc.da.slrs.sarBussionessStandState.dao;
import com.adc.da.slrs.sarBussionessStandState.entity.ModelData;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,6 +17,8 @@ import java.util.List;
*/
public interface SarBussionessStandStateDao extends BaseMapper<SarBussionessStandState> {
List<ModelData> getSarBussionessStandStateProcessList(SarBussionessStandStatePage page);
List<SarBussionessStandState> getBussionessStandStatePage(SarBussionessStandStatePage page);
int getBussionessStandStateCount(SarBussionessStandStatePage page);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/ModelData.java
+45
View File
@@ -0,0 +1,45 @@
/**
* Copyright 2022 bejson.com
*/
package com.adc.da.slrs.sarBussionessStandState.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
* Auto-generated: 2022-06-23 15:31:2
*
* @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
*/
@Data
public class ModelData {
private String id;
private String standId;
private String standName;
private String standCode;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private String reviewTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private String issueTime;
private String reviewResults;
private String reviewProcessNum;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private String creationTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private String modifyTime;
private int validFlag;
private String param1;
private String param2;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private String putTime;
private String standSort;
private String qcdw;
private String fsrqbuss;
private String qcrbuss;
private String processStatus;
private String bussFsSubUser1;
private String bussFsSubUser1Name;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java
+3
View File
@@ -1,5 +1,6 @@
package com.adc.da.slrs.sarBussionessStandState.service;
import com.adc.da.slrs.sarBussionessStandState.entity.ModelData;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,6 +17,8 @@ import java.util.List;
*/
public interface ISarBussionessStandStateService extends IService<SarBussionessStandState> {
List<ModelData> getSarBussionessStandStateProcessList(SarBussionessStandStatePage page);
List<SarBussionessStandState> getSarBussionessStandStatePageNo(SarBussionessStandStatePage page) throws Exception;
List<SarBussionessStandState> getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java
+7
View File
@@ -1,5 +1,6 @@
package com.adc.da.slrs.sarBussionessStandState.service.impl;
import com.adc.da.slrs.sarBussionessStandState.entity.ModelData;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
import com.adc.da.slrs.sarBussionessStandState.dao.SarBussionessStandStateDao;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
@@ -20,6 +21,12 @@ import java.util.List;
@Service
public class SarBussionessStandStateServiceImpl extends ServiceImpl<SarBussionessStandStateDao, SarBussionessStandState> implements ISarBussionessStandStateService {
@Override
public List<ModelData> getSarBussionessStandStateProcessList(SarBussionessStandStatePage page){
List<ModelData> stateList = this.baseMapper.getSarBussionessStandStateProcessList(page);
return stateList;
}
@Override
public List<SarBussionessStandState> getSarBussionessStandStatePageNo(SarBussionessStandStatePage page) throws Exception{
Integer rowCount = this.baseMapper.getBussionessStandStateCountNo(page);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java
+2
View File
@@ -42,4 +42,6 @@ public class AddDetailedDto {
private String inforlist2;
@ApiModelProperty(value = "新车型实施时间")
private String inforlist3;
@ApiModelProperty(value = "适用认证")
private String inforlist4;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+72 -49
View File
@@ -323,30 +323,50 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
sarLawsDetailedListDao.insert(sarLawsDetailedList);
if (addDetailedDto.getInforlist() != null) {
if (addDetailedDto.getInforlist().contains(",")) {
String[] id = addDetailedDto.getInforlist().split(",");
String[] putTime = addDetailedDto.getInforlist1().split(";");
String[] zcc = addDetailedDto.getInforlist2().split(";");
String[] xcx = addDetailedDto.getInforlist3().split(";");
String[] id = new String[]{};
String[] putTime = new String[]{};
String[] zcc = new String[]{};
String[] xcx = new String[]{};
String[] syrz = new String[]{};
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist())) {
id = addDetailedDto.getInforlist().split(",");
}
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist1())) {
putTime = addDetailedDto.getInforlist1().split(";");
}
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist2())) {
zcc = addDetailedDto.getInforlist2().split(";");
}
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist3())) {
xcx = addDetailedDto.getInforlist3().split(";");
}
if (StringUtils.isNotEmpty(addDetailedDto.getInforlist4())) {
syrz = addDetailedDto.getInforlist4().split(";");
}
for (int a = 0; a < id.length; a++) {
TimeDto dto = new TimeDto();
dto.setStandId(id[a]);
//putTiem即ssrq可能为空 ''
if (putTime.length > 0) {
if ("-".equals(putTime[a]) || null == putTime[a]) {
dto.setSsrq(null);
} else {
dto.setSsrq(putTime[a]);
}
if ("-".equals(putTime[a]) || null == xcx[a]) {
dto.setXcxssrqgj(null);
} else {
dto.setXcxssrqgj(xcx[a]);
}
if ("-".equals(putTime[a]) || null == zcc[a]) {
dto.setZccssrqgj(null);
} else {
dto.setZccssrqgj(zcc[a]);
}
if (putTime.length <= a) {
dto.setSsrq(null);
} else {
dto.setSsrq(putTime[a]);
}
if (xcx.length <= a) {
dto.setXcxssrqgj(null);
} else {
dto.setXcxssrqgj(xcx[a]);
}
if (zcc.length <= a) {
dto.setZccssrqgj(null);
} else {
dto.setZccssrqgj(zcc[a]);
}
if (syrz.length <= a) {
dto.setSyrz(null);
} else {
dto.setSyrz(syrz[a]);
}
timeDto.add(dto);
}
@@ -356,22 +376,25 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
dto.setSsrq(addDetailedDto.getInforlist1());
dto.setXcxssrqgj(addDetailedDto.getInforlist2());
dto.setZccssrqgj(addDetailedDto.getInforlist3());
dto.setSyrz(addDetailedDto.getInforlist4());
timeDto.add(dto);
}
} else {
timeDto = null;
}
service.insertDetailedList(sarLawsDetailedList.getId(), timeDto);
if (null != timeDto) {
List<SarStandardsInfo> sarStandardsInfos = new ArrayList<>();
timeDto.forEach(timeDto1 -> {
SarStandardsInfo sarStandardsInfo = new SarStandardsInfo();
sarStandardsInfo.setId(timeDto1.getStandId());
sarStandardsInfo.setIsRelateAccess("1");
sarStandardsInfos.add(sarStandardsInfo);
});
sarStandardsInfoService.updateBatchById(sarStandardsInfos);
List<String> list1 = new ArrayList<>();
List<String> list2 = new ArrayList<>();
//避免出现数据丢失 处理一下适用认证信息
list1.addAll(Arrays.asList(addDetailedDto.getInforlist().split(",")));
Hashtable<String, String> hashtable = new Hashtable<>();
for (TimeDto dto:timeDto) {
if (StringUtils.isNotBlank(dto.getSyrz())) {
hashtable.put(dto.getStandId(), dto.getSyrz());
}
}
//下面写消息队列了开始
createUpdateMQService.sendMQ(hashtable, list2, list1);
} catch (Exception e) {
e.printStackTrace();
@@ -656,16 +679,16 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
String[] zcc = new String[]{};
String[] xcx = new String[]{};
String[] syrz = new String[]{};
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist())){
if (StringUtils.isNotEmpty(detailedUpDto.getInforlist())) {
id = detailedUpDto.getInforlist().split(",");
}
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist1())){
if (StringUtils.isNotEmpty(detailedUpDto.getInforlist1())) {
putTime = detailedUpDto.getInforlist1().split(";");
}
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist2())){
if (StringUtils.isNotEmpty(detailedUpDto.getInforlist2())) {
zcc = detailedUpDto.getInforlist2().split(";");
}
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist3())){
if (StringUtils.isNotEmpty(detailedUpDto.getInforlist3())) {
xcx = detailedUpDto.getInforlist3().split(";");
}
if(StringUtils.isNotEmpty(detailedUpDto.getInforlist4())){
@@ -722,7 +745,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
if (list1.size() > 0) {
QueryWrapper<SarLawsAttrDetailedList> wrapper1 = new QueryWrapper<>();
wrapper1.in("stand_id", list1);
List<SarLawsAttrDetailedList> res = sarLawsAttrDetailedListDao.selectList(wrapper);
List<SarLawsAttrDetailedList> res = sarLawsAttrDetailedListDao.selectList(wrapper1);
if (res.size() > 0) {
res.forEach(sarLawsAttrDetailedList -> {
dealWithHashTableData(list1, list2, hashtable, sarLawsAttrDetailedList);
@@ -869,20 +892,20 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
}
//数据校验 先做重复交验+再做是否存在校验
if (null != res && "".equals(stringBuilder.toString())) {
for (ExportEmptyModelDto re:res) {
if(!(re.getSsrq().contains(",")||re.getSsrq().contains("，"))) {
for (ExportEmptyModelDto re : res) {
if (!(re.getSsrq().contains(",") || re.getSsrq().contains("，"))) {
Date date = org.apache.poi.ss.usermodel.DateUtil
.getJavaDate(Double.valueOf(re.getSsrq()));
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
re.setSsrq(format.format(date));
}
if(!(re.getXcxssrqgj().contains(",")||re.getXcxssrqgj().contains("，"))) {
if (!(re.getXcxssrqgj().contains(",") || re.getXcxssrqgj().contains("，"))) {
Date date = org.apache.poi.ss.usermodel.DateUtil
.getJavaDate(Double.valueOf(re.getXcxssrqgj()));
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
re.setXcxssrqgj(format.format(date));
}
if(!(re.getZccssrqgj().contains(",")||re.getZccssrqgj().contains("，"))) {
if (!(re.getZccssrqgj().contains(",") || re.getZccssrqgj().contains("，"))) {
Date date = org.apache.poi.ss.usermodel.DateUtil
.getJavaDate(Double.valueOf(re.getZccssrqgj()));
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
@@ -989,10 +1012,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
ExportEmptyModelDto model = map.get(sarStandardsInfo.getId());
model.setStandName(sarStandardsInfo.getStandName());
model.setStandEnName(sarStandardsInfo.getStandEnName());
model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString():"");
model.setSycpx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ?sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString():"");
model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString():"");
model.setSycx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ?sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString():"");
model.setNylx(null != sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ? sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString() : "");
model.setSycpx(null != sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ? sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString() : "");
model.setZrbm(null != sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ? sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString() : "");
model.setSycx(null != sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ? sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString() : "");
result.add(model);
});
}
@@ -1016,10 +1039,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
ExportEmptyModelDto model = map.get(sarStandardsInfo.getId());
model.setStandName(sarStandardsInfo.getStandName());
model.setStandEnName(sarStandardsInfo.getStandEnName());
model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString():"");
model.setSycpx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ?sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString():"");
model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString():"");
model.setSycx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ?sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString():"");
model.setNylx(null != sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ? sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString() : "");
model.setSycpx(null != sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ? sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString() : "");
model.setZrbm(null != sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ? sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString() : "");
model.setSycx(null != sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ? sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString() : "");
result.add(model);
});
}
@@ -1042,11 +1065,11 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
ExportEmptyModelDto model = map.get(sarStandardsInfo.getId());
model.setStandName(sarStandardsInfo.getLawsName());
model.setStandEnName(sarStandardsInfo.getLawsEnName());
model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws").toString():"");
model.setNylx(null != sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws") ? sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws").toString() : "");
//没有使用产品线
// model.setSycpx(null!=sarStandardsInfo.getLawsSycx() ?sarStandardsInfo.getLawsSycx():"");
model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws").toString():"");
model.setSycx(null!=sarStandardsInfo.getLawsSycx() ?sarStandardsInfo.getLawsSycx():"");
model.setZrbm(null != sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws") ? sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws").toString() : "");
model.setSycx(null != sarStandardsInfo.getLawsSycx() ? sarStandardsInfo.getLawsSycx() : "");
result.add(model);
});
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java
+4
View File
@@ -95,4 +95,8 @@ public class StandWarningEO extends EarlyWarningEO {
@ApiModelProperty("范围查询发布日期结束")
@DateTimeFormat(pattern = "YYYY-MM-dd")
private String endIssueTime;
@ExcelIgnore
@ApiModelProperty("stand标准 item条款")
private String mark;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/controller/WgCommitteeController.java
+4
View File
@@ -15,8 +15,11 @@ import com.adc.da.slrs.wgCommittee.entity.WgCommittee;
import io.swagger.annotations.Api;
import com.adc.da.base.web.BaseController;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -43,6 +46,7 @@ public class WgCommitteeController extends BaseController<WgCommittee> {
@PostMapping("/insert")
public ResponseMessage addWorkCommitter(WgCommittee wgCommittee) {
wgCommittee.setCreateTime(new Date());
if (isDistinct(wgCommittee.getCommitteeName(),null)){
if (iWgCommitteeService.add(wgCommittee)){
return Result.success("200","新增成功");
adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/entity/WgCommittee.java
+4
View File
@@ -9,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
import java.util.List;
/**
@@ -45,6 +46,9 @@ public class WgCommittee extends BasePage {
@ApiModelProperty(value = "委员关联表")
private String committeer;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "委员")
@TableField(exist = false)
private String committeeIds;
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+2 -2
View File
@@ -392,7 +392,7 @@
FROM sar_bussioness_stand
WHERE stand_sort = 'Q/QCBFC'
AND ISSUE_TIME IS NOT NULL
AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d')
AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d')
BETWEEN DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_ADD(DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d'),INTERVAL 1 DAY)
UNION
SELECT
@@ -401,7 +401,7 @@
FROM sar_bussioness_stand
WHERE stand_sort != 'Q/QCBFC'
AND ISSUE_TIME IS NOT NULL
AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d')
AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d')
BETWEEN DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_ADD(DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d'),INTERVAL 1 DAY)
</select>
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
+115 -1
View File
@@ -5,6 +5,9 @@
<resultMap id="BaseResultMap" type="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState" >
</resultMap>
<resultMap id="BaseResultStandStateMap" type="com.adc.da.slrs.sarBussionessStandState.entity.ModelData" >
</resultMap>
<sql id="Base_Column_List" >
sar_bussioness_stand_state.ID,
sar_bussioness_stand_state.STAND_ID,
@@ -33,8 +36,62 @@
sar_bussioness_stand.VALID_FLAG
</sql>
<sql id="SarBussionInfoRole_Where_Clause_Review_Results_Buss_StandState_1">
where sar_bussioness_stand.stand_sort = 'Q/QCBFC' and sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0'
AND DATE_FORMAT(DATE_SUB(DATE_ADD(sar_bussioness_stand.ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') = DATE_FORMAT(current_timestamp(), '%Y-%m-%d')
<trim suffixOverrides="," >
<if test="standCode != null and standCode != '' " >
and STAND_CODE like concat(concat('%',#{standCode}),'%')
</if>
<if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd != null and reviewTimeEnd != ''">
and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')
</if>
<if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd == null and reviewTimeEnd == ''">
and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS,'%Y-%m-%d') &gt;= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d')
</if>
<if test="reviewTimeStart == null and reviewTimeStart == '' and reviewTimeEnd != null and reviewTimeEnd != ''">
and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS,'%Y-%m-%d') &lt;= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')
</if>
<if test="issueTimeStart != null and issueTimeStart != '' and issueTimeEnd != null and issueTimeEnd != ''">
and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
</if>
<if test="issueTimeStart != null and issueTimeStart != '' and issueTimeEnd == null and issueTimeEnd == ''">
and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') &gt;= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d')
</if>
<if test="issueTimeStart == null and issueTimeStart == '' and issueTimeEnd != null and issueTimeEnd != ''">
and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') &lt;= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
</if>
</trim>
</sql>
<sql id="SarBussionInfoRole_Where_Clause_Review_Results_Buss_StandState_2">
where sar_bussioness_stand.stand_sort != 'Q/QCBFC' and sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0'
AND DATE_FORMAT(DATE_SUB(DATE_ADD(sar_bussioness_stand.ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') = DATE_FORMAT(current_timestamp(), '%Y-%m-%d')
<trim suffixOverrides="," >
<if test="standCode != null and standCode != '' " >
and STAND_CODE like concat(concat('%',#{standCode}),'%')
</if>
<if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd != null and reviewTimeEnd != ''">
and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')
</if>
<if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd == null and reviewTimeEnd == ''">
and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS,'%Y-%m-%d') &gt;= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d')
</if>
<if test="reviewTimeStart == null and reviewTimeStart == '' and reviewTimeEnd != null and reviewTimeEnd != ''">
and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS,'%Y-%m-%d') &lt;= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')
</if>
<if test="issueTimeStart != null and issueTimeStart != '' and issueTimeEnd != null and issueTimeEnd != ''">
and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
</if>
<if test="issueTimeStart != null and issueTimeStart != '' and issueTimeEnd == null and issueTimeEnd == ''">
and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') &gt;= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d')
</if>
<if test="issueTimeStart == null and issueTimeStart == '' and issueTimeEnd != null and issueTimeEnd != ''">
and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') &lt;= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
</if>
</trim>
</sql>
<sql id="SarBussionInfoRole_Where_Clause_Review_Results_Buss">
where sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL
where sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0'
<trim suffixOverrides="," >
<if test="standCode != null and standCode != '' " >
and STAND_CODE like concat(concat('%',#{standCode}),'%')
@@ -113,6 +170,63 @@
</trim>
</sql>
<select id="getSarBussionessStandStateProcessList" resultMap="BaseResultStandStateMap" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
SELECT t.* FROM (
SELECT
A.ID,
A.STAND_ID as standId,
A.STAND_NAME as standName,
A.STAND_CODE as standCode,
A.REVIEW_TIME as reviewTime,
A.ISSUE_TIME as issueTime,
A.PUT_TIME as putTime,
A.CREATION_TIME as creationTime,
A.MODIFY_TIME as modifyTime,
A.VALID_FLAG as validFlag,
A.QCDW as qcdw,
A.QCRBUSS as qcrbuss,
A.standSort
FROM (
select
<include refid="Base_Column_List_buss" />,
DATE_SUB(DATE_ADD(sar_bussioness_stand.ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH) AS REVIEW_TIME,
sar_buss_stand_attr_info.QCDW,
sar_buss_stand_attr_info.QCRBUSS
from sar_bussioness_stand
LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand.id
<include refid="SarBussionInfoRole_Where_Clause_Review_Results_Buss_StandState_1"/>
) A
UNION
SELECT
A.ID,
A.STAND_ID as standId,
A.STAND_NAME as standName,
A.STAND_CODE as standCode,
A.REVIEW_TIME as reviewTime,
A.ISSUE_TIME as issueTime,
A.PUT_TIME as putTime,
A.CREATION_TIME as creationTime,
A.MODIFY_TIME as modifyTime,
A.VALID_FLAG as validFlag,
A.QCDW as qcdw,
A.QCRBUSS as qcrbuss,
A.standSort
FROM (
select
<include refid="Base_Column_List_buss" />,
DATE_SUB(DATE_ADD(sar_bussioness_stand.ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH) AS REVIEW_TIME,
sar_buss_stand_attr_info.QCDW,
sar_buss_stand_attr_info.QCRBUSS
from sar_bussioness_stand
LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand.id
<include refid="SarBussionInfoRole_Where_Clause_Review_Results_Buss_StandState_2"/>
) A
) t
ORDER BY
t.reviewTime DESC,
t.issueTime DESC
</select>
<!-- 分页查询条件当页数据 -->
<select id="getSarBussionessStandStatePageNo" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
SELECT
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
+8 -4
View File
@@ -3,7 +3,7 @@
<mapper namespace="com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao">
<select id="getPublicIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
SELECT sar_public_idea_all.id,sar_public_idea_all.reason,concat(t2.name,'_',ts_institution.name) as dept_name,ts_institution.name as department,sar_public_idea_all.old_text,
SELECT sar_public_idea_all.id,sar_public_idea_all.reason,concat(t3.name,'_',t2.name,'_',ts_institution.name) as dept_name,ts_institution.name as department,sar_public_idea_all.old_text,
sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,
sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,
sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.wk_flag,sar_public_idea_all.cause, sar_public_idea_all.state,sar_public_idea_all.source_type as sourceType
@@ -12,6 +12,7 @@
left join ts_user on ts_user.USID = sar_public_idea_all.user_id
left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
left join ts_institution t2 on ts_institution.parent_id=t2.id
left join ts_institution t3 on t2.parent_id=t3.id
WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique}
</select>
@@ -32,7 +33,7 @@
FROM
(
SELECT (@i:=@i+1) as rows,
sar_public_idea_all.id,sar_public_idea_all.reason,concat(t2.name,'_',ts_institution.name) as dept_name,sar_public_idea_all.old_text,
sar_public_idea_all.id,sar_public_idea_all.reason,concat(t3.name,'_',t2.name,'_',ts_institution.name) as dept_name,sar_public_idea_all.old_text,
sar_public_idea_all.wk_flag,sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,
sar_public_idea_all.part_code,sar_public_idea_all.user_name,
sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,
@@ -41,6 +42,7 @@
left join ts_user on sar_public_idea_all.user_id=ts_user.USID
left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
left join ts_institution t2 on ts_institution.parent_id=t2.id
left join ts_institution t3 on t2.parent_id=t3.id
WHERE
sar_public_idea_all.idea_id = #{ideaId}
)c
@@ -55,12 +57,13 @@
</select>
<select id="getPublicAllIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
SELECT sar_public_idea_all.id,reason,concat(t2.name,'_',ts_institution.name) as
SELECT sar_public_idea_all.id,reason,concat(t3.name,'_',t2.name,'_',ts_institution.name) as
deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause,sar_public_idea_all.source_type as sourceType
FROM sar_public_idea_all
left join ts_user on ts_user.USID=sar_public_idea_all.user_id
left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
left join ts_institution t2 on ts_institution.parent_id=t2.id
left join ts_institution t3 on t2.parent_id=t3.id
WHERE sar_public_idea_all.idea_id = #{cid}
<if test="null!=type and type != ''">
and sar_public_idea_all.wk_flag ='1' and sar_public_idea_all.state in ('1','2')
@@ -69,12 +72,13 @@
</select>
<select id="getPublicAllIdeaExport" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
SELECT sar_public_idea_all.id,reason,concat(t2.name,'_',ts_institution.name) as
SELECT sar_public_idea_all.id,reason,concat(t3.name,'_',t2.name,'_',ts_institution.name) as
deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause,sar_public_idea_all.source_type as sourceType
FROM sar_public_idea_all
left join ts_user on ts_user.USID=sar_public_idea_all.user_id
left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
left join ts_institution t2 on ts_institution.parent_id=t2.id
left join ts_institution t3 on t2.parent_id=t3.id
WHERE cid = #{cid}
<if test="null==type or ''==type">
and sar_public_idea_all.wk_flag is null
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+12 -2
View File
@@ -209,7 +209,12 @@
LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID
<where>
POWER = '1'
AND (MARK = 'stand')
<if test="waringEO.mark != null and waringEO.mark != ''">
AND (MARK = #{mark})
</if>
<if test="waringEO.mark == null or waringEO.mark == ''">
AND (MARK = 'stand')
</if>
AND sarInfo.VALID_FLAG='0'
<include refid="stand_where"/>
<if test="waringEO.applyType != null and waringEO.applyType != ''">AND attr.CLLX LIKE CONCAT('%',
@@ -255,7 +260,12 @@
LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEM_ID
<where>
POWER = '1'
AND (MARK = 'item')
<if test="waringEO.mark != null and waringEO.mark != ''">
AND (MARK = #{mark})
</if>
<if test="waringEO.mark == null or waringEO.mark == ''">
AND (MARK = 'item')
</if>
AND sarInfo.VALID_FLAG='0'
<include refid="stand_where"/>
<if test="waringEO.applyType != null and waringEO.applyType != ''">
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml
+4 -19
View File
@@ -4,7 +4,7 @@
<insert id="ignoreInsert" parameterType="java.util.LinkedList">
REPLACE INTO sar_stand_warning (ID,STAND_ID,ITEMS_ID,POLICY_ID,MARK,POWER)
REPLACE INTO sar_stand_warning (ID,STAND_ID,ITEM_ID,POLICY_ID,MARK,POWER)
VALUES
<if test="warningEOS !=null and warningEOS.size()!=0">
<foreach collection="warningEOS" item="item" index="index" separator=",">
@@ -21,26 +21,11 @@
</insert>
<delete id="autoCancelWarning">
UPDATE sar_stand_warning
SET POWER ='0'
SET POWER ='0'
WHERE
STAND_ID IN (
SELECT
law_id
FROM
warning_date
WHERE
DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d')
)
STAND_ID IN ( SELECT law_id FROM warning_date WHERE DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d'))
OR
ITEMS_ID IN (
SELECT
ITEM_ID
FROM
warning_date
WHERE
DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d')
)
ITEM_ID IN ( SELECT ITEM_ID FROM warning_date WHERE DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d') AND ITEM_ID IS NOT NULL )
</delete>
adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml
+6 -4
View File
@@ -5,17 +5,18 @@
<select id="getData" resultType="com.adc.da.slrs.wgCommittee.entity.WgCommitteeDTO">
SELECT wg_committee.id, wg_committee.committee_name as committeeName ,wg_committee.committee_director as committeeDirector
,t1.UNAME as committeeDirectorName,wg_committee.committee_secretary as committeeSecretary,t2.UNAME as committeeSecretaryName,
wg_committee.committeer , wg_committee_user.committer_id as committorId ,wg_committee_user.committee_deputy as committeeDeputy,
wg_committee.committeer , wg_committee_user.committer_id as committorId ,wg_committee.committee_deputy as committeeDeputy,
t3.UNAME as committeeDeputyName
from wg_committee
LEFT JOIN wg_committee_user ON wg_committee.committeer = wg_committee_user.id
LEFT JOIN ts_user t1 on t1.USID = wg_committee.committee_director
LEFT JOIN ts_user t2 on t2.USID = wg_committee.committee_secretary
LEFT JOIN ts_user t3 on t3.USID = wg_committee_user.committee_deputy
LEFT JOIN ts_user t3 on t3.USID = wg_committee.committee_deputy
where 1=1
<if test="committeeName != null and ''!=committeeName">
and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%')
</if>
order by create_time desc
limit ${(page-1)*pageSize},${pageSize}
</select>
@@ -33,18 +34,19 @@
<select id="getDataWk" resultType="com.adc.da.slrs.wgCommittee.entity.WgCommitteeDTO">
SELECT wg_committee.id, wg_committee.committee_name as committeeName ,wg_committee.committee_director as committeeDirector
,t1.UNAME as committeeDirectorName,wg_committee.committee_secretary as committeeSecretary,t2.UNAME as committeeSecretaryName,
t3.UNAME as committor,t3.USID as committorId,wg_committee.committeer ,wg_committee_user.committee_deputy as committeeDeputy,
t3.UNAME as committor,t3.USID as committorId,wg_committee.committeer ,wg_committee.committee_deputy as committeeDeputy,
t4.UNAME as committeeDeputyName
from wg_committee
LEFT JOIN ts_user t1 on t1.USID = wg_committee.committee_director
LEFT JOIN ts_user t2 on t2.USID = wg_committee.committee_secretary
LEFT JOIN wg_committee_user on wg_committee_user.id = wg_committee.committeer
LEFT JOIN ts_user t3 on t3.USID = wg_committee_user.committer_id
LEFT JOIN ts_user t4 on t4.USID = wg_committee_user.committee_deputy
LEFT JOIN ts_user t4 on t4.USID = wg_committee.committee_deputy
where 1=1
<if test="committeeName != null and ''!=committeeName">
and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%')
</if>
order by create_time desc
limit ${(page-1)*pageSize},${pageSize}
</select>
adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
+9
View File
@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -752,4 +753,12 @@ public class AttFileEOController {
}
}
@ApiOperation(value = "修改文件名称")
@GetMapping("/updateFileName")
public ResponseMessage<AttFileEO> updateFileName(@Param("fileId") String fileId,@Param("fileName") String fileName) {
AttFileEO attFileEO = attFileEOService.updateFileInfo(fileId,fileName);
return Result.success(attFileEO);
}
}
adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java
+3 -1
View File
@@ -20,6 +20,8 @@ public interface AttFileEODao extends BaseMapper<AttFileEO> {
public AttFileEO selectFileInfoById(AttFileEO attFileEO);
public int updateFileInfoById(AttFileEO attFileEO);
public int insertData(AttFileEO attFileEO);
}
adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java
+2
View File
@@ -20,6 +20,8 @@ public interface IAttFileEOService extends IService<AttFileEO> {
public AttFileEO getFileInfo(String attId);
public AttFileEO updateFileInfo(String attId,String name);
public List<AttFileEO> getMultiFileInfos(String fileIds);
public List<AttFileEO> getMultiFileInfosOrderByDateDesc(String fileIds);
adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java
+20
View File
@@ -333,6 +333,26 @@ public class AttFileEOServiceImpl extends ServiceImpl<AttFileEODao, AttFileEO> i
return attFileEO;
}
@Override
public AttFileEO updateFileInfo(String attId,String name) {
/**
* 根据ID获取文件信息
*/
AttFileEO attFileEO = new AttFileEO();
AttFileEO attFileInfo=null;
Integer flag=0;
try {
attFileEO.setId(attId);
attFileInfo = this.baseMapper.selectFileInfoById(attFileEO);
attFileInfo.setOldFileName(name);
this.baseMapper.updateFileInfoById(attFileEO);
return attFileInfo;
} catch (Exception e) {
log.error(e.getMessage(),e);
}
return attFileInfo;
}
/**
* @Author super_liu
* @Description 多文件查询
adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml
+3
View File
@@ -96,5 +96,8 @@
where id = #{id}
</select>
<update id="updateFileInfoById">
update ${tableName} set OLD_FILE_NAME = #{oldFileName} where id = #{id}
</update>
</mapper>
doc/sql/20220623_定时任务执行管理表添加预警信息.sql
+1
View File
@@ -0,0 +1 @@
INSERT INTO `tb_task`(`id`, `task_name`, `task_desc`, `task_exp`, `task_status`, `task_class`, `update_time`, `create_time`) VALUES ('6', 'task6', '每天定时扫描标准预警数据', '0 0 0 * * ?', 0, 'com.adc.da.scheduled.WarningSchedulingTasks', '2022-06-23 06:19:32', '2022-06-23 06:19:32');