From 5cd7e4310b1001072f0ea73420b7c4dd4abe0fcb Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 4 Apr 2023 10:25:33 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=BC=96=E5=8F=B7=20?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=80=BC=20=E5=8A=A01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/login/security/WebMvcConfig.java | 3 +-- .../controller/SarBussionessStandController.java | 6 ++++++ .../dao/SarBussionessStandDao.java | 2 ++ .../service/ISarBussionessStandService.java | 2 ++ .../service/impl/SarBussionessStandServiceImpl.java | 13 +++++++++++++ .../sarBussionessStand/SarBussionessStandMapper.xml | 4 ++++ 6 files changed, 28 insertions(+), 2 deletions(-) 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 74df1e57..471cd64b 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 @@ -115,8 +115,7 @@ public class WebMvcConfig implements WebMvcConfigurer { //企业标准导出 addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/exportSarBussionessStand"); - addInterceptor.excludePathPatterns("/api/lawss/sarFileSplitItems/exportTemplate"); - + addInterceptor.excludePathPatterns("/api/lawss/sarFileSplitItems/exportTemplate"); //预警导出 addInterceptor.excludePathPatterns("/api/sys/EarlyWarning/exportWarning"); 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 175047ca..a0ed8143 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 @@ -511,5 +511,11 @@ public class SarBussionessStandController extends BaseController { @Select("select * from sar") String setDtqbbhbuss(String dtqbbhbuss); + + String selectMaxStandnSn(); } 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 25a366cb..4df42144 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 @@ -63,5 +63,7 @@ public interface ISarBussionessStandService extends IService ResponseMessage repetitionFile(); ResponseMessage newRpetitionFile(); + + ResponseMessage selectMaxStandnSn(); } 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 96b0ebfb..4313ce01 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 @@ -4311,6 +4311,19 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList,String standId,String attfId) { //重复的集合 List chongfu = new ArrayList<>(); 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 365a62f4..0eac68be 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 @@ -1254,4 +1254,8 @@ update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile} where id = #{attfId} + + From c038fae038e0d3bef1b3cf36d02cc85dbc2e8cca Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 4 Apr 2023 11:44:31 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=BC=96=E5=8F=B7=20?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=80=BC=20=E5=8A=A01=20=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C=E4=BC=81=E6=A0=87=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=8F=AF=E4=BB=A5=E9=87=8D=E5=A4=8D=EF=BC=88=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D=E4=B9=9F?= =?UTF-8?q?=E6=98=AF=E6=96=B0=E5=A2=9E=E4=B8=80=E6=9D=A1=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=81=9A=E8=A6=86=E7=9B=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkFlowController.java | 318 +++++++++--------- .../service/impl/EsRevisePlanServiceImpl.java | 8 +- .../sarBussStandSn/dao/SarBussStandSnDao.java | 1 + .../service/ISarBussStandSnService.java | 3 + .../impl/SarBussStandSnServiceImpl.java | 5 + .../dao/SarBussionessStandDao.java | 1 - .../impl/SarBussionessStandServiceImpl.java | 2 +- .../sarBussStandSn/SarBussStandSnMapper.xml | 4 + .../SarBussionessStandMapper.xml | 3 - 9 files changed, 176 insertions(+), 169 deletions(-) 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 6c5786cd..30cc6c3b 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 @@ -101,12 +101,12 @@ public class WorkFlowController { InputStream inputStream = null; HttpURLConnection conn = null; response.reset(); - File file = new File(downloadUrl+modelHisOne.getEditFilePath()); + File file = new File(downloadUrl + modelHisOne.getEditFilePath()); - if(file.exists()){ + if (file.exists()) { try { - String fileOldName = fileNameEncoding(oldFileName,request); - response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); + String fileOldName = fileNameEncoding(oldFileName, request); + response.setHeader("Content-Disposition", "attachment;filename=\"" + fileOldName + "\""); response.setContentType("application/octet-stream"); inputStream = new FileInputStream(file); os = response.getOutputStream(); @@ -118,13 +118,13 @@ public class WorkFlowController { org.apache.commons.io.IOUtils.closeQuietly(inputStream); org.apache.commons.io.IOUtils.closeQuietly(os); } - }else { + } else { URL url; try { - String fileOldName = fileNameEncoding(oldFileName,request); - response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); + String fileOldName = fileNameEncoding(oldFileName, request); + response.setHeader("Content-Disposition", "attachment;filename=\"" + fileOldName + "\""); response.setContentType("application/octet-stream"); - url = new URL(downloadUrl+modelHisOne.getEditFilePath()); + url = new URL(downloadUrl + modelHisOne.getEditFilePath()); conn = (HttpURLConnection) url.openConnection(); // 设置超时间为5秒 conn.setConnectTimeout(3 * 1000); @@ -153,13 +153,13 @@ public class WorkFlowController { } /** + * @return java.lang.String * @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 { + public String fileNameEncoding(String fileName, HttpServletRequest request) throws IOException { String agent = request.getHeader("User-Agent"); if (agent.contains("Firefox")) { /*BASE64Encoder base64Encoder = new BASE64Encoder(); @@ -169,21 +169,21 @@ public class WorkFlowController { } else { fileName = URLEncoder.encode(fileName, "utf-8"); //谷歌中空格变为+问题 - fileName = fileName.replaceAll("\\+","%20"); + fileName = fileName.replaceAll("\\+", "%20"); } return fileName; } @ApiOperation(value = "存储在线编辑文件") @GetMapping("/saveEditFile") - public BusProcessModelHis saveEditFile(String model){ - return workFlowFeignClient.saveEditFile(model); + public BusProcessModelHis saveEditFile(String model) { + return workFlowFeignClient.saveEditFile(model); } @ApiOperation(value = "查询在线编辑流程汇总文件编辑对象") @GetMapping("/processEditFile") - public BusProcessModelHis processEditFile(@RequestParam("id") String id){ - return workFlowFeignClient.processEditFile(id); + public BusProcessModelHis processEditFile(@RequestParam("id") String id) { + return workFlowFeignClient.processEditFile(id); } @ApiOperation(value = "手机获取token") @@ -191,14 +191,14 @@ public class WorkFlowController { @ResponseBody public ResponseMessage loginMobile(String taskIds, String pId) throws UnsupportedEncodingException { BusProcessNew busProcessNew = workFlowFeignClient.queryDetail(taskIds); - if(busProcessNew == null || StringUtils.isBlank(busProcessNew.getUserId())){ + if (busProcessNew == null || StringUtils.isBlank(busProcessNew.getUserId())) { return Result.error("r0011", "用户不存在"); } TsUser userEO = userService.getById(busProcessNew.getUserId()); if (null == userEO) { return Result.error("r0011", "用户不存在"); } - if(userEO.getDisableFlag().equals("1")){ + if (userEO.getDisableFlag().equals("1")) { return Result.error("r0011", "帐号已禁用"); } String token = jwtUtils.generateToken(userEO.getUserId()); @@ -206,78 +206,77 @@ public class WorkFlowController { // 加密重要信息 BASE64Encoder encoder = new BASE64Encoder(); String userStr = JSON.toJSONString(userEO); - String userStr2 = URLEncoder.encode(userStr,"UTF-8"); + String userStr2 = URLEncoder.encode(userStr, "UTF-8"); userStr = encoder.encode(userStr2.getBytes()); return Result.success(userStr); } - @ApiOperation(value = "查询在线编辑流程汇总文件编辑对象") @GetMapping("/processModelHisOneCount") - public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid){ - return workFlowFeignClient.processModelHisOneCount(pid); + public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid) { + return workFlowFeignClient.processModelHisOneCount(pid); } @ApiOperation(value = "更新在线编辑流程当前节点编辑状态") @GetMapping("/processModelHisOneUpd") - public BusProcessModelHis processModelHisOneUpd(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ - return workFlowFeignClient.processModelHisOneUpdStatus(pid,taskId); + public BusProcessModelHis processModelHisOneUpd(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId) { + return workFlowFeignClient.processModelHisOneUpdStatus(pid, taskId); } @ApiOperation(value = "查询在线编辑流程当前节点编辑对象") @GetMapping("/processModelHisOne") - public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ - return workFlowFeignClient.processModelHisOne(pid,taskId); + public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId) { + return workFlowFeignClient.processModelHisOne(pid, taskId); } @ApiOperation(value = "根据pid 节点信息查询") @GetMapping("/evaluationHisListByOne") - public BusProcessEvaluationHis evaluationHisListByOne(@RequestParam("pid") String pid,@RequestParam("taskInfo") String taskInfo){ - return workFlowFeignClient.evaluationHisListByOne(pid,taskInfo); + public BusProcessEvaluationHis evaluationHisListByOne(@RequestParam("pid") String pid, @RequestParam("taskInfo") String taskInfo) { + return workFlowFeignClient.evaluationHisListByOne(pid, taskInfo); } @ApiOperation(value = "查询流程父节点所有评分(去重)返回节点评分总数") @GetMapping("/evaluationHisListRepSum") - public Map evaluationHisListRepSum(@RequestParam("pid") String pid){ - return workFlowFeignClient.evaluationHisListRepSum(pid); + public Map evaluationHisListRepSum(@RequestParam("pid") String pid) { + return workFlowFeignClient.evaluationHisListRepSum(pid); } @ApiOperation(value = "查询流程父节点所有评分(去重)") @GetMapping("/evaluationHisListRep") - public List evaluationHisListRep(@RequestParam("pid") String pid){ - return workFlowFeignClient.evaluationHisListRep(pid); + public List evaluationHisListRep(@RequestParam("pid") String pid) { + return workFlowFeignClient.evaluationHisListRep(pid); } @ApiOperation(value = "查询流程父节点所有评分") @GetMapping("/evaluationHisList") - public List evaluationHisList(@RequestParam("pid") String pid){ - return workFlowFeignClient.evaluationHisList(pid); + public List evaluationHisList(@RequestParam("pid") String pid) { + return workFlowFeignClient.evaluationHisList(pid); } @ApiOperation(value = "干活流程接收待办") @GetMapping("/execTask") - public Map execTask(@RequestParam("todoId") String todoId){ - return workFlowFeignClient.execTask(todoId); + public Map execTask(@RequestParam("todoId") String todoId) { + return workFlowFeignClient.execTask(todoId); } @ApiOperation(value = "管控流程接收任务") @GetMapping("/acceptTack") public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId) { sarAgenldAcceptButtonService.add(taskId); - return workFlowFeignClient.acceptTack(nowEsId,oaFlag,taskId); + return workFlowFeignClient.acceptTack(nowEsId, oaFlag, taskId); } @ApiOperation(value = "管控流程判断接收任务") @GetMapping("/judgeAcceptTack") public ResponseMessage judgeAcceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk) { - return Result.success(workFlowFeignClient.judgeAcceptTack(nowEsId,oaFlag,prcIdGk)); + return Result.success(workFlowFeignClient.judgeAcceptTack(nowEsId, oaFlag, prcIdGk)); } @ApiOperation(value = "流程实例明细验证是否完成") @GetMapping("/get_verify_by_instance") - public Map activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ - return workFlowFeignClient.get_verify_by_instance(taskId,pId); + public Map activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId) { + return workFlowFeignClient.get_verify_by_instance(taskId, pId); } @ApiOperation(value = "导出excel") @@ -288,7 +287,7 @@ public class WorkFlowController { // if(exportExcel==null||exportExcel.getJson()==null)return; // ExportExcelEO exportExcelEO=JSON.parseObject(exportExcel.getJson(),ExportExcelEO.class); - if(exportExcelEO.getFileName()==null||exportExcelEO.getFileName().trim().length()==0){ + if (exportExcelEO.getFileName() == null || exportExcelEO.getFileName().trim().length() == 0) { exportExcelEO.setFileName(UUID.fastUUID().toString(true)); } List> dataList = exportExcelEO.getDataList().stream() @@ -319,77 +318,77 @@ public class WorkFlowController { // } - @ApiOperation(value = "启动流程-以流程定义id") @GetMapping("/activiti_define_start") - public ResponseMessage activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam(value = "bpnId",required = false) String bpnId){ - return workFlowFeignClient.activiti_define_start(id,userId,bpnId); + public ResponseMessage activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam(value = "bpnId", required = false) String bpnId) { + return workFlowFeignClient.activiti_define_start(id, userId, bpnId); } @ApiOperation(value = "启动流程-以流程定义id") @GetMapping("/activiti_define_start_rollBack") public ResponseMessage activiti_define_start_rollBack(@RequestParam("id") String id, @RequestParam("userId") String userId, - @RequestParam(value = "bpnId",required = false) String bpnId,@RequestParam(value = "json",required = false)String json){ - return workFlowFeignClient.activiti_define_start_rollBack(id,userId,bpnId,json); + @RequestParam(value = "bpnId", required = false) String bpnId, @RequestParam(value = "json", required = false) String json) { + return workFlowFeignClient.activiti_define_start_rollBack(id, userId, bpnId, json); } + @ApiOperation(value = "启动流程-以流程定义id") @GetMapping("/activiti_define_start1") - public Map activiti_define_start1(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("standName") String standName){ - return workFlowFeignClient.activiti_define_start1(id,userId,standName); + public Map activiti_define_start1(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("standName") String standName) { + return workFlowFeignClient.activiti_define_start1(id, userId, standName); } @ApiOperation(value = "启动流程-以流程定义id") @GetMapping("/startProcess") - public ResponseMessage startProcess(@RequestParam("type") String type, @RequestParam(value="id",required = false) String id){ - if(StringUtils.isNotBlank(type)){ - return this.activiti_define_start(ActDefineStartMap.actDefineStartMap(type), LoginUserUtil.getUserId(),id); - }else { + public ResponseMessage startProcess(@RequestParam("type") String type, @RequestParam(value = "id", required = false) String id) { + if (StringUtils.isNotBlank(type)) { + return this.activiti_define_start(ActDefineStartMap.actDefineStartMap(type), LoginUserUtil.getUserId(), id); + } else { return null; } } @ApiOperation(value = "启动流程-以流程定义id-加上草稿内容（为了实现撤回）") @PostMapping("/startProcessRollBack") - public ResponseMessage startProcessRollBack(ProcessRollBackEO processRollBackEO){ - if(StringUtils.isNotBlank(processRollBackEO.getType())){ - return this.activiti_define_start_rollBack(ActDefineStartMap.actDefineStartMap(processRollBackEO.getType()), LoginUserUtil.getUserId(),processRollBackEO.getId(),processRollBackEO.getJson()); - }else { + public ResponseMessage startProcessRollBack(ProcessRollBackEO processRollBackEO) { + if (StringUtils.isNotBlank(processRollBackEO.getType())) { + return this.activiti_define_start_rollBack(ActDefineStartMap.actDefineStartMap(processRollBackEO.getType()), LoginUserUtil.getUserId(), processRollBackEO.getId(), processRollBackEO.getJson()); + } else { return null; } } @ApiOperation(value = "定时任务启动流程-以流程定义id") @GetMapping("/startProcessNew") - public ResponseMessage startProcessNew(@RequestParam("type") String type, @RequestParam(value="userId",required = false) String userId, @RequestParam(value="id",required = false) String id){ - if(StringUtils.isNotBlank(type)){ - return this.activiti_define_start(ActDefineStartMap.actDefineStartMap(type), userId,id); - }else { + public ResponseMessage startProcessNew(@RequestParam("type") String type, @RequestParam(value = "userId", required = false) String userId, @RequestParam(value = "id", required = false) String id) { + if (StringUtils.isNotBlank(type)) { + return this.activiti_define_start(ActDefineStartMap.actDefineStartMap(type), userId, id); + } else { return null; } } @ApiOperation(value = "待办任务详情") - @GetMapping("/todotask") - public PageInfo todotask(@RequestParam("userId") String userId, @RequestParam("pId") String pId){ + @GetMapping("/todotask") + public PageInfo todotask(@RequestParam("userId") String userId, @RequestParam("pId") String pId) { workFlowFeignClient.todotask(userId, pId); return null; } @ApiOperation(value = "详情") @GetMapping("/queryDetail") - public BusProcessNew queryDetail(@RequestParam("taskIds") String taskIds){ + public BusProcessNew queryDetail(@RequestParam("taskIds") String taskIds) { return workFlowFeignClient.queryDetail(taskIds); } @ApiOperation(value = "入库联络人详情") @GetMapping("/inboundLiaisonDetail") public BusProcessNew inboundLiaisonDetail(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId) { - return workFlowFeignClient.inboundLiaisonDetail(taskIds,pId); + return workFlowFeignClient.inboundLiaisonDetail(taskIds, pId); } @ApiOperation(value = "入库联络人详情") @GetMapping("/nonconformity") - public String nonconformity(@RequestParam("taskIds") String taskIds){ + public String nonconformity(@RequestParam("taskIds") String taskIds) { return workFlowFeignClient.nonconformity(taskIds); } @@ -443,7 +442,7 @@ public class WorkFlowController { @ApiOperation(value = "企标制修订评估详情") @GetMapping("/qbzxdpgDetail") - public String qbzxdpgDetail(@RequestParam("taskIds")String taskIds){ + public String qbzxdpgDetail(@RequestParam("taskIds") String taskIds) { return workFlowFeignClient.qbzxdpgDetail(taskIds); } @@ -461,64 +460,65 @@ public class WorkFlowController { @ApiOperation(value = "保存任务") @PostMapping("/saveTask") - public Wrapper saveTask(@RequestBody BusMes busMes){ + public Wrapper saveTask(@RequestBody BusMes busMes) { return workFlowFeignClient.saveTask(busMes); } @ApiOperation(value = "行政管理要求评估流程保存") @PostMapping("/saveTaskForXZYQ") - public Wrapper saveTaskForXZYQ(BusMes busMes){ + public Wrapper saveTaskForXZYQ(BusMes busMes) { return workFlowFeignClient.saveTaskForXZYQ(busMes); } /** * 复审流程使用 + * * @param busMes * @return */ - @ApiOperation(value = "保存到代办") + @ApiOperation(value = "保存到代办") @PostMapping("/autoSaveFirst1") - public Wrapper autoSaveFirst1(@RequestBody BusMes busMes){ + public Wrapper autoSaveFirst1(@RequestBody BusMes busMes) { return workFlowFeignClient.autoSaveFirst1(busMes); } @ApiOperation(value = "改派") @GetMapping("/changeAssigneeNew") - public Wrapper run(@RequestParam("taskId")String taskId, @RequestParam("assignee") String assignee, - @RequestParam("userId")String userId, @RequestParam("pId") String pId) { - return workFlowFeignClient.run(taskId,assignee,userId,pId); + public Wrapper run(@RequestParam("taskId") String taskId, @RequestParam("assignee") String assignee, + @RequestParam("userId") String userId, @RequestParam("pId") String pId) { + return workFlowFeignClient.run(taskId, assignee, userId, pId); } @ApiOperation(value = "我的已办任务列表") @PostMapping("/hastodoTasksList") - public Wrapper> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery){ + public Wrapper> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery) { return workFlowFeignClient.HastodoTasksListByUserId(taskCommonQuery); } @ApiOperation(value = "我的待办任务列表") @PostMapping("/todoTaskList") - public PageInfo todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery){ + public PageInfo todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery) { List busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); - PageInfo pageInfo= new PageInfo(); - if(busProcessNames!=null){ + PageInfo pageInfo = new PageInfo(); + if (busProcessNames != null) { pageInfo.setList(list1); pageInfo.setPageNo(taskCommonQuery.getCurrent()); pageInfo.setCount(Long.valueOf(busProcessNames.size())); pageInfo.setPageSize(taskCommonQuery.getSize()); - }else{ + } else { List list = new ArrayList<>(); pageInfo.setList(list); pageInfo.setPageNo(taskCommonQuery.getCurrent()); pageInfo.setCount(Long.valueOf(0)); pageInfo.setPageSize(taskCommonQuery.getSize()); } - for (BusProcessName data : pageInfo.getList()){ - if(StringUtils.isNotBlank(data.getTaskIds())){ + for (BusProcessName data : pageInfo.getList()) { + if (StringUtils.isNotBlank(data.getTaskIds())) { String s = sarAgenldAcceptButtonService.selectIsNot(data.getTaskIds()); - if(s.equals("1")){ + if (s.equals("1")) { data.setShowreceive(false); - }else { + } else { data.setShowreceive(true); } } @@ -528,16 +528,16 @@ public class WorkFlowController { @ApiOperation(value = "我的待办任务列表") @PostMapping("/todoTaskListNew") - public PageInfo todoTaskListNew(@RequestBody TaskCommonQuery taskCommonQuery){ + public PageInfo todoTaskListNew(@RequestBody TaskCommonQuery taskCommonQuery) { List busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); - PageInfo pageInfo= new PageInfo(); - if(busProcessNames!=null){ + PageInfo pageInfo = new PageInfo(); + if (busProcessNames != null) { pageInfo.setList(list1); pageInfo.setPageNo(taskCommonQuery.getCurrent()); pageInfo.setCount(Long.valueOf(busProcessNames.size())); pageInfo.setPageSize(taskCommonQuery.getSize()); - }else{ + } else { List list = new ArrayList<>(); pageInfo.setList(list); pageInfo.setPageNo(taskCommonQuery.getCurrent()); @@ -549,9 +549,9 @@ public class WorkFlowController { @ApiOperation(value = "完成任务") @PostMapping("/completeTask") - public Wrapper completeTaskByUserId( BusMes busMes){ + public Wrapper completeTaskByUserId(BusMes busMes) { Wrapper str = workFlowFeignClient.completeTaskByUserId(busMes); - if(str.getCode() == 500){ + if (str.getCode() == 500) { str.setSuccess(false); } return str; @@ -559,9 +559,9 @@ public class WorkFlowController { @ApiOperation(value = "特殊完成任务节点 会更·改草稿") @PostMapping("/completeTaskNew") - public Wrapper completeTaskByUserIdNew( BusMesSpecial busMes){ + public Wrapper completeTaskByUserIdNew(BusMesSpecial busMes) { Wrapper str = workFlowFeignClient.completeTaskByUserIdNew(busMes); - if(str.getCode() == 500){ + if (str.getCode() == 500) { str.setSuccess(false); } return str; @@ -569,90 +569,90 @@ public class WorkFlowController { @ApiOperation(value = "保存标准入库流程") @PostMapping("/saveinboundTask") - public Wrapper saveinboundTask(BusMes busMes){ + public Wrapper saveinboundTask(BusMes busMes) { return workFlowFeignClient.saveinboundTask(busMes); } @ApiOperation(value = "整改流程保存") @PostMapping("/saveUnqualified") - public Wrapper saveUnqualified(BusMes busMes){ + public Wrapper saveUnqualified(BusMes busMes) { return workFlowFeignClient.saveUnqualified(busMes); } @ApiOperation(value = "国内法规入库技术评估流程保存") @PostMapping("/saveInboundLiaisonDetailForLawsAss") - public Wrapper saveInboundLiaisonDetailForLawsAss(BusMes busMes){ + public Wrapper saveInboundLiaisonDetailForLawsAss(BusMes busMes) { return workFlowFeignClient.saveInboundLiaisonDetailForLawsAss(busMes); } @ApiOperation(value = "国内法规入库项目评估流程保存") @PostMapping("/saveProjectAssessDetail2") - public Wrapper saveProjectAssessDetail2(BusMes busMes){ + public Wrapper saveProjectAssessDetail2(BusMes busMes) { return workFlowFeignClient.saveProjectAssessDetail2(busMes); } @ApiOperation(value = "国内法规入库项目评估流程保存") @PostMapping("/saveProjectAssessDetail3") - public Wrapper saveProjectAssessDetail3(BusMes busMes){ + public Wrapper saveProjectAssessDetail3(BusMes busMes) { return workFlowFeignClient.saveProjectAssessDetail3(busMes); } @ApiOperation(value = "国内法规入库项目评估流程保存") @PostMapping("/saveProjectAssessDetail4") - public Wrapper saveProjectAssessDetail4(BusMes busMes){ + public Wrapper saveProjectAssessDetail4(BusMes busMes) { return workFlowFeignClient.saveProjectAssessDetail4(busMes); } @ApiOperation(value = "国内法规入库项目评估流程保存") @PostMapping("/saveProjectAssessDetail5") - public Wrapper saveProjectAssessDetail5(BusMes busMes){ + public Wrapper saveProjectAssessDetail5(BusMes busMes) { return workFlowFeignClient.saveProjectAssessDetail5(busMes); } @ApiOperation(value = "政策法规评估流程保存") @PostMapping("/saveZcfgpg") - public Wrapper saveZcfgpg(BusMes busMes){ + public Wrapper saveZcfgpg(BusMes busMes) { return workFlowFeignClient.saveZcfgpg(busMes); } @ApiOperation(value = "国内法规入库评估流程保存") @PostMapping("/saveTaskForPub") - public Wrapper saveTaskForPub(BusMes busMes){ + public Wrapper saveTaskForPub(BusMes busMes) { return workFlowFeignClient.saveTaskForPub(busMes); } @ApiOperation(value = "保存任务第一步") @PostMapping("/saveTaskFirst") - public Wrapper saveTaskFirst(BusMes busMes){ + public Wrapper saveTaskFirst(BusMes busMes) { return workFlowFeignClient.saveTaskFirst(busMes); } @ApiOperation(value = "查询任务第一步") @GetMapping("/queryTaskFirst") - public BusProcessName queryTaskFirst(@RequestParam("bpnId")String bpnId) { + public BusProcessName queryTaskFirst(@RequestParam("bpnId") String bpnId) { return workFlowFeignClient.queryTaskFirst(bpnId); } @ApiOperation(value = "查询taskid任务") @GetMapping("/queryTaskIndex") - public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId,@RequestParam("taskIds") String taskIds){ - return workFlowFeignClient.queryTaskIndex(prcId,taskIds); + public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId, @RequestParam("taskIds") String taskIds) { + return workFlowFeignClient.queryTaskIndex(prcId, taskIds); } @ApiOperation(value = "查询草稿") @PostMapping("/queryTaskDraft") - public PageInfo queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery){ + public PageInfo queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery) { List busProcessNames = workFlowFeignClient.queryTaskDraft(taskCommonQuery); List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); - PageInfo pageInfo= new PageInfo(); - if(busProcessNames!=null){ + PageInfo pageInfo = new PageInfo(); + if (busProcessNames != null) { pageInfo.setList(list1); pageInfo.setPageNo(taskCommonQuery.getCurrent()); pageInfo.setCount(Long.valueOf(busProcessNames.size())); pageInfo.setPageSize(taskCommonQuery.getSize()); - }else{ + } else { List list = new ArrayList(); pageInfo.setList(list); pageInfo.setPageNo(taskCommonQuery.getCurrent()); @@ -664,33 +664,33 @@ public class WorkFlowController { @ApiOperation(value = "定时任务发起流程") @PostMapping("/autoSaveFirst") - public Wrapper autoSaveFirst(@RequestBody BusMes busMes){ + public Wrapper autoSaveFirst(@RequestBody BusMes busMes) { return workFlowFeignClient.autoSaveFirst(busMes); } @ApiOperation(value = "查询流程是否结束") @GetMapping("/isEnd") - public String isEnd(@RequestParam("pId")String pId){ + public String isEnd(@RequestParam("pId") String pId) { return workFlowFeignClient.isEnd(pId); } @ApiOperation(value = "删除流程") @GetMapping("/deleteProcessInstance") - public Wrapper deleteProcessInstance(@RequestParam("pId")String pId){ + public Wrapper deleteProcessInstance(@RequestParam("pId") String pId) { return workFlowFeignClient.deleteProcessInstance(pId); } @ApiOperation(value = "删除草稿") @GetMapping("/deleteDraft") - public Wrapper deleteDraft(@RequestParam("id")String id){ + public Wrapper deleteDraft(@RequestParam("id") String id) { return workFlowFeignClient.deleteDraft(id); } @ApiOperation(value = "已发流程") @PostMapping("/IssuedProcess") - public PageInfo IssuedProcess(@RequestBody TaskCommonQuery taskCommonQuery){ + public PageInfo IssuedProcess(@RequestBody TaskCommonQuery taskCommonQuery) { Page page = workFlowFeignClient.issuedProcess(taskCommonQuery); - PageInfo pageInfo= new PageInfo(); + PageInfo pageInfo = new PageInfo(); pageInfo.setList(page.getList()); pageInfo.setPageNo(taskCommonQuery.getCurrent()); pageInfo.setCount(Long.valueOf(page.getCount())); @@ -700,9 +700,9 @@ public class WorkFlowController { @ApiOperation(value = "已办流程") @PostMapping("/doneProcess") - public PageInfo doneProcess(@RequestBody TaskCommonQuery taskCommonQuery){ + public PageInfo doneProcess(@RequestBody TaskCommonQuery taskCommonQuery) { Page page = workFlowFeignClient.doneProcess(taskCommonQuery); - PageInfo pageInfo= new PageInfo(); + PageInfo pageInfo = new PageInfo(); pageInfo.setList(page.getList()); pageInfo.setPageNo(page.getPageNo()); pageInfo.setCount(page.getCount()); @@ -712,8 +712,9 @@ public class WorkFlowController { /** * 开始分页 + * * @param list - * @param pageNum 页码 + * @param pageNum 页码 * @param pageSize 每页多少条数据 * @return */ @@ -752,19 +753,19 @@ public class WorkFlowController { @ApiOperation(value = "流程实例明细列表") @GetMapping("/get_list_by_instance") - public List> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ - return workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu); + public List> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value = "sortWord", required = false) String sortWord, @RequestParam(value = "shunxu", required = false) String shunxu) { + return workFlowFeignClient.get_list_by_instance(prcNum, sortWord, shunxu); } @ApiOperation(value = "流程实例汇总列表") @GetMapping("/get_gather_by_instance") - public List> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ - return workFlowFeignClient.get_gather_by_instance(prcNum,sortWord,shunxu); + public List> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value = "sortWord", required = false) String sortWord, @RequestParam(value = "shunxu", required = false) String shunxu) { + return workFlowFeignClient.get_gather_by_instance(prcNum, sortWord, shunxu); } @ApiOperation(value = "获取图片") @GetMapping("/getImg") - public void getImg(@RequestParam("prcNum")String prcNum, HttpServletResponse response) throws IOException { + public void getImg(@RequestParam("prcNum") String prcNum, HttpServletResponse response) throws IOException { OutputStream os = null; response.setContentType("image/jpg"); response.flushBuffer(); @@ -776,11 +777,11 @@ public class WorkFlowController { @ApiOperation(value = "监控流程列表") @PostMapping("/allProcess") - public PageInfo allProcess(@RequestBody TaskCommonQuery taskCommonQuery){ - Page page= workFlowFeignClient.allProcess(taskCommonQuery); - PageInfo pageInfo= new PageInfo(); + public PageInfo allProcess(@RequestBody TaskCommonQuery taskCommonQuery) { + Page page = workFlowFeignClient.allProcess(taskCommonQuery); + PageInfo pageInfo = new PageInfo(); pageInfo.setPageNo(taskCommonQuery.getCurrent()); - pageInfo.setList(page.getList() == null ? new ArrayList<>():page.getList()); + pageInfo.setList(page.getList() == null ? new ArrayList<>() : page.getList()); pageInfo.setCount(page.getCount() == null ? 0 : page.getCount()); pageInfo.setPageSize(page.getPageSize() == null ? 0 : page.getPageSize()); return pageInfo; @@ -801,25 +802,25 @@ public class WorkFlowController { response.setContentType("application/force-download"); ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.XSSF); - List> list = workFlowFeignClient.get_list_by_instance(prcNum,null,null); - List exportDatas=new ArrayList<>(); + List> list = workFlowFeignClient.get_list_by_instance(prcNum, null, null); + List exportDatas = new ArrayList<>(); List listId = Arrays.asList(idAndSartypeList.split(",")); - for(Map map:list){ - for(String id:listId){ - if(id.equals(map.get("id").toString())){ - if(map.get("endTime")!=null){ - map.put("flag","已完成"); - }else{ - map.put("flag","未完成"); + for (Map map : list) { + for (String id : listId) { + if (id.equals(map.get("id").toString())) { + if (map.get("endTime") != null) { + map.put("flag", "已完成"); + } else { + map.put("flag", "未完成"); } - if(map.get("comment")!=null && !map.get("comment").toString().equals("")){ + if (map.get("comment") != null && !map.get("comment").toString().equals("")) { String comment = map.get("comment").toString(); - switch (comment){ + switch (comment) { case "0": - map.put("comment","同意"); + map.put("comment", "同意"); break; case "1": - map.put("comment","不同意"); + map.put("comment", "不同意"); break; default: } @@ -846,56 +847,56 @@ public class WorkFlowController { @ApiOperation(value = "强制撤回") @GetMapping("/forceRecall") - public Wrapper forceRecall(@RequestParam("prcId") String prcId){ + public Wrapper forceRecall(@RequestParam("prcId") String prcId) { return workFlowFeignClient.forceRecall(prcId); } @ApiOperation(value = "流程分类列表") @GetMapping("/categoryList") - public Wrapper> categoryList(){ + public Wrapper> categoryList() { return workFlowFeignClient.categoryList(); } @ApiOperation(value = "添加流程分类") @PostMapping("/addCategory") - public Wrapper addCategory(@RequestBody Category category){ + public Wrapper addCategory(@RequestBody Category category) { return workFlowFeignClient.addCategory(category); } @ApiOperation(value = "删除流程分类") @GetMapping("/deleteCategory") - public Wrapper deleteCategory(@RequestParam("objectId") String objectId){ + public Wrapper deleteCategory(@RequestParam("objectId") String objectId) { return workFlowFeignClient.deleteCategory(objectId); } @ApiOperation(value = "编辑流程分类") @PostMapping("/editCategory") - public Wrapper editCategory(@RequestBody Category category){ + public Wrapper editCategory(@RequestBody Category category) { return workFlowFeignClient.editCategory(category); } @ApiOperation(value = "查询流程") @GetMapping("/modelListPage") - public Wrapper> modelListPage(@RequestParam(value="name",required = false)String name, @RequestParam(value="category_id ",required = false)String category_id, - @RequestParam("current")int current, @RequestParam("size")int size){ - return workFlowFeignClient.modelListPage(name,category_id,current,size); + public Wrapper> modelListPage(@RequestParam(value = "name", required = false) String name, @RequestParam(value = "category_id ", required = false) String category_id, + @RequestParam("current") int current, @RequestParam("size") int size) { + return workFlowFeignClient.modelListPage(name, category_id, current, size); } @ApiOperation(value = "政策法规入库评估查看最后数据") @GetMapping("/zcfgrkpgDetail") - public List zcfgrkpgDetail(@RequestParam("pId") String pId){ + public List zcfgrkpgDetail(@RequestParam("pId") String pId) { return workFlowFeignClient.zcfgrkpgDetail(pId); } @ApiOperation(value = "修改流程所属分类") @GetMapping("/updatModel") - public Wrapper updatModel(@RequestParam("modelId")String modelId, @RequestParam("categoryId")String categoryId){ - return workFlowFeignClient.updatModel(modelId,categoryId); + public Wrapper updatModel(@RequestParam("modelId") String modelId, @RequestParam("categoryId") String categoryId) { + return workFlowFeignClient.updatModel(modelId, categoryId); } @ApiOperation(value = "查询流程编号") @GetMapping("/findPrcNumByPid") - public Wrapper findPrcNumByPid(@RequestParam("pId")String pId){ + public Wrapper findPrcNumByPid(@RequestParam("pId") String pId) { return workFlowFeignClient.findPrcNumByPid(pId); } @@ -907,8 +908,8 @@ public class WorkFlowController { @ApiOperation(value = "标准解读流程汇总详情") @GetMapping("/decodeDetail") - public BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId){ - return workFlowFeignClient.decodeDetail(taskIds,pId); + public BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId) { + return workFlowFeignClient.decodeDetail(taskIds, pId); } @ApiOperation(value = "采购保存接口") @@ -919,6 +920,7 @@ public class WorkFlowController { @Autowired ProcessTimer processTimer; + @ApiOperation(value = "自动催办，任务截至时间前3天开始每天催办") @PostMapping("/send123") public String send123() { @@ -958,14 +960,14 @@ public class WorkFlowController { @ApiOperation(value = "草稿删除") @PostMapping("/delCG") - public String delCG(@RequestParam("id")String id){ + public String delCG(@RequestParam("id") String id) { return workFlowFeignClient.delCG(id); } @ApiOperation(value = "通过企标计划和技术标准起草关联表查询对应的计划id") @GetMapping("/getEsByWk") - public String getEsByWk(@RequestParam("prcId")String prcId){ + public String getEsByWk(@RequestParam("prcId") String prcId) { return workFlowFeignClient.getEsByWk(prcId); } @@ -978,18 +980,14 @@ public class WorkFlowController { @ApiOperation(value = "问答中心（第一个人回答以后删除其他人的代办任务以及OA提醒）") @PostMapping("/deleteReplyToenNotice") - public List deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer) { - return workFlowFeignClient.deleteReplyToenNotice(taskId,answerer); + public List deleteReplyToenNotice(@RequestParam("taskId") String taskId, @RequestParam("answerer") String answerer) { + return workFlowFeignClient.deleteReplyToenNotice(taskId, answerer); } @ApiOperation(value = "问答中心（通过taskId获取提问Id）") @GetMapping("/selectAskId") public String selectAskId(@RequestParam("taskId") String taskId) { return workFlowFeignClient.selectAskId(taskId); - ｝ - @ApiOperation(value = "OA待办强制删除") - @GetMapping("/deleteOAByMandatory") - public String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee) { - return workFlowFeignClient.deleteOAByMandatory(todoId,assignee); } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index b51ef3f0..84d6bc17 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -163,9 +163,9 @@ public class EsRevisePlanServiceImpl extends ServiceImpl addPlan(EsRevisePlan esRevisePlan) { esRevisePlan.setId(UUIDUtils.randomUUID(32)); List esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan); - if (esRevisePlans.size()>0){ - return Result.success("企标名称不能重复,请更换新的企标名称"); - }else { + // if (esRevisePlans.size()>0){ + // return Result.success("企标名称不能重复,请更换新的企标名称"); + // }else { esRevisePlanDao.insertOne(esRevisePlan); //加日志 String esName = esRevisePlan.getEsName(); @@ -181,7 +181,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl { + String selectMaxStandnSn(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java index 76af0a85..c61e0c37 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java @@ -16,4 +16,7 @@ public interface ISarBussStandSnService extends IService { Boolean verifySnExists(String taskId,String standSn,String standSort); Boolean modSnByProcess(String taskId); + + String selectMaxStandnSn(); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java index 1ebe3f38..f55ac7c4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java @@ -60,4 +60,9 @@ public class SarBussStandSnServiceImpl extends ServiceImpl { @Select("select * from sar") String setDtqbbhbuss(String dtqbbhbuss); - String selectMaxStandnSn(); } 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 a6aed27e..21a63880 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 @@ -4320,7 +4320,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl + + 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 0eac68be..250329c1 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 @@ -1255,7 +1255,4 @@ where id = #{attfId} - From 4de795c255c6ed020b5b39bf44743ba0a3ca185c Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 4 Apr 2023 13:10:52 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96=E5=8F=8A=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 8 +++ .../impl/SarBussionessStandServiceImpl.java | 57 ++++++++++--------- .../adc/da/utils/util/FieldConvertUtil.java | 4 +- 3 files changed, 39 insertions(+), 30 deletions(-) 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 5053c5f4..d2a60dbc 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 @@ -33,6 +33,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.hssf.usermodel.HSSFSheet; @@ -94,6 +95,9 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file,String menuId,String userId) throws Exception{ + List tsResources = tsResourceService.getByMenuId(menuId); + if (ObjectUtils.isEmpty(tsResources)) { + return Result.error("请选择需要导入的目录"); + } return sarBussionessStandEOService.importSarBussionessStandFile(file,menuId,userId); } @ApiOperation(value = "|SarBussionessStand|判断原文译文") 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 21a63880..e4f4371f 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 @@ -259,8 +259,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl importSarBussionessStandFile(MultipartFile file,String menuId,String userId)throws Exception { - - List tsResources = tsResourceService.getByMenuId(menuId); - if (ObjectUtils.isEmpty(tsResources)) { - return Result.error("请选择需要导入的目录"); - } //给出头部信息 - String[] headerExcel = {"*企标类别,企标编号,*标准年份,*企标名称,企标英文名称,*文本状态,发布日期,企标实施日期,起草部门,起草人,适用车型,能源类型,适用产品线,体系类别,关联模块-乘用车VPPS编码,关联模块--卡车VPPS编码,发布稿,编制说明,历史版本,其他文件,修改单,代替企标编号,采用标准,采标程度,引用标准,关联文件,"}; + String[] headerExcel = {"*企标类别,*企标编号,*标准年份,*企标名称,企标英文名称,*文本状态,发布日期,企标实施日期,起草部门,起草人,适用车型,能源类型,适用产品线,体系类别,关联模块-乘用车VPPS编码,关联模块--卡车VPPS编码,发布稿,编制说明,历史版本,其他文件,修改单,代替企标编号,采用标准,采标程度,引用标准,关联文件,"}; //获取文件全称 String fileNameStr = file.getOriginalFilename(); @@ -2294,8 +2287,16 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 100){ + return Result.error("第"+ count +"行企标编号输入过长"); + } + sarBussStandAttrInfo.setStandNumber(standNumber); + }else { + return Result.error("第"+ count +"行企标编号不能为空"); + } + String standYear = rowList.get("*标准年份"); if (StringUtils.isNotBlank(standYear)) { @@ -2524,7 +2525,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Tue, 4 Apr 2023 13:20:05 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EsRevisePlanServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 84d6bc17..b9c81b0b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -162,10 +162,10 @@ public class EsRevisePlanServiceImpl extends ServiceImpl addPlan(EsRevisePlan esRevisePlan) { esRevisePlan.setId(UUIDUtils.randomUUID(32)); - List esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan); - // if (esRevisePlans.size()>0){ - // return Result.success("企标名称不能重复,请更换新的企标名称"); - // }else { +// List esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan); +// if (esRevisePlans.size()>0){ +// return Result.success("企标名称不能重复,请更换新的企标名称"); +// }else { esRevisePlanDao.insertOne(esRevisePlan); //加日志 String esName = esRevisePlan.getEsName(); From 7aa1c4a80cfa774eeaaea1dd6afba274f2a77eca Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 4 Apr 2023 15:36:56 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E7=AD=94=E8=BF=94=E5=9B=9E=E6=89=80=E6=9C=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=92=8C=E5=9B=9E=E7=AD=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AskQuestionsController.java | 5 ++++ .../entity/AskQuestionsReplyVO.java | 13 +++++++++ .../service/impl/AskQuestionsServiceImpl.java | 29 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsReplyVO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java index 7693ce2c..fe674d1e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java @@ -311,4 +311,9 @@ public class AskQuestionsController extends BaseController { return Result.success(objects); } + @PostMapping("/selectAskReply") + public ResponseMessage selectAskReply(String id){ + + return askQuestionsService.selectAskReply(id); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsReplyVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsReplyVO.java new file mode 100644 index 00000000..50692179 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsReplyVO.java @@ -0,0 +1,13 @@ +package com.adc.da.slrs.StandardQA.entity; + +import lombok.Data; + +import java.util.List; + +@Data +public class AskQuestionsReplyVO { + + private AskQuestions askQuestions; + + private List replyList; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java index c3574e69..3960bf9e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java @@ -2,10 +2,14 @@ package com.adc.da.slrs.StandardQA.service.Impl; import com.adc.da.slrs.StandardQA.dao.AskQuestionsDao; +import com.adc.da.slrs.StandardQA.dao.ReplyDao; import com.adc.da.slrs.StandardQA.entity.AskQuestions; import com.adc.da.slrs.StandardQA.entity.AskQuestionsPage; +import com.adc.da.slrs.StandardQA.entity.AskQuestionsReplyVO; import com.adc.da.slrs.StandardQA.entity.Reply; import com.adc.da.slrs.StandardQA.service.AskQuestionsService; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -17,6 +21,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; /** @@ -31,6 +36,9 @@ public class AskQuestionsServiceImpl extends ServiceImpl getAskQuestions(AskQuestions askQuestions) { return askQuestionsDao.getAskQuestions(askQuestions); @@ -110,4 +118,25 @@ public class AskQuestionsServiceImpl extends ServiceImpl objects = new ArrayList<>(); + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("STANDARD_ID",id); + List askQuestions = askQuestionsDao.selectList(objectQueryWrapper); + if(!askQuestions.isEmpty()){ + for (AskQuestions data:askQuestions){ + AskQuestionsReplyVO askQuestionsReplyVO = new AskQuestionsReplyVO(); + QueryWrapper replyQueryWrapper = new QueryWrapper<>(); + replyQueryWrapper.eq("ASK_ID",data.getId()); + List replies = replyDao.selectList(replyQueryWrapper); + askQuestionsReplyVO.setAskQuestions(data); + if(!replies.isEmpty()){ + askQuestionsReplyVO.setReplyList(replies); + } + objects.add(askQuestionsReplyVO); + } + + } + return Result.success(objects); + } } From c8c55a839b96498eaa35d79309f91d35504cf362 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 4 Apr 2023 17:44:55 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=80=9A=E8=BF=87id=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarBussionessStandController.java | 6 ++++++ .../service/ISarBussionessStandService.java | 2 ++ .../impl/SarBussionessStandServiceImpl.java | 16 ++++++++++++++++ 3 files changed, 24 insertions(+) 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 d2a60dbc..f117a5aa 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 @@ -524,5 +524,11 @@ public class SarBussionessStandController extends BaseController ResponseMessage newRpetitionFile(); ResponseMessage selectMaxStandnSn(); + + ResponseMessage selectById(String id,String type); } 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 e4f4371f..a08ee712 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 @@ -70,6 +70,7 @@ import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.sarVppsTree.dao.SarVppsTreeDao; @@ -4332,6 +4333,21 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList,String standId,String attfId) { //重复的集合 List chongfu = new ArrayList<>(); From 87fcf9e4b30f9df71e7e0d4b570aae6f87b2ee53 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 4 Apr 2023 18:27:48 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussStandAttrInfoExecl.java | 1 + .../SarBussionessStandController.java | 10 ++++- .../impl/SarBussionessStandServiceImpl.java | 45 ++++++++++++++----- .../sarInstitution/dao/TsInstitutionDao.java | 2 + .../adc/da/slrs/sarUser/dao/TsUserDao.java | 3 ++ .../adc/da/utils/util/FieldConvertUtil.java | 2 +- 6 files changed, 50 insertions(+), 13 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java index c0d91052..670aa79e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java @@ -190,6 +190,7 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { private String standCode; + @TableField(exist = false) private Map attrInfoMap = new LinkedHashMap<>(); 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 d2a60dbc..a52ac3c7 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 @@ -172,8 +172,14 @@ public class SarBussionessStandController extends BaseController list = sarBussionessStandEOService.list(queryWrapper); - if ((list.size() ==1 && !list.get(0).getId().equals(sarBussionessStandEO.getId())) || list.size() >1){ - return Result.error("当前企标标准号和企标名称已存在"); + Integer valIdFlag = 0; + for (SarBussionessStand stand :list){ + if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ + valIdFlag = stand.getValidFlag(); + if (valIdFlag == 0){ + throw new com.adc.da.exception.AdcDaBaseException("企标标准号"+ sarBussionessStandEO.getStandCode() +"或企标名称"+ sarBussionessStandEO.getStandName() +"已存在"); + } + } } sarBussionessStandEO.setModifyTime(new Date()); sarBussionessStandEOService.updateSarBussionessStand(sarBussionessStandEO); 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 e4f4371f..9a6b12bc 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 @@ -53,6 +53,8 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; +import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao; +import com.adc.da.slrs.sarInstitution.entity.TsInstitution; import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService; @@ -71,6 +73,9 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; +import com.adc.da.slrs.sarUser.dao.TsUserDao; +import com.adc.da.slrs.sarUser.entity.TsUser; +import com.adc.da.slrs.sarUser.entity.UpDTO; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.sarVppsTree.dao.SarVppsTreeDao; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; @@ -263,6 +268,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 100) { - return Result.error("第"+ count +"行输入的起草部门过长"); - } + String qcbm = tsInstitutionDao.selectByName(qcdw); + if (qcdw != null && !qcdw.equals("")){ + if (!qcdw.equals(qcbm)){ + return Result.error("第"+ count +"行输入的起草部门不存在"); + } + if (StringUtils.isNotBlank(qcdw)) { + if (qcdw.length() > 100) { + return Result.error("第"+ count +"行输入的起草部门过长"); + } + } sarBussStandAttrInfo.setQcdw(qcdw); } String qcrbuss = rowList.get("起草人"); - if (StringUtils.isNotBlank(qcrbuss)) { - if (qcrbuss.length() > 100) { - return Result.error("第"+ count +"行输入的起草人过长"); - } - sarBussStandAttrInfo.setQcrbuss(qcrbuss); + String account = tsUserDao.selectByAccount(qcrbuss); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(qcrbuss != null,"UNAME",qcrbuss) + .eq(account != null,"ACCOUNT",account); + TsUser tsUser = tsUserDao.selectOne(queryWrapper); + if (qcrbuss != null && !qcrbuss.equals("")) { + if (!account.equals(tsUser.getAccount()) && !qcrbuss.equals(tsUser.getUname())){ + return Result.error("第"+ count +"行输入的起草人名称不存在"); + } + if (qcrbuss.length() > 100) { + return Result.error("第"+ count +"行输入的起草人过长"); + } + sarBussStandAttrInfo.setQcrbuss(qcrbuss + "(" + account + ")"); } String sycxclass = rowList.get("适用车型"); 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 2bbd36c0..7e6e8c66 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 @@ -77,4 +77,6 @@ public interface TsInstitutionDao extends BaseMapper { int clearData(); + @Select("select name from ts_institution where name = #{qcdw} limit 1") + String selectByName(String qcdw); } 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 1fd546fe..7ea3406f 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 @@ -75,4 +75,7 @@ public interface TsUserDao extends BaseMapper { @Select("select UNAME from ts_user where USID = #{userId}") String selectByName(String userId); + + @Select("select ACCOUNT from ts_user where UNAME =#{qcrbuss}") + String selectByAccount(String qcrbuss); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index e5f24a0f..b49ffe02 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -71,7 +71,7 @@ public class FieldConvertUtil { public static String exportName = "填写说明\n" + "1.导入数据从第三行开始,第一行为填写说明,第二行为表头,第三行是正式数据\n" + "2.所有带*号的字段必须填写\n" + - "3.企标类别(例如:Q/FT),文本状态(包含:发布、被代替、参考、即将实施、有效、直接上传、作废、待修订-指的其他企业标准),采用标准(包含:IDT等同采用、NEQ非等效采用、MOD修改采用)字段是单选属性,必须和系统中的对应字段选项相匹配\n" + + "3.企标类别(例如:Q/FD),文本状态(包含:发布、被代替、参考、即将实施、有效、直接上传、作废、待修订-指的其他企业标准),采用标准(包含:IDT等同采用、NEQ非等效采用、MOD修改采用)字段是单选属性,必须和系统中的对应字段选项相匹配\n" + "4.适用车型,能源类型,适用产品线字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文逗号分割\n" + "5.发布日期,企标实施日期字段为年-月-日格式,必须精确到日,例如(2023-04-01)\n" + "6.企标编号,企标名称,企标英文名称字段为文本,填写文本内容\n" + From a74737ccb6e06d08b82584fd25ed48e3acbf4f15 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 4 Apr 2023 19:33:49 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussStandAttrInfoExecl.java | 5 +++++ .../service/impl/SarBussionessStandServiceImpl.java | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java index 670aa79e..f763e8e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java @@ -190,6 +190,11 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { private String standCode; + //模块结构单元变型号 + private String dybxhbuss; + + //模块结构单元名称 + private String dymcbuss; @TableField(exist = false) private Map attrInfoMap = new LinkedHashMap<>(); 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 6610b3ae..d1684aa3 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 @@ -2509,6 +2509,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl