diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 5413f86b..808a1999 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; import java.util.Set; @@ -20,6 +22,12 @@ import java.util.Set; //@FeignClient(value = "shan6") public interface workFlowFeignClient { + @RequestMapping(value = "/bat-wkflow/busProcessModel/saveEditFile",method = RequestMethod.GET) + BusProcessModelHis saveEditFile(); + + @RequestMapping(value = "/bat-wkflow/busProcessModel/processEditFile",method = RequestMethod.GET) + BusProcessModelHis processEditFile(@RequestParam("id") String id); + @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOneUpdStatus",method = RequestMethod.GET) BusProcessModelHis processModelHisOneUpdStatus(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index be3ef332..1552ca62 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -16,6 +16,8 @@ import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -28,6 +30,16 @@ public class workFlowFeignClientImpl { @Autowired private IUserEOService userEOService; + public BusProcessModelHis saveEditFile(){ + BusProcessModelHis stringWrapper = workFlowFeignClient.saveEditFile(); + return stringWrapper; + } + + public BusProcessModelHis processEditFile(@RequestParam("id") String id){ + BusProcessModelHis stringWrapper = workFlowFeignClient.processEditFile(id); + return stringWrapper; + } + public BusProcessModelHis processModelHisOneUpdStatus(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOneUpdStatus(pid,taskId); return stringWrapper; 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 f37f251e..398b9319 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 @@ -187,6 +187,7 @@ public class ProcessTimer { } @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行 +// @Scheduled(cron = "0 0 0/1 * * ? ")//每天十点执行 // @Scheduled(cron = "*/40 * * * * ? ")//20s public void everyDayTenOlockScanSAM() { List busProcessNews=new ArrayList<>(); diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java index ff511b51..df9d072e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java @@ -1,5 +1,6 @@ package com.adc.da.common; +import com.adc.da.utils.removeHtml.RemoveHtml; import org.apache.commons.beanutils.BeanUtils; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.ss.usermodel.*; @@ -39,6 +40,7 @@ public class TableToExcel { sheet.addMergedRegion(new CellRangeAddress(0,1,5,5)); sheet.addMergedRegion(new CellRangeAddress(0,1,6,6)); sheet.addMergedRegion(new CellRangeAddress(0,1,7,7)); + sheet.addMergedRegion(new CellRangeAddress(0,1,8,8)); //生成表头行 int j=0; @@ -75,6 +77,10 @@ public class TableToExcel { Cell nCell1 = neckRow.createCell(4); nCell1.setCellValue("修改理由"); } + if (null!=columnMap.get("cause")) { + Cell nCell1 = headRow.createCell(8); + nCell1.setCellValue("原因"); + } //从第三行开始填充数据 @@ -88,6 +94,10 @@ public class TableToExcel { if (!"commentText".equals(key)) { try { Object val = BeanUtils.getProperty(t, key); + val= RemoveHtml.getResultsFromHtml(String.valueOf(val)); + if ("null".equals(val)){ + val=""; + } if (val instanceof Long) { dataRow.createCell(v++).setCellValue((Long) val); } else if (val instanceof Double) { diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java index a15cbc75..956a30b3 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java @@ -11,9 +11,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/${restPath}/lawss/actSarItemsBuss") @@ -35,4 +33,10 @@ public class ActSarItemsBussEOController extends BaseController { return Result.error("传入数据json不能为空"); } } + + @ApiOperation(value = "手动更新") + @GetMapping("/autoUpdIndex") + public void autoUpdIndex(@RequestParam("pid") String pid,@RequestParam("bussId") String bussId) { + actSarItemsEOService.autoUpdIndex(pid,bussId); + } } 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 dcddca3d..9668cd53 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 @@ -66,7 +66,64 @@ public class WorkFlowController { // @Autowired // private ExportExcelMapper exportExcelMapper; + @ApiOperation(value = "|File|下载文件") + @GetMapping("/downloadFileForSar") + // @RequiresPermissions("sys:file:downloadFileForSar") + public void downloadFileForSar(String fileId, String oldFileName, HttpServletResponse response, HttpServletRequest request) throws Exception { + BusProcessModelHis modelHisOne = workFlowFeignClient.processEditFile(fileId); + InputStream is = null; + OutputStream os = null; + response.reset(); + try { + String fileOldName = fileNameEncoding(oldFileName,request); + response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); + response.setContentType("application/octet-stream"); + File file = new File(standEditFilePath+modelHisOne.getEditFilePath()); + is = new FileInputStream(file); + os = response.getOutputStream(); + org.apache.commons.io.IOUtils.copy(is, os); + os.flush(); + } catch (IOException e) { + logger.error(e.getMessage(), e); + } finally { + org.apache.commons.io.IOUtils.closeQuietly(is); + org.apache.commons.io.IOUtils.closeQuietly(os); + } + } + /** + * @Author super_liu + * @Description 根据不同浏览器定义下载文件编码 + * Date 2018/10/11 10:40 + * @Param [fileName, request] + * @return java.lang.String + **/ + public String fileNameEncoding(String fileName, HttpServletRequest request) throws IOException { + String agent = request.getHeader("User-Agent"); + if (agent.contains("Firefox")) { + /*BASE64Encoder base64Encoder = new BASE64Encoder(); + fileName = "=?utf-8?B?" + + base64Encoder.encode(fileName.getBytes("utf-8")) + "?=";*/ + fileName = new String(fileName.getBytes("UTF-8"), "ISO8859-1"); // firefox浏览器 + } else { + fileName = URLEncoder.encode(fileName, "utf-8"); + //谷歌中空格变为+问题 + fileName = fileName.replaceAll("\\+","%20"); + } + return fileName; + } + + @ApiOperation(value = "存储在线编辑文件") + @GetMapping("/saveEditFile") + public BusProcessModelHis saveEditFile(){ + return workFlowFeignClient.saveEditFile(); + } + + @ApiOperation(value = "查询在线编辑流程汇总文件编辑对象") + @GetMapping("/processEditFile") + public BusProcessModelHis processEditFile(@RequestParam("id") String id){ + return workFlowFeignClient.processEditFile(id); + } @ApiOperation(value = "手机获取token") @PostMapping(value = "/loginMobile") @@ -641,13 +698,7 @@ public class WorkFlowController { 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/entity/ProcessDetailExport.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java index 1cde1409..0dbc9112 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java @@ -16,7 +16,7 @@ public class ProcessDetailExport { @Excel(name = "完成时间", orderNum = "4",exportFormat = "yyyy/MM/dd",width = 15) private Date endTime; @Excel(name = "流程信息", orderNum = "5",width = 15) - private String comment; + private String commentText; @Excel(name = "状态", orderNum = "6",width = 15) private String flag; } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 047bfa43..341e3159 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -29,6 +29,7 @@ import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.InitStandAttrUtil; +import com.adc.da.utils.util.Utils; import com.adc.da.workFlow.dao.ActSarItemsEODao; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; import com.alibaba.fastjson.JSON; @@ -44,8 +45,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; @Service("actSarItemsBussEOService") @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) @@ -78,6 +81,49 @@ public class ActSarItemsBussEOService { @Value("${elas.flag}") private boolean elasflag; + public void autoUpdIndex(String pid,String bussId){ + List evaluationHisFilter = workFlowFeignClient.evaluationHisList(pid); + List evaluationHis = new ArrayList<>(); + Map> listMap = new TreeMap<>(); + + // 按 相同数据分组 + listMap = evaluationHisFilter.stream().collect( + Collectors.groupingBy(a -> Utils.format("{0}#{1}", a.getPId(),a.getTaskInfo()))); + + List evaluations = new ArrayList<>(); + if(!listMap.isEmpty()){ + SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); + listMap.forEach((key, value) -> { + if(!value.isEmpty()){ + evaluationHis.add(value.get(0)); + } + }); + String finalBussId = bussId; + Date date = new Date(); + evaluationHis.forEach(busProcessEvaluationHis -> { + List valueArr = JSONArray.parseArray(busProcessEvaluationHis.getMesg(),JSONObject.class); + if(!valueArr.isEmpty()){ + valueArr.forEach(object -> { + QualityEvaluation evaluation = new QualityEvaluation(); + evaluation.setId(UUIDUtils.randomUUID20()); + evaluation.setLawId(finalBussId); + evaluation.setUserId(object.getString("userId")); + evaluation.setScore(object.getString("score")); + evaluation.setReason(object.getString("reason")); + evaluation.setEvaluationIndex(object.getString("code")); + evaluation.setProcessNode(object.getString("processNode")); + evaluation.setEvaluationType(object.getString("indexType")); + evaluation.setCreateTime(date); + evaluation.setModifyTime(date); + evaluations.add(evaluation); + + }); + } + }); + qualityEvaluationService.saveBatch(evaluations); + } + } + /*** * @Description: 国内外标准流程入库" * @Date: 2020/12/7 13:48 @@ -161,7 +207,7 @@ public class ActSarItemsBussEOService { iSarBussionessStandService.attrInfoDetails(query); Map attrInfoMap = query.getAttrInfoMap(); if(attInfoMap!=null && !attInfoMap.isEmpty()){ - updateStandFileFieldData(attInfoMap,attrInfoMap); +// updateStandFileFieldData(attInfoMap,attrInfoMap); resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarBussionessStand.setSarStandAttrEOStr(resData); } @@ -192,7 +238,7 @@ public class ActSarItemsBussEOService { iSarBussionessStandService.attrInfoDetails(query); Map attrInfoMap = query.getAttrInfoMap(); if(attInfoMap!=null && !attInfoMap.isEmpty()){ - updateStandFileFieldData(attInfoMap,attrInfoMap); +// updateStandFileFieldData(attInfoMap,attrInfoMap); resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarBussionessStand.setSarStandAttrEOStr(resData); } @@ -238,10 +284,24 @@ public class ActSarItemsBussEOService { // saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum); // } - List evaluationHis = workFlowFeignClient.evaluationHisList(pid); + List evaluationHisFilter = workFlowFeignClient.evaluationHisList(pid); + List evaluationHis = new ArrayList<>(); + Map> listMap = new TreeMap<>(); + + // 按 相同数据分组 + listMap = evaluationHisFilter.stream().collect( + Collectors.groupingBy(a -> Utils.format("{0}#{1}", a.getPId(),a.getTaskInfo()))); + List evaluations = new ArrayList<>(); - if(!evaluationHis.isEmpty()){ + if(!listMap.isEmpty()){ + SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); + listMap.forEach((key, value) -> { + if(!value.isEmpty()){ + evaluationHis.add(value.get(0)); + } + }); String finalBussId = bussId; + Date date = new Date(); evaluationHis.forEach(busProcessEvaluationHis -> { List valueArr = JSONArray.parseArray(busProcessEvaluationHis.getMesg(),JSONObject.class); if(!valueArr.isEmpty()){ @@ -255,15 +315,15 @@ public class ActSarItemsBussEOService { evaluation.setEvaluationIndex(object.getString("code")); evaluation.setProcessNode(object.getString("processNode")); evaluation.setEvaluationType(object.getString("indexType")); - evaluation.setCreateTime(new Date()); - evaluation.setModifyTime(new Date()); + evaluation.setCreateTime(date); + evaluation.setModifyTime(date); evaluations.add(evaluation); }); } }); + qualityEvaluationService.saveBatch(evaluations); } - qualityEvaluationService.saveBatch(evaluations); } @@ -408,6 +468,8 @@ public class ActSarItemsBussEOService { case "standName": sarBussionessStand.setStandName(valueStr); break; case "standEnName": sarBussionessStand.setStandEnName(valueStr); break; case "textStatusBuss": sarBussionessStand.setTextStatusBuss(valueStr); break; + case "reviseStatus": sarBussionessStand.setReviseStatus(valueStr); break; + case "standSn": sarBussionessStand.setStandSn(valueStr); break; case "issueTime": if (StringUtils.isNotBlank(valueStr)) { sarBussionessStand.setIssueTime(tTo(valueStr)); 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 b1186a6d..3cc10fc3 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 @@ -31,6 +31,7 @@ public class WebMvcConfig implements WebMvcConfigurer { */ addInterceptor.excludePathPatterns("/api/login"); addInterceptor.excludePathPatterns("/v2/api-docs"); + addInterceptor.excludePathPatterns("/favicon.ico"); addInterceptor.excludePathPatterns("/webjars/**"); addInterceptor.excludePathPatterns("/swagger-resources/**"); addInterceptor.excludePathPatterns("/swagger-ui.html"); @@ -71,6 +72,12 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/activiti/processModelHisOne"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/downloadFileForSar"); + + addInterceptor.excludePathPatterns("/api/lawss/activiti/saveEditFile"); + + addInterceptor.excludePathPatterns("/api/lawss/activiti/processEditFile"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/processModelHisOneCount"); addInterceptor.excludePathPatterns("/api/att/attFile/getSyncPdfFileInfo"); @@ -100,9 +107,11 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/activiti/getImg"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/loginMobile"); + // //测试接口使用 -// addInterceptor.excludePathPatterns("/api/**"); + addInterceptor.excludePathPatterns("/api/**"); diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index bd254d7d..a4aa4373 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,10 +3,9 @@ # 数据库配置 #============================================= 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=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 +spring.datasource.url = jdbc:mysql://10.100.5.111:3306/foton_slrs?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.username = tempuser +spring.datasource.password = Fting&8g35g#geg2 @@ -16,10 +15,10 @@ spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== -#Eruept +#Eureka eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/ #============================================== # 邮箱配置1 @@ -35,22 +34,18 @@ spring.mail.properties.smtp.starttls.required=false spring.mail.properties.mail.smtp.ssl.enable=false spring.mail.port=587 -# ============================================== -# rabbitMQ -# ============================================== -#spring.rabbitmq.host=10.2.186.93 -#spring.rabbitmq.port=5672 -#spring.rabbitmq.username=ca -#spring.rabbitmq.password=cs986432 -spring.rabbitmq.host=62.234.118.181 +#============================================== +# MQ配置 +#============================================== +spring.rabbitmq.host=10.100.5.119 spring.rabbitmq.port=5672 spring.rabbitmq.username=admin -spring.rabbitmq.password=admin +spring.rabbitmq.password=foton@admin spring.rabbitmq.listener.simple.acknowledge-mode= manual # 生产者 默认关闭 发版 需改为 true -spring.rabbitmq.listener.direct.auto-startup=false +spring.rabbitmq.listener.direct.auto-startup=true # 消费者 默认关闭 发版 需改为 true -spring.rabbitmq.listener.simple.auto-startup=false +spring.rabbitmq.listener.simple.auto-startup=true #消费失败消息干掉 spring.rabbitmq.listener.simple.default-requeue-rejected= true #5秒 @@ -58,22 +53,23 @@ spring.rabbitmq.listener.simple.retry.initial-interval= 5000 spring.rabbitmq.listener.simple.retry.enabled= true #最大重试5次 spring.rabbitmq.listener.simple.retry.max-attempts= 5 +# ============================================== # 文档存储路径指向 # ============================================== -file.path=/usr/laws/file/ -file.split.path=/usr/laws/file/ +file.path=/data/slrs/file +file.split.path=/data/slrs/file/splitImage/ # 云端OCR识别集成配置参数 #OCR请求识别URL地址 OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion # OCR回调接口地址 配置客户本地的IP及端口号 -OCR.callBackUrl = http://62.234.136.153:8033/api/ocr/OCRRestful/OcrHandleResult +OCR.callBackUrl = https://srms.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult OCR.userId =dayuzhou1234 OCR.authCode =123456 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M # OCR文件存储路径 -OCR.ocrPath=/opt/foton-slrs/front/dist/file/ +OCR.ocrPath=/data/slrs/ocrResultFile/ # OCR文件请求下载或在线预览时URL -OCR.ocrDownPath=http://62.234.136.153:8038/file/ +OCR.ocrDownPath=/data/slrs/ocrResultFile/ OCR.times=20 OCR.convertType=BOTH \ No newline at end of file diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index a6f3ac0c..be7c405b 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -9,12 +9,12 @@ spring.profiles.active=dev server.compression.enabled=true server.compression.mime-types=application/json,application/xml,text/html,text/plain,text/css,application/x-javascript # 端口号设置 -server.port=9999 +server.port=4202 #主服务session超时 server.servlet.session.timeout =600 #tomcat /resource/local/version-manager 创建tomcat指定临时目录 -server.tomcat.basedir=/resource/local/version-manager +server.tomcat.basedir=/data/slrs/temp # http-only server.session.cookie.http-only=true @@ -30,20 +30,14 @@ logging.level.org.springframework=info # 请求前缀 restPath=/api -#server.servlet.context-path=/api #是否将自己注册到Eureka Server上，默认为true eureka.client.register-with-eureka=true ##是否从Eureka Server上获取注册信息，默认为true eureka.client.fetch-registry=true +eureka.instance.prefer-ip-address=true - -#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -#eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ -#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ - -eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ -#eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 @@ -137,11 +131,11 @@ verifyCodeMode=1 # 文件上传管控及配置 # ============================================================================= # file模块上传文件的服务器地址 -file.path=D:/uploadfile/bus +file.path=/data/slrs/file -stand.edit.file.path = /usr/laws/file/ +stand.edit.file.path = /data/slrs/file/ # onlyoffice 预览地址 -file.downloadUrl=http://10.100.5.116:1080/file/ +file.downloadUrl=https://srms.foton.com.cn/file/ #上传文件白名单-以,分隔 upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt @@ -150,14 +144,13 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt # elasticsearch 配置 # ============================================================================= elasticsearch.clustername=elasticsearch -elasticsearch.ip=172.17.0.1 +elasticsearch.ip=10.100.5.122 elasticsearch.port=9300 elasticsearch.poolSize=5 elas.flag=true # 文档转换TCP通讯地址 convert.host=127.0.0.1 -#convert.host=0.0.0.0 # ============================================================================= # scheduled 配置 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 b0dd13fa..ecd82781 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 @@ -2,6 +2,7 @@ package com.adc.da.search.service.impl; import com.adc.da.search.entity.*; import com.adc.da.search.service.SearchCenterService; +import com.adc.da.search.util.DateUtil; import com.adc.da.search.util.InitStandAttrSearchUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -421,7 +422,12 @@ public class SearchCenterServiceImpl implements SearchCenterService { } } if(!fields.isEmpty()){ + if(fields.size() > 1){ + if(field.equals("SSRQ") || field.equals("XCXSSRQ") || field.equals("ZCCSSRQ")){ + List fieldRQList = DateUtil.getAllDate(fields.get(0),fields.get(1)); + fields.addAll(fieldRQList); + } BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder(); fields.forEach(s -> { boolQueryBuilderShould.should(QueryBuilders.wildcardQuery(keyWordField, "*"+s+"*")); @@ -805,13 +811,13 @@ public class SearchCenterServiceImpl implements SearchCenterService { // 循环统计各种类型数据 String[] seniortype; if("stand".equals(searchInfoEO.getSelectIndex())) { - String[] seniortypeStand = {"standSort", "numbershow","statecode","CYSD","ZRLX","CLLX","CBCD","textStatus","textStatusName","NYLXCLASS"}; + String[] seniortypeStand = {"standSort", "numbershow","statecode","CYSD","ZRLX","CLLX","CBCD","textStatus","textStatusName","NYLXCLASS","NYLX"}; 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 = {"standSort", "numbershow", "statecode","CLLX","textStatus","textStatusName","NYLXCLASS"}; + String[] seniortypeBuss = {"standSort", "numbershow", "statecode","CLLX","textStatus","textStatusName","NYLXCLASS","SYCXCLASS"}; seniortype = seniortypeBuss.clone(); } else { String[] seniortypeMsg = {"module"}; @@ -1158,18 +1164,21 @@ public class SearchCenterServiceImpl implements SearchCenterService { List> result = new ArrayList<>(); SearchRequestBuilder searchRequestBuilder; BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); + BoolQueryBuilder boolSelectValue = new BoolQueryBuilder(); + // 记录搜索记录到数据库中 if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){ - boolQueryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), + boolSelectValue.should(QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), "title" ).minimumShouldMatch("100%").field("title",10f)); - boolQueryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), + boolSelectValue.should(QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), "textContent" ).minimumShouldMatch("100%").field("title",10f)); - boolQueryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), + boolSelectValue.should(QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), "textItems" ).minimumShouldMatch("100%").field("title",10f)); - boolQueryBuilder.should(QueryBuilders.wildcardQuery("title.keyword","*"+searchInfoEO.getSelectValue()+"*")); + boolSelectValue.should(QueryBuilders.wildcardQuery("title.keyword","*"+searchInfoEO.getSelectValue()+"*")); + boolQueryBuilder.must(boolSelectValue); } //在结果中检索 if (StringUtils.isNotEmpty(searchInfoEO.getResultKeyword())) { @@ -1177,14 +1186,21 @@ public class SearchCenterServiceImpl implements SearchCenterService { 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)); + BoolQueryBuilder queryBuilder = new BoolQueryBuilder(); + if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS()) || StringUtils.isNotBlank(searchInfoEO.getCLLX())){ + if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS())){ + queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getNYLXCLASS(), + "textContent" + ).minimumShouldMatch("100%").field("title",10f)); + } + + if(StringUtils.isNotBlank(searchInfoEO.getCLLX())){ + queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(), + "textContent" + ).minimumShouldMatch("100%").field("title",10f)); + } + + boolQueryBuilder.must(queryBuilder); } HighlightBuilder hiBuilder=new HighlightBuilder(); diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index e6593226..65e7bfc9 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -179,8 +179,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); }else { contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDWName")).append(" "); - contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); - contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); +// contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); + contentBuilder.append("起草单位:").append(attrInfoMap.get("QCDW")).append(" "); +// contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); + contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMR")).append(" "); contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSDName")).append(" "); contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPMName")).append(" "); } @@ -188,8 +190,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXName")).append(" "); contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXName")).append(" "); contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZName")).append(" "); - contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); - contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); +// contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); + contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBM")).append(" "); +// contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); + contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCS")).append(" "); contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBMName")).append(" "); contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append(" "); contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append(" "); @@ -309,15 +313,17 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { StringBuilder contentBuilder = new StringBuilder(); contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" "); contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); - contentBuilder.append("企标名称:").append(attrInfoMap.get("standName")).append(" "); + contentBuilder.append("企标名称:").append(attrInfoMap.get("stand_name")).append(" "); contentBuilder.append("企标英文名称:").append(attrInfoMap.get("stand_en_name")).append(" "); contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" "); contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).append(" "); contentBuilder.append("企标发布日期:").append(attrInfoMap.get("issueTime")).append(" "); contentBuilder.append("废止日期:").append(attrInfoMap.get("FZRQBUSSName")).append(" "); contentBuilder.append("复审日期:").append(attrInfoMap.get("FSRQBUSSName")).append(" "); - contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); - contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" "); +// contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); + contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDW")).append(" "); +// contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" "); + contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSS")).append(" "); contentBuilder.append("文件上传人员:").append(attrInfoMap.get("WJSCRYBUSSName")).append(" "); contentBuilder.append("适用车型:").append(attrInfoMap.get("SYCXCLASSName")).append(" "); contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXCLASSName")).append(" "); diff --git a/adc-da-search/src/main/java/com/adc/da/search/util/DateUtil.java b/adc-da-search/src/main/java/com/adc/da/search/util/DateUtil.java new file mode 100644 index 00000000..d6a0440d --- /dev/null +++ b/adc-da-search/src/main/java/com/adc/da/search/util/DateUtil.java @@ -0,0 +1,124 @@ +package com.adc.da.search.util; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * @Description: 判断是否为日期格式 + * @Author: super_liu + * date: 2020/12/31 11:25 + */ +public class DateUtil { + + /** + * 取起始时间到结束时间 所有的时间 + * @param startTime + * @param endTime + * @return + */ + + public static List getAllDate(String startTime, String endTime) { + List list = new ArrayList(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Calendar cal = Calendar.getInstance(); + + try { + cal.setTime(sdf.parse(startTime)); + for (long d = cal.getTimeInMillis(); d <= sdf.parse(endTime).getTime(); d = get_D_Plaus_1(cal)) { + list.add(sdf.format(d)); + } + } catch (ParseException e) { + System.out.println("date change err"); + } + + return list; + } + + public static long get_D_Plaus_1(Calendar c) { + c.set(Calendar.DAY_OF_MONTH, c.get(Calendar.DAY_OF_MONTH) + 1); + return c.getTimeInMillis(); + } + + /*** + * @Description: 判断多个日期是否都符合日期格式 + * @Author: super_liu + * @Date: 2020/12/31 11:31 + * @Param: [str] + * @Return: boolean + */ + public static boolean isValidDate(String str) throws Exception{ + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String[] strArr = str.split(","); + for (String dateStr : strArr) { + try { + simpleDateFormat.setLenient(false); + simpleDateFormat.parse(dateStr); + } catch (Exception e){ + return false; + } + } + return true; + } + + /** + * utc 时间格式转换正常格式 2018-08-07T03:41:59Z + * @param utcTime 时间 + * @return + */ + public static String formatStrUTCToDateStr(String utcTime) { + SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.SIMPLIFIED_CHINESE); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + TimeZone utcZone = TimeZone.getTimeZone("UTC"); + sf.setTimeZone(utcZone); + Date date = null; + String dateTime = ""; + try { + date = sf.parse(utcTime); + dateTime = sdf.format(date); + } catch (ParseException e) { + e.printStackTrace(); + } + return dateTime; + } + + /** + * 将日期对象转换为指定的日期字符串 + * + * @param date 传入的日期对象 + * @param format 格式 + * @return 日期字符串 + * @author 赵肖云 + */ + public static String dateToString(Date date, String format) { + String string = ""; + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format); + if (date != null) { + string = simpleDateFormat.format(date); + } + return string; + } + + /** + * 将日期字符串转换为一个日期对象 + * + * @param datestr 日期字符串 + * @param format 格式 + * @return Date + * @author 赵肖云 + */ + public static Date stingToDate(String datestr, String format) throws ParseException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format); + return simpleDateFormat.parse(datestr); + } + + + public static void main(String[] args) { + String utcTime = "2021-04-15T01:43:54.296Z"; + String time = formatStrUTCToDateStr("2021-04-15T01:43:54.296Z"); + System.out.println("utcTime 转换前：" + utcTime); + System.out.println("utcTime 转换后 time ：" + time); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index bca2139e..3ea60c6e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -133,7 +133,7 @@ public class SendBussMQService { saveMap.put("stand_year",infoEO.getStandYear()); saveMap.put("standNumber",infoEO.getStandCode()); saveMap.put("stand_code",infoEO.getStandCode()); - saveMap = dealNumberMsg(saveMap,infoEO,getCodeName); + saveMap = dealNumberMsg(saveMap,infoEO,infoEO.getStandSort()); saveMap.put("nameshow",infoEO.getStandName()); saveMap.put("stand_name",infoEO.getStandName()); saveMap.put("standEnName",infoEO.getStandEnName()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index 4cf2e4e8..1bebf78d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -107,7 +107,7 @@ public class SendStandMQService { } saveMap.put("standNumber",infoEO.getStandNumber()); saveMap.put("stand_number",infoEO.getStandNumber()); - saveMap = dealNumberMsg(saveMap,infoEO,getCodeName); + saveMap = dealNumberMsg(saveMap,infoEO,infoEO.getStandSort()); saveMap.put("standYear",infoEO.getStandYear()); saveMap.put("stand_year",infoEO.getStandYear()); saveMap.put("nameshow",infoEO.getStandName()); @@ -211,6 +211,24 @@ public class SendStandMQService { context = context.replace(",,", ","); saveMap.put("content", context); } + +// 如果出现提示查询报错，而且提示 查询内容无法转换为 日期格式的 情况，原因可能是没有把日期转换为字符串，可以考虑放开下面的代码（目前，域内没有报错，但是，本地有问题） +// //部分字段没有转为汉字，在此处转为汉字 +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("XCXSSRQName")))) { +// saveMap.put("XCXSSRQName"," " + String.valueOf(saveMap.get("XCXSSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("ZCCSSRQName")))) { +// saveMap.put("ZCCSSRQName"," " + String.valueOf(saveMap.get("ZCCSSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("SSRQName")))) { +// saveMap.put("SSRQName"," " + String.valueOf(saveMap.get("SSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("issueTime")))) { +// saveMap.put("issueTime"," " + String.valueOf(saveMap.get("issueTime"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("ZCCSSRQ")))) { +// saveMap.put("ZCCSSRQ"," " + String.valueOf(saveMap.get("ZCCSSRQ"))); +// } if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index c371bc49..46aec11b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -14,11 +14,14 @@ import com.adc.da.slrs.sarStandWarning.entity.WarningDate; import com.adc.da.slrs.sarStandWarning.service.IWarningDateService; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; +import net.sf.json.JSONObject; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -71,7 +74,7 @@ public class ScheduledJob { private IWarningDateService iWarningDateService;// 预警日期 // @PostConstruct //程序启动时执行一次 - @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 +// @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 // @Scheduled(cron="*/5 * * * * ?") // @Scheduled(fixedDelay = 120000) @Async @@ -109,13 +112,17 @@ public class ScheduledJob { // }; // // runnable.run(); + + logger.info("========================================================================================================="); + logger.info("========================================================================================================="); + + logger.info("开始执行预警!!!"); + logger.info("========================================================================================================"); + logger.info("========================================================================================================"); //删除不在预警范围的标准 int remove = sarStandardWarningDao.autoCancelWarning(); - - logger.info("=========================================================================="); logger.info("取消"+remove+"条预警"); - logger.info("开始执行预警!!!"); - logger.info("=========================================================================="); + //预警期限(当前日期至3个月后) TermDTO term = new TermDTO(); //查询符合预警期限的标准 多个 @@ -126,7 +133,7 @@ public class ScheduledJob { for (String s : item.getSSRQ().split(",")) { - String pattern = "^\\d{4}-\\d{1,2}-\\d{1,2}"; + String pattern = term.getTermStr(); Pattern r = Pattern.compile(pattern); Matcher m = r.matcher(s); @@ -171,7 +178,8 @@ public class ScheduledJob { - + @Autowired + private ISarUpdLogService sarUpdLogEOService; /** @@ -181,9 +189,17 @@ public class ScheduledJob { // @Scheduled(cron="*/5 * * * * ?") @Async public void TextStatusSchedulingTasks() { - QueryWrapper wrapper = new QueryWrapper<>(); + Logger logger = LoggerFactory.getLogger(ScheduledJob.class); - TermDTO data = new TermDTO(LocalDate.now(), LocalDate.now()); + + logger.info("========================================================================================================="); + logger.info("========================================================================================================="); + logger.info("开始更新文本状态!!!"); + logger.info("========================================================================================================="); + logger.info("========================================================================================================="); +// QueryWrapper wrapper = new QueryWrapper<>(); + +// TermDTO data = new TermDTO(LocalDate.now(), LocalDate.now()); /** *实施日期是当前系统时间的标准文本状态变为'现行有效' @@ -213,12 +229,19 @@ public class ScheduledJob { */ QueryWrapper columnForDTBJH = new QueryWrapper<>(); - columnForDTBJH.select("DTBJH"); + columnForDTBJH.select("DTBJH") + .eq("VALID_FLAG","0") + .ne("DTBJH",""); //查询代替标准字段得到一个 被代替了的标准的id的键值对列表 - List> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH); + List> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH).subList(0,100); HashMap replaceIdCountMap = new HashMap<>(); + + // 格式为 T/CSAE 175-2021 - Pattern pattern = Pattern.compile("^\\S*\\s\\S*[\\u2014\\u002d\\s]\\d{4}$"); + /** + * 国内外表准号格式不统一 + */ +// Pattern pattern = Pattern.compile("^\\S*\\s\\S*[\\u2014\\u002d\\s]\\d{4}$"); replaceStandIdMaps.forEach(item->{ if (item!=null){ //此标准代替的标准的标准号的数组 @@ -229,30 +252,30 @@ public class ScheduledJob { String[] DTBJHArray = DTBJHStr.split(","); for (String DTBJH : DTBJHArray) { - if (!pattern.matcher(DTBJH).matches()){ - continue; - } +// if (!pattern.matcher(DTBJH).matches()){ +// continue; +// } - String[] split = DTBJH.split("[\\u2014\\u002d\\s]");//以空格或'-'或'—'分割 - String sort = split[0]; - String number = split[1]; - String year = split[2]; - - QueryWrapper infoWrapper = new QueryWrapper<>(); - infoWrapper.select("ID") - .eq("STAND_SORT", sort) - .eq("STAND_NUMBER", number) - .eq("STAND_YEAR", year); +// String[] split = DTBJH.split("[\\u2014\\u002d\\s]");//以空格或'-'或'—'分割 +// String sort = split[0]; +// String number = split[1]; +// String year = split[2]; +// +// QueryWrapper infoWrapper = new QueryWrapper<>(); +// infoWrapper.select("ID") +// .eq("STAND_SORT", sort) +// .eq("STAND_NUMBER", number) +// .eq("STAND_YEAR", year); - List> idMaps = sarStandardsInfoDao.selectMaps(infoWrapper); - if (idMaps.size() > 0) { - String standId = idMaps.get(0).get("ID").toString(); + List standId = sarStandardsInfoDao.selectIdFormDTBZH(DTBJH); + if (standId.size() > 0) { + //如果代替标准id已存在则映射为2不存在则添加并映射为1 if (replaceIdCountMap.containsKey(standId)) { - replaceIdCountMap.replace(standId, 2); + replaceIdCountMap.replace(standId.get(0), 2); } else { - replaceIdCountMap.put(standId, 1); + replaceIdCountMap.put(standId.get(0), 1); } } @@ -269,27 +292,64 @@ public class ScheduledJob { //一个被代替标准号时,文本状态更新为废止状态,两个及以上时更新为被代替状态 - SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); for (String key : replaceIdCountMap.keySet()) { + SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); + String reasonMsg=""; switch (replaceIdCountMap.get(key)){ case 1 : - sarStandardsInfo.setTextStatus("chblaarg77");//废止状态 + //废止状态 + sarStandardsInfo.setTextStatus("chblaarg77"); sarStandardsInfo.setId(key); + reasonMsg="该标准被一个标准代替"; break; - default : - sarStandardsInfo.setTextStatus("qke0ckro2p");//被代替状态 + case 2 : + //被代替状态 + sarStandardsInfo.setTextStatus("qke0ckro2p"); sarStandardsInfo.setId(key); + reasonMsg="该标准被一个以上标准代替"; + break; + default: break; } try { + //更新日志 + SarStandardsInfo beforeSarStandardsInfoEO = sarStandardsInfoDao.selectById(sarStandardsInfo.getId()); + sarStandardsInfo.setStandType(beforeSarStandardsInfoEO.getStandType()); + sarStandardsInfo.setStandSort(beforeSarStandardsInfoEO.getStandSort()); + sarStandardsInfo.setStandNumber(beforeSarStandardsInfoEO.getStandNumber()); + sarStandardsInfo.setStandYear(beforeSarStandardsInfoEO.getStandYear()); + sarStandardsInfo.setStandName(beforeSarStandardsInfoEO.getStandName()); + saveUpdateLog(sarStandardsInfo,beforeSarStandardsInfoEO,reasonMsg); + //更新日志 sarStandardsInfoDao.updateById(sarStandardsInfo); }catch (Exception e){ System.out.println("代替标准状态更新:id为"+key+"文本状态更新失败"); } } - + logger.info("==================================更新文本状态结束======================================"); + logger.info("==================================更新文本状态结束======================================"); } + + + + public void saveUpdateLog(SarStandardsInfo sarStandardsInfoEO, SarStandardsInfo beforeSarStandardsInfo,String reasonMsg) throws Exception { + Map newMap = new HashMap<>(); + Map oldMap = new HashMap<>(); + String attrStr = sarStandardsInfoEO.getSarStandAttrEOStr(); + if (StringUtils.isNotBlank(attrStr)) { + newMap = JSONObject.fromObject(attrStr); + } + newMap.put("textStatus",sarStandardsInfoEO.getTextStatus()); + oldMap.put("textStatus",beforeSarStandardsInfo.getTextStatus()); + // 增加关联事件 + String number = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber(); + if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) { + number += "-" + sarStandardsInfoEO.getStandYear(); + } + String content ="==定时任务执行修改==:" + number + " 《" + sarStandardsInfoEO.getStandName() + "》"+reasonMsg; + sarUpdLogEOService.createUpdateLog(sarStandardsInfoEO.getStandType() + "_STAND", sarStandardsInfoEO.getId(), oldMap, newMap, content); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/controller/Controller.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/controller/Controller.java index 582af319..b38dfaa3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/controller/Controller.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/controller/Controller.java @@ -4,6 +4,7 @@ package com.adc.da.scheduled.controller; import com.adc.da.scheduled.ScheduledJob; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -16,8 +17,15 @@ public class Controller { @Autowired ScheduledJob scheduledJob; - @PostMapping - public void run(){ + @PutMapping("/warning") + public void warning(){ scheduledJob.warningSchedulingTasks(); } + + @PutMapping("textStatus") + public void textStatus(){ + scheduledJob.TextStatusSchedulingTasks(); + } + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java index 17e093b8..a148c45d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java @@ -37,8 +37,8 @@ public class TermDTO { public TermDTO() { //系统当前日期 LocalDate starDate = LocalDate.now(); - //系统当前日期3个月后 - LocalDate endDate = LocalDate.now().plusMonths(3); + //系统当前日期36个月后 + LocalDate endDate = LocalDate.now().plusMonths(36); convertToStr(starDate,endDate); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java new file mode 100644 index 00000000..a138ed68 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java @@ -0,0 +1,116 @@ +package com.adc.da.slrs.customWorkGroup.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage; +import com.adc.da.slrs.customWorkGroup.service.IWorkGroupService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiModelProperty; +import org.apache.commons.codec.language.Nysiis; +import org.apache.ibatis.annotations.Delete; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 前端控制器 + *

+* +* @author zhaokaiyao +* @since 2022-01-18 +*/ +@RestController +@Api(description = "|WorkGroup|") +@RequestMapping("/${restPath}/workGroup/work-group") +public class WorkGroupController extends BaseController { + + + @Autowired + IWorkGroupService iWorkGroupService; + + @ApiModelProperty("新增工作组") + @PostMapping + public ResponseMessage addWorkGroup(WorkGroup workGroup) { + ResponseMessage result = Result.success(); + + if (isDistinct(workGroup.getWorkGroup(),null)){ + if (iWorkGroupService.add(workGroup)){ + result=Result.success("200","新增成功"); + }else { + result=Result.error("201","新增失败"); + + } + }else { + result=Result.error("202","组名已存在"); + + } + + return result; + } + + + + @ApiModelProperty("批量删除工作组") + @DeleteMapping + public ResponseMessage deleteWorkGroup(String id){ + boolean delete = iWorkGroupService.delete(id); + + return Result.success(delete); + } + + @ApiModelProperty("根据组长民或者组名查询工作组,参数为空时查询全部") + @GetMapping + public ResponseMessage> getWorkGroupLists(WorkGroupQueryPage queryPage){ + IPage workGroup = iWorkGroupService.getWorkGroup(queryPage); + return Result.success(workGroup); + } + + + @ApiModelProperty("修改工作组") + @PutMapping + public ResponseMessage updateWorkGroup(WorkGroup workGroup){ + + ResponseMessage result = Result.success(); + + if (isDistinct(workGroup.getWorkGroup(),workGroup.getId())){ + if (iWorkGroupService.update(workGroup)){ + result=Result.success("200", "修改成功"); + }else { + result=Result.error("201", "修改失败"); + } + + }else { + result=Result.error("202", "组名已存在"); + } + + return result; + } + + /** + * 判断提交的工作组名称是否重复 + * @param groupName 条件 + * @param id 排除id + * @returntrue 没有重复 false 有重复 + */ + private boolean isDistinct(String groupName,String id){ + + QueryWrapper ew = new QueryWrapper<>(); + + ew.eq("work_group_name",groupName); + + if (id!=null){ + ew.ne("id",id); + } + + List list = iWorkGroupService.list(ew); + return list.isEmpty(); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java new file mode 100644 index 00000000..233fdb42 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java @@ -0,0 +1,30 @@ +package com.adc.da.slrs.customWorkGroup.dao; + +import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; +import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zhaokaiyao + * @since 2022-01-18 + */ +public interface WorkGroupDao extends BaseMapper { + + + public IPage getWorkGroup( @Param("page")IPage page, + @Param(Constants.WRAPPER) Wrapper queryWrapper, + @Param("queryCondition")WorkGroupQueryPage queryCondition); + + + public List getUserName(String userId); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java new file mode 100644 index 00000000..11eb1357 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java @@ -0,0 +1,46 @@ +package com.adc.da.slrs.customWorkGroup.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * + *

+ * + * @author zhaokaiyao + * @since 2022-01-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WorkGroup对象", description="") +public class WorkGroup extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId + private String id; + + @TableField("work_group_name") + private String workGroup; + + @TableField(exist = false) + private String workLeader; + + @TableField("work_leader_id") + private String workLeaderId; + + @TableField(exist = false) + private String workPeople; + + @TableField("work_people_id") + private String workPeopleId; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroupQueryPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroupQueryPage.java new file mode 100644 index 00000000..5b09a2e5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroupQueryPage.java @@ -0,0 +1,32 @@ +package com.adc.da.slrs.customWorkGroup.entity; + +import lombok.Data; + +import java.util.Optional; + +/** + * @author 22501 + */ +@Data +public class WorkGroupQueryPage { + + private Integer page; + + private Integer pageSize; + + private String leaderName; + + private String workGroupName; + + + public int getPage() { + return Optional.ofNullable(this.page) + .orElse(1); + + } + + public int getPageSize() { + return Optional.ofNullable(this.pageSize) + .orElse(20); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java new file mode 100644 index 00000000..214fdbc8 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java @@ -0,0 +1,49 @@ +package com.adc.da.slrs.customWorkGroup.service; + +import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; +import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author zhaokaiyao + * @since 2022-01-18 + */ +public interface IWorkGroupService extends IService { + + /** + * 新增 + * @param workGroup + * @return + */ + public boolean add(WorkGroup workGroup); + + + /** + * 删除 + * @param workGroupId + * @return + */ + public boolean delete(String workGroupId); + + /** + * 修改 + * @param queryPage + * @return + */ + public IPage getWorkGroup(WorkGroupQueryPage queryPage); + + + /** + * 更新 + * @param workGroup + * @return + */ + public boolean update(WorkGroup workGroup); + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java new file mode 100644 index 00000000..297b092a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java @@ -0,0 +1,74 @@ +package com.adc.da.slrs.customWorkGroup.service.impl; + +import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; +import com.adc.da.slrs.customWorkGroup.dao.WorkGroupDao; +import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage; +import com.adc.da.slrs.customWorkGroup.service.IWorkGroupService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author zhaokaiyao + * @since 2022-01-18 + */ +@Service +public class WorkGroupServiceImpl extends ServiceImpl implements IWorkGroupService { + + @Autowired + WorkGroupDao workGroupDao; + + + + @Override + public boolean add(WorkGroup workGroup) { + workGroup.setId(UUIDUtils.randomUUID20()); + return this.save(workGroup); + } + + @Override + public boolean delete(String workGroupId) { + List idList = Arrays.asList(workGroupId.split(",")); + return this.removeByIds(idList); + } + + @Override + public IPage getWorkGroup(WorkGroupQueryPage queryPage) { + + + QueryWrapper wrapper = new QueryWrapper<>(); + if (queryPage.getWorkGroupName()!=null && !"".equals(queryPage.getWorkGroupName())){ + wrapper.eq("work_group_name",queryPage.getWorkGroupName()); + } + //可以通过组长名称模糊查询 + IPage workGroupList = workGroupDao.getWorkGroup(new Page<>(queryPage.getPage(), queryPage.getPageSize()), wrapper,queryPage); + //需要把组长的id和组员的id转换为其名称 + for (WorkGroup record : workGroupList.getRecords()) { + + record.setWorkLeader( String.join(",",workGroupDao.getUserName(record.getWorkLeaderId())) ); + record.setWorkPeople( String.join(",",workGroupDao.getUserName(record.getWorkPeopleId()))); + } + + return workGroupList; + + } + + + + + @Override + public boolean update(WorkGroup workGroup) { + return this.updateById(workGroup); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 9fb2b8e5..0c38b17d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -94,6 +94,10 @@ public class EsRevisePlan extends BasePage { //企标类别 private String standType; + // 标准编号 + private String standNum; + + @ApiModelProperty(value = "企标类别") private String esMatingRelations; private String esStandRelations; @@ -118,5 +122,7 @@ public class EsRevisePlan extends BasePage { @TableField(exist = false) private List planStatusList; - + @ApiModelProperty(value = "立项单") + @TableField("LXD") + private String lxd; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 3270c493..640a820f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -70,6 +70,20 @@ public class SarBussionessStandController extends BaseController getStandInfoByReviseStatus(String reviseStatus) { + SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus); + return Result.success(result); + } + @ApiOperation(value = "|SarBussionessStandEO|删除") @PostMapping("deleteSarBussionessStand") //401问题2021-03-31暂时注释掉 liuhuiwen @@ -232,7 +246,7 @@ public class SarBussionessStandController extends BaseController> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception { if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { @@ -281,5 +295,33 @@ public class SarBussionessStandController extends BaseController> getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception { + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } + + if (null != page.getNowOrderBy()) { + nowOrderFunc(page); + } + List rows = sarBussionessStandEOService.getSarBussionStandPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 0b7d0854..6129a753 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -22,6 +22,8 @@ import java.util.List; @Repository public interface SarBussionessStandDao extends BaseMapper { + SarBussionessStand getStandInfoByReviseStatus(String reviseStatus); + SarBussionessStand selectByPrimaryKey(String standId); List selectStandardsByStandNumber(SarBussionessStand sarBussionessStand); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java index 3f411919..2d6502fe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -111,8 +111,20 @@ public class SarBussionessStand extends BaseEntity { @TableField("TEXT_STATUS_BUSS") private String textStatusBuss; + @ApiModelProperty(value = "计划库制定状态 0 默认 1 制定 2修订") + @TableField("REVISE_STATUS") + private String reviseStatus; + + @ApiModelProperty(value = "标准顺序号") + @TableField("STAND_SN") + private String standSn; + // 非表字段 + @TableField(exist = false) + private String newStandSn; + + @TableField(exist = false) @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private String firstPutTime; @@ -141,6 +153,9 @@ public class SarBussionessStand extends BaseEntity { @TableField(exist = false) private String menuParentId; + @TableField(exist = false) + private String textStatusBussShow; + @TableField(exist = false) private String standStatusShow; // 标准状态下拉框 --单选 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 39fa8d65..baeaee4e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -18,6 +18,8 @@ import java.util.List; */ public interface ISarBussionessStandService extends IService { + SarBussionessStand getStandInfoByReviseStatus(String reviseStatus); + void attrInfoDetails (SarBussionessStand row) throws Exception; ResponseMessage deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception; @@ -39,5 +41,7 @@ public interface ISarBussionessStandService extends IService List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); List getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception; + + List getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception; } 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 c68dc1d7..775607ae 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 @@ -145,6 +145,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception { SarBussionessStand sarStandardsInfoEO = new SarBussionessStand(); sarStandardsInfoEO.setValidFlag(1); @@ -282,7 +287,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl getList = sarBussionessStandEODao.getSarBussionessStand(page); attrInfoShowExport(getList); return getList; @@ -468,15 +473,18 @@ public class SarBussionessStandServiceImpl extends ServiceImpl changeMap (SarBussionessStand sarStandardsInfoEO,Map map) { @@ -825,7 +833,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl valArr = Arrays.asList(value.split(",")); value = dicTypeEODao.getDicNamesByCodes(valArr); - entry.setValue(value); + + Optional.ofNullable(value) + .ifPresent(val->{ + entry.setValue(val); + }); + + } } } @@ -905,6 +919,35 @@ public class SarBussionessStandServiceImpl extends ServiceImpl getSarBussionStandPageQd(SarBussionessStandEOPage 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 = this.baseMapper.getBussionessStandInfoCount(page); + page.getPager().setRowCount(rowCount); + List sarlist = this.baseMapper.getBussionessStandInfoPage(page); + attrInfo(sarlist); + return sarlist; + } /*** * @Description: 处理属性表数据 * @Param: [sarlist] diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java index db50f52a..a6398a23 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity; import com.adc.da.base.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -77,10 +78,12 @@ public class QualityEvaluation extends BaseEntity { @ApiModelProperty(value = "创建时间") @TableField(fill = FieldFill.INSERT) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; @ApiModelProperty(value = "更新时间") @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date modifyTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index 6b8980ed..f909068e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -135,6 +135,9 @@ public class QualityEvaluationServiceImpl extends ServiceImpl page = new Page<>(1, 1000); + /** + * 查询得到 每个流程节点的质量评分 和 动态评分值 (已经计算了打分权重,之后汇总计算流程节点权重) + */ List list = qualityEvaluationDao.getHistory(page, queryWrapper).getRecords(); // return list.stream() // .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType, @@ -152,11 +155,11 @@ public class QualityEvaluationServiceImpl extends ServiceImpl{ + Collectors.summingDouble(item ->{ Double score; String value; @@ -173,10 +176,10 @@ public class QualityEvaluationServiceImpl extends ServiceImpl { return Result.success(); } + @ApiOperation("根据部门ID获取部门下所有用户") + @GetMapping("/getInstitutionIdToDept") + public List getInstitutionIdToDept(String institutionIds,String userName){ + return tsInstitutionService.getInstitutionIdToDept(institutionIds,userName); + } + @ApiOperation("获得下一级的部门和人员") @GetMapping("/getNext") public List getNext(String institutionId,String userName){ 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 619e6efd..c2565c52 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 @@ -29,6 +29,8 @@ public interface TsInstitutionDao extends BaseMapper { */ List selectNextUser(@Param("institutionId") String institutionId,@Param("userName") String userName); + List selectNextUsers(@Param("institutionIds") List institutionIds,@Param("userName") String userName); + List selectNextUserByIds(@Param("ids") List ids); 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 892228b0..92409ed4 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 @@ -37,6 +37,8 @@ public interface ITsInstitutionService extends IService { */ public List getNext(String institutionId,String userName); + public List getInstitutionIdToDept(String institutionIds,String userName); + public List getNextById(String ids); /** 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 5f117ceb..d3e52881 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 @@ -200,6 +200,13 @@ public class TsInstitutionServiceImpl extends ServiceImpl getInstitutionIdToDept(String institutionIds,String userName){ + List strings=new ArrayList<>(Arrays.asList(institutionIds.split(","))); + List tsUsers=tsInstitutionDao.selectNextUsers(strings,userName); + return tsUsers; + } + /** * 通过部门id获得这个部门下的下一级部门 * @return diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index af745434..a55d325a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -163,7 +163,7 @@ public class SarLawsDetailedListController extends BaseController idList) { QueryWrapper wrapper = new QueryWrapper<>(); for (String id : idList) { + //把老的弄出来 + QueryWrapper wrapper2 = new QueryWrapper<>(); + wrapper2.eq("detailed_list_id",id); + List sarLawsAttrDetailedLists=sarLawsAttrDetailedListDao.selectList(wrapper2); + List list1=new ArrayList<>(); + if (sarLawsAttrDetailedLists.size()>0){ + sarLawsAttrDetailedLists.forEach(sarLawsAttrDetailedList -> {list1.add(sarLawsAttrDetailedList.getStandId());}); + } wrapper.eq("detailed_list_id", id); sarLawsAttrDetailedListDao.delete(wrapper); +// -- eeee + //移除之后 需要判定一下 还有没有其他地方引用 + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.in("stand_id",list1); + List res=sarLawsAttrDetailedListDao.selectList(wrapper); + res.forEach(sarLawsAttrDetailedList -> { + list1.remove(sarLawsAttrDetailedList.getStandId()); + }); + if (null!=list1 && list1.size()>0){ + sarStandardsInfoDao.updateISRELATEACCESSById("2", list1); + } + } sarLawsDetailedListDao.deleteBatchIds(idList); return "删除成功"; @@ -292,6 +318,16 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl sarStandardsInfos=new ArrayList<>(); + timeDto.forEach(timeDto1 -> { + SarStandardsInfo sarStandardsInfo=new SarStandardsInfo(); + sarStandardsInfo.setId(timeDto1.getStandId()); + sarStandardsInfo.setIsRelateAccess("1"); + sarStandardsInfos.add(sarStandardsInfo); + }); + sarStandardsInfoService.updateBatchById(sarStandardsInfos); + } } catch (Exception e) { e.printStackTrace(); @@ -318,53 +354,55 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl pageRes = new Page<>(page, pageSize); IPage userIPage = sarLawsDetailedListDao.selectPage(pageRes, wrapper); - if ("1".equals(sortKey)) { - Map map = iDicTypeEOService.getDicTypeListCode(); - List list = userIPage.getRecords(); - List> arr = (List>) map.get("COUNTRY"); - for (SarLawsDetailedList list1 : list) { - if (StringUtils.isNotBlank(list1.getCountryArea()) && list1.getCountryArea().contains(",")) { - String[] split = list1.getCountryArea().split(","); - StringBuilder builder = new StringBuilder(); - for (String s : split) { + if ( userIPage.getRecords().size()>0){ + if ("1".equals(sortKey)) { + Map map = iDicTypeEOService.getDicTypeListCode(); + List list = userIPage.getRecords(); + List> arr = (List>) map.get("COUNTRY"); + for (SarLawsDetailedList list1 : list) { + if (StringUtils.isNotBlank(list1.getCountryArea()) && list1.getCountryArea().contains(",")) { + String[] split = list1.getCountryArea().split(","); + StringBuilder builder = new StringBuilder(); + for (String s : split) { + for (Map map1 : arr) { + if (map1.get("value").equals(s)) { + s = map1.get("value"); + builder.append(s + ","); + break; + } + } + } + String completedString = ""; + if (builder.length() > 0) { + completedString = builder.delete(builder.length() - 1, builder.length()).toString(); + } + list1.setCountryArea(completedString); + } else { for (Map map1 : arr) { - if (map1.get("value").equals(s)) { - s = map1.get("value"); - builder.append(s + ","); + if (map1.get("value").equals(list1.getCountryArea())) { + list1.setCountryArea(map1.get("value")); break; } } } - String completedString = ""; - if (builder.length() > 0) { - completedString = builder.delete(builder.length() - 1, builder.length()).toString(); - } - list1.setCountryArea(completedString); - } else { - for (Map map1 : arr) { - if (map1.get("value").equals(list1.getCountryArea())) { - list1.setCountryArea(map1.get("value")); - break; - } - } } + userIPage.setRecords(list); } - userIPage.setRecords(list); + List names = new ArrayList<>(); + userIPage.getRecords().forEach(sarLawsDetailedList -> { + names.add(sarLawsDetailedList.getUpdatePeople()); + }); + List upDTOS = iTsUserService.selectNameById(names, "0"); + Map stringMap = new HashMap<>(); + upDTOS.forEach(upDTO -> { + stringMap.put(upDTO.getId(), upDTO.getValue()); + }); + userIPage.getRecords().forEach(sarLawsDetailedList -> { + if (null != stringMap.get(sarLawsDetailedList.getUpdatePeople())) { + sarLawsDetailedList.setUpdatePeople(stringMap.get(sarLawsDetailedList.getUpdatePeople())); + } + }); } - List names = new ArrayList<>(); - userIPage.getRecords().forEach(sarLawsDetailedList -> { - names.add(sarLawsDetailedList.getUpdatePeople()); - }); - List upDTOS = iTsUserService.selectNameById(names, "0"); - Map stringMap = new HashMap<>(); - upDTOS.forEach(upDTO -> { - stringMap.put(upDTO.getId(), upDTO.getValue()); - }); - userIPage.getRecords().forEach(sarLawsDetailedList -> { - if (null != stringMap.get(sarLawsDetailedList.getUpdatePeople())) { - sarLawsDetailedList.setUpdatePeople(stringMap.get(sarLawsDetailedList.getUpdatePeople())); - } - }); System.out.println("总条数" + userIPage.getTotal()); System.out.println("总页数" + userIPage.getPages()); return userIPage; @@ -602,7 +640,25 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("detailed_list_id",detailedUpDto.getId()); + List sarLawsAttrDetailedLists=sarLawsAttrDetailedListDao.selectList(wrapper); + List list1=new ArrayList<>(); + if (sarLawsAttrDetailedLists.size()>0){ + sarLawsAttrDetailedLists.forEach(sarLawsAttrDetailedList -> {list1.add(sarLawsAttrDetailedList.getStandId());}); + } + list1.removeAll(Arrays.asList(detailedUpDto.getInforlist().split(","))); + if (list1.size()>0){ + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.in("stand_id",list1); + List res=sarLawsAttrDetailedListDao.selectList(wrapper); + res.forEach(sarLawsAttrDetailedList -> { + list1.remove(sarLawsAttrDetailedList.getStandId()); + }); + if (null!=list1 && list1.size()>0){ + sarStandardsInfoDao.updateISRELATEACCESSById("2", list1); + } + } //更新标准是否纳入认证清单 sarStandardsInfoDao.updateISRELATEACCESSById("1", Arrays.asList(detailedUpDto.getInforlist().split(","))); @@ -668,6 +724,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl { @Autowired private ITsRoleService tsRoleService; + @Autowired + private TsRoleDao tsRoleDao; @ApiOperation("查询所有角色") @GetMapping @@ -95,9 +98,14 @@ public class TsRoleController extends BaseController { @ApiOperation("查询角色详情") @GetMapping("/id") public ResponseMessage getRoleById(@RequestParam String roleId){ - TsRole tsRole=tsRoleService.getById(roleId); +// TsRole tsRole=tsRoleService.getById(roleId); +// if(tsRole.getParentId()!=null){ +// TsRole parent=tsRoleService.getById(tsRole.getParentId()); +// tsRole.setParent(parent.getName()); +// } + TsRole tsRole=tsRoleDao.getAllDatas(roleId); if(tsRole.getParentId()!=null){ - TsRole parent=tsRoleService.getById(tsRole.getParentId()); + TsRole parent=tsRoleDao.getAllDatas(tsRole.getParentId()); tsRole.setParent(parent.getName()); } return Result.success(tsRole); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java index d709188b..a6edddff 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java @@ -99,4 +99,7 @@ public interface TsRoleDao extends BaseMapper { * @return List */ List getRootMenuIdsByRoleIds(List roleIds); + + @Select("select *,DATE_ADD(ts_role.operate_time,INTERVAL 8 HOUR) as operateTime from ts_role where ts_role.ID = #{roleId}") + TsRole getAllDatas(@Param("roleId") String roleId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java index a2a705b2..cd72e305 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java @@ -69,7 +69,7 @@ public class TsRole extends BaseEntity { private String remarks; @ApiModelProperty(value = "操作时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss",locale = "zh") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp operateTime; @@ -89,13 +89,13 @@ public class TsRole extends BaseEntity { @ApiModelProperty(value = "创建时间") @TableField("CREATION_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp creationTime; @ApiModelProperty(value = "修改时间") @TableField("MODIFY_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp modifyTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java index 4f009999..3c9910bb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarRole.entity.TsRole; import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO; import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 7c8206fc..84176653 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -6,6 +6,7 @@ import com.adc.da.http.Result; import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao; import com.adc.da.slrs.sarStandIdea.entity.*; import com.adc.da.slrs.sarStandIdea.service.Impl.SarPublicIdeaAllServiceImpl; +import com.adc.da.utils.removeHtml.RemoveHtml; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -84,6 +85,15 @@ public class SarPublicIdeaAllController extends BaseController } + + @ApiOperation(value = "增加意见") + @PostMapping("/saveBatchByWk") + public ResponseMessage saveBatchByWk(@RequestBody List sar){ + boolean flag=sarPublicIdeaAllImpl.saveOrUpdateBatch(sar); + return Result.success("200",flag); + + } + @ApiOperation(value = "删除意见") @GetMapping("/deleteStand") public ResponseMessage deleteStand(DelStandDto delStandDto){ @@ -114,11 +124,16 @@ public class SarPublicIdeaAllController extends BaseController Map map=new HashMap<>(); map.put("1","上报"); map.put("2","处理后上报"); + map.put("3","不上报"); String fileName = URLEncoder.encode(textName, "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); List data=new ArrayList<>(); if (!StringUtils.isEmpty(cid)){ - data=sarPublicIdeaAllDao.getPublicAllIdea(cid,type); +// if (null!=type) { + data = sarPublicIdeaAllDao.getPublicAllIdea(cid, type); +// }else { +// data = sarPublicIdeaAllDao.getPublicAllIdeaExport(cid,type); +// } } List standExcel=new ArrayList<>(); List standExcel2=new ArrayList<>(); @@ -126,22 +141,25 @@ public class SarPublicIdeaAllController extends BaseController if ("1".equals(type)) { GetExcelDto2 getExcelDto = GetExcelDto2.builder() .partCode(sarPublicIdeaAll.getPartCode()) - .oldText(sarPublicIdeaAll.getOldText()) - .newText(sarPublicIdeaAll.getNewText()) + .oldText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getOldText())) + .newText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getNewText())) .reason(sarPublicIdeaAll.getReason()) .userName(sarPublicIdeaAll.getUserName()) .deptName(sarPublicIdeaAll.getDeptName()) .state(map.get(sarPublicIdeaAll.getState())) + .cause(sarPublicIdeaAll.getCause()) .build(); standExcel2.add(getExcelDto); }else { GetExcelDto getExcelDto = GetExcelDto.builder() .partCode(sarPublicIdeaAll.getPartCode()) - .oldText(sarPublicIdeaAll.getOldText()) - .newText(sarPublicIdeaAll.getNewText()) + .oldText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getOldText())) + .newText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getNewText())) .reason(sarPublicIdeaAll.getReason()) .userName(sarPublicIdeaAll.getUserName()) .deptName(sarPublicIdeaAll.getDeptName()) + .state(map.get(sarPublicIdeaAll.getState())) + .cause(sarPublicIdeaAll.getCause()) .build(); standExcel.add(getExcelDto); } @@ -154,9 +172,8 @@ public class SarPublicIdeaAllController extends BaseController headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改理由")); headList.add(Lists.newArrayList("提出部门")); headList.add(Lists.newArrayList("提出人")); - if ("1".equals(type)){ - headList.add(Lists.newArrayList("处理意见")); - } + headList.add(Lists.newArrayList("处理意见")); + headList.add(Lists.newArrayList("原因")); if ("1".equals(type)) { EasyExcel.write(response.getOutputStream(), GetExcelDto2.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(standExcel2); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java index a56520f0..0111de68 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java @@ -69,14 +69,14 @@ public class SarPublicIdeaController extends BaseController { @PostMapping("/addSarPublicIdea") public ResponseMessage addSarPublicIdea(@RequestBody SarPublicIdea sarPublicIdea){ try{ - Calendar c = Calendar.getInstance(); - c.setTime(sarPublicIdea.getStartTime()); - c.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天 - sarPublicIdea.setStartTime(c.getTime()); - +// Calendar c = Calendar.getInstance(); +// c.setTime(sarPublicIdea.getStartTime()); +// c.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天 +// sarPublicIdea.setStartTime(c.getTime()); +// Calendar c2 = Calendar.getInstance(); c2.setTime(sarPublicIdea.getEndTime()); - c2.add(Calendar.DAY_OF_MONTH, 2);// 今天+1天 + c2.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天 sarPublicIdea.setEndTime(c2.getTime()); sarPublicIdeaService.save(sarPublicIdea); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java index d361e5ee..2f4ffad1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java @@ -28,4 +28,6 @@ public interface SarPublicIdeaAllDao extends BaseMapper { Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId); List getPublicAllIdea(@Param("cid") String cid,@Param("type")String type); + + List getPublicAllIdeaExport(@Param("cid") String cid,@Param("type")String type); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java index 80e65918..505f964e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java @@ -38,6 +38,10 @@ public class GetExcelDto { // @ExcelProperty("提出人") private String userName; + private String state; + + private String cause; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java index 6d2b104d..fc79bf30 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java @@ -37,6 +37,8 @@ public class GetExcelDto2 { private String state; + private String cause; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java index 72cfc5f8..589fb322 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java @@ -75,4 +75,7 @@ public class SarPublicIdeaAll extends BaseEntity { @TableField("state") private String state; + @TableField("cause") + private String cause; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java index 2a9b9275..319c4ef4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java @@ -47,11 +47,29 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl selectAllP(Integer p, Integer size, String category, String cname, Date start, Date end, String type) { QueryWrapper list = new QueryWrapper<>(); if ("1".equals(type)) { - list.like(StringUtils.isNotEmpty(category), "category", category) - .like(StringUtils.isNotEmpty(cname), "cid", cname) - .ge(start != null, "start_time", start) - .le(end != null, "end_time", end) - .orderByDesc("start_time"); + if (start!=null && end !=null){ + list.like(StringUtils.isNotEmpty(category), "category", category) + .like(StringUtils.isNotEmpty(cname), "cid", cname) + .ge(start != null, "start_time", start) + .le(end != null, "end_time", end) + .orderByDesc("start_time"); + }else if (start!=null){ + list.like(StringUtils.isNotEmpty(category), "category", category) + .like(StringUtils.isNotEmpty(cname), "cid", cname) + .le(start != null, "start_time", start) + .ge(start != null, "end_time", start) + .orderByDesc("start_time"); + }else if (end!=null){ + list.like(StringUtils.isNotEmpty(category), "category", category) + .like(StringUtils.isNotEmpty(cname), "cid", cname) + .le(end != null, "start_time", end) + .ge(end != null, "end_time", end) + .orderByDesc("start_time"); + }else { + list.like(StringUtils.isNotEmpty(category), "category", category) + .like(StringUtils.isNotEmpty(cname), "cid", cname) + .orderByDesc("start_time"); + } } else { list.like(StringUtils.isNotEmpty(category), "category", category) .like(StringUtils.isNotEmpty(cname), "cname", cname) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 053e1756..f43caaab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -123,8 +123,8 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "|SarFileSplitInfoEO|根据标准id查询分解单的文本类型") @GetMapping("getFileType") - public ResponseMessage> getFileType(String standId){ - Map fileType = ServiceImpl.getFileType(standId); + public ResponseMessage>> getFileType(String standId){ + List> fileType = ServiceImpl.getFileType(standId); return Result.success(fileType); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index c3672b64..bdda5828 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -246,13 +246,16 @@ public class SarStandItemsServiceImpl extends ServiceImpl getFileType(String standId){ + public List> getFileType(String standId){ List fileType = dao.getFileType(standId); Map typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream() .collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName)); - Map collect = fileType.stream() - .collect(Collectors.toMap(a -> a, b -> typeNameMap.get(b))); + List> collect = fileType.stream() + .map(item -> new HashMap(){ { put("label", typeNameMap.get(item));put("value", item);} } + ).collect(Collectors.toList()); + + return collect; } } 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 02888d99..0cd08aa5 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 @@ -343,4 +343,19 @@ public class SarStandProjectLibraryController extends BaseController selectListByids(@Param("ids") List ids); + List queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); + + List queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List strings); } 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 85ed659b..72f916ab 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 @@ -29,5 +29,8 @@ public interface SarStandProjectLibraryService { void batchInsertAdd(@Param("ids") List list); List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId); public Head AnalysisJsonAndStorage(String jsonStr); + public List queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); + + public List queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); } 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 e36f5f7d..f7ce0a56 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 @@ -126,6 +126,24 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary) { + return sarStandProjectLibraryDao.queryProjectGroup(sarStandProjectLibrary); + } + + @Override + public List queryProjects(SarStandProjectLibrary sarStandProjectLibrary) { + List ids=new ArrayList<>(); + if (null!=sarStandProjectLibrary.getProjectGroup() && !"".equals(sarStandProjectLibrary.getProjectGroup())){ + if (sarStandProjectLibrary.getProjectGroup().contains(",")){ + ids.addAll(new ArrayList<>(Arrays.asList(sarStandProjectLibrary.getProjectGroup().split(",")))); + }else { + ids.add(sarStandProjectLibrary.getProjectGroup()); + } + } + return sarStandProjectLibraryDao.queryProjects(sarStandProjectLibrary,ids); + } + @Override public IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java index c456d737..b83f734b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java @@ -24,6 +24,8 @@ public interface SarStandUnqualifiedDao extends BaseMapper List getSarStandUnqualifiedPage(@Param("start")Integer start, @Param("end")Integer end, @Param("sar") SarStandUnqualifiedPage sarStandUnqualified); + List getSarStandUnqualifiedExcel(@Param("ids")List strings); + Integer getSarStandUnqualifiedCount(@Param("sar") SarStandUnqualifiedPage sarStandUnqualified); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 65dfec0e..eeb93142 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -78,10 +78,10 @@ public class SarStandUnqualified extends BaseEntity { @TableField("ITEMS_NAME") private String itemsName; - @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class) - @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") - @TableField("PRODUCT_TYPE") - private String productType; +// @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class) +// @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") +// @TableField("PRODUCT_TYPE") +// private String productType; @ExcelProperty("产品线") @ApiModelProperty(value = "产品线") @@ -142,11 +142,16 @@ public class SarStandUnqualified extends BaseEntity { @TableField("AUTH_ENGINEER") private String authEngineer; - @ExcelProperty("责任工程师") + @ExcelIgnore @ApiModelProperty(value = "责任工程师") @TableField("DUTY_ENGINEER") private String dutyEngineer; + @ExcelProperty("责任工程师") + @ApiModelProperty(value = "责任工程师") + @TableField(exist=false) + private String dutyEngineerName; + @ExcelIgnore @ApiModelProperty(value = "计划关闭时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -177,10 +182,6 @@ public class SarStandUnqualified extends BaseEntity { @TableField(exist=false) private String authEngineerName; - @ExcelIgnore - @ApiModelProperty(value = "责任工程师") - @TableField(exist=false) - private String dutyEngineerName; @ExcelIgnore @ApiModelProperty(value = "国内OR海外") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/StandUnqualifiedExcelVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/StandUnqualifiedExcelVO.java index 830e23c1..47602dea 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/StandUnqualifiedExcelVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/StandUnqualifiedExcelVO.java @@ -11,6 +11,8 @@ import java.util.List; public class StandUnqualifiedExcelVO { @ApiModelProperty("文件名") String exportName; + @ApiModelProperty("导出类型") + String exportType; @ApiModelProperty("导出的未符合项ID列表") List ids; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index c2258498..76d1de95 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -148,12 +148,12 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getStandUnqualifiedExcelData(StandUnqualifiedExcelVO standUnqualifiedExcelVO) { - QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); - sarStandUnqualifiedQueryWrapper.eq("close_state",1); - if(standUnqualifiedExcelVO.getIds()!=null && standUnqualifiedExcelVO.getIds().size()>0){ - sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds()); - } - List stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper); +// QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); +// sarStandUnqualifiedQueryWrapper.eq("close_state",1); +// if(standUnqualifiedExcelVO.getIds()!=null && standUnqualifiedExcelVO.getIds().size()>0){ +// sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds()); +// } + List stand = sarStandUnqualifiedDao.getSarStandUnqualifiedExcel(standUnqualifiedExcelVO.getIds()); // 去掉日期时分秒 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/ProductTypeConverter.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/ProductTypeConverter.java index 168354ed..d2b1cd58 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/ProductTypeConverter.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/utils/ProductTypeConverter.java @@ -27,6 +27,9 @@ public class ProductTypeConverter implements Converter { if(stringValue.equals("在产产品")){ return "product"; } + if (!stringValue.equals("在研产品") && !stringValue.equals("在产产品")){ + return ""; + } } return null; } @@ -40,6 +43,9 @@ public class ProductTypeConverter implements Converter { if(s.equals("product")){ return new CellData<>("在产产品"); } + if (!s.equals("research") && !s.equals("product")){ + return new CellData<>(""); + } } return null; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java index b1604d9a..d073b263 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java @@ -14,6 +14,12 @@ import java.util.Date; public class StandWarningEO extends EarlyWarningEO { private static final long serialVersionUID = 1L; + @ExcelProperty("条款内容") + @ApiModelProperty("条款内容") + private String termsConditions; + + + @ExcelProperty("新车型实施日期") @ApiModelProperty("新车型实施日期") @DateTimeFormat(pattern = "YYYY-MM-dd") @@ -83,10 +89,10 @@ public class StandWarningEO extends EarlyWarningEO { @ExcelIgnore @ApiModelProperty("范围查询发布日期开始") @DateTimeFormat(pattern = "YYYY-MM-dd") - private String startPutTime; + private String startIssueTime; @ExcelIgnore @ApiModelProperty("范围查询发布日期结束") @DateTimeFormat(pattern = "YYYY-MM-dd") - private String endPutTime; + private String endIssueTime; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 03be8495..f48a9162 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -59,7 +59,7 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandApplicationType() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE"); + queryWrapper.select(" STAND_ID,ANY_VALUE(STAND_NUMBER) as STAND_NUMBER, STAND_NAME, STAND_TYPE"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } @@ -69,6 +69,7 @@ public class SarStandardComplianceAssessResultController { if (eo.getType() != null && !eo.getType().trim().equals("")) { queryWrapper.like("type", eo.getType().trim()); } + queryWrapper.groupBy("STAND_ID,STAND_NAME,STAND_TYPE"); IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); while (page.getRecords().remove(null)) ; 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 0182065a..c670d718 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 @@ -99,7 +99,7 @@ public class SarStandardsInfoController extends BaseController if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { @@ -137,7 +137,7 @@ public class SarStandardsInfoController extends BaseController if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { @@ -210,59 +210,23 @@ public class SarStandardsInfoController extends BaseController @GetMapping("/getSarStandardsInfoPageBak") //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") public ResponseMessage> getSarStandardsInfoPageBak(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception { -// int isNull = -1; -// if (null != page.getNowOrderBy()) { -// switch (page.getNowOrderBy()) { -// case 1: -// page.setOrderByA("issueTime");//发布日期 -// break; -// case 2: -// page.setOrderByA("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期 -// break; -// case 3: -// page.setOrderByA("SAR_STAND_ATTR_INFO.XCXSSRQ");//在产车实施日期 -// break; -// case 4: -// page.setOrderByA("SAR_STANDARDS_INFO.text_status");//文本状态 -// break; -// case 5: -// page.setOrderByA("paixu"); -// break; -// case 6: -// page.setOrderByA("SAR_STAND_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 (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { -// List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); -// String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); -// if (StringUtils.isNotBlank(advanceStr)) { -// page.setAdvanceSearchStr(advanceStr); -// } else { -// page.setAdvanceSearchStr(null); -// } -// } -// -// if(page.getUserId() == null || page.getUserId().equals("")){ -// page.setUserId(LoginUserUtil.getUserId()); -// } + if (null != page.getNowOrderBy()) { + nowOrderFunc(page); + } + + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } 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 0b9dfd4b..07a0949b 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 @@ -74,4 +74,7 @@ public interface SarStandardsInfoDao extends BaseMapper { int updateISRELATEACCESSById(@Param("IS_RELATE_ACCESS") String ACCESS,@Param("list") List list); + + List selectIdFormDTBZH(String DTBZHCode); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java index 0fc3aec2..ba950ca9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java @@ -22,6 +22,13 @@ public class SarBussionessStandEOPage extends BasePage { this.textStatusBuss = textStatusBuss; } + private String startIssueTime; + private String endIssueTime; + private String startPutTime; + private String endPutTime; + + + private String modifyTime; private String modifyTime1; private String modifyTime2; @@ -1130,4 +1137,37 @@ public class SarBussionessStandEOPage extends BasePage { public void setSql(String sql) { this.sql = sql; } + + public String getStartIssueTime() { + return startIssueTime; + } + + public void setStartIssueTime(String startIssueTime) { + this.startIssueTime = startIssueTime; + } + + public String getEndIssueTime() { + return endIssueTime; + } + + public void setEndIssueTime(String endIssueTime) { + this.endIssueTime = endIssueTime; + } + + + public String getStartPutTime() { + return startPutTime; + } + + public void setStartPutTime(String startPutTime) { + this.startPutTime = startPutTime; + } + + public String getEndPutTime() { + return endPutTime; + } + + public void setEndPutTime(String endPutTime) { + this.endPutTime = endPutTime; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index 142e98a1..cde2968f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -91,6 +91,10 @@ public class SarStandardsInfo extends BaseEntity { @TableField("REPLACE_STAND_NUM") private String replaceStandNum; + @ApiModelProperty(value = "代替标准号") + @TableField(exist = false) + private String dtbzh; + @ApiModelProperty(value = "被代替标准号") @TableField("REPLACED_STAND_NUM") private String replacedStandNum; 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 aab3ee7c..244fa967 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 @@ -716,9 +716,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist) throws Exception { + //查询字典表,形成Hash映射提升速度 List dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name"); - Map dicMap = - dicInfo.stream() + Map dicMap = dicInfo.stream() + .filter(item-> !item.getDicTypeCode().isEmpty()) .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2)); @@ -732,26 +733,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl 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 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(); +// 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 { + /** + *============================ 对getAttrMap的value赋值中文名称=============================== + */ + if(entry.getValue()!=null) { + StringBuilder builder = new StringBuilder(""); + for (String s : entry.getValue().toString().split(",")) { + if (dicMap.containsKey(s) && !"ZRBM".equals(name)){ + builder.append(dicMap.get(s)+" "); + } + + } + + + if (builder.toString().isEmpty()){ + getAttrMap.put(name, entry.getValue().toString()); + }else { + getAttrMap.put(name, builder.toString()); + } } - } else { - List valArr = Arrays.asList(value.split(",")); - value = dicTypeEODao.getDicNamesByCodes(valArr); - } - } - entry.setValue(value); + /** + *============================ 对getAttrMap的value赋值中文名称=============================== + */ +// } + +// entry.setValue(value); } } getAttrMap.put("SVPPSTips", svppsTip); @@ -1705,6 +1708,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getList = dao.getSarStandardsExportInfo(page); + attrInfoShowExport(getList); return getList; } @@ -2601,6 +2605,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl i selectFieldMap.put("country","COUNTRY"); selectFieldMap.put("standSort","STANDCLASSIFY"); selectFieldMap.put("standState","STANDSTATE"); + selectFieldMap.put("standNature","STANDNATURE"); + selectFieldMap.put("textStatus","TEXTSTATUS"); } else if (SarTypeEnum.INLAND_LAWS.getValue().equals(sarType) || SarTypeEnum.FOREIGN_LAWS.getValue().equals(sarType)) { selectFieldMap = InitStandAttrUtil.selectFieldMapLaws; selectFieldMap.put("isRelateAccess","SHIFOUGL"); @@ -149,6 +151,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl i if (StringUtils.isNotBlank(selVal)) { value = getSelectionValueName(selVal,value); } else { + //变更字段是否是文件 List fileList = new ArrayList<>(); if (SarTypeEnum.INLAND_STAND.getValue().equals(sarType) || SarTypeEnum.FOREIGN_STAND.getValue().equals(sarType)) { fileList = InitStandAttrUtil.fileFieldList; @@ -197,6 +200,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl i public String changeStandName (String field,String sarType) throws Exception{ switch (field) { + case "textStatus":return "文本状态"; case "country": return "适用区域"; case "isRelateAccess": return "重要度"; case "issueTime": return "发布日期"; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java index 300b63ab..09e8d111 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java @@ -10,6 +10,7 @@ import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarUrl.dao.TsUrlDao; import com.adc.da.slrs.sarUser.dao.TsUserDao; import com.adc.da.slrs.sarUser.entity.UpDTO; +import com.adc.da.slrs.sarUser.entity.UserPositionBatchVO; import com.adc.da.slrs.sarUser.entity.UserPositionVO; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -23,6 +24,8 @@ import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; import javax.validation.Valid; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -60,6 +63,13 @@ public class TsUserController extends BaseController { return tsUserService.setPosition(userPositionVO); } + + @ApiOperation("配置岗位") + @PostMapping("/positionBatch") + public ResponseMessage setPositionBatch(@Valid @RequestBody UserPositionBatchVO userPositionVO){ + return tsUserService.setPositionBatch(userPositionVO); + } + @ApiOperation("查询当前登录用户权限") @GetMapping("/menu") public ResponseMessage> getMenu(){ @@ -89,5 +99,12 @@ public class TsUserController extends BaseController { } + @ApiOperation("调研流程查询人 部门专用接口") + @GetMapping("/selectDeptByDY") + public ResponseMessage> selectDeptByDY(@Param("ids") String ids) throws Exception { + List strings=new ArrayList<>(Arrays.asList(ids.split(","))); + return Result.success(tsUserDao.selectDeptByDY(strings)); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java index 012cc4e8..d3a8ad84 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java @@ -32,7 +32,7 @@ public interface TsUserDao extends BaseMapper { * @param positionId：岗位ID */ @Insert("insert into ts_user_position (user_id,position_id) values (#{userId},#{positionId})") - void addPosition(String userId, String positionId); + void addPosition(@Param("userId") String userId,@Param("positionId")String positionId); /** * 解绑岗位 @@ -40,7 +40,7 @@ public interface TsUserDao extends BaseMapper { * @param positionId：岗位ID */ @Delete("delete from ts_user_position where user_id=#{userId} and position_id=#{positionId}") - void delPosition(String userId, String positionId); + void delPosition(@Param("userId")String userId, @Param("positionId")String positionId); /** * 通过岗位ID查询用户及其岗位 @@ -56,4 +56,6 @@ public interface TsUserDao extends BaseMapper { * @return List */ List getUserIdsByPositionIds(List positionIds); + + List selectDeptByDY(@Param("list") List strings); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UserPositionBatchVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UserPositionBatchVO.java new file mode 100644 index 00000000..336a011e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UserPositionBatchVO.java @@ -0,0 +1,14 @@ +package com.adc.da.slrs.sarUser.entity; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +public class UserPositionBatchVO { + @NotNull(message = "userId不能为空") + private List userId; + @NotNull(message = "positionIds不能为空") + private List positionIds; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index ad53434a..9e33e87e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.slrs.sarUser.entity.UpDTO; +import com.adc.da.slrs.sarUser.entity.UserPositionBatchVO; import com.adc.da.slrs.sarUser.entity.UserPositionVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -44,6 +45,8 @@ public interface ITsUserService extends IService { */ ResponseMessage setPosition(UserPositionVO userPositionVO); + ResponseMessage setPositionBatch(UserPositionBatchVO userPositionVO); + /** * 查询当前登录的用户权限 * @return List diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index 2ff1ec6b..d3298b95 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -11,11 +11,8 @@ import com.adc.da.slrs.sarPosition.service.ITsPositionService; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarRole.service.ITsRoleService; -import com.adc.da.slrs.sarUser.entity.SyncUser; -import com.adc.da.slrs.sarUser.entity.TsUser; +import com.adc.da.slrs.sarUser.entity.*; import com.adc.da.slrs.sarUser.dao.TsUserDao; -import com.adc.da.slrs.sarUser.entity.UpDTO; -import com.adc.da.slrs.sarUser.entity.UserPositionVO; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sync.service.SyncUserService; import com.adc.da.sys.entity.UserEO; @@ -144,6 +141,48 @@ public class TsUserServiceImpl extends ServiceImpl implements return Result.success(); } + + /** + * 配置岗位 + * @param userPositionVO2：用户、岗位ID + * @return ResponseMessage + */ + @Override + @Transactional + public ResponseMessage setPositionBatch(UserPositionBatchVO userPositionVO2) { + + boolean flag=true; + + for (String s:userPositionVO2.getUserId()) { + UserPositionVO userPositionVO=new UserPositionVO(); + userPositionVO.setUserId(s); + userPositionVO.setPositionIds(userPositionVO2.getPositionIds()); + TsUser tsUser=tsUserDao.selectById(userPositionVO.getUserId()); + if(tsUser==null){ + flag=false; + } + List oldPositionIds=tsUserDao.selectPositionIds(userPositionVO.getUserId()); + Map> ids= ListUtil.difList(userPositionVO.getPositionIds(),oldPositionIds); + List insertIds=ids.get("insert"); + List deleteIds=ids.get("delete"); + if(insertIds!=null&&insertIds.size()>0){ + for(String positionId:insertIds){ + tsUserDao.addPosition(userPositionVO.getUserId(),positionId); + } + } + if(deleteIds!=null&&deleteIds.size()>0){ + for(String positionId:deleteIds){ + tsUserDao.delPosition(userPositionVO.getUserId(),positionId); + } + } + } + if (flag) { + return Result.success(); + }else { + return Result.error("用户不存在"); + } + } + /** * 查询当前登录的用户权限 * @return List diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java index c43411d3..fb1c648d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java @@ -56,7 +56,7 @@ public class SarVppsTreeServiceImpl extends ServiceImpl children=this.baseMapper.selectList(sarMenuQueryWrapper); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java index f9fb1071..a6d6cd24 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java @@ -275,7 +275,8 @@ public class SarFileSplitInfoEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(SarItemsStandCompareHisEOController.class); + + @Autowired + private SarItemsCompareHisEODao sarItemsCompareHisEOService; + + @ApiOperation(value = "|SarStandItemsCompareHisEO|分页查询") + @GetMapping("/page") + public ResponseMessage> page(SarStandItemsCompareHisEOPage page) throws Exception { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("STAND_HIS_ID",page.getStandHisId()); + List rows = sarItemsCompareHisEOService.selectList(queryWrapper); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java index 3825e89e..d2951f2a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java @@ -3,6 +3,8 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.entity.BaseEntity; import com.adc.da.common.UploadFileInfo; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + import java.util.Date; import java.util.List; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarItemsCompareHisEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarItemsCompareHisEO.java index bd626150..1d490b88 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarItemsCompareHisEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarItemsCompareHisEO.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; @@ -11,6 +12,7 @@ import java.util.Date; * 日期： 2020-02-26
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@TableName("sar_items_compare_his") public class SarItemsCompareHisEO extends BaseEntity { private String id; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index b0f15bbd..40bc2020 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -486,7 +486,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService if (!file1.exists()) { file1.mkdirs(); } - String filepathandname = filePath + "/img/" + imageName; + String filepathandname = splitFilePath +"/" + imageName; try { FileOutputStream fos = new FileOutputStream(filepathandname); fos.write(bytev); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java index fec300f5..01f0771e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java @@ -384,6 +384,7 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId()); sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId()); sarFileSplitItemsEO.setEditFlag(String.valueOf(UUID.randomUUID())); + sarFileSplitItemsEO.setWorkFlowShow(sarFileSplitItemsEO.getWorkFlowShow()); result += sarFileSplitItemsEODao.insertSelective(sarFileSplitItemsEO); // SAR_FILE_ITEMS_VAL 添加数据， diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java index 937dd5e1..296adee2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java @@ -243,6 +243,10 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ sarItemsCompareHisEO.setCreateTime(new Date()); sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO); } + SarStandCompareHisEO sarStandCompareHisEO =new SarStandCompareHisEO(); + sarStandCompareHisEO.setId(standHisId); + sarStandCompareHisEO.setCompareStatus("比对完成"); + sarStandCompareHisEODao.updateByPrimaryKeySelective(sarStandCompareHisEO); return resultMap; } @@ -377,6 +381,7 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ sarItemsCompareHisEO.setCreateTime(new Date()); sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO); } + return resultMap; } @Async diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java index 717efb75..e59d1507 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java @@ -62,7 +62,7 @@ public class SysInfoEOService { String[] idArr = userIds.split(","); userNames = userEODao.getNamesByIds(idArr); if (StringUtils.isBlank(userNames) || "null".equals(userNames)) { - userNames = ""; + userNames = userIds; } } return userNames; @@ -81,7 +81,7 @@ public class SysInfoEOService { String[] idArr = orgIds.split(","); names = orgEODao.getNamesByIds(idArr); if (StringUtils.isBlank(names) || "null".equals(names)) { - names = ""; + names = orgIds; } } return names; 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 index 6ec1cf93..f671536f 100644 --- 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 @@ -52,6 +52,14 @@ public class WgNetInfo extends BaseEntity { @TableField("email") private String email; + @ApiModelProperty(value = "联络人") + @TableField("name") + private String name; + + @ApiModelProperty(value = "单位") + @TableField("unit") + private String unit; + } 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 index e838fcd2..05bee0a3 100644 --- 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 @@ -63,6 +63,12 @@ public class WgWorkGroupController extends BaseController { return wgWorkGroupService.updateData(wgWorkGroupShowDTO); } + @ApiOperation("修改工作组节点数据") + @PostMapping("/updateDataByWk") + public ResponseMessage updateDataByWk(@RequestBody WgWorkGroupShowDTO wgWorkGroupShowDTO){ + return wgWorkGroupService.updateDataByWk(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 index 12341a91..f15f4d5a 100644 --- 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 @@ -26,4 +26,6 @@ public interface WgWorkGroupDao extends BaseMapper { List researchDownCheck(@Param(value = "data") String data,@Param(value = "status")String status); + List researchDatasCheck(@Param(value = "data") String data,@Param(value = "status")String status); + } 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 index 29b3096b..e6f56e74 100644 --- 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 @@ -31,6 +31,8 @@ public interface IWgWorkGroupService extends IService { ResponseMessage updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO); + ResponseMessage updateDataByWk(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 index 2525d233..aeee43bc 100644 --- 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 @@ -126,33 +126,33 @@ public class WgWorkGroupServiceImpl extends ServiceImpl wgStandorpolicyInfos= wgStandorpolicyInfoDao.researchDatas(); - Map map=new HashMap<>(); + List wgStandorpolicyInfos = wgStandorpolicyInfoDao.researchDatas(); + Map map = new HashMap<>(); wgStandorpolicyInfos.forEach(wgStandorpolicyInfo -> { - map.put(wgStandorpolicyInfo.getStandId()+"-"+wgStandorpolicyInfo.getWgId(),wgStandorpolicyInfo); + map.put(wgStandorpolicyInfo.getStandId() + "-" + wgStandorpolicyInfo.getWgId(), wgStandorpolicyInfo); }); - if (null!=wgWorkGroupDTO.getWgStandorpolicyInfos() && wgWorkGroupDTO.getWgStandorpolicyInfos().size()>0){ - List wgWorkGroups=new ArrayList<>(); + if (null != wgWorkGroupDTO.getWgStandorpolicyInfos() && wgWorkGroupDTO.getWgStandorpolicyInfos().size() > 0) { + List wgWorkGroups = new ArrayList<>(); wgWorkGroupDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { - WgWorkGroup wgWorkGroup=new WgWorkGroup(); - BeanUtils.copyProperties(wgWorkGroupDTO,wgWorkGroup); + WgWorkGroup wgWorkGroup = new WgWorkGroup(); + BeanUtils.copyProperties(wgWorkGroupDTO, wgWorkGroup); wgWorkGroup.setId(String.valueOf(UUID.randomUUID())); wgStandorpolicyInfo.setWgId(wgWorkGroup.getId()); - if (null==map.get(wgStandorpolicyInfo.getStandId()+"-"+wgWorkGroup.getPid())) { + if (null == map.get(wgStandorpolicyInfo.getStandId() + "-" + wgWorkGroup.getPid())) { wgWorkGroups.add(wgWorkGroup); } }); - if (wgWorkGroups.size()==0){ + if (wgWorkGroups.size() == 0) { return "政策已存在，请勿重复添加"; } - boolean flag=wgWorkGroupService.saveOrUpdateBatch(wgWorkGroups); - boolean flag1=wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupDTO.getWgStandorpolicyInfos()); - if (flag && flag1){ + boolean flag = wgWorkGroupService.saveOrUpdateBatch(wgWorkGroups); + boolean flag1 = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupDTO.getWgStandorpolicyInfos()); + if (flag && flag1) { return "添加成功"; - }else { + } else { return "添加失败"; } - }else { + } else { return "数据有误，请检查数据"; } } @@ -179,82 +179,82 @@ public class WgWorkGroupServiceImpl extends ServiceImpl wgMeetingUserRelations = wgMeetingUserRelationService.getMeetingAllPeoples(type); //处理数据 //part1 会议数据组装 提速第一步建造数据的map集合 - Map wgWorkGroupMap=new HashMap<>(); + Map wgWorkGroupMap = new HashMap<>(); wgWorkGroupShowDTOS.forEach(wgWorkGroupShowDTO -> { - wgWorkGroupMap.put(wgWorkGroupShowDTO.getId(),wgWorkGroupShowDTO); + wgWorkGroupMap.put(wgWorkGroupShowDTO.getId(), wgWorkGroupShowDTO); }); Map meetMap = new HashMap<>(); - if (null!=wgMeetingInfos && wgMeetingInfos.size()>0) { + if (null != wgMeetingInfos && wgMeetingInfos.size() > 0) { wgMeetingInfos.forEach(wgMeetingInfo -> { meetMap.put(wgMeetingInfo.getId(), wgMeetingInfo); }); } //组装会议数据 - if (null!=wgMeetingUserRelations && wgMeetingUserRelations.size()>0) { + if (null != wgMeetingUserRelations && wgMeetingUserRelations.size() > 0) { wgMeetingUserRelations.forEach(wgMeetingUserRelationShow -> { - if (null!=meetMap.get(wgMeetingUserRelationShow.getMeetingId()).getJoinMeetingPeopleInfo()) { + if (null != meetMap.get(wgMeetingUserRelationShow.getMeetingId()).getJoinMeetingPeopleInfo()) { meetMap.get(wgMeetingUserRelationShow.getMeetingId()).getJoinMeetingPeopleInfo().add(wgMeetingUserRelationShow); - }else { - List wgMeetingUserRelationShows=new ArrayList<>(); + } else { + List wgMeetingUserRelationShows = new ArrayList<>(); wgMeetingUserRelationShows.add(wgMeetingUserRelationShow); meetMap.get(wgMeetingUserRelationShow.getMeetingId()).setJoinMeetingPeopleInfo(wgMeetingUserRelationShows); } }); } //组装总数据 - if (null!=wgDeptShows && wgDeptShows.size()>0) { + if (null != wgDeptShows && wgDeptShows.size() > 0) { wgDeptShows.forEach(wgDeptShow -> { - if (null!=wgWorkGroupMap.get(wgDeptShow.getWgId()).getWgDepts()) { + if (null != wgWorkGroupMap.get(wgDeptShow.getWgId()).getWgDepts()) { wgWorkGroupMap.get(wgDeptShow.getWgId()).getWgDepts().add(wgDeptShow); - }else { + } else { List wgDepts = new ArrayList<>(); wgDepts.add(wgDeptShow); wgWorkGroupMap.get(wgDeptShow.getWgId()).setWgDepts(wgDepts); } }); } - if (null!=wgMeetingInfos && wgMeetingInfos.size()>0) { + if (null != wgMeetingInfos && wgMeetingInfos.size() > 0) { wgMeetingInfos.forEach(wgMeetingInfo -> { - if (null!=wgWorkGroupMap.get(wgMeetingInfo.getWgId()).getWgMeetingInfos()) { + if (null != wgWorkGroupMap.get(wgMeetingInfo.getWgId()).getWgMeetingInfos()) { wgWorkGroupMap.get(wgMeetingInfo.getWgId()).getWgMeetingInfos().add(meetMap.get(wgMeetingInfo.getId())); - }else { + } else { List wgMeetingInfos1 = new ArrayList<>(); wgMeetingInfos1.add(wgMeetingInfo); wgWorkGroupMap.get(wgMeetingInfo.getWgId()).setWgMeetingInfos(wgMeetingInfos1); } }); } - if (null!=wgNetInfoDTOS && wgNetInfoDTOS.size()>0) { + if (null != wgNetInfoDTOS && wgNetInfoDTOS.size() > 0) { wgNetInfoDTOS.forEach(wgNetInfoDTO -> { - if (null!=wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).getWgNetInfos()) { + if (null != wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).getWgNetInfos()) { wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).getWgNetInfos().add(wgNetInfoDTO); - }else { - List wgNetInfos=new ArrayList<>(); + } else { + List wgNetInfos = new ArrayList<>(); wgNetInfos.add(wgNetInfoDTO); wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).setWgNetInfos(wgNetInfos); } }); } - if (null!=wgPayInfos && wgPayInfos.size()>0) { + if (null != wgPayInfos && wgPayInfos.size() > 0) { wgPayInfos.forEach(wgPayInfo -> { - if (null!=wgWorkGroupMap.get(wgPayInfo.getWgId()).getWgPayInfos()) { + if (null != wgWorkGroupMap.get(wgPayInfo.getWgId()).getWgPayInfos()) { wgWorkGroupMap.get(wgPayInfo.getWgId()).getWgPayInfos().add(wgPayInfo); - }else { - List wgPayInfos1=new ArrayList<>(); + } else { + List wgPayInfos1 = new ArrayList<>(); wgPayInfos1.add(wgPayInfo); wgWorkGroupMap.get(wgPayInfo.getWgId()).setWgPayInfos(wgPayInfos1); } }); } //处理标准政策数据 - if (null!=wgStandorpolicyInfos && wgStandorpolicyInfos.size()>0) { + if (null != wgStandorpolicyInfos && wgStandorpolicyInfos.size() > 0) { wgStandorpolicyInfos.forEach(wgStandorpolicyInfo -> { - if (null!=wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).getWgStandorpolicyInfos()) { + if (null != wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).getWgStandorpolicyInfos()) { wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setName(wgStandorpolicyInfo.getName()); wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).getWgStandorpolicyInfos().add(wgStandorpolicyInfo); - }else { - List wgStandorpolicyInfos1=new ArrayList<>(); + } else { + List wgStandorpolicyInfos1 = new ArrayList<>(); wgStandorpolicyInfos1.add(wgStandorpolicyInfo); wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setName(wgStandorpolicyInfo.getName()); wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setWgStandorpolicyInfos(wgStandorpolicyInfos1); @@ -262,27 +262,27 @@ public class WgWorkGroupServiceImpl extends ServiceImpl nums=new ArrayList<>(); - Map> map=new HashMap<>(); + List nums = new ArrayList<>(); + Map> map = new HashMap<>(); wgWorkGroupShowDTOS.forEach(wgWorkGroupShowDTO -> { - if (null!=map.get(Integer.valueOf(wgWorkGroupShowDTO.getLevel()))){ + if (null != map.get(Integer.valueOf(wgWorkGroupShowDTO.getLevel()))) { map.get(Integer.valueOf(wgWorkGroupShowDTO.getLevel())).add(wgWorkGroupShowDTO); - }else { + } else { List middle = new ArrayList<>(); middle.add(wgWorkGroupShowDTO); nums.add(Integer.valueOf(wgWorkGroupShowDTO.getLevel())); - map.put(Integer.valueOf(wgWorkGroupShowDTO.getLevel()),middle); + map.put(Integer.valueOf(wgWorkGroupShowDTO.getLevel()), middle); } }); //组装数据 - for (int i=nums.size()-1;i>0;i--){ + for (int i = nums.size() - 1; i > 0; i--) { int finalI = i; - map.get(i-1).forEach(wgWorkGroupShowDTO -> { + map.get(i - 1).forEach(wgWorkGroupShowDTO -> { map.get(finalI).forEach(wgWorkGroupShowDTO1 -> { - if (wgWorkGroupShowDTO.getId().equals(wgWorkGroupShowDTO1.getPid())){ - if (null!=wgWorkGroupShowDTO.getChildren()) { + if (wgWorkGroupShowDTO.getId().equals(wgWorkGroupShowDTO1.getPid())) { + if (null != wgWorkGroupShowDTO.getChildren()) { wgWorkGroupShowDTO.getChildren().add(wgWorkGroupShowDTO1); - }else { + } else { List children = new ArrayList<>(); children.add(wgWorkGroupShowDTO1); wgWorkGroupShowDTO.setChildren(children); @@ -322,104 +322,167 @@ public class WgWorkGroupServiceImpl extends ServiceImpl updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO) { - List wgWorkGroupShowDTOS = wgWorkGroupDao.researchDownCheck(wgWorkGroupShowDTO.getId(), "1"); + List wgWorkGroupShowDTOS = wgWorkGroupDao.researchDatasCheck(wgWorkGroupShowDTO.getId(), "0"); if (null != wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size() > 0) { return Result.error("工作组处在流程中，无法修改"); } else { - WgWorkGroup wgWorkGroup = new WgWorkGroup(); - BeanUtils.copyProperties(wgWorkGroupShowDTO, wgWorkGroup); - boolean flag = false; - flag = wgWorkGroupService.saveOrUpdate(wgWorkGroup); - if (null != wgWorkGroupShowDTO.getWgDepts() && wgWorkGroupShowDTO.getWgDepts().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(","))); - wgDeptService.removeByIds(strings); - } - List wgDepts=new ArrayList<>(); - wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> { - WgDept wgDept=new WgDept(); - BeanUtils.copyProperties(wgDeptShow,wgDept); - if (null==wgDept.getWgId()){ - wgDept.setWgId(wgWorkGroupShowDTO.getId()); - } - wgDepts.add(wgDept); - }); - flag = wgDeptService.saveOrUpdateBatch(wgDepts); - } - if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(","))); - wgDeptService.removeByIds(strings); - wgMeetingUserRelationService.removeByIds(strings); - } - List removeMeet = new ArrayList<>(); - List wgMeetingUserRelations = new ArrayList<>(); - wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { - if (null==wgMeetingInfo.getId()){ - wgMeetingInfo.setId(String.valueOf(UUID.randomUUID())); - wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - wgMeetingInfo.getMeetingPeople().forEach(s -> { - WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); - wgMeetingUserRelation.setUserId(s); - wgMeetingUserRelation.setMeetingId(wgMeetingInfo.getId()); - wgMeetingUserRelations.add(wgMeetingUserRelation); - }); - removeMeet.add(wgMeetingInfo.getId()); - }); - flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos()); - if (!removeMeet.isEmpty()) { - wgMeetingUserRelationService.removeByIds(removeMeet); - wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations); - } - } - if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(","))); - wgNetInfoService.removeByIds(strings); - } - List wgNetInfos = new ArrayList<>(); - wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { - WgNetInfo wgNetInfo = new WgNetInfo(); - BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo); - if (null==wgNetInfo.getWgId()){ - wgNetInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - wgNetInfos.add(wgNetInfo); - }); - flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); - } - if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(","))); - wgPayInfoService.removeByIds(strings); - } - if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()){ - wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> { - if (null==wgPayInfo.getWgId()){ - wgPayInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - }); - } - flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); - } - if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { - if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()){ - wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { - if (null==wgStandorpolicyInfo.getWgId()){ - wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - }); - } - flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); - } + return dealAllDatas(wgWorkGroupShowDTO,"sys"); + } + } - if (flag) { - return Result.success("更新成功"); - } else { - return Result.error("无法更新"); + @Override + public ResponseMessage updateDataByWk(WgWorkGroupShowDTO wgWorkGroupShowDTO) { + return dealAllDatas(wgWorkGroupShowDTO,"wk"); + } + + private ResponseMessage dealAllDatas(WgWorkGroupShowDTO wgWorkGroupShowDTO,String part) { + WgWorkGroup wgWorkGroup = new WgWorkGroup(); + BeanUtils.copyProperties(wgWorkGroupShowDTO, wgWorkGroup); + boolean flag = false; + flag = wgWorkGroupService.saveOrUpdate(wgWorkGroup); + saveBathDept(wgWorkGroupShowDTO, flag,part); + saveBathMeetingUserRelations(wgWorkGroupShowDTO, flag,part); + saveBathNetInfo(wgWorkGroupShowDTO, flag,part); + saveBathPayInfo(wgWorkGroupShowDTO, flag,part); + saveBathStandardPolicyInfo(wgWorkGroupShowDTO, flag,part); + + if (flag) { + return Result.success("更新成功"); + } else { + return Result.error("无法更新"); + } + } + + private boolean saveBathPayInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { + if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(","))); + wgPayInfoService.removeByIds(strings); + } + if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()) { + wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> { + if (null == wgPayInfo.getWgId()) { + wgPayInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } + flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); + }else if ("sys".equals(part)){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgPayInfoService.remove(queryWrapper); + } + return flag; + } + + private boolean saveBathNetInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { + if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(","))); + wgNetInfoService.removeByIds(strings); + } + List wgNetInfos = new ArrayList<>(); + wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { + WgNetInfo wgNetInfo = new WgNetInfo(); + BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo); + if (null == wgNetInfo.getWgId()) { + wgNetInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + wgNetInfos.add(wgNetInfo); + }); + flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); + }else if ("sys".equals(part)) { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgNetInfoService.remove(queryWrapper); + } + return flag; + } + + private boolean saveBathMeetingUserRelations(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { + if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(","))); + wgDeptService.removeByIds(strings); + wgMeetingUserRelationService.removeByIds(strings); + } + List removeMeet = new ArrayList<>(); + List wgMeetingUserRelations = new ArrayList<>(); + wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { + if (null == wgMeetingInfo.getId()) { + wgMeetingInfo.setId(String.valueOf(UUID.randomUUID())); + wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + wgMeetingInfo.getMeetingPeople().forEach(s -> { + WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); + wgMeetingUserRelation.setUserId(s); + wgMeetingUserRelation.setMeetingId(wgMeetingInfo.getId()); + wgMeetingUserRelations.add(wgMeetingUserRelation); + }); + removeMeet.add(wgMeetingInfo.getId()); + }); + flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos()); + if (!removeMeet.isEmpty()) { + wgMeetingUserRelationService.removeByIds(removeMeet); + wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations); + } + }else if ("sys".equals(part)) { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgMeetingInfoService.remove(queryWrapper); + List wgMeetingInfos=wgMeetingInfoService.list(queryWrapper); + List removeIds=new ArrayList<>(); + wgMeetingInfos.forEach(wgMeetingInfo -> { + removeIds.add(wgMeetingInfo.getId()); + }); + if (removeIds.size()>0) { + wgMeetingUserRelationService.removeByIds(removeIds); } } + return flag; + } + + private boolean saveBathDept(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { + if (null != wgWorkGroupShowDTO.getWgDepts() && wgWorkGroupShowDTO.getWgDepts().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(","))); + wgDeptService.removeByIds(strings); + } + List wgDepts = new ArrayList<>(); + wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> { + WgDept wgDept = new WgDept(); + BeanUtils.copyProperties(wgDeptShow, wgDept); + if (null == wgDept.getWgId()) { + wgDept.setWgId(wgWorkGroupShowDTO.getId()); + } + wgDepts.add(wgDept); + }); + flag = wgDeptService.saveOrUpdateBatch(wgDepts); + }else if ("sys".equals(part)) { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgDeptService.remove(queryWrapper); + } + return flag; + } + + + private boolean saveBathStandardPolicyInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { + if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { + if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()) { + wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { + if (null == wgStandorpolicyInfo.getWgId()) { + wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } + flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); + }else if ("sys".equals(part)) { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgStandorpolicyInfoService.remove(queryWrapper); + } + return flag; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/removeHtml/RemoveHtml.java b/adc-da-slrs/src/main/java/com/adc/da/utils/removeHtml/RemoveHtml.java new file mode 100644 index 00000000..8165d3ff --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/removeHtml/RemoveHtml.java @@ -0,0 +1,100 @@ +package com.adc.da.utils.removeHtml; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class RemoveHtml { + + + /** + * 匹配html标签，例如"

xxx

"这种格式 + */ + private static Pattern HTML_TAG_PATTERN = Pattern.compile("<[a-zA-Z]+.*?>([\\s\\S]*?)"); + + /** + * 替换掉html标签里面的style内容 + * + * @param content + * @return + */ + public static String replaceStyle(String content) { + if (content == null || content.length() == 0) { + return content; + } + String regEx = " style=\"(.*?)\""; + Pattern p = Pattern.compile(regEx); + Matcher m = p.matcher(content); + if (m.find()) { + content = m.replaceAll(""); + } + return content; + } + + + /** + * 移除掉
标签 + * + * @param src + * @return + */ + public static String removeBrTag(String src) { + if (src != null && !src.isEmpty()) { + src = src.replaceAll("
", ""); + } + return src; + } + + + /** + * 针对多个标签嵌套的情况进行处理 + * 比如

王者荣耀

+ * 预处理并且正则匹配完之后结果是 王者荣耀 + * 需要手工移除掉前面的起始标签 + * @param content + * @return + */ + public static String replaceStartTag(String content) { + if (content == null || content.length() == 0) { + return content; + } + String regEx = "<[a-zA-Z]*?>([\\s\\S]*?)"; + Pattern p = Pattern.compile(regEx); + Matcher m = p.matcher(content); + if (m.find()) { + content = m.replaceAll(""); + } + return content; + } + + + + /** + * 获取html中的数据 + * @param htmlStr + * @return + */ + public static String getResultsFromHtml(String htmlStr) { + //定义script的正则表达式，去除js可以防止注入 + String scriptRegex="]*?>[\\s\\S]*?<\\/script>"; + //定义style的正则表达式，去除style样式，防止css代码过多时只截取到css样式代码 + String styleRegex="]*?>[\\s\\S]*?<\\/style>"; + //定义HTML标签的正则表达式，去除标签，只提取文字内容 + String htmlRegex="<[^>]+>"; + //定义空格,回车,换行符,制表符 + String spaceRegex = "\\s*|\t|\r|\n"; + + // 过滤script标签 + htmlStr = htmlStr.replaceAll(scriptRegex, ""); + // 过滤style标签 + htmlStr = htmlStr.replaceAll(styleRegex, ""); + // 过滤html标签 + htmlStr = htmlStr.replaceAll(htmlRegex, ""); + // 过滤空格等 + htmlStr = htmlStr.replaceAll(spaceRegex, ""); + return htmlStr.trim(); // 返回文本字符串 + } + + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/DateUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/DateUtil.java index cd892c2c..83e709f9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/DateUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/DateUtil.java @@ -2,9 +2,7 @@ package com.adc.da.utils.util; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; -import java.util.TimeZone; +import java.util.*; /** * @Description: 判断是否为日期格式 @@ -13,6 +11,36 @@ import java.util.TimeZone; */ public class DateUtil { + /** + * 取起始时间到结束时间 所有的时间 + * @param startTime + * @param endTime + * @return + */ + + public static List getAllDate(String startTime, String endTime) { + List list = new ArrayList(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Calendar cal = Calendar.getInstance(); + + try { + cal.setTime(sdf.parse(startTime)); + for (long d = cal.getTimeInMillis(); d <= sdf.parse(endTime).getTime(); d = get_D_Plaus_1(cal)) { + list.add(sdf.format(d)); + } + } catch (ParseException e) { + System.out.println("date change err"); + } + + return list; + } + + public static long get_D_Plaus_1(Calendar c) { + c.set(Calendar.DAY_OF_MONTH, c.get(Calendar.DAY_OF_MONTH) + 1); + return c.getTimeInMillis(); + } + /*** * @Description: 判断多个日期是否都符合日期格式 * @Author: super_liu diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index 811274f5..b35dd3f9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -81,26 +81,64 @@ public class SarAdvanceSearchUtil { /** - * 国内外标准高级查询 对SAR_STAND_ATTR_INFO表自定义字段生成条件语句 + * 国内外标准高级查询 对tableName表自定义字段生成条件语句 * @param searchVOList * @return */ - public static String createStandSql(List searchVOList) { + public static String createStandSql(List searchVOList,String tableName) { + tableName=tableName+"."; String sqlInfo = ""; - String tableName="SAR_STAND_ATTR_INFO."; StringBuilder sqlBuilder = new StringBuilder(); if (searchVOList != null && !searchVOList.isEmpty()) { for (int i = 0; i < searchVOList.size(); i++) { String sql = ""; SarAdvanceSearchVO searchVO=searchVOList.get(i); - if (StringUtils.isNotBlank(searchVO.getValue())); - if (i==0){ - sql+=tableName+searchVO.getField()+" " + searchVO.getType() + " " + "concat(concat('%','" +searchVO.getValue() + "'),'%') "; - }else { - sql+="AND"+" "+tableName+searchVO.getField()+" " + searchVO.getType() + " " + "concat(concat('%','" +searchVO.getValue() + "'),'%') "; + if (StringUtils.isNotBlank(searchVO.getValue())) { + + + switch (searchVO.getType()) { + //多个正则查询 + case "regexp": + case "REGEXP": + if (i == 0) { + sql += tableName + searchVO.getField() + " " + "REGEXP" + " " + "\'" + searchVO.getValue().replaceAll(",", "|").replaceAll("\\s*", "") + "\'"; + } else { + sql += " AND " + " " + tableName + searchVO.getField() + " " + "REGEXP" + " " + "\'" + searchVO.getValue().replaceAll(",", "|").replaceAll("\\s*", "") + "\'"; + } + break; + //模糊查询 + case "LIKE": + case "like": + if (i == 0) { + sql += tableName + searchVO.getField() + " " + "LIKE" + " " + "concat(concat('%','" + searchVO.getValue() + "'),'%') "; + } else { + sql += " AND " + " " + tableName + searchVO.getField() + " " + "LIKE" + " " + "concat(concat('%','" + searchVO.getValue() + "'),'%') "; + } + break; + //日期范围查询 + case "between": + case "BETWEEN": + String[] boundaryArray = searchVO.getValue().split(","); + if (i == 0) { + sql += "DATE_FORMAT(" + tableName + searchVO.getField() + ",'%Y-%m-%d')" + " " + "BETWEEN" + " " + "DATE_FORMAT(" + "\'" + boundaryArray[0].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')" + " AND " + "DATE_FORMAT(" + "\'" + boundaryArray[1].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')"; + } else { + sql += " AND " + " " + "DATE_FORMAT(" + tableName + searchVO.getField() + ",'%Y-%m-%d')" + " " + "BETWEEN" + " " + "DATE_FORMAT(" + "\'" + boundaryArray[0].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')" + " AND " + "DATE_FORMAT(" + "\'" + boundaryArray[1].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')"; + } + break; + case "equals": + case "EQUALS": + if (i == 0) { + sql += "DATE_FORMAT(" + tableName + searchVO.getField() + ",'%Y-%m-%d')" + " " + "=" + " " + "DATE_FORMAT(" + "\'" + searchVO.getValue() + "\'" + ",'%Y-%m-%d')"; + } else { + sql += " AND " + " " + "DATE_FORMAT(" + tableName + searchVO.getField() + ",'%Y-%m-%d')" + " " + "=" + " " + "DATE_FORMAT(" + "\'" + searchVO.getValue() + "\'" + ",'%Y-%m-%d')"; + } + break; + default: + } + + sqlBuilder.append(sql); } - sqlBuilder.append(sql); } sqlInfo = sqlBuilder.toString(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java index 27a7a463..f43dfae9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java @@ -5,6 +5,8 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Row; +import java.text.MessageFormat; + /** * @Description: TODO * @author: super_liu @@ -12,6 +14,10 @@ import org.apache.poi.ss.usermodel.Row; */ public class Utils { + public static String format(String value, Object... paras) { + return MessageFormat.format(value, paras); + } + //判断row是否为空 空返回true public static boolean isRowEmpty(Row row) { if (null == row) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index a938f6d8..fea29b3a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -75,6 +75,7 @@ + @@ -140,6 +141,7 @@ es_revise_plan.use_level, es_revise_plan.technologic, es_revise_plan.buss_sort, + es_revise_plan.LXD, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, @@ -208,8 +210,10 @@ es_revise_plan.use_level, es_revise_plan.technologic, es_revise_plan.buss_sort, + es_revise_plan.LXD, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, + sar_bussioness_stand.stand_number as standNum, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,area) ) as areaName, @@ -221,34 +225,34 @@ left join sar_bussioness_stand on sar_bussioness_stand.ID = es_revise_plan.rqb_json - and es_name like concat('%',#{esName},'%') + and es_revise_plan.es_name like concat('%',#{esName},'%') - and area = #{area} + and es_revise_plan.area = #{area} - and plan_status in + and es_revise_plan.plan_status in #{item} - and revise_status = #{reviseStatus} + and es_revise_plan.revise_status = #{reviseStatus} - and drafter = #{drafter} + and es_revise_plan.drafter = #{drafter} - and res_person = #{resPerson} + and es_revise_plan.res_person = #{resPerson} - and wg_leader = #{wgLeader} + and es_revise_plan.wg_leader = #{wgLeader} - and DATE_FORMAT(draft_time,'%Y-%m-%d')=DATE_FORMAT(#{draftTime},'%Y-%m-%d') + and DATE_FORMAT(es_revise_plan.draft_time,'%Y-%m-%d')=DATE_FORMAT(#{draftTime},'%Y-%m-%d') - and DATE_FORMAT(release_time,'%Y-%m-%d')=DATE_FORMAT(#{releaseTime},'%Y-%m-%d') + and DATE_FORMAT(es_revise_plan.release_time,'%Y-%m-%d')=DATE_FORMAT(#{releaseTime},'%Y-%m-%d') and (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) like concat('%',#{unit},'%') @@ -279,6 +283,7 @@ es_revise_plan.use_level, es_revise_plan.technologic, es_revise_plan.buss_sort, + es_revise_plan.LXD, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, @@ -353,6 +358,9 @@ buss_sort=#{bussSort}, + + LXD=#{lxd}, + where id = #{id} @@ -417,6 +425,9 @@ buss_sort, + + LXD, + values @@ -477,6 +488,9 @@ #{bussSort}, + + #{lxd}, + @@ -512,6 +526,7 @@ es_revise_plan.use_level, es_revise_plan.technologic, es_revise_plan.buss_sort, + es_revise_plan.LXD, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, 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 982af830..7abb5fd4 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 @@ -21,6 +21,7 @@ + @@ -55,7 +56,7 @@ stand_status, replaced_stand_num, replace_stand_num,put_time, - issue_time, stand_en_name, stand_name, stand_code,standStatusShow, + issue_time, stand_en_name, stand_name, stand_code,stand_status, SAR_BUSSIONESS_STAND.id @@ -170,6 +171,8 @@ stand_sort, stand_year, stand_number, + REVISE_STATUS, + STAND_SN, #{modifyTime, jdbcType=TIMESTAMP}, @@ -190,6 +193,8 @@ #{standSort, jdbcType=VARCHAR}, #{standYear, jdbcType=VARCHAR}, #{standNumber, jdbcType=VARCHAR}, + #{reviseStatus, jdbcType=VARCHAR}, + #{standSn, jdbcType=VARCHAR}, @@ -322,6 +327,12 @@ + + delete from SAR_BUSSIONESS_STAND @@ -440,6 +451,7 @@ like concat('%', #{standCode}, '%') and (SAR_BUSSIONESS_STAND.STAND_YEAR = '' or SAR_BUSSIONESS_STAND.STAND_YEAR is null) ) ) --> and SAR_BUSSIONESS_STAND.STAND_CODE like concat('%', #{standCode}, '%') + or REPLACE( SAR_BUSSIONESS_STAND.STAND_CODE,' ','') like REPLACE( concat('%', #{standCode}, '%'),' ','') and ( @@ -465,9 +477,27 @@ and DATE_FORMAT(issue_time,'%Y-%m-%D') >= #{issueTime1} - -- and to_char(issue_time,'YYYY-MM-DD') <= #{issueTime2} and DATE_FORMAT(issue_time,'%Y-%m-%D') <= #{issueTime2} + + + + + and DATE_FORMAT(put_time,'%Y-%m-%d') >= #{startPutTime} + + + and DATE_FORMAT(put_time,'%Y-%m-%d') <= #{endPutTime} + + + and DATE_FORMAT(issue_time,'%Y-%m-%d') >= #{startIssueTime} + + + and DATE_FORMAT(issue_time,'%Y-%m-%d') <= #{endIssueTime} + + + + + and SAR_BUSS_STAND_MENU.MENU_ID in @@ -719,12 +749,13 @@ @@ -36,6 +35,7 @@ resultType="com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation"> SELECT + DISTINCT UNAME AS userName, score, reason, @@ -48,13 +48,20 @@ `index`.one_index_title as oneIndexTitle, `index`.two_index_title as twoIndexTitle, `index`.three_index_title as threeIndexTitle, - `index`.weight as weight + `index`.weight as weight, + `index`.index_sort FROM quality_evaluation LEFT JOIN ts_user `user` ON quality_evaluation.user_id = `user` .USID LEFT JOIN evaluation_index AS `index` ON `index`.id = quality_evaluation.evaluation_index ${ew.customSqlSegment} - + AND create_time IN ( + SELECT + MAX(create_time) + FROM + quality_evaluation + ${ew.customSqlSegment} + ) ORDER BY `index`.index_sort 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 5e8f9d90..fdf3da7b 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 @@ -35,6 +35,26 @@ WHERE parent_id=#{institutionId} + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index 5d0c2271..9c185c3e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -63,6 +63,29 @@ ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml index 1f4b15bd..8cea401f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml @@ -29,7 +29,7 @@ FROM warning_date WHERE - DATE_FORMAT(SSRQ, '%Y-%m-%d') > DATE_FORMAT(now(), '%Y-%m-%d') + DATE_FORMAT(SSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') ) OR @@ -39,7 +39,7 @@ FROM warning_date WHERE - DATE_FORMAT(SSRQ, '%Y-%m-%d') > DATE_FORMAT(now(), '%Y-%m-%d') + DATE_FORMAT(SSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') ) @@ -79,12 +79,15 @@ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 1e82d62d..4a7f892f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -30,6 +30,7 @@ + @@ -75,6 +76,7 @@ SAR_STANDARDS_INFO.STAND_SYSTEM, SAR_STANDARDS_INFO.IS_RELATE_ACCESS, SAR_STAND_ATTR_INFO.CHJL AS CHJL, + SAR_STAND_ATTR_INFO.DTBJH AS DTBZH, dicstandSort.DIC_TYPE_NAME AS standSortShow, dicstandTextStatus.DIC_TYPE_NAME AS standTextStatusShow, ( @@ -1717,4 +1719,34 @@ ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml index b5e3c5f8..47413212 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml @@ -75,4 +75,13 @@ ) + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml index b63aa9be..a24f29f9 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml @@ -68,7 +68,7 @@ SAR_FILE_SPLIT_ITEMS.fo,SAR_FILE_SPLIT_ITEMS.duty_engineer, SAR_FILE_SPLIT_ITEMS.claim_type, SAR_FILE_SPLIT_ITEMS.bus_stand_cover,SAR_FILE_SPLIT_ITEMS.file_type,SAR_FILE_SPLIT_ITEMS.responsible_unit, TS_ORG.org_name as responsibleUnitShow, dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.NAME as - dutyEngineerShow,tsFo.NAME as foShow + dutyEngineerShow,tsFo.NAME as foShow,SAR_FILE_SPLIT_ITEMS.work_flow_show AS workFlowShow @@ -211,6 +211,7 @@ claim_type, bus_stand_cover, file_type, + work_flow_show, responsible_unit @@ -233,12 +234,13 @@ #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, - #{editFlag,jdbcType=VARCHAR} + #{editFlag,jdbcType=VARCHAR}, #{fo, jdbcType=VARCHAR}, #{dutyEngineer, jdbcType=VARCHAR}, #{claimType, jdbcType=VARCHAR}, #{busStandCover, jdbcType=VARCHAR}, #{fileType, jdbcType=VARCHAR}, + #{workFlowShow, jdbcType=VARCHAR}, #{responsibleUnit, jdbcType=VARCHAR} @@ -350,6 +352,9 @@ responsible_unit = #{responsibleUnit}, + + work_flow_show = #{workFlowShow}, + where id = #{id} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml index 430e0e6c..ae5b1047 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml @@ -258,7 +258,7 @@ - select from (select tmp_tb.* from (select from SAR_STAND_COMPARE_HIS 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 index 97768a6b..f7f5dd81 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml @@ -11,13 +11,11 @@ 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 index fde7c4e7..5c94098d 100644 --- 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 @@ -45,6 +45,10 @@ select * from wg_work_group where wg_work_group.pid = #{data} and wg_work_group.status = #{status} + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml new file mode 100644 index 00000000..9376f2d6 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java index 3f1560e4..e58f8e60 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java @@ -340,8 +340,10 @@ public class DicTypeEORestController extends BaseController { @GetMapping("/getDicTypeListCode") //@RequiresPermissions("sys:dicType:getDicTypeListCode") public ResponseMessage> getDicTypeListCode() throws Exception { - Map dicTypeEO = dicTypeEOService.getDicTypeListCode(); - return Result.success(dicTypeEO); + + return Result.success("1","hello"); +// Map dicTypeEO = dicTypeEOService.getDicTypeListCode(); +// return Result.success(dicTypeEO); } /** diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java index 98c3ccaf..a8b96227 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java @@ -97,7 +97,7 @@ public class DicTypeEOServiceImpl extends ServiceImpl im @Override public Integer saveDictype(DicTypeEO dicTypeEO){ // 此处存在问题， 当当前参数为标准类别时需要输入的code为name值 - if(StringUtils.isNotEmpty(dicTypeEO.getDicId()) && !"JKSADFH564S".equals(dicTypeEO.getDicId())){ + if(StringUtils.isNotEmpty(dicTypeEO.getDicId()) && !"JKSADFH564S".equals(dicTypeEO.getDicId()) && !"NGETEMDJDI".equals(dicTypeEO.getDicId()) ){ if(!StringUtils.isNotEmpty(dicTypeEO.getDicTypeCode())){ dicTypeEO.setDicTypeCode(UUIDUtils.randomUUID10()); } diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml index 8cc364d0..af630bc2 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml @@ -602,6 +602,11 @@ FROM TS_DICTYPE + + + ${item} is not NULL + +