diff --git a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java index b5299ff2..f37f251e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java +++ b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java @@ -13,6 +13,7 @@ import com.adc.da.workFlow.controller.WorkFlowController; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.EnableScheduling; @@ -32,6 +33,7 @@ import java.util.List; */ @Component @EnableScheduling +@Slf4j public class ProcessTimer { @Autowired @@ -179,7 +181,7 @@ public class ProcessTimer { busMes.setJson(jsonObject.toJSONString()); busMes.setUserId(jsonObject.getString("revisionId")); Wrapper wrapper=workFlowFeignClient.completeTaskByUserId(busMes); - System.out.println("dasda"); + log.info("政策课题组会后流程已发起"); } } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 50e95ab8..d7ee90bb 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -28,6 +28,9 @@ public class ActDefineStartMap { // 政策入库 map.put("laws1","lawsLibraryWkflow"); + //政策征求意见, 认证重点法规/政策 流程 + map.put("laws2","PolicyCommentProcessWorkFlow"); + map.put("laws3","KCSTPReviewProcessWorkFlow"); //张超然 map.put("20","StandardApplyMeetProcess"); diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/common/ExportExcel.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/common/ExportExcel.java new file mode 100644 index 00000000..0460891c --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/common/ExportExcel.java @@ -0,0 +1,99 @@ +package com.adc.da.workFlow.common; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.apache.commons.lang.StringUtils; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import sun.awt.SunHints; + + +import java.util.List; +import java.util.Map; + +public class ExportExcel { + + private String header; + + private static String[] property; + Workbook workbook=new XSSFWorkbook(); + + public void setProperty(String property){ + this.property=property.split(","); + } + + public void setHeader(String header){ + this.header=header; + } + + public Workbook getWorkBook(T dataJson) throws Exception { + JSONArray dataArray = JSONObject.parseArray(dataJson.toString()); + + CellStyle cellStyle = workbook.createCellStyle();//初始化单元格格式对象 + cellStyle.setAlignment(HorizontalAlignment.CENTER); + + + Sheet sheet = workbook.createSheet(); + sheet.setDefaultColumnWidth(25); + + createHeader(sheet,header); + + createData(sheet,dataArray); + + return workbook; + } + + + public static void createHeader(Sheet sheet, String header){ + + Row rowHeader = sheet.createRow(0);//开始创建标题行 + if (StringUtils.isNotBlank(header)) { + String[] headerArr = header.split(","); + for (int i=0;i < headerArr.length; i++) { + + rowHeader.createCell(i).setCellValue(headerArr[i]); + + } + } + } + + + + public static void createData(Sheet sheet, List data) throws Exception{ + + if (data != null && !data.isEmpty()) { + for (int i=0;i < data.size(); i++) { + + Row row = sheet.createRow(i+1); + + int sheetNum = 0; + + JSONObject datumJson =(JSONObject)data.get(i); + /** + * 遍历jsonObject值填入一行的单元格中 + */ + for (String s : property) { + String value = datumJson.getString(s); + row.createCell(sheetNum).setCellValue(value); + sheetNum++; + } +// Class cls = importDto.getClass(); +// Field[] fields = cls.getDeclaredFields(); +// for (Field field : fields) { +// field.setAccessible(true); +// if (field.get(importDto)!=null){ +// String value = field.get(importDto).toString(); +// row.createCell(sheetNum).setCellValue(value); +// }else { +// row.createCell(sheetNum).setCellValue(""); +// } +// sheetNum++; +// } + } + } + } + + + + +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java new file mode 100644 index 00000000..4b39a04b --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java @@ -0,0 +1,69 @@ +package com.adc.da.workFlow.controller; + +import com.adc.da.common.ReadExcel; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.workFlow.common.ExportExcel; +import com.adc.da.workFlow.service.PolicyWorkFlowService; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + +@RestController +@RequestMapping("/${restPath}/policy/activiti") +@Api(tags = "政策征求意见和重点法规或政策认证流程") +public class PolicyWorkFlowController { + + + /** + * 政策征求意见导出 + */ + @PostMapping("/exportExcel") + @ApiOperation("导出政策征求意见为excel") + public void exportExcel(@RequestBody String dataJson, HttpServletResponse response, HttpServletRequest request) throws Exception { + JSONObject data = JSONObject.parseObject(dataJson); + JSONArray info = data.getJSONArray("dataList"); + + + ExportExcel exportExcel = new ExportExcel(); + exportExcel.setHeader("章节编号,章节名称,修改前,修改后,修改理由,原因,提出部门,提出人"); + exportExcel.setProperty("chapterNumber,chapterName,oldText,newText,changeReason,reason,department,responUserName"); + Workbook workbook=exportExcel.getWorkBook(info); + + + response.setContentType("application/vnd.ms-excel"); + response.setHeader("Content-Disposition", + "attachment; filename=" + ReadExcel.encodeFileName("政策征求意见"+".xlsx",request)); +// response.setContentType("application/force-download"); + ServletOutputStream outputStream = response.getOutputStream(); + workbook.write(outputStream); + outputStream.flush(); + + } + + + + @Autowired + private PolicyWorkFlowService policyWorkFlowService; + + /** + * 政策征求意见导出 + */ + @PostMapping("/enterIssue") + @ApiOperation("纳入重点问题管控") + public ResponseMessage enterIssue(@RequestBody String json){ + boolean result = policyWorkFlowService.enterIssue(json); + + return Result.success(result); + } + +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 2dd91c46..36a98550 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -524,13 +524,22 @@ public class WorkFlowController { map.put("flag","未完成"); } if(map.get("comment")!=null && !map.get("comment").toString().equals("")){ - if(map.get("comment").toString().equals("0")){ - map.put("comment","同意"); - }else if(map.get("comment").toString().equals("1")){ - map.put("comment","不同意"); - }else{ - map.put("comment",map.get("commentText").toString()); + String comment = map.get("comment").toString(); + switch (comment){ + case "0": + map.put("comment","同意"); + break; + case "1": + map.put("comment","不同意"); + break; + default: + String commentText=""; + map.put("comment",comment+map.get("commentText")); } + + }else if (map.get("commentText")!=null && !"".equals(map.get("commentText"))){ + map.put("comment",map.get("commentText").toString()); + } ProcessDetailExport user = JSON.parseObject(JSON.toJSONString(map), ProcessDetailExport.class); exportDatas.add(user); diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java new file mode 100644 index 00000000..e5db9b02 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java @@ -0,0 +1,45 @@ +package com.adc.da.workFlow.service; + +import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue; +import com.adc.da.slrs.sarStandUnqualified.service.IBusinessDeptIssueService; +import com.adc.da.util.UUIDUtils; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class PolicyWorkFlowService { + + @Autowired + private IBusinessDeptIssueService businessDeptIssueService; + + + public boolean enterIssue(String json){ + boolean count=false; //是否成功 + JSONObject dataJsonObj = JSONObject.parseObject(json); + + if ("1".equals(dataJsonObj.getString("department"))) { + JSONArray dataList = dataJsonObj.getJSONArray("dataList"); + + /** + * 把json对象转换未实体对象 + */ + List data = dataList + .stream() + .map(jsonObj -> { + + BusinessDeptIssue businessDeptIssue = JSONObject.parseObject(jsonObj.toString(), BusinessDeptIssue.class); + businessDeptIssue.setId(UUIDUtils.randomUUID20()); + return businessDeptIssue; + }).collect(Collectors.toList()); + count=businessDeptIssueService.saveBatch(data); + + } + + return count; + } +} diff --git a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java index d33481f1..bbadfc57 100644 --- a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java +++ b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java @@ -53,7 +53,7 @@ public class WaterMarkUtil { under.setGState(gs); under.restoreState(); under.beginText(); - under.setFontAndSize(base, 13); + under.setFontAndSize(base, 25); under.setTextMatrix(30, 30); under.setColorFill(BaseColor.LIGHT_GRAY); for (int y = 0; y < 10; y++) { diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 16b25f82..6e3bca21 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -40,6 +40,7 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/person/userInfo/getByUserInfoCode"); addInterceptor.excludePathPatterns("/api/att/attFile/upload"); addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel"); + addInterceptor.excludePathPatterns("/api/lawss/sarLawsInfo/exportStandardsInfoExcel"); //pcms项目数据下发开放接口 addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/save"); addInterceptor.excludePathPatterns("/api/sar-stand-project-team/save"); @@ -72,6 +73,8 @@ public class WebMvcConfig implements WebMvcConfigurer { //OCR回调存储文件 addInterceptor.excludePathPatterns("/api/ocr/OCRRestful/OcrHandleResult"); + addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/exportStandAttrInfoExcel"); + // //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/IDMUtil.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/IDMUtil.java index 735c958b..73394161 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/IDMUtil.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/IDMUtil.java @@ -21,7 +21,7 @@ public class IDMUtil { private final String app_secret = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe"; private final String access_url = "http://sso.foton.com.cn/oauth2.0/accessTokenByJson"; private final String profile_ur = "http://sso.foton.com.cn/oauth2.0/profileByJson"; - private final String redirect_url = "https://slrs.foton.com.cn"; + private final String redirect_url = "https://srms.foton.com.cn"; public String idmLogin(String code){ try{ diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 3a1561dc..485a213d 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false #spring.datasource.url = jdbc:mysql://10.96.10.54/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root diff --git a/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java b/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java index 222fae10..9101420d 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java +++ b/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java @@ -267,6 +267,7 @@ public class SeniorSearchInfoEO extends BasePage { private String lawsLabel; private String lawsRemark; private String CYSDLAWS; + private String NYLXCLASS; diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 99ae7e92..b0dd13fa 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -7,7 +7,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; @@ -32,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; +import java.lang.reflect.Field; import java.text.SimpleDateFormat; import java.util.*; import java.util.regex.Matcher; @@ -172,7 +175,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { }else { boolQueryBuilder.must(boolQueryShould); } - searchRequestBuilder.setQuery(boolQueryBuilder); + searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true); //在结果中检索 if (StringUtils.isNotEmpty(searchInfoEO.getResultKeyword()) && StringUtils.isNotBlank(searchInfoEO.getIsHigh())) { QueryBuilder multiQuery = queryInResult(searchInfoEO); @@ -282,8 +285,12 @@ public class SearchCenterServiceImpl implements SearchCenterService { if (StringUtils.isNotBlank(searchInfoEO.getType())) { boolQueryShould.must(QueryBuilders.wildcardQuery("type.keyword", "*"+searchInfoEO.getType()+"*")); } - if (StringUtils.isNotBlank(searchInfoEO.getStandType())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*")); + 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()+" "+"*")); @@ -310,7 +317,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryBuilder.must(multiQuery); } - searchRequestBuilder.setQuery(boolQueryBuilder); + searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true); // 获取查询到的结果 result = countStandSearchResult(searchRequestBuilder,searchInfoEO); @@ -386,6 +393,12 @@ public class SearchCenterServiceImpl implements SearchCenterService { collectAttrMap.put("CYSDLAWS",array); } + if(searchInfoEO.getNYLXCLASS() != null && StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS())){ + List fieldList = Arrays.asList(searchInfoEO.getNYLXCLASS() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList)); + collectAttrMap.put("NYLXCLASS",array); + } + } List fieldList = getStringField(searchInfoEO); @@ -394,6 +407,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { // 关键字查询属性字段 String keyWordField = field + ".keyword"; String keyWordField2 = field + "Name.keyword"; + if(field.equals("NYLX")){ + field = field+"CLASS"; + } if(collectAttrMap.containsKey(field)){ List fields = new ArrayList<>(); Object json= new JSONTokener(collectAttrMap.get(field).toString()).nextValue(); @@ -471,19 +487,32 @@ public class SearchCenterServiceImpl implements SearchCenterService { private List getStringField(SeniorSearchInfoEO searchInfoEO) { String fieldInfo = InitStandAttrSearchUtil.queryField; + List fieldTimeInfo = InitStandAttrSearchUtil.timeFieldList; String fieldLawsInfo = InitStandAttrSearchUtil.queryFieldLaws; + List fieldLawsTimeInfo = InitStandAttrSearchUtil.timeFieldListLaws; String fieldBussInfo = InitStandAttrSearchUtil.queryFieldBuss; + List fieldBussTimeInfo = InitStandAttrSearchUtil.timeFieldListBuss; + if(!fieldBussTimeInfo.isEmpty()){ + fieldBussTimeInfo.add("FSRQBUSS"); + } List fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); List fieldLawsInfoList = Arrays.asList(fieldLawsInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); List fieldBussInfoList = Arrays.asList(fieldBussInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); List fieldList = new ArrayList<>(); if(StringUtils.isNotBlank(searchInfoEO.getSelectIndex())){ + fieldInfoList = fieldInfoList.stream().filter(s -> !fieldTimeInfo.contains(s)).collect(Collectors.toList()); + fieldLawsInfoList = fieldLawsInfoList.stream().filter(s -> !fieldLawsTimeInfo.contains(s)).collect(Collectors.toList()); + fieldBussInfoList = fieldBussInfoList.stream().filter(s -> !fieldBussTimeInfo.contains(s)).collect(Collectors.toList()); if(searchInfoEO.getSelectIndex().equals("stand")){ fieldList.addAll(fieldInfoList); }else if(searchInfoEO.getSelectIndex().equals("bussstand")){ fieldList.addAll(fieldBussInfoList); }else if(searchInfoEO.getSelectIndex().equals("laws")){ fieldList.addAll(fieldLawsInfoList); + }else if(searchInfoEO.getSelectIndex().equals("fulltextserch")){ + fieldList.addAll(fieldInfoList); + fieldList.addAll(fieldBussInfoList); + fieldList.addAll(fieldLawsInfoList); } } return fieldList; @@ -503,11 +532,11 @@ public class SearchCenterServiceImpl implements SearchCenterService { if(list.size() > 1){ BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); list.forEach(s -> { - boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+s+" "+"*")); + boolQueryBuilderShould.should(QueryBuilders.termQuery("standSort.keyword", s)); }); boolQueryBuilder.must(boolQueryBuilderShould); }else { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*")); + boolQueryBuilder.must(QueryBuilders.termQuery("standSort.keyword", searchInfoEO.getStandSort())); } } if (StringUtils.isNotBlank(searchInfoEO.getStandNumber())) { @@ -670,7 +699,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { // 高级搜索项，只针对标准 if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getStandSort()+"*")); + boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+"*")); } if (StringUtils.isNotBlank(searchInfoEO.getStandCode())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getStandCode()+"*")); @@ -723,9 +752,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { List fieldList = getStringField(searchInfoEO); List fieldNameList = new ArrayList<>(); String[] standStr = {"content","standSort","standNumber","standYear","stand_name","standEnName","standNatureName", - "textStatusName","isRelateAccessName","numbershow","standSystem"}; + "textStatusName","isRelateAccessName","numbershow","standSystem","NYLXCLASS","CLLX"}; String[] lawsStr = {"content","lawsType","lawsNumber","lawsName","lawsEnName","lawsNo","issueCompany","lawsTextState","lawsSyqy","lawsSycx","isRelateAccess","lawsYear","lawsNotisyncNum","lawsBulletin","lawsLabel","lawsRemark"}; - String[] bussstandStr = {"content","standSort","stand_code","standYear","stand_name","standEnName","nameshow","standstateshow","numbershow","textStatusBuss"}; + String[] bussstandStr = {"content","standSort","stand_code","standYear","stand_name","standEnName","nameshow","standstateshow","numbershow","textStatusBuss","NYLXCLASS","CLLX"}; for (String field : fieldList) { // 关键字查询属性字段 String keyWordField2 = field + "Name"; @@ -776,22 +805,29 @@ public class SearchCenterServiceImpl implements SearchCenterService { // 循环统计各种类型数据 String[] seniortype; if("stand".equals(searchInfoEO.getSelectIndex())) { - String[] seniortypeStand = {"standSort", "statecode","CYSD","ZRLX","CLLX","CBCD","textStatus","textStatusName"}; + String[] seniortypeStand = {"standSort", "numbershow","statecode","CYSD","ZRLX","CLLX","CBCD","textStatus","textStatusName","NYLXCLASS"}; seniortype = seniortypeStand.clone(); } else if("laws".equals(searchInfoEO.getSelectIndex())){ String[] seniortypeLaws = {"lawsSyqy","lawsSycx","CYSDLAWS"}; seniortype = seniortypeLaws.clone(); } else if ("bussstand".equals(searchInfoEO.getSelectIndex())) { - String[] seniortypeBuss = {"textStatusBuss","QCDW"}; + String[] seniortypeBuss = {"standSort", "numbershow", "statecode","CLLX","textStatus","textStatusName","NYLXCLASS"}; seniortype = seniortypeBuss.clone(); } else { String[] seniortypeMsg = {"module"}; seniortype = seniortypeMsg.clone(); } + String standType = searchInfoEO.getStandType(); + String[] standVerify = {"GB","GB/T","QC/T","JT","JB","GA","GJB","HJ"}; + String[] standEnVerify = {"ECE","EU","EC","EEC","ISO","IEC","GTR","CFR", + "JASO","JIS","GSO","GOST","ΓOCT","TP","SASO","UAE","CONTRAN","DENATRAN","ABNT NBR","NBR","INMETRO","CONAMA","Normative Instruction","ADR"}; + String[] bussStandVerify = {"Q/FT A","Q/FT B","Q/FT E","Q/FT F","Q/FT G","Q/FT M","Q/FT Q","Q/FT R","Q/FT S","Q/FT T","Q/FT V","Q/FT X","Q/FT Y","Q/FT Z","Q/QCBFC"}; + List list = new ArrayList<>(); + Map map = new HashMap<>(); for (int i = 0; i < seniortype.length; i++) { //分组依靠关键字terms - TermsAggregationBuilder aggregationBuilders = AggregationBuilders.terms("by_" + seniortype[i]).field(seniortype[i] + ".keyword").size(1000); + TermsAggregationBuilder aggregationBuilders = AggregationBuilders.terms("by_" + seniortype[i]).field(seniortype[i] + ".keyword").size(100000); searchRequestBuilder.addAggregation(aggregationBuilders); } // 获取查询到的结果 @@ -799,51 +835,100 @@ public class SearchCenterServiceImpl implements SearchCenterService { result = SearchResponseToList(response); searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits().value); Map aggmap = response.getAggregations().asMap(); - if (!result.isEmpty()) { - for (int i = 0; i < seniortype.length; i++) { - //分组后得到的数据整合 - Object results = aggmap.get("by_" + seniortype[i]); - if(results instanceof StringTerms){ - StringTerms stResult = (StringTerms) results; - Map submap = new HashMap<>(); - for (StringTerms.Bucket bucket : stResult.getBuckets()) { - // 多选处理，当前全部允许多选 - String keyname = bucket.getKeyAsString(); - String[] keynamelist = keyname.split(","); - // 对于属性允许多选，此处做出处理 - if(keynamelist.length>0){ - for (String itemkeyname: keynamelist){ - // put 之前判断是否已存在该key ,如果不存在，直接放入值，如果存在，需要进行一个累加 - if(submap.containsKey(itemkeyname)){ - submap.put(itemkeyname.trim(), (long)submap.get(itemkeyname)+ bucket.getDocCount()); + + if(StringUtils.isNotBlank(standType)){ + if(standType.equals("INLAND")){ + list = Stream.of(standVerify).collect(Collectors.toList()); + }else if(standType.equals("bussstand")){ + list = Stream.of(bussStandVerify).collect(Collectors.toList()); + }else if(standType.equals("FOREIGN")){ + list = Stream.of(standEnVerify).collect(Collectors.toList()); + } + if (!result.isEmpty()) { + for (int i = 0; i < seniortype.length; i++) { + //分组后得到的数据整合 + Object results = aggmap.get("by_" + seniortype[i]); + if(results instanceof StringTerms){ + StringTerms stResult = (StringTerms) results; + Map submap = new HashMap<>(); + for (StringTerms.Bucket bucket : stResult.getBuckets()) { + // 多选处理，当前全部允许多选 + String keyName = bucket.getKeyAsString(); + String[] keyNameList = keyName.split(","); + // 对于属性允许多选，此处做出处理 + if(keyNameList.length>0){ + for (String itemKeyName: keyNameList){ + // put 之前判断是否已存在该key ,如果不存在，直接放入值，如果存在，需要进行一个累加 + keyNameFilter(standType, list, submap, bucket, itemKeyName); } - else { - submap.put(itemkeyname.trim(), bucket.getDocCount()); - } - } - } - else { - if(submap.containsKey(keyname)){ - submap.put(keyname.trim(), (long)submap.get(keyname)+ bucket.getDocCount()); } else { - submap.put(keyname.trim(), bucket.getDocCount()); + keyNameFilter(standType, list, submap, bucket, keyName); } } + map.put(seniortype[i], submap); + } + else{ + Map submap = new HashMap<>(); + map.put(seniortype[i], submap); } - map.put(seniortype[i], submap); - } - else{ - Map submap = new HashMap<>(); - map.put(seniortype[i], submap); - } + } + if(standType.equals("bussstand")){ + map.forEach((s, o) -> { + if(s.equals("numbershow")){ + map.put("standSort",o); + } + }); + } + result.get(0).put("groupdata", map); } - result.get(0).put("groupdata", map); } return result; } + public static Map objectToMap(Object obj){ + if(obj == null){ + return null; + } + + Map map = new HashMap(); + + Field[] declaredFields = obj.getClass().getDeclaredFields(); + try { + for (Field field : declaredFields) { + field.setAccessible(true); + map.put(field.getName(), field.get(obj)); + } + }catch (Exception e){ + e.getMessage(); + } + + return map; + } + + private void keyNameFilter(String standType, List list, Map submap, StringTerms.Bucket bucket, String keyname) { + if(standType.equals("bussstand")){ + if(!list.isEmpty()){ + String finalKeyName = keyname; + List list1 = list.stream().filter(string-> (finalKeyName.contains(string))).collect(Collectors.toList()); + if(!list1.isEmpty()){ + if(submap.containsKey(list1.get(0))){ + submap.put(list1.get(0).trim(), (long)submap.get(list1.get(0).trim())+ bucket.getDocCount()); + }else { + submap.put(list1.get(0).trim(), bucket.getDocCount()); + } + } + } + }else { + if(submap.containsKey(keyname)){ + submap.put(keyname.trim(), (long)submap.get(keyname)+ bucket.getDocCount()); + }else { + submap.put(keyname.trim(), bucket.getDocCount()); + } + } + } + @Override public List> SearchResponseToList(SearchResponse searchResponse) { List> sourceList = new ArrayList>(); @@ -1091,6 +1176,17 @@ public class SearchCenterServiceImpl implements SearchCenterService { QueryBuilder multiQuery = queryInResult(searchInfoEO); boolQueryBuilder.must(multiQuery); } + + if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS())){ + boolQueryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getNYLXCLASS(), + "textContent" + ).minimumShouldMatch("100%").field("title",10f)); + }else if(StringUtils.isNotBlank(searchInfoEO.getCLLX())){ + boolQueryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(), + "textContent" + ).minimumShouldMatch("100%").field("title",10f)); + } + HighlightBuilder hiBuilder=new HighlightBuilder(); HighlightBuilder.Field highlightTitle = new HighlightBuilder.Field("title"); hiBuilder.field(highlightTitle); @@ -1110,7 +1206,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { // boolQueryBuilder.must(QueryBuilders.matchQuery("valid_flag", 0)); // boolQueryBuilder.should(boolQueryBuilderShould); - searchRequestBuilder.setQuery(boolQueryBuilder); + searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true); // 获取查询到的结果 SearchResponse response = searchRequestBuilder.get(); for (SearchHit searchHit : response.getHits().getHits()) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java index 7fac0233..29ff23c1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java @@ -23,6 +23,7 @@ public class ExclExport extends ExclErrorOut { for (Map.Entry> entry : dataMap.entrySet()) { List datas = entry.getValue(); Sheet sheet = workbook.createSheet(entry.getKey()); + sheet.setDefaultColumnWidth(25); super.createHeader(workbook,sheet,header); super.createDatas(workbook,sheet,datas); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java index 7ba28226..bf2f0174 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java @@ -52,13 +52,15 @@ public class ImportExcelController extends BaseController { /** * 导入系统 */ - List errorList = importExcelService.storageExclData(mapMap); +// List errorList = importExcelService.storageExclData(mapMap); // mapMap.put("导入后的信息",errorList); // List guonei= mapMap.get("GNBZ"); // List haiwai = mapMap.get("HWBZ"); // List qibiao = mapMap.get("QYBZ"); + + /** * 生成错误表格 */ @@ -94,4 +96,47 @@ public class ImportExcelController extends BaseController { } + + @ApiOperation("从excl中导入标准信息") + @PostMapping("/analysisExcl") + public void analysisExcl(MultipartFile exclFile,MultipartFile standSort, HttpServletResponse response, HttpServletRequest request) throws IOException { + /** + * 分解数据 + */ + String headStr="标准号,标准类别,内容,标准名称,英文名称,发布时间,实施时间,标准状态,代替标准号,//,//"; + Map> stringListMap = importExcelService.analysisExcl(exclFile,standSort); + + + + /** + * 生成错误表格 + */ + OutputStream os = null; + Workbook workbook = null; + try { + + String exportName="错误表格"; + response.setHeader("Content-Disposition", + "attachment; filename=" + ReadExcel.encodeFileName(exportName+".xlsx",request)); + response.setContentType("application/force-download"); + //导出数据 +// workbook = exclErrorOut.exportDatas(guonei,headStr); + + ExclExport exclExport = new ExclExport(); + workbook = exclExport.exportData(stringListMap, headStr); + + os = response.getOutputStream(); + workbook.write(os); + os.flush(); + } catch (IOException e) { + throw new AdcDaBaseException("下载文件失败，请重试"); + } finally { + IOUtils.closeQuietly(os); + if (workbook != null) { + workbook.close(); + } + } + } + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/entity/ImportDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/entity/ImportDto.java index 849680e3..f473618d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/entity/ImportDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/entity/ImportDto.java @@ -8,6 +8,10 @@ public class ImportDto extends BaseEntity { // 标准号 private String standId; +//标准类别 + private String standSort; + // + private String standIdExcludeSort; // 标准名称 private String standName; // 英文名称 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java index 61851025..95eaa3af 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java @@ -14,4 +14,5 @@ public interface ImportExcelService extends IService { public List storageExclData(Map> importListMap); + public Map> analysisExcl(MultipartFile exclFile,MultipartFile standSort); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java index 28a15541..aa56d921 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java @@ -31,6 +31,7 @@ import java.io.InputStream; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Pattern; +import java.util.stream.Collectors; @Service public class ImportExcelServiceImpl extends ServiceImpl implements ImportExcelService { @@ -51,9 +52,10 @@ public class ImportExcelServiceImpl extends ServiceImpl6){ + + for (String s : sortList) { + int sortLength = s.length();//标准类别长度 + if (s.equals(content.substring(0,sortLength ))){ + importDto.setStandSort(s); + importDto.setStandIdExcludeSort(content.substring(sortLength)); + } + + } + + importDto.setStandId(null != as[0] ? as[0].trim() : ""); importDto.setStandName(null != as[1] ? as[1].trim() : ""); importDto.setStandNameEN(null != as[2] ? as[2].trim() : ""); importDto.setPublishTime(null != as[3] ? as[3].trim() : ""); importDto.setImplementedTime(null != as[4] ? as[4].trim() : ""); importDto.setStandStatus(null != as[5] ? as[5].trim() : ""); - importDto.setReplaceId(null != as[6] ? as[6].trim() : ""); - } else if (as.length == 7) { - importDto.setStandId(null != as[0] ? as[0].trim() : ""); - importDto.setStandName(null != as[1] ? as[1].trim() : ""); - importDto.setStandNameEN(null != as[2] ? as[2].trim() : ""); - importDto.setPublishTime(null != as[3] ? as[3].trim() : ""); - importDto.setImplementedTime(null != as[4] ? as[4].trim() : ""); - importDto.setStandStatus(null != as[5] ? as[5].trim() : ""); - importDto.setReplaceId(""); + if (length==7){ + importDto.setReplaceId(""); + }else if (length==8){ + importDto.setReplaceId(null != as[6] ? as[6].trim() : ""); + } + } + return importDto; } @@ -241,7 +254,6 @@ public class ImportExcelServiceImpl extends ServiceImpl sortList=new LinkedList<>(); + + @Override + public Map> analysisExcl(MultipartFile exclFile,MultipartFile standSort) { + //TODO analy + + if (exclFile == null || exclFile.getSize() == 0) { + log.error("文件上传错误，重新上传"); + } + String filename = exclFile.getOriginalFilename(); + String standSortName=standSort.getOriginalFilename(); + + List datas = new ArrayList<>(); + + + if (filename.endsWith(".xls")) { + datas = isXls(exclFile); + } else { + datas = isXlsx(exclFile); + } + + if (standSortName.endsWith(".xls")){ + sortList = isXls(standSort); + }else { + sortList = isXlsx(standSort); + } + + HashMap> result = new HashMap<>(); + LinkedList exportList = new LinkedList<>(); + HashSet distinct = new HashSet<>(); + datas.forEach(data->{ + System.out.print("#"); + String[] row = data.split("\\,"); + if (row.length>7){ + + if ((!"".equals(row[0].trim()) || !"".equals(row[1].trim()))&&distinct.add(row[0].trim()+row[1].trim())){ + ImportDto importDto = getImportDto(row); + + if(importDto.getStandId()!=null&&importDto.getStandName()!=null){ + exportList.add(importDto); + + } + } + + } + + }); + result.put("标准数据all_new",exportList); + + + + return result; + } + /** * 整理为标准信息实体 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 9e0b430d..f216455c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -220,7 +220,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl getList = sarBussionessStandEODao.getSarBussionessStand(page); - attrInfoShow(getList); + attrInfoShowExport(getList); return getList; } @@ -332,6 +332,55 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarlist) throws Exception { + for(SarBussionessStand row : sarlist){ + attrInfoDetailsExport(row); + Map getAttrMap = row.getAttrInfoMap(); + Map getNewMap = new LinkedHashMap<>(); + if (getAttrMap != null && getAttrMap.size() > 0) { + String svppsTip = ""; + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + String value = ""; + if ("SVPPS".equals(name)) { + Object svpps = entry.getValue(); + if (svpps != null && StringUtils.isNotBlank(svpps.toString())) { + svppsTip = svpps.toString(); + } + if (StringUtils.isNotBlank(svppsTip)) { + svppsTip = sysInfoEOService.getSvppsNamesTipByIds(svppsTip); + } + value = String.valueOf(getAttrMap.get("SVPPSName")); + entry.setValue(value); + } else if (entry.getValue() != null && InitStandAttrUtil.fileFieldListBuss != null && InitStandAttrUtil.fileFieldListBuss.size() > 0 && InitStandAttrUtil.fileFieldListBuss.contains(name)) { + value = entry.getValue().toString(); + if (StringUtils.isNotBlank(value)) { + List fileObj = attFileEOService.getMultiFileInfos(value); + entry.setValue(fileObj); + } + } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { + value = entry.getValue().toString(); + String selVal = InitStandAttrUtil.selectFieldMapBuss.get(name); + if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal) || SelectionTypeEnum.USERLIST.getValue().equals(selVal) || SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) { + if("ZYQCR".equals(name)||"QTQCR".equals(name)){ + if(getAttrMap.get(name + "Name")!=null && !getAttrMap.get(name + "Name").equals("")){ + value = String.valueOf(getAttrMap.get(name + "Name")); + } + }else{ + value = String.valueOf(getAttrMap.get(name + "Name")); + } + } else { + List valArr = Arrays.asList(value.split(",")); + value = dicTypeEODao.getDicNamesByCodes(valArr); + } + entry.setValue(value); + } + } + getAttrMap.put("SVPPSTips",svppsTip); + } + } + } + public SarBussionessStand updateSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception { String standId = sarBussionessStandEO.getId(); SarBussionessStand beforeStandEO = this.baseMapper.selectByPrimaryKey(standId); @@ -991,6 +1040,54 @@ public class SarBussionessStandServiceImpl extends ServiceImpl getAttrMap = sarBussStandAttrInfoEODao.selectStandFieldAndData(fieldInfo,row.getId()); + if (InitStandAttrUtil.clobFieldListBuss != null && !InitStandAttrUtil.clobFieldListBuss.isEmpty()) { + // 遍历修改所有clob类型的值 + for (String clobField : InitStandAttrUtil.clobFieldListBuss) { + Clob clobValue = (Clob) getAttrMap.get(clobField); + String fieldValue = FieldConvertUtil.ClobToString(clobValue); + getAttrMap.put(clobField,fieldValue); + } + } + // 组织机构和人员 + Map newMap = new HashMap<>(); + if(getAttrMap != null){ + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + Object value1 = entry.getValue(); + if (value1 != null && value1.toString().equals("\"null\"")){ + entry.setValue(""); + } + 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); + if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal)) { + value = sysInfoEOService.getOrgNamesByIds(value); + newMap.put(name + "Name",value); + } else if (SelectionTypeEnum.USERLIST.getValue().equals(selVal)) { + value = sysInfoEOService.getUserNamesByIds(value); + newMap.put(name + "Name",value); + } else if (SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) { + value = sysInfoEOService.getRoleNamesByIds(value); + newMap.put(name + "Name",value); + } + } + } + getAttrMap.putAll(newMap); + } + + if (getAttrMap != null && !getAttrMap.isEmpty()) { + row.setAttrInfoCaseMap(transformUpperCase(getAttrMap)); + } + + row.setAttrInfoMap(getAttrMap); + } + } + @Override diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index 1615a683..b3887516 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -82,8 +82,8 @@ public class TsInstitutionController extends BaseController { @ApiOperation("获得下一级的部门和人员") @GetMapping("/getNext") - public List getNext(String institutionId){ - return tsInstitutionService.getNext(institutionId); + public List getNext(String institutionId,String userName){ + return tsInstitutionService.getNext(institutionId,userName); } @ApiOperation("获得第一级部门目录") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java index 8f7b76a9..bc0b5780 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java @@ -27,7 +27,7 @@ public interface TsInstitutionDao extends BaseMapper { * 根据部门id查询此部门的子一级人员 * @return */ - List selectNextUser(String institutionId); + List selectNextUser(@Param("institutionId") String institutionId,@Param("userName") String userName); List selectTreeByIds(@Param("rootIds") List rootIds); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java index af1e8996..48d24c8b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java @@ -35,7 +35,7 @@ public interface ITsInstitutionService extends IService { * @param institutionId * @return */ - public List getNext(String institutionId); + public List getNext(String institutionId,String userName); /** * 获得第一级的部门 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index 0d78c184..ce821462 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -204,9 +204,9 @@ public class TsInstitutionServiceImpl extends ServiceImpl getNext(String institutionId){ + public List getNext(String institutionId,String userName){ List tsInstitutions = tsInstitutionDao.selectNextInstitution(institutionId); - List tsUsers=tsInstitutionDao.selectNextUser(institutionId); + List tsUsers=tsInstitutionDao.selectNextUser(institutionId,userName); for(TsInstitution tsInstitution:tsInstitutions){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/controller/SarLawsMenuController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/controller/SarLawsMenuController.java index de02d5af..8914f59b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/controller/SarLawsMenuController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/controller/SarLawsMenuController.java @@ -31,7 +31,7 @@ import java.util.List; */ @RestController @Api(description = "|SarLawsMenu|") -@RequestMapping("/sarLawsMenu/sar-laws-menu") +@RequestMapping("/${restPath}/lawss/sarLawsMenu") public class SarLawsMenuController extends BaseController { @Autowired @@ -63,7 +63,7 @@ public class SarLawsMenuController extends BaseController { if (getList == null || getList.isEmpty()) { // 查询根节点 TsResource sarMenuEO = new TsResource(); - sarMenuEO.setSorDivide("BUSINESS_STAND"); + sarMenuEO.setSorDivide("LAWS_STAND"); List getRootMenu = sarMenuEOService.queryMenuByDis(sarMenuEO); menuEO.setMenuId(getRootMenu.get(0).getId()); menuEO.setId(UUIDUtils.randomUUID20()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java index 6fe6490b..d3aefe07 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java @@ -127,6 +127,63 @@ public class SarLawsStandInfoController extends BaseController return Result.success(getPageInfo(page.getPager(), rows)); } + @ApiOperation(value = "|SarLawsInfoEO|分页查询") + @GetMapping("/pageLaws") + /*@RequiresPermissions("lawss:sarLawsInfo:page")*/ + public ResponseMessage> pageLaws(SarLawsStandInfoPage page) throws Exception { + if (null != page.getNowOrderBy()) { + switch (page.getNowOrderBy()) { + case 1: + page.setOrderByA("a.issueTime");//发布日期 + break; + case 2: + page.setOrderByA("SAR_LAWS_ATTR_INFO.XCXSSRQLAWS");//新车型实施日期 + break; + case 3: + page.setOrderByA("SAR_LAWS_ATTR_INFO.ZCXSSRQLAWS");//在产车实施日期 + break; + case 4: + page.setOrderByA("a.LAWS_TEXT_STATE");//文本状态 + break; + case 5: + page.setOrderByA("paixu"); + break; + case 6: + page.setOrderByA("SAR_LAWS_ATTR_INFO.SSRQ"); + break; + default: + page.setNowOrder(null); + break; + } + if (null != page.getNowOrder()) { + switch (page.getNowOrder()) { + case 1: + page.setOrder1("desc"); + break; + case 2: + page.setOrder1("asc"); + default: + page.setOrder1(null); + break; + } + } + } + + + if (com.adc.da.util.utils.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_LAWS_ATTR_INFO"); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + + List rows = sarLawsInfoEOService.getSarStandardsInfoPageBak(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + @ApiOperation(value = "|SarLawsStandInfo|详情") @GetMapping("/getStandInfoById") //@RequiresPermissions("lawss:sarStandardsInfo:get") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java index 483337b0..897dbaad 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java @@ -230,6 +230,27 @@ public class SarLawsStandInfoPage extends BasePage { private String GLWJBUSS; private String XCSJBUSS; + private String SSRQLAWS; + private String XCXSSRQLAWS; + private String ZCXSSRQLAWS; + private String ZCWBLAWS; + private String GCWBLAWS; + private String JDWJLAWS; + private String FBJGLAWS; + private String CYSDLAWS; + private String TGRLAWS; + private String TGDWLAWS; + private String NYLXLAWS; + private String YYRZLAWS; + private String ZRBMLAWS; + private String ZRGCSLAWS; + private String DTWJHLAWS; + private String BDTWJHLAWS; + private String YYBZZCLAWS; + private String CHJLLAWS; + private String GLWJLAWS; + + //页面排序 private String paixu; private String shunxu; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/ISarLawsStandInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/ISarLawsStandInfoService.java index 19c33c58..a4a7b022 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/ISarLawsStandInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/ISarLawsStandInfoService.java @@ -36,6 +36,8 @@ public interface ISarLawsStandInfoService extends IService { List getSarStandardsInfoPage(SarLawsStandInfoPage page) throws Exception; + List getSarStandardsInfoPageBak(SarLawsStandInfoPage page) throws Exception; + SarLawsStandInfo selectStandardsInfoByKey(String id) throws Exception; SarLawsStandInfo selectStandardsInfoUpdateByKey(String id) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index a8325bbe..0033955a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -157,7 +157,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl ids = iTsResourceService.getChildMenuList(userId); + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); if (ids != null && !ids.isEmpty()) { page.setMenuAllChildrenIdList(ids); } @@ -170,6 +170,36 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl getSarStandardsInfoPageBak(SarLawsStandInfoPage page) throws Exception { + //查询当前登录人角色拥有权限的菜单 + String userId = UserUtils.getUserId(); + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(userId)){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ + List getMenuIdList = tsUserService.getResourceUserId(userId); + if (!getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iTsResourceService.getChildMenuList(userId); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + } + Integer rowCount = this.baseMapper.getSarStandardsInfoCount(page); + page.getPager().setRowCount(rowCount); + List rows = this.baseMapper.getSarStandardsInfoPage(page); + attrInfo(rows); + return rows; + } + + /*** * @Description: 处理属性表数据 * @Param: [sarlist] @@ -268,6 +298,54 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl getAttrMap = sarLawsAttrInfoDao.selectLawsFieldAndData(fieldInfo,row.getId()); + if (InitStandAttrUtil.clobFieldListLaws != null && !InitStandAttrUtil.clobFieldListLaws.isEmpty()) { + // 遍历修改所有clob类型的值 + for (String clobField : InitStandAttrUtil.clobFieldListLaws) { + Clob clobValue = (Clob) getAttrMap.get(clobField); + String fieldValue = FieldConvertUtil.ClobToString(clobValue); + getAttrMap.put(clobField,fieldValue); + } + } + // 组织机构和人员 + Map newMap = new HashMap<>(); + if(getAttrMap != null){ + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + Object value1 = entry.getValue(); + if (value1 != null && value1.toString().equals("\"null\"")){ + entry.setValue(""); + } + if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListLaws != null && InitStandAttrUtil.selectionFieldListLaws.size() > 0 && InitStandAttrUtil.selectionFieldListLaws.contains(name)) { + String value = entry.getValue().toString(); + String selVal = InitStandAttrUtil.selectFieldMapLaws.get(name); + if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal)) { + value = sysInfoEOService.getOrgNamesByIds(value); + newMap.put(name + "Name",value); + } else if (SelectionTypeEnum.USERLIST.getValue().equals(selVal)) { + value = sysInfoEOService.getUserNamesByIds(value); + newMap.put(name + "Name",value); + } else if (SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) { + value = sysInfoEOService.getRoleNamesByIds(value); + newMap.put(name + "Name",value); + } + } + } + getAttrMap.putAll(newMap); + } + + if (getAttrMap != null && !getAttrMap.isEmpty()) { + row.setAttrInfoCaseMap(transformUpperCase(getAttrMap)); + } + + row.setAttrInfoMap(getAttrMap); + } + } + private Map transformUpperCase(Map orgMap) { Map resultMap = new HashMap<>(); @@ -352,14 +430,14 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl rows = this.baseMapper.getSarStandardsExportInfo(page); - attrInfoShow(rows); + attrInfoShowExport(rows); return rows; } @@ -402,6 +480,45 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl sarlist) throws Exception { + for(SarLawsStandInfo row : sarlist){ + attrInfoDetailsExport(row); + Map getAttrMap = row.getAttrInfoMap(); + Map getNewMap = new LinkedHashMap<>(); + if (getAttrMap != null && getAttrMap.size() > 0) { + String svppsTip = ""; + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + String value = ""; + if (entry.getValue() != null && InitStandAttrUtil.fileFieldListLaws != null && InitStandAttrUtil.fileFieldListLaws.size() > 0 && InitStandAttrUtil.fileFieldListLaws.contains(name)) { + value = entry.getValue().toString(); + if (StringUtils.isNotBlank(value)) { + List fileObj = attFileEOService.getMultiFileInfos(value); + entry.setValue(fileObj); + } + } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListLaws != null && InitStandAttrUtil.selectionFieldListLaws.size() > 0 && InitStandAttrUtil.selectionFieldListLaws.contains(name)) { + value = entry.getValue().toString(); + String selVal = InitStandAttrUtil.selectFieldMapLaws.get(name); + if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal) || SelectionTypeEnum.USERLIST.getValue().equals(selVal) || SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) { + if("ZYQCR".equals(name)||"QTQCR".equals(name)){ + if(getAttrMap.get(name + "Name")!=null && !getAttrMap.get(name + "Name").equals("")){ + value = String.valueOf(getAttrMap.get(name + "Name")); + } + }else{ + value = String.valueOf(getAttrMap.get(name + "Name")); + } + } else { + List valArr = Arrays.asList(value.split(",")); + value = dicTypeEODao.getDicNamesByCodes(valArr); + } + entry.setValue(value); + } + } + getAttrMap.put("SVPPSTips",svppsTip); + } + } + } + @Override public SarLawsStandInfoPage updateStandardsMenu(SarLawsStandInfoPage standardsInfoEO) { SarLawsMenu sarStandMenuEO = new SarLawsMenu(); @@ -477,6 +594,8 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl { return Result.success(tsResources); } + @ApiOperation("查询有权限资源") + @GetMapping("/getListStand") + public ResponseMessage> getListStand(TsResource tsResource){ + List tsResources=tsResourceService.getListStand(tsResource); + return Result.success(tsResources); + } + // @ApiOperation("查询所有资源") // @GetMapping("/getDefault") // public ResponseMessage> getDefault(){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java index de959ae0..223bbb93 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarResource.dao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; import java.util.HashMap; import java.util.List; @@ -14,6 +15,7 @@ import java.util.List; * @author zyl * @since 2021-06-30 */ +@Repository public interface TsResourceDao extends BaseMapper { List queryMenuByDis(TsResource sarMenuEO); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java index 1f20ec11..0f4698c5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java @@ -36,6 +36,8 @@ public interface ITsResourceService extends IService { List getList(TsResource tsResource); + List getListStand(TsResource tsResource); + List getDefaultByName(); ResponseMessage addResource(TsResource tsResource); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index d1e8776f..ff7a3ace 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -151,6 +151,10 @@ public class TsResourceServiceImpl extends ServiceImpl list = new ArrayList<>(); + list.add("INLAND_STAND"); + list.add("FOREIGN_STAND"); + tsResourceQueryWrapper.notIn("SOR_DIVIDE",list); tsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); List TsResources=dao.selectList(tsResourceQueryWrapper); for(TsResource TsResource:TsResources){ @@ -181,7 +185,7 @@ public class TsResourceServiceImpl extends ServiceImpl getListStand(TsResource tsResource) { + List TsResources = new ArrayList<>(); + + QueryWrapper queryWrapper =new QueryWrapper<>(); + if(tsResource.getSorDivide()!=null){ + queryWrapper.eq("sor_divide",tsResource.getSorDivide()); + } + queryWrapper.isNull("PARENT_ID"); + queryWrapper.orderByAsc("DISPLAY_SEQ"); + TsResources=dao.selectList(queryWrapper); + + for(TsResource TsResource:TsResources){ + TsResource.setChildren(recursionGetListChildrenStand((tsResource.getSorDivide()),(TsResource))); + } + + return TsResources; + } + @Override public List getDefaultByName() { List menusNames=new ArrayList<>(); @@ -287,14 +314,32 @@ public class TsResourceServiceImpl extends ServiceImpl */ - private List recursionGetListChildren(TsResource parent,List getMenuIdList){ + private List recursionGetListChildren(String sorDivide,TsResource parent,List getMenuIdList){ QueryWrapper TsResourceQueryWrapper=new QueryWrapper<>(); TsResourceQueryWrapper.eq("PARENT_ID",parent.getId()); - TsResourceQueryWrapper.in("ID",getMenuIdList); + if(StringUtils.isNotBlank(sorDivide)){ + TsResourceQueryWrapper.in("ID",getMenuIdList); + } TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); List children=dao.selectList(TsResourceQueryWrapper); for(TsResource TsResource:children){ - TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList))); + TsResource.setChildren(recursionGetListChildren((sorDivide),(TsResource),(getMenuIdList))); + } + return children; + } + + /** + * 递归调用获取子节点 + * @param parent：父节点 + * @return List + */ + private List recursionGetListChildrenStand(String sorDivide,TsResource parent){ + QueryWrapper TsResourceQueryWrapper=new QueryWrapper<>(); + TsResourceQueryWrapper.eq("PARENT_ID",parent.getId()); + TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); + List children=dao.selectList(TsResourceQueryWrapper); + for(TsResource TsResource:children){ + TsResource.setChildren(recursionGetListChildrenStand((sorDivide),(TsResource))); } return children; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 68ec9c77..077f5e0f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -54,6 +54,12 @@ public class SarStandProjectLibraryController extends BaseController ids); void batchInsert(@Param("list") List list); List selectPages(@Param("page")Integer page, @Param("size")Integer size,@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag); + List selectPagessolostar(@Param("flag")int flag,@Param("type")String type); Integer selectCount(@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag); List selectPagesWorkFlow(@Param("page")Integer page, @Param("size")Integer size,@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag); + List selectPagesWorkFlowsolostar(@Param("flag")int flag,@Param("type")String type); Integer selectCountWorkFlow(@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag); List getAllStands(); List getAllStand(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 21feeaa7..ccee2c44 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -6,12 +6,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; public interface SarStandProjectLibraryService { IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); + List queryMaintenanceProjectsolostar(String type); IPage queryMaintenanceProjectWorkFlow(int current, int pageSize, SarStandProjectLibraryDto sarDto); IPage queryMaintenanceProjectConfirm(int current, int pageSize, SarStandProjectLibraryDto sarDto); IPage queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); + List queryNotMaintenanceProjectsolostar(String type); + Map solostar(); List queryById(String id); IPage queryProjectManager(int current, int pageSize); List queryByProductLine(String productLine); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 76b8ad99..2553c394 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -152,6 +152,12 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryMaintenanceProjectsolostar(String type) { + int flag=2; + return getSarStandProjectLibraryIPagesolostar(flag,type); + } @Override public IPage queryMaintenanceProjectWorkFlow(int current, int pageSize, SarStandProjectLibraryDto sarDto) { @@ -240,6 +246,12 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryNotMaintenanceProjectsolostar(String type) { + int flag=1; + return getSarStandProjectLibraryIPagesolostar(flag,type); + } + @Override public List queryById(String id) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -295,8 +307,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl page1 = new Page<>(current, pageSize); IPage userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1); @@ -308,8 +320,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl page2 = new Page<>(current, pageSize); IPage userIPage2 = sarStandAttrInfoDao.selectPage(page2, wrapper2); @@ -457,4 +469,36 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl getSarStandProjectLibraryIPagesolostar(int flag,String type) { + if (3!=flag) { + List sarStandProjectLibraries = sarStandProjectLibraryDao.selectPagessolostar(flag,type); + return sarStandProjectLibraries; + } + else { + flag=2; + List sarStandProjectLibraries = sarStandProjectLibraryDao.selectPagesWorkFlowsolostar(flag,type); + return sarStandProjectLibraries; + } + } + + + @Override + public Map solostar() { + Map map = new HashMap(); + List MaintenanceProjectClassification; + List MaintenanceProjectStatus; + List notMaintenanceProjectClassification; + List notMaintenanceProjectStatus; + MaintenanceProjectClassification = this.queryMaintenanceProjectsolostar("ProjectClassification"); + MaintenanceProjectStatus = this.queryMaintenanceProjectsolostar("ProjectStatus"); + notMaintenanceProjectClassification = this.queryNotMaintenanceProjectsolostar("ProjectClassification"); + notMaintenanceProjectStatus = this.queryMaintenanceProjectsolostar("ProjectStatus"); + map.put("MaintenanceProjectClassification",MaintenanceProjectClassification); + map.put("MaintenanceProjectStatus",MaintenanceProjectStatus); + map.put("notMaintenanceProjectClassification",notMaintenanceProjectClassification); + map.put("notMaintenanceProjectStatus",notMaintenanceProjectStatus); + + return map; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/KeyIssueManagementController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/KeyIssueManagementController.java new file mode 100644 index 00000000..0d0bc370 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/KeyIssueManagementController.java @@ -0,0 +1,8 @@ +package com.adc.da.slrs.sarStandUnqualified.controller; + +import org.springframework.stereotype.Controller; + +@Controller +public class KeyIssueManagementController { + //TODO zky +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java new file mode 100644 index 00000000..f7e83ff4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java @@ -0,0 +1,12 @@ +package com.adc.da.slrs.sarStandUnqualified.dao; + + + +import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +public interface BusinessDeptIssueDao extends BaseMapper { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java new file mode 100644 index 00000000..bda88181 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java @@ -0,0 +1,8 @@ +package com.adc.da.slrs.sarStandUnqualified.dao; + +import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface ProductDeptIssueDao extends BaseMapper { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java new file mode 100644 index 00000000..8a60ea81 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java @@ -0,0 +1,26 @@ +package com.adc.da.slrs.sarStandUnqualified.entity; + + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("business_dept_issue") +public class BusinessDeptIssue { + + private String id; + private String lawId; + private String productType; + private Date implTime; + private String implRequire; + private String conformSituation; + private String devScheme; + private Date sopTime; + private String completeSituation; + private String timeoutSituation; + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java new file mode 100644 index 00000000..4013565f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.sarStandUnqualified.entity; + + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("product_dept_issue") +public class ProductDeptIssue { + + private String id; + private String lawId; + private String productBusiness; + private String platform; + private String pojName; + private String pojDescription; + private String currentNode; + private String conceptualState; + private Date scheduledIssuanceTime; + private String revisedPlan; + private String explanation; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java new file mode 100644 index 00000000..f666a013 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java @@ -0,0 +1,7 @@ +package com.adc.da.slrs.sarStandUnqualified.service; + +import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface IBusinessDeptIssueService extends IService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java new file mode 100644 index 00000000..3d87745d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java @@ -0,0 +1,4 @@ +package com.adc.da.slrs.sarStandUnqualified.service; + +public interface IProductDeptIssueService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java new file mode 100644 index 00000000..c83ee8b9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java @@ -0,0 +1,11 @@ +package com.adc.da.slrs.sarStandUnqualified.service.impl; + +import com.adc.da.slrs.sarStandUnqualified.dao.BusinessDeptIssueDao; +import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue; +import com.adc.da.slrs.sarStandUnqualified.service.IBusinessDeptIssueService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service +public class BusinessDeptIssueService extends ServiceImpl implements IBusinessDeptIssueService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java new file mode 100644 index 00000000..046c56b1 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java @@ -0,0 +1,9 @@ +package com.adc.da.slrs.sarStandUnqualified.service.impl; + +import com.adc.da.slrs.sarStandUnqualified.dao.ProductDeptIssueDao; +import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue; +import com.adc.da.slrs.sarStandUnqualified.service.IProductDeptIssueService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +public class ProductDeptIssueService extends ServiceImpl implements IProductDeptIssueService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 4f8e4179..ebd67e12 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -96,7 +96,7 @@ public class SarStandardsInfoController extends BaseController if (null != page.getNowOrderBy()) { switch (page.getNowOrderBy()) { case 1: - page.setOrderByA("issueTime");//发布日期 + page.setOrderByA("ISSUE_TIME");//发布日期 break; case 2: page.setOrderByA("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期 @@ -240,7 +240,7 @@ public class SarStandardsInfoController extends BaseController // if(page.getUserId() == null || page.getUserId().equals("")){ // page.setUserId(LoginUserUtil.getUserId()); // } - List rows = sarStandardsInfoEOService.getSarStandardsInfoPageBak(page); + List rows = sarStandardsInfoEOService.getSarStandardsInfoPageBak1(page); return Result.success(getPageInfo(page.getPager(), rows)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 9e07c26a..8d2845a4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -21,7 +21,7 @@ import java.util.List; @Repository public interface SarStandardsInfoDao extends BaseMapper { - List getSarStandardsInfoPage(SarStandardsInfoEOPage page); + List getSarStandardsInfoPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark); int getSarStandardsInfoCount(SarStandardsInfoEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index 9fcbf007..aa4617f5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -23,6 +23,8 @@ public interface ISarStandardsInfoService extends IService { List getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception; + List getSarStandardsInfoPageBak1(SarStandardsInfoEOPage page) throws Exception; + void createSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception; int updateSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 43ad052b..d85f760f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -293,12 +293,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl children = iTsResourceService.list(qw); if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ - List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); - if (getMenuIdList != null && !getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } +// List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); +// if (getMenuIdList != null && !getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } List ids = iTsResourceService.getChildMenuList(page.getMenuId()); if (ids != null && !ids.isEmpty()) { page.setMenuAllChildrenIdList(ids); @@ -307,7 +307,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist = dao.getSarStandardsInfoPage(page); + List sarlist = dao.getSarStandardsInfoPage(page,"0"); attrInfoCollect(sarlist); return sarlist; } @@ -335,7 +335,35 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist = dao.getSarStandardsInfoPage(page); + List sarlist = dao.getSarStandardsInfoPage(page,"999"); + attrInfo(sarlist); + return sarlist; + } + + @Override + public List getSarStandardsInfoPageBak1(SarStandardsInfoEOPage page) throws Exception { + //查询当前登录人角色拥有权限的菜单 + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + } + Integer rowCount = dao.getSarStandardsInfoCount(page); + page.getPager().setRowCount(rowCount); + List sarlist = dao.getSarStandardsInfoPage(page,"0"); attrInfo(sarlist); return sarlist; } @@ -413,6 +441,53 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId()); + if (InitStandAttrUtil.clobFieldList != null && !InitStandAttrUtil.clobFieldList.isEmpty()) { + // 遍历修改所有clob类型的值 + for (String clobField : InitStandAttrUtil.clobFieldList) { + Clob clobValue = (Clob) getAttrMap.get(clobField); + String fieldValue = FieldConvertUtil.ClobToString(clobValue); + getAttrMap.put(clobField, fieldValue); + } + } + // 组织机构和人员 + Map newMap = new HashMap<>(); + if (getAttrMap != null) { + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + if ("\"null\"".equals(entry.getValue())) { + entry.setValue(""); + } + if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { + String value = entry.getValue().toString(); + String selVal = InitStandAttrUtil.selectFieldMap.get(name); + if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal)) { + value = sysInfoEOService.getOrgNamesByIds(value); + newMap.put(name + "Name", value); + } else if (SelectionTypeEnum.USERLIST.getValue().equals(selVal)) { + value = sysInfoEOService.getUserNamesByIds(value); + newMap.put(name + "Name", value); + } else if (SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) { + value = sysInfoEOService.getRoleNamesByIds(value); + newMap.put(name + "Name", value); + } + } + } + getAttrMap.putAll(newMap); + } + + if (getAttrMap != null && !getAttrMap.isEmpty()) { + row.setAttrInfoCaseMap(transformUpperCase(getAttrMap)); + } + + row.setAttrInfoMap(getAttrMap); + } + } + public void attrInfoSearchDetails(SarStandardsInfo row,String type) throws Exception { String fieldInfo = InitStandAttrUtil.queryField; String collectId = personCollectEOService.queryCollectByUserAndId(row.getId()); @@ -604,6 +679,55 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist) throws Exception { + for (SarStandardsInfo row : sarlist) { + attrInfoDetailsExport(row); + Map getAttrMap = row.getAttrInfoMap(); + Map getNewMap = new LinkedHashMap<>(); + if (getAttrMap != null && getAttrMap.size() > 0) { + String svppsTip = ""; + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + String value = ""; + if ("SVPPS".equals(name)) { + Object svpps = entry.getValue(); + if (svpps != null && StringUtils.isNotBlank(svpps.toString())) { + svppsTip = svpps.toString(); + } + if (StringUtils.isNotBlank(svppsTip)) { + svppsTip = sysInfoEOService.getSvppsNamesTipByIds(svppsTip); + } + value = String.valueOf(getAttrMap.get("SVPPSName")); + entry.setValue(value); + } else if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) { + value = entry.getValue().toString(); + if (StringUtils.isNotBlank(value)) { + List fileObj = attFileEOService.getMultiFileInfos(value); + entry.setValue(fileObj); + } + } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { + value = entry.getValue().toString(); + if ("GZZXX".equals(name)) { + value = sysInfoEOService.getGroupNamesByIds(value); + } else { + String selVal = InitStandAttrUtil.selectFieldMap.get(name); + if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal) || SelectionTypeEnum.USERLIST.getValue().equals(selVal) || SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) { + if (getAttrMap.get(name + "Name") != null) { + value = String.valueOf(getAttrMap.get(name + "Name")); + } + } else { + List valArr = Arrays.asList(value.split(",")); + value = dicTypeEODao.getDicNamesByCodes(valArr); + } + } + entry.setValue(value); + } + } + getAttrMap.put("SVPPSTips", svppsTip); + } + } + } + /*** * @Description: 新增标准 @@ -655,7 +779,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getReplacedStands = dao.getSarStandardsInfoPage(sarStandardsInfoEOPage); + List getReplacedStands = dao.getSarStandardsInfoPage(sarStandardsInfoEOPage,"0"); if (getReplacedStands != null && !getReplacedStands.isEmpty()) { for (SarStandardsInfo stand : getReplacedStands) { SarStandardsInfo newStand = new SarStandardsInfo(); @@ -1456,19 +1580,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getMenuIdList = new ArrayList<>(); - if(standardsInfoExcelVO.getUserId() != null){ - getMenuIdList= tsUserService.getResourceUserId(standardsInfoExcelVO.getUserId()); - } - // List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); - if (getMenuIdList != null && !getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } - List ids = sarMenuEOService.getChildMenuList(page.getMenuId()); - if (ids != null && !ids.isEmpty()) { - page.setMenuAllChildrenIdList(ids); + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ +// List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); +// if (getMenuIdList != null && !getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } } if (org.apache.commons.lang.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class); @@ -1480,14 +1608,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getList = dao.getSarStandardsExportInfo(page); - attrInfoShow(getList); + attrInfoShowExport(getList); return getList; } @@ -2640,7 +2767,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist = dao.getSarStandardsInfoPage(page); + List sarlist = dao.getSarStandardsInfoPage(page,"0"); attrInfo(sarlist); return sarlist; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/controller/WgDeptController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/controller/WgDeptController.java new file mode 100644 index 00000000..b02ce635 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/controller/WgDeptController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.wgDept.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.wgDept.entity.WgDept; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 集团参与情况 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-04 +*/ +@RestController +@Api(description = "|WgDept|") +@RequestMapping("/${restPath}/wgDept") +public class WgDeptController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/dao/WgDeptDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/dao/WgDeptDao.java new file mode 100644 index 00000000..5cb113d5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/dao/WgDeptDao.java @@ -0,0 +1,21 @@ +package com.adc.da.slrs.wgDept.dao; + +import com.adc.da.slrs.wgDept.entity.WgDept; +import com.adc.da.slrs.wgDept.entity.WgDeptShow; +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 集团参与情况 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface WgDeptDao extends BaseMapper { + List researchDatas(@Param(value = "data") String data); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java new file mode 100644 index 00000000..0566b276 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java @@ -0,0 +1,62 @@ +package com.adc.da.slrs.wgDept.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + *

+ * 集团参与情况 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgDept对象", description="集团参与情况") +@TableName("wg_dept") +public class WgDept extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "我司在工作组排名顺序") + @TableField("dept_order") + private String deptOrder; + + @ApiModelProperty(value = "我司人员") + @TableField("dept_people_id") + private String deptPeopleId; + + @ApiModelProperty(value = "身份") + @TableField("identity") + private String identity; + + @ApiModelProperty(value = "资料") + @TableField("joinfile") + private String joinfile; + + @ApiModelProperty(value = "前端id") + @TableField("join_id") + private String joinId; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java new file mode 100644 index 00000000..db6423e3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java @@ -0,0 +1,75 @@ +package com.adc.da.slrs.wgDept.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 集团参与情况 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgDept对象", description="集团参与情况") +public class WgDeptShow extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "我司在工作组排名顺序") + @TableField("dept_order") + private String deptOrder; + + @ApiModelProperty(value = "我司人员") + @TableField("dept_people_id") + private String deptPeopleId; + + @ApiModelProperty(value = "身份") + @TableField("identity") + private String identity; + + @ApiModelProperty(value = "资料") + @TableField("joinfile") + private String joinfile; + + @ApiModelProperty(value = "中文名") + private String name; + + @ApiModelProperty(value = "单位") + private String unit; + + @ApiModelProperty(value = "单位名称") + private String unitName; + + @ApiModelProperty(value = "电话") + private String phone; + + @ApiModelProperty(value = "邮箱") + private String email; + + @ApiModelProperty(value = "部门Id") + private String deptId; + + @ApiModelProperty(value = "部门名称") + private String deptName; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/service/IWgDeptService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/service/IWgDeptService.java new file mode 100644 index 00000000..1974bf96 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/service/IWgDeptService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.wgDept.service; + +import com.adc.da.slrs.wgDept.entity.WgDept; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 集团参与情况 服务类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface IWgDeptService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/service/impl/WgDeptServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/service/impl/WgDeptServiceImpl.java new file mode 100644 index 00000000..71a4fb5a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/service/impl/WgDeptServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgDept.service.impl; + +import com.adc.da.slrs.wgDept.entity.WgDept; +import com.adc.da.slrs.wgDept.dao.WgDeptDao; +import com.adc.da.slrs.wgDept.service.IWgDeptService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 集团参与情况 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Service +public class WgDeptServiceImpl extends ServiceImpl implements IWgDeptService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/controller/WgMeetingInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/controller/WgMeetingInfoController.java new file mode 100644 index 00000000..89f7579e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/controller/WgMeetingInfoController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.wgMeetingInfo.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 参会记录及资料 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-04 +*/ +@RestController +@Api(description = "|WgMeetingInfo|") +@RequestMapping("/${restPath}/wgMeetingInfo") +public class WgMeetingInfoController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/dao/WgMeetingInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/dao/WgMeetingInfoDao.java new file mode 100644 index 00000000..da9b1711 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/dao/WgMeetingInfoDao.java @@ -0,0 +1,22 @@ +package com.adc.da.slrs.wgMeetingInfo.dao; + +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 参会记录及资料 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface WgMeetingInfoDao extends BaseMapper { + + List researchDatas(@Param(value = "data") String data); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/entity/WgMeetingInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/entity/WgMeetingInfo.java new file mode 100644 index 00000000..5c6d33cd --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/entity/WgMeetingInfo.java @@ -0,0 +1,77 @@ +package com.adc.da.slrs.wgMeetingInfo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; + +import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelationShow; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + *

+ * 参会记录及资料 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgMeetingInfo对象", description="参会记录及资料") +@TableName("wg_meeting_info") +public class WgMeetingInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "参会时间") + @TableField("meeting_time") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date meetingTime; + + @ApiModelProperty(value = "会议名称") + @TableField("meeting_name") + private String meetingName; + + + @ApiModelProperty(value = "会议报告") + @TableField("meeting_report") + private String meetingReport; + + @ApiModelProperty(value = "会议资料") + @TableField("joinfile") + private String joinfile; + + @ApiModelProperty(value = "前端id") + @TableField("join_id") + private String joinId; + + @ApiModelProperty(value = "人员信息") + @TableField(exist = false) + private List meetingPeople; + + @TableField(exist = false) + private List joinMeetingPeopleInfo; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/service/IWgMeetingInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/service/IWgMeetingInfoService.java new file mode 100644 index 00000000..2a2e0155 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/service/IWgMeetingInfoService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.wgMeetingInfo.service; + +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 参会记录及资料 服务类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface IWgMeetingInfoService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/service/impl/WgMeetingInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/service/impl/WgMeetingInfoServiceImpl.java new file mode 100644 index 00000000..0cc958d0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/service/impl/WgMeetingInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgMeetingInfo.service.impl; + +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import com.adc.da.slrs.wgMeetingInfo.dao.WgMeetingInfoDao; +import com.adc.da.slrs.wgMeetingInfo.service.IWgMeetingInfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 参会记录及资料 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Service +public class WgMeetingInfoServiceImpl extends ServiceImpl implements IWgMeetingInfoService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/controller/WgMeetingUserRelationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/controller/WgMeetingUserRelationController.java new file mode 100644 index 00000000..933b7dc8 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/controller/WgMeetingUserRelationController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.wgMeetingUserRelation.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelation; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-09 +*/ +@RestController +@Api(description = "|WgMeetingUserRelation|") +@RequestMapping("/wgMeetingUserRelation") +public class WgMeetingUserRelationController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/dao/WgMeetingUserRelationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/dao/WgMeetingUserRelationDao.java new file mode 100644 index 00000000..0047c965 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/dao/WgMeetingUserRelationDao.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgMeetingUserRelation.dao; + +import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelation; +import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelationShow; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-09 + */ +public interface WgMeetingUserRelationDao extends BaseMapper { + List getMeetingPeoples(@Param("meetId") String meetingId); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/entity/WgMeetingUserRelation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/entity/WgMeetingUserRelation.java new file mode 100644 index 00000000..49782efe --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/entity/WgMeetingUserRelation.java @@ -0,0 +1,34 @@ +package com.adc.da.slrs.wgMeetingUserRelation.entity; + +import com.adc.da.base.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-11-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgMeetingUserRelation对象", description="") +public class WgMeetingUserRelation extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "会议id") + private String meetingId; + + @ApiModelProperty(value = "人员id") + private String userId; + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/entity/WgMeetingUserRelationShow.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/entity/WgMeetingUserRelationShow.java new file mode 100644 index 00000000..d30cf59a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/entity/WgMeetingUserRelationShow.java @@ -0,0 +1,45 @@ +package com.adc.da.slrs.wgMeetingUserRelation.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.slrs.sarInstitution.entity.TsUserVO; +import com.adc.da.slrs.sarPosition.entity.TsPosition; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import java.sql.Timestamp; +import java.util.List; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-11-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgMeetingUserRelation对象", description="") +public class WgMeetingUserRelationShow extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "会议id") + private String meetingId; + + @ApiModelProperty(value = "人员id") + private String userId; + + @ApiModelProperty(value = "人员名称") + private String name; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/service/IWgMeetingUserRelationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/service/IWgMeetingUserRelationService.java new file mode 100644 index 00000000..b3345ab0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/service/IWgMeetingUserRelationService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.wgMeetingUserRelation.service; + +import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelation; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author super_liu + * @since 2021-11-09 + */ +public interface IWgMeetingUserRelationService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/service/impl/WgMeetingUserRelationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/service/impl/WgMeetingUserRelationServiceImpl.java new file mode 100644 index 00000000..86963f88 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingUserRelation/service/impl/WgMeetingUserRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgMeetingUserRelation.service.impl; + +import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelation; +import com.adc.da.slrs.wgMeetingUserRelation.dao.WgMeetingUserRelationDao; +import com.adc.da.slrs.wgMeetingUserRelation.service.IWgMeetingUserRelationService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-09 + */ +@Service +public class WgMeetingUserRelationServiceImpl extends ServiceImpl implements IWgMeetingUserRelationService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/controller/WgNetInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/controller/WgNetInfoController.java new file mode 100644 index 00000000..ee80b7b9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/controller/WgNetInfoController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.wgNetInfo.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 工作组秘书联系方式 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-04 +*/ +@RestController +@Api(description = "|WgNetInfo|") +@RequestMapping("/${restPath}/wgNetInfo") +public class WgNetInfoController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/dao/WgNetInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/dao/WgNetInfoDao.java new file mode 100644 index 00000000..1bf05b94 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/dao/WgNetInfoDao.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.wgNetInfo.dao; + +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo; +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 工作组秘书联系方式 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface WgNetInfoDao extends BaseMapper { + + List researchDatas(@Param(value = "data") String data); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java new file mode 100644 index 00000000..12b1edec --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java @@ -0,0 +1,48 @@ +package com.adc.da.slrs.wgNetInfo.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 工作组秘书联系方式 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgNetInfo对象", description="工作组秘书联系方式") +@TableName("wg_net_info") +public class WgNetInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "人员id") + @TableField("net_id") + private String netId; + + @ApiModelProperty(value = "前端id") + @TableField("join_id") + private String joinId; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java new file mode 100644 index 00000000..cdf47254 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java @@ -0,0 +1,64 @@ +package com.adc.da.slrs.wgNetInfo.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 工作组秘书联系方式 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgNetInfo对象", description="工作组秘书联系方式") +@TableName("wg_net_info") +public class WgNetInfoDTO extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "人员id") + @TableField("net_id") + private String netId; + + + @ApiModelProperty(value = "前端id") + @TableField("join_id") + private String joinId; + + @ApiModelProperty(value = "中文名") + private String name; + + @ApiModelProperty(value = "单位") + private String unit; + + @ApiModelProperty(value = "单位名称") + private String unitName; + + @ApiModelProperty(value = "电话") + private String phone; + + @ApiModelProperty(value = "邮箱") + private String email; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/service/IWgNetInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/service/IWgNetInfoService.java new file mode 100644 index 00000000..37d60274 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/service/IWgNetInfoService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.wgNetInfo.service; + +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 工作组秘书联系方式 服务类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface IWgNetInfoService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/service/impl/WgNetInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/service/impl/WgNetInfoServiceImpl.java new file mode 100644 index 00000000..2ae5d889 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/service/impl/WgNetInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgNetInfo.service.impl; + +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo; +import com.adc.da.slrs.wgNetInfo.dao.WgNetInfoDao; +import com.adc.da.slrs.wgNetInfo.service.IWgNetInfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 工作组秘书联系方式 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Service +public class WgNetInfoServiceImpl extends ServiceImpl implements IWgNetInfoService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/controller/WgPayInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/controller/WgPayInfoController.java new file mode 100644 index 00000000..67f75b81 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/controller/WgPayInfoController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.wgPayInfo.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 支付信息 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-04 +*/ +@RestController +@Api(description = "|WgPayInfo|") +@RequestMapping("/${restPath}/wgPayInfo") +public class WgPayInfoController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/dao/WgPayInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/dao/WgPayInfoDao.java new file mode 100644 index 00000000..c97e3810 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/dao/WgPayInfoDao.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgPayInfo.dao; + +import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 支付信息 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface WgPayInfoDao extends BaseMapper { + List researchDatas(@Param(value = "data") String data); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java new file mode 100644 index 00000000..01a25d53 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java @@ -0,0 +1,73 @@ +package com.adc.da.slrs.wgPayInfo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 支付信息 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgPayInfo对象", description="支付信息") +@TableName("wg_pay_info") +public class WgPayInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "价格") + @TableField("price") + private BigDecimal price; + + @ApiModelProperty(value = "年份") + @TableField("year") + private String year; + + @ApiModelProperty(value = "支付状态（0:未支付,1:已支付）") + @TableField("status") + private String status; + + @ApiModelProperty(value = "是否计划内(0:计划内,1:计划外)") + @TableField("inplan") + private String inplan; + + @ApiModelProperty(value = "支付方式") + @TableField("pay_way") + private String payWay; + + @ApiModelProperty(value = "支付资料") + @TableField("joinfile") + private String joinfile; + + @ApiModelProperty(value = "费用列支") + @TableField("pay_info") + private String payInfo; + + @ApiModelProperty(value = "前端id") + @TableField("join_id") + private String joinId; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/service/IWgPayInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/service/IWgPayInfoService.java new file mode 100644 index 00000000..ff7d8468 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/service/IWgPayInfoService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.wgPayInfo.service; + +import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 支付信息 服务类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface IWgPayInfoService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/service/impl/WgPayInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/service/impl/WgPayInfoServiceImpl.java new file mode 100644 index 00000000..f348bba5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/service/impl/WgPayInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgPayInfo.service.impl; + +import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo; +import com.adc.da.slrs.wgPayInfo.dao.WgPayInfoDao; +import com.adc.da.slrs.wgPayInfo.service.IWgPayInfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 支付信息 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Service +public class WgPayInfoServiceImpl extends ServiceImpl implements IWgPayInfoService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/controller/WgStandorpolicyInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/controller/WgStandorpolicyInfoController.java new file mode 100644 index 00000000..582a41a7 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/controller/WgStandorpolicyInfoController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.wgStandorpolicyInfo.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 标准/政策 -信息 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-04 +*/ +@RestController +@Api(description = "|WgStandorpolicyInfo|") +@RequestMapping("/${restPath}/wgStandorpolicyInfo") +public class WgStandorpolicyInfoController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java new file mode 100644 index 00000000..16e7d3dd --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java @@ -0,0 +1,22 @@ +package com.adc.da.slrs.wgStandorpolicyInfo.dao; + +import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 标准/政策 -信息 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface WgStandorpolicyInfoDao extends BaseMapper { + + List researchDatas(@Param(value = "data") String data); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/entity/WgStandorpolicyInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/entity/WgStandorpolicyInfo.java new file mode 100644 index 00000000..cc9ffde9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/entity/WgStandorpolicyInfo.java @@ -0,0 +1,62 @@ +package com.adc.da.slrs.wgStandorpolicyInfo.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 标准/政策 -信息 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgStandorpolicyInfo对象", description="标准/政策 -信息") +@TableName("wg_standorpolicy_info") +public class WgStandorpolicyInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + private String wgId; + + @ApiModelProperty(value = "政策/标准 类别") + private String categary; + + @ApiModelProperty(value = "政策/标准 编号") + private String number; + + @ApiModelProperty(value = "政策/标准 年份") + private String year; + + @ApiModelProperty(value = "政策标准 名称") + private String name; + + @ApiModelProperty(value = "政策/标准 英文名称") + private String usname; + + @ApiModelProperty(value = "文本状态") + private String status; + + @ApiModelProperty(value = "参与制定情况") + private String joinDevelop; + + @ApiModelProperty(value = "相关材料") + private String netDatum; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/IWgStandorpolicyInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/IWgStandorpolicyInfoService.java new file mode 100644 index 00000000..e03fb8a5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/IWgStandorpolicyInfoService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.wgStandorpolicyInfo.service; + +import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 标准/政策 -信息 服务类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface IWgStandorpolicyInfoService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/impl/WgStandorpolicyInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/impl/WgStandorpolicyInfoServiceImpl.java new file mode 100644 index 00000000..3ad3244e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/impl/WgStandorpolicyInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgStandorpolicyInfo.service.impl; + +import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; +import com.adc.da.slrs.wgStandorpolicyInfo.dao.WgStandorpolicyInfoDao; +import com.adc.da.slrs.wgStandorpolicyInfo.service.IWgStandorpolicyInfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 标准/政策 -信息 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Service +public class WgStandorpolicyInfoServiceImpl extends ServiceImpl implements IWgStandorpolicyInfoService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java new file mode 100644 index 00000000..34ce0415 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java @@ -0,0 +1,68 @@ +package com.adc.da.slrs.wgWorkGroup.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; +import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService; +import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroup; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 工作组主表 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-04 +*/ +@RestController +@Api(description = "|WgWorkGroup|") +@RequestMapping("/${restPath}/wg_work_group") +public class WgWorkGroupController extends BaseController { + + @Autowired + private IWgWorkGroupService wgWorkGroupService; + + @ApiOperation("添加工作组节点数据") + @PostMapping("/add") + public ResponseMessage addResource(@RequestBody WgWorkGroupDTO wgWorkGroup){ + return Result.success(wgWorkGroupService.saveDatas(wgWorkGroup)); + } + + + @ApiOperation("搜索工作组节点数据") + @GetMapping("/researchData") + public ResponseMessage researchData(@RequestParam(value = "type") String type){ + return Result.success(wgWorkGroupService.researchData(type)); + } + + @ApiOperation("删除工作组节点数据") + @DeleteMapping("/deleteData") + public ResponseMessage deleteData(@Param(value = "id") String id){ + return wgWorkGroupService.deleteData(id); + } + + @ApiOperation("修改工作组节点数据") + @DeleteMapping("/updateData") + public ResponseMessage updateData(@RequestBody WgWorkGroupShowDTO wgWorkGroupShowDTO){ + return wgWorkGroupService.updateData(wgWorkGroupShowDTO); + } + + + + + + + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java new file mode 100644 index 00000000..71a92b11 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java @@ -0,0 +1,27 @@ +package com.adc.da.slrs.wgWorkGroup.dao; + +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroup; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 工作组主表 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface WgWorkGroupDao extends BaseMapper { + + WgWorkGroupShowDTO researchDatas(@Param(value = "data") List wgWorkGroupShowDTOS,@Param(value = "type")String type); + + List researchDownLevel(@Param(value = "data") String data); + + List researchDownCheck(@Param(value = "data") String data,@Param(value = "status")String status); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroup.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroup.java new file mode 100644 index 00000000..fdf5426e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroup.java @@ -0,0 +1,78 @@ +package com.adc.da.slrs.wgWorkGroup.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 工作组主表 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgWorkGroup对象", description="工作组主表") +@TableName("wg_work_group") +public class WgWorkGroup extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "父级id") + @TableId("pid") + private String pid; + + @ApiModelProperty(value = "编号") + @TableId("number") + private String number; + + @ApiModelProperty(value = "名称") + @TableId("name") + private String name; + + @ApiModelProperty(value = "性质（0:标委会,1:分标委,2:工作组,3:政策）") + @TableId("nature") + private String nature; + + @ApiModelProperty(value = "状态(0:流程中,1:流程已通过)") + @TableId("status") + private String status; + + @ApiModelProperty(value = "换届时间") + @TableField("change_time") + private LocalDateTime changeTime; + + @ApiModelProperty(value = "标准化工作领域") + @TableField("stander_area") + private String standerArea; + + @ApiModelProperty(value = "备注") + @TableField("mark") + private String mark; + + @ApiModelProperty(value = "0:标准化流程 1:政策课题组") + @TableField("type") + private String types; + + @ApiModelProperty(value = "层级") + @TableField("level") + private String level; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupDTO.java new file mode 100644 index 00000000..58badaf3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupDTO.java @@ -0,0 +1,87 @@ +package com.adc.da.slrs.wgWorkGroup.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.slrs.wgDept.entity.WgDept; +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo; +import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo; +import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.List; + +/** + *

+ * 工作组主表 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgWorkGroup对象", description="工作组主表") +public class WgWorkGroupDTO extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "工作组id") + private String id; + + @ApiModelProperty(value = "父级id") + private String pid; + + @ApiModelProperty(value = "编号") + private String number; + + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "性质（0:标委会,1:分标委,2:工作组,3:政策）") + private String nature; + + @ApiModelProperty(value = "状态(0:流程中,1:流程已通过)") + private String status; + + @ApiModelProperty(value = "换届时间") + private LocalDateTime changeTime; + + @ApiModelProperty(value = "标准化工作领域") + private String standerArea; + + @ApiModelProperty(value = "备注") + private String mark; + + @ApiModelProperty(value = "0:标准化流程 1:政策课题组") + private String types; + + @ApiModelProperty(value = "层级") + private String level; + + //支付信息 + List wgPayInfos; + + //标准政策 + List wgStandorpolicyInfos; + + //集团参与情况 + List wgDepts; + + //秘书联系方式 + List wgNetInfos; + + //参会记录及资料 + List wgMeetingInfos; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java new file mode 100644 index 00000000..2c38d90d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java @@ -0,0 +1,86 @@ +package com.adc.da.slrs.wgWorkGroup.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.slrs.wgDept.entity.WgDept; +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo; +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO; +import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo; +import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; + +/** + *

+ * 工作组主表 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgWorkGroup对象", description="工作组主表") +public class WgWorkGroupShowDTO extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "工作组id") + private String id; + + @ApiModelProperty(value = "父级id") + private String pid; + + @ApiModelProperty(value = "编号") + private String number; + + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "性质（0:标委会,1:分标委,2:工作组,3:政策）") + private String nature; + + @ApiModelProperty(value = "状态(0:流程中,1:流程已通过)") + private String status; + + @ApiModelProperty(value = "换届时间") + private Date changeTime; + + @ApiModelProperty(value = "标准化工作领域") + private String standerArea; + + @ApiModelProperty(value = "备注") + private String mark; + + @ApiModelProperty(value = "0:标准化流程 1:政策课题组") + private String types; + + private String level; + + //支付信息 + List wgPayInfos; + + //标准政策 + List wgStandorpolicyInfos; + + //集团参与情况 + List wgDepts; + + //秘书联系方式 + List wgNetInfos; + + //参会记录及资料 + List wgMeetingInfos; + + List children; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java new file mode 100644 index 00000000..2ba8030e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java @@ -0,0 +1,31 @@ +package com.adc.da.slrs.wgWorkGroup.service; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroup; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 工作组主表 服务类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface IWgWorkGroupService extends IService { + + String saveDatas(WgWorkGroupDTO wgWorkGroupDTO); + + WgWorkGroupShowDTO researchData(String type); + + ResponseMessage deleteData(String id); + + ResponseMessage updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO); + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java new file mode 100644 index 00000000..cf2c086e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -0,0 +1,185 @@ +package com.adc.da.slrs.wgWorkGroup.service.impl; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgDept.service.IWgDeptService; +import com.adc.da.slrs.wgMeetingInfo.service.IWgMeetingInfoService; +import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelation; +import com.adc.da.slrs.wgMeetingUserRelation.service.IWgMeetingUserRelationService; +import com.adc.da.slrs.wgMeetingUserRelation.service.impl.WgMeetingUserRelationServiceImpl; +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo; +import com.adc.da.slrs.wgNetInfo.service.IWgNetInfoService; +import com.adc.da.slrs.wgPayInfo.service.IWgPayInfoService; +import com.adc.da.slrs.wgStandorpolicyInfo.service.IWgStandorpolicyInfoService; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroup; +import com.adc.da.slrs.wgWorkGroup.dao.WgWorkGroupDao; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; +import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + *

+ * 工作组主表 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Service +public class WgWorkGroupServiceImpl extends ServiceImpl implements IWgWorkGroupService { + + @Autowired + private IWgWorkGroupService wgWorkGroupService; + @Autowired + private IWgDeptService wgDeptService; + @Autowired + private IWgMeetingInfoService wgMeetingInfoService; + @Autowired + private IWgNetInfoService wgNetInfoService; + @Autowired + private IWgPayInfoService wgPayInfoService; + @Autowired + private IWgStandorpolicyInfoService wgStandorpolicyInfoService; + @Autowired + private WgWorkGroupDao wgWorkGroupDao; + @Autowired + private IWgMeetingUserRelationService wgMeetingUserRelationService; + + + @Transactional + @Override + public String saveDatas(WgWorkGroupDTO wgWorkGroupDTO) { + WgWorkGroup wgWorkGroup=new WgWorkGroup(); + BeanUtils.copyProperties(wgWorkGroupDTO,wgWorkGroup); + //存储集团参与情况 + boolean flag=true; + wgWorkGroup.setId(String.valueOf(UUID.randomUUID())); + flag=wgWorkGroupService.save(wgWorkGroup); + if (null!=wgWorkGroupDTO.getWgDepts()) { + wgWorkGroupDTO.getWgDepts().forEach(wgDept -> {wgDept.setWgId(wgWorkGroup.getId()); + }); + flag=wgDeptService.saveBatch(wgWorkGroupDTO.getWgDepts()); + } + //存储会议信息 + if (null!=wgWorkGroupDTO.getWgMeetingInfos()) { + List wgMeetingUserRelations = new ArrayList<>(); + wgWorkGroupDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { + wgMeetingInfo.setWgId(wgWorkGroup.getId()); + wgMeetingInfo.getMeetingPeople().forEach(s -> { + WgMeetingUserRelation wgMeetingUserRelation=new WgMeetingUserRelation(); + wgMeetingUserRelation.setMeetingId(wgMeetingInfo.getId()); + wgMeetingUserRelation.setUserId(s); + }); + }); + flag = wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations); + flag = wgMeetingInfoService.saveBatch(wgWorkGroupDTO.getWgMeetingInfos()); + } + //存储秘书联系方式信息 + if (null!=wgWorkGroupDTO.getWgNetInfos()) { + wgWorkGroupDTO.getWgNetInfos().forEach(wgNetInfo -> {wgNetInfo.setWgId(wgWorkGroup.getId());}); + flag = wgNetInfoService.saveBatch(wgWorkGroupDTO.getWgNetInfos()); + } + //支付信息 + if (null!=wgWorkGroupDTO.getWgPayInfos()) { + wgWorkGroupDTO.getWgPayInfos().forEach(wgPayInfo -> {wgPayInfo.setWgId(wgWorkGroup.getId());}); + flag = wgPayInfoService.saveBatch(wgWorkGroupDTO.getWgPayInfos()); + } + //标准政策信息 + if (null!=wgWorkGroupDTO.getWgStandorpolicyInfos()) { + wgWorkGroupDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> {wgStandorpolicyInfo.setWgId(wgWorkGroup.getId());}); + flag = wgStandorpolicyInfoService.saveBatch(wgWorkGroupDTO.getWgStandorpolicyInfos()); + } + //先存储主数据 + if (flag ) { + return "添加成功"; + }else { + return "数据错误，添加失败"; + } + } + + @Override + public WgWorkGroupShowDTO researchData(String type) { + //构建最初的节点 用来向下搜索 + WgWorkGroupShowDTO wgWorkGroupShowDTO=new WgWorkGroupShowDTO(); + wgWorkGroupShowDTO.setId("root"); + wgWorkGroupShowDTO.setTypes(type); + List wgWorkGroupShowDTOS=new ArrayList<>(); + wgWorkGroupShowDTOS.add(wgWorkGroupShowDTO); + return wgWorkGroupDao.researchDatas(wgWorkGroupShowDTOS,type); + } + + @Override + public ResponseMessage deleteData(String id) { + List wgWorkGroupShowDTOS=wgWorkGroupDao.researchDownCheck(id,"1"); + List wgWorkGroups=wgWorkGroupDao.researchDownLevel(id); + if (null!=wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size()>0 && null!= wgWorkGroups && wgWorkGroups.size()>0){ + return Result.error("该工作组下存在工作组且处在流程中，无法删除"); + } else if (null!=wgWorkGroups && wgWorkGroups.size()>0) { + return Result.error("该工作组下存在工作组，无法删除"); + } else if (null!=wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size()>0){ + return Result.error("该工作组处在流程中，无法删除"); + }else { + wgWorkGroupService.removeById(id); + Map columnMap = new HashMap<>(); + columnMap.put("wg_id", id); + wgStandorpolicyInfoService.removeByMap(columnMap); + wgPayInfoService.removeByMap(columnMap); + wgNetInfoService.removeByMap(columnMap); + wgMeetingInfoService.removeByMap(columnMap); + wgDeptService.removeByMap(columnMap); + return Result.success("删除成功"); + } + } + + @Override + public ResponseMessage updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO) { + List wgWorkGroupShowDTOS=wgWorkGroupDao.researchDownCheck(wgWorkGroupShowDTO.getId(),"1"); + if (null!=wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size()>0){ + return Result.error("工作组处在流程中，无法修改"); + }else { + WgWorkGroup wgWorkGroup=new WgWorkGroup(); + BeanUtils.copyProperties(wgWorkGroupShowDTO,wgWorkGroup); + boolean flag = false; + flag=wgWorkGroupService.updateById(wgWorkGroup); + if (null!=wgWorkGroupShowDTO.getWgDepts()) { + flag = wgDeptService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgDepts()); + } + if (null!=wgWorkGroupShowDTO.getWgMeetingInfos()) { + flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos()); + } + if (null!=wgWorkGroupShowDTO.getWgNetInfos()) { + List wgNetInfos=new ArrayList<>(); + wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { + WgNetInfo wgNetInfo=new WgNetInfo(); + BeanUtils.copyProperties(wgNetInfoDTO,wgNetInfo); + wgNetInfos.add(wgNetInfo); + }); + flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); + } + if (null!=wgWorkGroupShowDTO.getWgPayInfos()){ + flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); + } + if (null!=wgWorkGroupShowDTO.getWgStandorpolicyInfos()) { + flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); + } + + if (flag){ + return Result.success("更新成功"); + }else { + return Result.error("无法更新"); + } + } + } + + + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java index 6002aa1f..d64d8b74 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java @@ -91,19 +91,19 @@ public class BussStandExportUtil { Map attrValueMap = sarStandardsInfoEO.getAttrInfoMap(); switch (name) { case "企标类别": - value = sarStandardsInfoEO.getStandSortShow(); + value = verifyBean(sarStandardsInfoEO.getStandSortShow()); break; case "企标编号": - value = sarStandardsInfoEO.getStandCode(); + value = verifyBean(sarStandardsInfoEO.getStandCode()); break; case "中文名称": - value = sarStandardsInfoEO.getStandName(); + value = verifyBean(sarStandardsInfoEO.getStandName()); break; case "英文名称": - value = sarStandardsInfoEO.getStandEnName(); + value = verifyBean(sarStandardsInfoEO.getStandEnName()); break; case "文本状态": - value = sarStandardsInfoEO.getStandStatusShow(); + value = verifyBean(sarStandardsInfoEO.getStandStatusShow()); break; case "标准实施日期": String putTime=""; @@ -116,10 +116,10 @@ public class BussStandExportUtil { value = putTime; break; case "代替企标编号": - value = sarStandardsInfoEO.getReplaceStandNum(); + value = verifyBean(sarStandardsInfoEO.getReplaceStandNum()); break; case "被代替企标编号": - value = sarStandardsInfoEO.getReplacedStandNum(); + value = verifyBean(sarStandardsInfoEO.getReplacedStandNum()); break; case "发布日期": String issueTime=""; @@ -149,4 +149,14 @@ public class BussStandExportUtil { return value; } + private static String verifyBean(String value){ + String val = ""; + if(StringUtils.isNotBlank(value)){ + val =value; + }else { + val = ""; + } + return val; + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/LawsStandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/LawsStandExportUtil.java index c5388ff0..e7c63cfa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/LawsStandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/LawsStandExportUtil.java @@ -91,19 +91,19 @@ public class LawsStandExportUtil { Map attrValueMap = sarStandardsInfoEO.getAttrInfoMap(); switch (name) { case "政策分类": - value = sarStandardsInfoEO.getLawsType(); + value = verifyBean(sarStandardsInfoEO.getLawsType()); break; case "政策编号": - value = sarStandardsInfoEO.getLawsNumber(); + value = verifyBean(sarStandardsInfoEO.getLawsNumber()); break; case "中文名称": - value = sarStandardsInfoEO.getLawsName(); + value = verifyBean(sarStandardsInfoEO.getLawsName()); break; case "英文名称": - value = sarStandardsInfoEO.getLawsEnName(); + value = verifyBean(sarStandardsInfoEO.getLawsEnName()); break; case "政策文号": - value = sarStandardsInfoEO.getLawsNo(); + value = verifyBean(sarStandardsInfoEO.getLawsNo()); break; case "发文日期": String issueTime=""; @@ -116,11 +116,11 @@ public class LawsStandExportUtil { value = issueTime; break; case "发文单位": - value = sarStandardsInfoEO.getIssueCompany(); + value = verifyBean(sarStandardsInfoEO.getIssueCompany()); break; case "征集意见周期-起始时间": String commentCycleStart=""; - if (Date.class.equals(sarStandardsInfoEO.getCommentCycleStart().getClass())){ + if (Date.class.equals(sarStandardsInfoEO.getCommentCycleStart())){ commentCycleStart = sdf.format(sarStandardsInfoEO.getCommentCycleStart()); }else { commentCycleStart=sarStandardsInfoEO.getCommentCycleStart(); @@ -129,7 +129,7 @@ public class LawsStandExportUtil { break; case "征集意见周期-结束时间": String commentCycleEnd=""; - if (Date.class.equals(sarStandardsInfoEO.getCommentCycleEnd().getClass())){ + if (Date.class.equals(sarStandardsInfoEO.getCommentCycleEnd())){ commentCycleEnd = sdf.format(sarStandardsInfoEO.getCommentCycleEnd()); }else { commentCycleEnd=sarStandardsInfoEO.getCommentCycleEnd(); @@ -137,31 +137,31 @@ public class LawsStandExportUtil { value = commentCycleEnd; break; case "文本状态": - value = sarStandardsInfoEO.getStandStatusShow(); + value = verifyBean(sarStandardsInfoEO.getStandStatusShow()); break; case "适用区域": - value = sarStandardsInfoEO.getLawsSyqy(); + value = verifyBean(sarStandardsInfoEO.getLawsSyqy()); break; case "适用车型": - value = sarStandardsInfoEO.getLawsSycx(); + value = verifyBean(sarStandardsInfoEO.getLawsSycx()); break; case "是否纳入认证清单": value = sarStandardsInfoEO.getIsRelateAccess() != null ? (sarStandardsInfoEO.getIsRelateAccess().equals("1")?"是":"否"): ""; break; case "年度": - value = sarStandardsInfoEO.getLawsYear(); + value = verifyBean(sarStandardsInfoEO.getLawsYear()); break; case "福田转发通知文号": - value = sarStandardsInfoEO.getLawsNotisyncNum(); + value = verifyBean(sarStandardsInfoEO.getLawsNotisyncNum()); break; case "信息简报": - value = sarStandardsInfoEO.getLawsBulletin(); + value = verifyBean(sarStandardsInfoEO.getLawsBulletin()); break; case "标签": - value = sarStandardsInfoEO.getLawsLabel(); + value = verifyBean(sarStandardsInfoEO.getLawsLabel()); break; case "备注": - value = sarStandardsInfoEO.getLawsRemark(); + value = verifyBean(sarStandardsInfoEO.getLawsRemark()); break; default: String field = attrInfoMap.get(name); @@ -173,4 +173,14 @@ public class LawsStandExportUtil { return value; } + private static String verifyBean(String value){ + String val = ""; + if(StringUtils.isNotBlank(value)){ + val =value; + }else { + val = ""; + } + return val; + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java index 47f597c1..20781939 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java @@ -101,23 +101,28 @@ public class StandExportUtil { Map attrValueMap = sarStandardsInfoEO.getAttrInfoMap(); switch (name) { case "标准性质": - value = sarStandardsInfoEO.getStandNatureShow(); + value = verifyBean(sarStandardsInfoEO.getStandNatureShow()); break; case "是否纳入认证清单": - switch (sarStandardsInfoEO.getIsRelateAccess()){ - case "0": value="否"; break; - case "1": value="是"; break; - default:value=""; + boolean notBlank = StringUtils.isNotBlank(sarStandardsInfoEO.getIsRelateAccess()); + if (notBlank) { + switch (sarStandardsInfoEO.getIsRelateAccess()){ + case "0": value="否"; break; + case "1": value="是"; break; + default:value=""; + } + }else { + value = ""; } break; case "标准体系": - value = sarStandardsInfoEO.getStandSystem(); + value = verifyBean(sarStandardsInfoEO.getStandSystem()); break; case "适用区域": - value = sarStandardsInfoEO.getCountryShow(); + value = verifyBean(sarStandardsInfoEO.getCountryShow()); break; case "标准类别": - value = sarStandardsInfoEO.getStandSortShow(); + value = verifyBean(sarStandardsInfoEO.getStandSortShow()); break; case "重要度": if (StringUtils.isNotBlank(sarStandardsInfoEO.getIsRelateAccess())) { @@ -130,19 +135,19 @@ public class StandExportUtil { value = sarStandardsInfoEO.getIsRelateAccess(); break; case "标准编号": - value = sarStandardsInfoEO.getStandNumber(); + value = verifyBean(sarStandardsInfoEO.getStandNumber()); break; case "标准年份": - value = sarStandardsInfoEO.getStandYear(); + value = verifyBean(sarStandardsInfoEO.getStandYear()); break; case "中文名称": - value = sarStandardsInfoEO.getStandName(); + value = verifyBean(sarStandardsInfoEO.getStandName()); break; case "英文名称": - value = sarStandardsInfoEO.getStandEnName(); + value = verifyBean(sarStandardsInfoEO.getStandEnName()); break; case "文本状态": - value = sarStandardsInfoEO.getStandTextStatusShow(); + value = verifyBean(sarStandardsInfoEO.getStandTextStatusShow()); break; case "发布日期": if (sarStandardsInfoEO.getIssueTime() != null) { @@ -154,7 +159,7 @@ public class StandExportUtil { } break; case "文本说明": - value = sarStandardsInfoEO.getSynopsis(); + value = verifyBean(sarStandardsInfoEO.getSynopsis()); break; default: String field = attrInfoMap.get(name); @@ -166,4 +171,14 @@ public class StandExportUtil { return value; } + private static String verifyBean(String value){ + String val = ""; + if(StringUtils.isNotBlank(value)){ + val =value; + }else { + val = ""; + } + return val; + } + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 547edcd4..3465da42 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -348,6 +348,55 @@ + + ORDER BY + CASE + when tmp_tb.stand_code like concat('%', 'Q/FT A', '%') THEN 0 + when tmp_tb.stand_code like concat('%', 'Q/FT B', '%') THEN 1 + when tmp_tb.stand_code like concat('%', 'Q/FT E', '%') THEN 2 + when tmp_tb.stand_code like concat('%', 'Q/FT F', '%') THEN 3 + when tmp_tb.stand_code like concat('%', 'Q/FT G', '%') THEN 4 + when tmp_tb.stand_code like concat('%', 'Q/FT M', '%') THEN 5 + when tmp_tb.stand_code like concat('%', 'Q/FT Q', '%') THEN 6 + when tmp_tb.stand_code like concat('%', 'Q/FT R', '%') THEN 7 + when tmp_tb.stand_code like concat('%', 'Q/FT S', '%') THEN 8 + when tmp_tb.stand_code like concat('%', 'Q/FT T', '%') THEN 9 + when tmp_tb.stand_code like concat('%', 'Q/FT V', '%') THEN 10 + when tmp_tb.stand_code like concat('%', 'Q/FT X', '%') THEN 11 + when tmp_tb.stand_code like concat('%', 'Q/FT Y', '%') THEN 12 + when tmp_tb.stand_code like concat('%', 'Q/FT Z', '%') THEN 13 + when tmp_tb.stand_code like concat('%', 'Q/QCBFC', '%') THEN 14 + when tmp_tb.stand_code like concat('%', '雷萨企标Q/FL', '%') THEN 15 + when tmp_tb.stand_code like concat('%', 'Q/QCFLC', '%') THEN 16 + ELSE 17 + END, + tmp_tb.stand_sort ASC + + + ORDER BY + CASE + when tmp_tb.stand_code like concat('%', 'Q/FT A', '%') THEN 0 + when tmp_tb.stand_code like concat('%', 'Q/FT B', '%') THEN 1 + when tmp_tb.stand_code like concat('%', 'Q/FT E', '%') THEN 2 + when tmp_tb.stand_code like concat('%', 'Q/FT F', '%') THEN 3 + when tmp_tb.stand_code like concat('%', 'Q/FT G', '%') THEN 4 + when tmp_tb.stand_code like concat('%', 'Q/FT M', '%') THEN 5 + when tmp_tb.stand_code like concat('%', 'Q/FT Q', '%') THEN 6 + when tmp_tb.stand_code like concat('%', 'Q/FT R', '%') THEN 7 + when tmp_tb.stand_code like concat('%', 'Q/FT S', '%') THEN 8 + when tmp_tb.stand_code like concat('%', 'Q/FT T', '%') THEN 9 + when tmp_tb.stand_code like concat('%', 'Q/FT V', '%') THEN 10 + when tmp_tb.stand_code like concat('%', 'Q/FT X', '%') THEN 11 + when tmp_tb.stand_code like concat('%', 'Q/FT Y', '%') THEN 12 + when tmp_tb.stand_code like concat('%', 'Q/FT Z', '%') THEN 13 + when tmp_tb.stand_code like concat('%', 'Q/QCBFC', '%') THEN 14 + when tmp_tb.stand_code like concat('%', '雷萨企标Q/FL', '%') THEN 15 + when tmp_tb.stand_code like concat('%', 'Q/QCFLC', '%') THEN 16 + ELSE 17 + END, + tmp_tb.stand_sort ASC, + tmp_tb.issue_time is null,tmp_tb.issue_time desc,tmp_tb.id + left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id @@ -585,7 +634,9 @@ ORDER BY ${sql} - ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a + ) tmp_tb + + limit ${pager.startIndex-1},${pageSize}) a @@ -626,13 +677,13 @@ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index b3f53de2..aedae23d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -37,8 +37,15 @@ select from SAR_LAWS_MENU where laws_id = #{lawsId} and valid_flag=0 - and MENU_ID in (select SAR_MENU.id from SAR_MENU where VALID_FLAG=0 start with id=#{menuId} connect by prior id= parent_id) + and MENU_ID in + + #{item} + - update SAR_BUSS_STAND_MENU + update SAR_LAWS_MENU menu_id = #{menuId}, @@ -179,8 +182,10 @@ delete from SAR_LAWS_MENU where laws_id = #{lawsId} - and MENU_ID in (select SAR_MENU.id from SAR_MENU - where VALID_FLAG=0 start with id=#{oldMenuId} connect by prior id= parent_id) + and MENU_ID in + + #{item} + @@ -290,7 +290,7 @@ a.*, dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow from (select - from SAR_LAWS_ATTR_INFO + from SAR_LAWS_STAND_INFO ) a order by a.issue_time is null,a.issue_time desc,a.id diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index e57eafad..51417d7d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -159,6 +159,31 @@ limit ${(page-1)*size},${page*size} + + + + + @@ -901,11 +1135,16 @@ + select wg_dept.* ,ts_user.UNAME as name ,ts_user.PHONE as phone ,ts_user.EMAIL as email,ts_user.INSTITUTION_ID as deptId + ,ts_user.INSTITUTION_NAME as deptName + from wg_dept + left join ts_user on ts_user.ACCOUNT = wg_dept.dept_people_id + where wg_dept.wg_id =#{data} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingInfo/WgMeetingInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingInfo/WgMeetingInfoMapper.xml new file mode 100644 index 00000000..5762a95a --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingInfo/WgMeetingInfoMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingUserRelation/WgMeetingUserRelationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingUserRelation/WgMeetingUserRelationMapper.xml new file mode 100644 index 00000000..016b6723 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingUserRelation/WgMeetingUserRelationMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml new file mode 100644 index 00000000..dd9896b6 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgPayInfo/WgPayInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgPayInfo/WgPayInfoMapper.xml new file mode 100644 index 00000000..18d982b1 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgPayInfo/WgPayInfoMapper.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgStandorpolicyInfo/WgStandorpolicyInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgStandorpolicyInfo/WgStandorpolicyInfoMapper.xml new file mode 100644 index 00000000..636a0b83 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgStandorpolicyInfo/WgStandorpolicyInfoMapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml new file mode 100644 index 00000000..9256d02a --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +