From 07ce4f1866bc62de7573edddba8ffb6e7e1d1bd5 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 19 Jan 2022 16:27:39 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=96=B0=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarUser/controller/TsUserController.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 a60290a8..118e43d2 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 @@ -97,5 +97,13 @@ public class TsUserController extends BaseController { } + @ApiOperation("调研流程查询人 部门专用接口") + @GetMapping("/selectDeptByDY") + public ResponseMessage> selectDeptByDY(@Param("ids") String ids) throws Exception { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.in("USID",ids.split(",")); + return Result.success(tsUserService.list(queryWrapper)); + } + } From 4821c6c34b2f820c881acd59a1e285e70d04b7ff Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 19 Jan 2022 16:47:43 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8E=BBhtml=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/common/TableToExcel.java | 5 + .../SarPublicIdeaAllController.java | 9 +- .../adc/da/utils/removeHtml/RemoveHtml.java | 100 ++++++++++++++++++ 3 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/utils/removeHtml/RemoveHtml.java 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 ad1dec71..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.*; @@ -93,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-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 33e28534..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; @@ -140,8 +141,8 @@ 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()) @@ -152,8 +153,8 @@ public class SarPublicIdeaAllController extends BaseController }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()) 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(); // 返回文本字符串 + } + + + + +} From 3bd285aacdc0f82a7140851a93e7a2e9cd437708 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 19 Jan 2022 17:17:24 +0800 Subject: [PATCH 03/11] feat: There is no way the, --- .../ActSarItemsBussEOController.java | 10 ++- .../service/ActSarItemsBussEOService.java | 70 +++++++++++++++++-- .../entity/QualityEvaluation.java | 3 + .../java/com/adc/da/utils/util/Utils.java | 6 ++ 4 files changed, 81 insertions(+), 8 deletions(-) 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/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index badbd890..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 @@ -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); } 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/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) { From a2b38c85d37d2e6cc98472dca293af8c18edd1c1 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 19 Jan 2022 18:23:10 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarUser/controller/TsUserController.java | 7 ++++--- .../main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java | 2 ++ .../resources/mybatis/mapper/sarUser/TsUserMapper.xml | 9 +++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) 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 118e43d2..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 @@ -24,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; /** @@ -100,9 +102,8 @@ public class TsUserController extends BaseController { @ApiOperation("调研流程查询人 部门专用接口") @GetMapping("/selectDeptByDY") public ResponseMessage> selectDeptByDY(@Param("ids") String ids) throws Exception { - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.in("USID",ids.split(",")); - return Result.success(tsUserService.list(queryWrapper)); + 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 9f231fe6..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 @@ -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/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 @@ ) + + From 4826332deb2bc8ec3e5cd1d53fa38466c103225c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 20 Jan 2022 15:05:23 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=20=E5=87=86=E5=A4=87=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 15 +++++++++ .../dao/SarStandProjectLibraryDao.java | 3 ++ .../SarStandProjectLibraryService.java | 3 ++ .../SarStandProjectLibraryServiceImpl.java | 10 ++++++ .../SarStandProjectLibraryMapper.xml | 33 +++++++++++++++++++ 5 files changed, 64 insertions(+) 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); } 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 293ed9fd..a13297fb 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 @@ -128,6 +128,16 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary) { + return sarStandProjectLibraryDao.queryProjectGroup(sarStandProjectLibrary); + } + + @Override + public List queryProjects(SarStandProjectLibrary sarStandProjectLibrary) { + return sarStandProjectLibraryDao.queryProjects(sarStandProjectLibrary); + } + @Override public IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 660d2263..0ce3a5e7 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -368,4 +368,37 @@ #{item} + + From 888240c86c0cb7afa3dfeb1dccd238c5f2be2b61 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 20 Jan 2022 15:20:41 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=87=86=E5=A4=87?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarStandProjectLibraryDao.java | 2 +- .../impl/SarStandProjectLibraryServiceImpl.java | 10 +++++++++- .../SarStandProjectLibraryMapper.xml | 7 ++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index a9b62af7..ca7feae1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -35,5 +35,5 @@ public interface SarStandProjectLibraryDao extends BaseMapper selectListByids(@Param("ids") List ids); List queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); - List queryProjects(@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/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index a13297fb..63c7cddc 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 @@ -135,7 +135,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjects(SarStandProjectLibrary sarStandProjectLibrary) { - return sarStandProjectLibraryDao.queryProjects(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 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 0ce3a5e7..1fa348f5 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -399,6 +399,11 @@ and sar_stand_project_library.project_status=#{sarStandProjectLibrary.projectStatus} - + + and sar_stand_project_library.project_group in + + #{item} + + From d86f1c12cda279afa48fa916b8f677da697a8b5f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 20 Jan 2022 16:21:09 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandProjectLibrary/SarStandProjectLibraryMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 1fa348f5..7350546f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -370,7 +370,7 @@ + + + + + From 12ad84d7d64d6d5db1b0498170f1223b4b37ca02 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 21 Jan 2022 15:49:21 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=96=B0=E6=94=B9?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/common/ActDefineStartMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 2cbd6614..59408875 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -18,7 +18,7 @@ public class ActDefineStartMap { map.put("2","standardSurveyWorkFlow"); map.put("3","StandAskForOpinion"); map.put("4","standardregulatoryinventory"); - map.put("5","projectEvaluationProcess"); + map.put("5","projectEvaluationNewProcess"); map.put("6","Projectcomplianceassessment"); From 5d0df6d02cb195219a1b16c670f7649cafcbf624 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 21 Jan 2022 18:54:21 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TsInstitutionController.java | 11 +++++ .../adc/da/slrs/sarUser/dao/TsUserDao.java | 4 ++ .../slrs/sarUser/service/ITsUserService.java | 2 + .../service/impl/TsUserServiceImpl.java | 42 ++++++++++++++++++ .../mybatis/mapper/sarUser/TsUserMapper.xml | 43 +++++++++++++++++++ 5 files changed, 102 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index 9028d757..1341f25c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -73,6 +73,17 @@ public class TsInstitutionController extends BaseController { return Result.success(tsUserIPage); } + /** + * 查询机构下所有的机构人员 + * @return ResponseMessage> + */ + @ApiOperation("查询机构的人员") + @PostMapping("/userUnderInstitution") + public ResponseMessage> userUnderInstitution(TsUser tsUser){ + + return Result.success(tsUserService.getAllUsers(tsUser)); + } + @ApiOperation("导入机构数据") @PostMapping("/import") public ResponseMessage importInstitution() throws Exception { 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 d3a8ad84..1bef85d0 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 @@ -49,7 +49,11 @@ public interface TsUserDao extends BaseMapper { */ List getUserAndPositionPage(@Param("start")Integer start, @Param("end")Integer end,@Param("TsUser") TsUser tsUser); + List userUnderInstitution(@Param("start")Integer start, @Param("end")Integer end,@Param("TsUser") TsUser tsUser,@Param("ids") List ids); + Integer getUserAndPositionCount(@Param("TsUser") TsUser tsUser); + + Integer userUnderInstitutionCount(@Param("TsUser") TsUser tsUser,@Param("ids") List ids); /** * 通过岗位Id列表查询用户ID列表 * @param positionIds：岗位ID列表 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 9e33e87e..667438d8 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 @@ -83,4 +83,6 @@ public interface ITsUserService extends IService { List selectByName(String name); List selectNameById(List strings,String type); + + IPage getAllUsers(TsUser tsUser); } 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 d3298b95..83752721 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 @@ -3,6 +3,8 @@ package com.adc.da.slrs.sarUser.service.impl; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.login.util.UserUtils; +import com.adc.da.slrs.sarInstitution.entity.TsInstitution; +import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService; import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarMenu.service.ISarMenuService; import com.adc.da.slrs.sarPosition.dao.TsPositionDao; @@ -47,6 +49,8 @@ public class TsUserServiceImpl extends ServiceImpl implements @Autowired private TsUserDao tsUserDao; @Autowired + private ITsUserService tsUserService; + @Autowired private ITsPositionService tsPositionService; @Autowired @Lazy @@ -59,6 +63,8 @@ public class TsUserServiceImpl extends ServiceImpl implements private SyncUserService syncUserService; @Autowired private TsPositionDao tsPositionDao; + @Autowired + private ITsInstitutionService tsInstitutionService; public void deleteUser(){ @@ -364,4 +370,40 @@ public class TsUserServiceImpl extends ServiceImpl implements }); return result; } + + @Override + public IPage getAllUsers(TsUser tsUser) { + List ids=new ArrayList<>(); + ids.add(tsUser.getInstitutionId()); + List middle=new ArrayList<>(); + middle.addAll(ids); + boolean flag=true; + while (flag){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.in("parent_id",middle); + List tsmiddle=tsInstitutionService.list(queryWrapper); + if (tsmiddle.size()>0){ + tsmiddle.forEach(tsInstitution -> { + middle.add(tsInstitution.getId()); + }); + middle.removeAll(ids); + ids.addAll(middle); + }else { + tsmiddle.forEach(tsInstitution -> { + middle.add(tsInstitution.getId()); + }); + middle.removeAll(ids); + ids.addAll(middle); + flag=false; + } + } + Page tsUserPage = new Page<>(); + tsUserPage.setCurrent(tsUser.getCurrent()); + tsUserPage.setSize(tsUser.getSize()); + tsUserPage.setRecords(tsUserDao.userUnderInstitution((tsUser.getCurrent()-1)*tsUser.getSize(),tsUser.getSize(),tsUser,ids)); + tsUserPage.setTotal(tsUserDao.userUnderInstitutionCount(tsUser,ids)); + return tsUserPage; + } + + } 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 47413212..0a403363 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 @@ -48,6 +48,49 @@ limit #{start},#{end} + + + +