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 d9051d84..058ac857 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 @@ -74,6 +74,10 @@ public class WebMvcConfig implements WebMvcConfigurer { //企业标准导出 addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/exportSarBussionessStand"); + //预警导出 + addInterceptor.excludePathPatterns("/api/sys/EarlyWarning/exportWarning"); + + //OCR回调存储文件 addInterceptor.excludePathPatterns("/api/ocr/OCRRestful/OcrHandleResult"); @@ -94,7 +98,7 @@ public class WebMvcConfig implements WebMvcConfigurer { - // 添加自定义拦截器，并拦截对应 url - addInterceptor.addPathPatterns("/**"); +// // 添加自定义拦截器，并拦截对应 url +// addInterceptor.addPathPatterns("/**"); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java index 22621812..c146dbf8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java @@ -71,16 +71,17 @@ public class QualityEvaluationController extends BaseController> getEvaluationForm(FormVO form){ QualityEvaluation qualityEvaluation = new QualityEvaluation(); qualityEvaluation.setLawId(form.getLawId()) ; qualityEvaluation.setUserId(form.getUserId()) ; + qualityEvaluation.setEvaluationType(form.getEvaluationType()); - iQualityEvaluationService.getEvaluationForm(qualityEvaluation); + List evaluationForm = iQualityEvaluationService.getEvaluationForm(qualityEvaluation); - return null; + return Result.success(evaluationForm); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java index 9432145d..0059d8ca 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java @@ -23,4 +23,7 @@ public interface QualityEvaluationDao extends BaseMapper { public IPage getHistory(IPage page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + public List getEvaluationForm(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + } 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 ddcb4919..db50f52a 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 @@ -77,13 +77,35 @@ public class QualityEvaluation extends BaseEntity { @ApiModelProperty(value = "创建时间") @TableField(fill = FieldFill.INSERT) - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "更新时间") @TableField(fill = FieldFill.INSERT_UPDATE) - private LocalDateTime modifyTime; + private Date modifyTime; + + @TableField(exist = false) + @ApiModelProperty(value = "指标名称") + private String indexTitle; + + @ApiModelProperty(value = "一级指标名称") + @TableField(exist = false) + private String oneIndexTitle; + + @ApiModelProperty(value = "二级指标名称") + @TableField(exist = false) + private String twoIndexTitle; + + @ApiModelProperty(value = "三级指标名称") + @TableField(exist = false) + private String threeIndexTitle; + + + @ApiModelProperty(value = "指标权重") + @TableField(exist = false) + private String weight; + @TableField(exist = false) private Integer page; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java index c4984665..6eb17ced 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java @@ -26,5 +26,5 @@ public interface IQualityEvaluationService extends IService { public List getEvaluationForm(QualityEvaluation query); - Map getScore(String lawId); + Map getScore(String lawId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index b068eff1..765241da 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -58,6 +58,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl tableData = form.getTableData(); tableData.forEach(item->{ + item.setModifyTime(new Date()); item.setId( UUIDUtils.randomUUID20()); if ("number".equals(item.getValueType()) ){ item.setScore(String.valueOf (Double.valueOf(item.getScore()) * 2) ); @@ -83,6 +84,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl getEvaluationForm(QualityEvaluation query) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("UNAME as userName","score","reason","create_time as createTime","modify_time as modifyTime","idx.value_type as valueType") - .last("JOIN ts_user user ON quality_evaluation.user_id = user.USID" + - "LEFT JOIN evaluation_index as idx on iex.id=quality_evaluation.evaluation_index"); if (query.getLawId()!=null){ @@ -113,8 +112,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl getScore(String lawId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("law_id",lawId); - List list = this.list(queryWrapper); + queryWrapper.eq("law_id",lawId) + .eq("`index`.value_type","number"); - return list.stream() + Page page = new Page<>(1, 1000); + List list = qualityEvaluationDao.getHistory(page, queryWrapper).getRecords(); +// return list.stream() +// .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType, +// Collectors.groupingBy(QualityEvaluation::getEvaluationIndex, +// Collectors.averagingDouble(item -> Double.valueOf(item.getScore())) +// ) +// )); + + + HashMap result = new HashMap<>(); + result.put("dynamic",0.0); + result.put("quality",0.0); + + result.putAll(list.stream() .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType, - Collectors.averagingDouble(item -> getScoreSingle(item)))); + Collectors.averagingDouble(item ->Double.valueOf(item.getScore()) )))); + return result; } - private Double getScoreSingle(QualityEvaluation item){ - - QueryWrapper indexQuery = new QueryWrapper<>(); - indexQuery.select("code","weight"); - - List indexList = iEvaluationIndexService.list(indexQuery); - - Map weightMap = indexList.stream() - .collect(Collectors.toMap(EvaluationIndex::getCode, obj -> Float.valueOf(obj.getWeight()))); - - - - String score = item.getScore(); - return ((score == null || (Float.valueOf(item.getScore()) < 0.0)) ? 0.0 : Float.valueOf(score) * weightMap.get(item.getEvaluationIndex())); - } +// private Double getScoreSingle(QualityEvaluation item){ +// +// QueryWrapper indexQuery = new QueryWrapper<>(); +// indexQuery.select("code","weight") +// .eq("value_type","number"); +// +// List indexList = iEvaluationIndexService.list(indexQuery); +// +// Map weightMap = indexList.stream() +// .collect(Collectors.toMap(EvaluationIndex::getCode, obj -> Float.valueOf(obj.getWeight()))); +// +// +// +// String score = item.getScore(); +// return (score == null && !weightMap.containsKey(item.getEvaluationIndex()) ) ? 0.0 : Float.valueOf(score) * weightMap.get(item.getEvaluationIndex()); +// } 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 7077606a..4d02e421 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 @@ -102,10 +102,7 @@ public class SarPublicIdeaAllController extends BaseController response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); List data=new ArrayList<>(); if (!StringUtils.isEmpty(cid)){ - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(SarPublicIdeaAll.CID,cid); - wrapper.orderByAsc("part_code"); - data=sarPublicIdeaAllDao.selectList(wrapper); + data=sarPublicIdeaAllDao.getPublicAllIdea(cid); } List standExcel=new ArrayList<>(); for (SarPublicIdeaAll sarPublicIdeaAll:data){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java index 55791c62..d3fae93a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java @@ -26,4 +26,6 @@ public interface SarPublicIdeaAllDao extends BaseMapper { List getAllDataByIdea(@Param("page")Integer page,@Param("size")Integer size, @Param("ideaId")String ideaId); Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId); + + List getPublicAllIdea(@Param("cid") String cid); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java index 3833259b..6d387013 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java @@ -25,11 +25,11 @@ public class FindSarItemsPageReqDTO extends BasePage { @ApiModelProperty(value = "新车型实施日期") @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date XCXSSRQ; + private String XCXSSRQ; @ApiModelProperty(value = "在产车实施日期") @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date ZCCSSRQ; + private String ZCCSSRQ; @ApiModelProperty(value = "文件类型") private String fileType; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index 06cd41a3..7d32b016 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -125,12 +125,12 @@ public class SarStandItems extends BaseEntity { @ApiModelProperty(value = "新车型实施日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @TableField("XCXSSRQ") - private Date xccssrq; + private String xccssrq; @ApiModelProperty(value = "在产车实施日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @TableField("ZCCSSRQ") - private Date zccssrq; + private String zccssrq; @ApiModelProperty(value = "符合性要求-符合性状态") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index e71dcf59..12b12d4e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -236,7 +236,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl { - @GetMapping("/exprotWarning") + @GetMapping("/exportWarning") @ApiOperation("导出预警") public void exportStandardsInfoExcel(WarningExcelVO excelVO, HttpServletResponse response) throws Exception { + + // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman try { response.setContentType("application/vnd.ms-excel"); @@ -145,11 +147,12 @@ public class EarlyWarningEOController extends BaseController { String fileName = URLEncoder.encode(excelVO.getExportName(), "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); +// List exportExcel = earlyWarningEOService.getExportExcel(excelVO); List exportExcel = earlyWarningEOService.getExportExcel(excelVO); // 这里需要设置不关闭流 - EasyExcel.write(response.getOutputStream(), SarStandIssueControlProduct.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + EasyExcel.write(response.getOutputStream(), StandWarningEO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(exportExcel); } catch (Exception e) { System.out.println(e); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java index 0aac00c8..6bef46dd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java @@ -11,6 +11,9 @@ import java.util.List; public interface EarlyWarningEODao extends BaseMapper { - IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO,@Param("idList") List ids); + IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO); + + + List exportWarning(@Param("idList") List ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 0471434c..9ad1b399 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -37,6 +37,11 @@ public class EarlyWarningEO extends BaseEntity { @TableField("STAND_ID") private String standId; + @ExcelIgnore + @ApiModelProperty("分解单条款id") + @TableField("ITEM_ID") + private String itemId; + @ExcelIgnore @ApiModelProperty("标准类别") @TableField(exist = false) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java index 13ea497b..b1915f6f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java @@ -14,6 +14,9 @@ public class WarningDate { @TableField("law_id") private String lawId; + @TableField("itemId") + private String itemId; + @TableField("SSRQ") private String SSRQ; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index d22a9db3..57569568 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -112,7 +112,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getStandWarning(StandWarningEO queryPage) { IPage iPage = new Page<>(queryPage.getPage(),queryPage.getPageSize()); - return earlyWarningEODao.selectWarningPage(iPage,queryPage,null); + return earlyWarningEODao.selectWarningPage(iPage,queryPage); } /** @@ -121,8 +121,10 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getExportExcel(WarningExcelVO excelVO){ - IPage standWarningEOIPage = earlyWarningEODao.selectWarningPage(null, null, excelVO.getIds()); - return standWarningEOIPage.getRecords(); + List standWarningEOList = earlyWarningEODao.exportWarning( excelVO.getIds()); +// IPage standWarningEOIPage = earlyWarningEODao.selectWarningPage(null, null, null); + + return standWarningEOList; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 17084c8b..17b851a6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -127,6 +127,44 @@ public class SarStandardsInfoController extends BaseController return Result.success(getPageInfo(page.getPager(), rows)); } + @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") + @GetMapping("/getSarStandardsInfoPageByWk1") + //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") + public ResponseMessage> getSarStandardsInfoPageByWk1(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception { + if (null != page.getNowOrderBy()) { + nowOrderFunc(page); + } + + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } + List rows = sarStandardsInfoEOService.getSarStandardsInfoPageByWk1(page); + +// 去掉日期时分秒 + rows.forEach(item->{ + + Optional.ofNullable(item.getSSRQ()) + .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getXCXSSRQ()) + .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getZCCSSRQ()) + .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + + }); + + return Result.success(getPageInfo(page.getPager(), rows)); + } + private void nowOrderFunc(SarStandardsInfoEOPage page) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index aa4617f5..4caf6161 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -21,6 +21,8 @@ public interface ISarStandardsInfoService extends IService { List getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception; + List getSarStandardsInfoPageByWk1(SarStandardsInfoEOPage page) throws Exception; + List getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception; List getSarStandardsInfoPageBak1(SarStandardsInfoEOPage page) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 91c7ebed..48b557dc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -321,6 +321,34 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getSarStandardsInfoPageByWk1(SarStandardsInfoEOPage page) throws Exception { + //查询当前登录人角色拥有权限的菜单 + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ +// List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); +// if (getMenuIdList != null && !getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + } + Integer rowCount = dao.getSarStandardsInfoCount(page); + page.getPager().setRowCount(rowCount); + List sarlist = dao.getSarStandardsInfoPage(page,"996"); + attrInfoCollect(sarlist); + return sarlist; + } + @Override public List getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception { //查询当前登录人角色拥有权限的菜单 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 5323d86d..b21525e1 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 @@ -108,7 +108,7 @@ public class FieldConvertUtil { List timeList = Arrays.asList(timeStr.split(",")); List collect = timeList.stream() - .map(item -> "str_to_date('" + item + "','%Y-%m-%d %H:%i:%s')") + .map(item -> "str_to_date('" + item + "','%Y-%m-%d')") .collect(Collectors.toList()); timeStr ="concat(" + String.join(", \',\' ,", collect) + ")"; } else { @@ -143,7 +143,7 @@ public class FieldConvertUtil { String mustValue = "'"+ UUIDUtils.randomUUID20() + "','" + id + "','0','" + LoginUserUtil.getUserId() + "'"; Date date = new Date(); - SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd"); String nowTime = sf.format(date); String timeValue = "," + changeTimeValue(nowTime); mustValue += timeValue + timeValue; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 4ed21b75..fc9e9e94 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -390,10 +390,10 @@ and ITEMS_NAME like CONCAT('%', #{itemsName},'%') - and XCXSSRQ=#{XCXSSRQ} + and XCXSSRQ like concat('%', #{XCXSSRQ},'%') - and ZCCSSRQ=#{ZCCSSRQ} + and ZCCSSRQ like concat('%',#{ZCCSSRQ},'%') diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml index 2c134c8c..20dc0681 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml @@ -8,17 +8,50 @@ SELECT `user`.UNAME AS userName, eva.user_id, - avg(eva.score * iex.weight) AS score, - iex.index_type as valueType + `index`.value_type as valueType, + eva.evaluation_type as evaluationType, + avg(eva.score * `index`.weight) AS score, + min(eva.create_time) as createTiem, + max(eva.modify_time) as modifyTime FROM quality_evaluation AS eva LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID - LEFT JOIN evaluation_index AS iex ON eva.evaluation_index = iex.id + LEFT JOIN evaluation_index AS `index` ON eva.evaluation_index = `index`.id + ${ew.customSqlSegment} GROUP BY userName, eva.user_id, - index_type + index_type, + valueType, + evaluationType + ORDER BY modifyTime DESC - ${ew.customSqlSegment} + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 61e052a0..864e0387 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -24,4 +24,12 @@ FROM sar_public_idea_all WHERE idea_id = #{ideaId} + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index 4c5861f7..fdc9655e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -38,16 +38,7 @@ - - warning.ID - IN - - - #{id} - - - AND trim(replace(CONCAT( @@ -83,6 +74,92 @@ ) + SELECT - law_id as STAND_ID, - '-1' AS itemsId, - 'stand' AS mark, - '1' as power + law_id AS standId, + item_id AS itemId, + CASE + WHEN item_id = '-1' THEN + 'stand' + WHEN + item_id IS NULL THEN + 'stand' + ELSE + 'item' + END AS mark, + '1' as power FROM warning_date AS warning WHERE DATE_FORMAT(warning.SSRQ,'%Y-%m-%d') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m-%d') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d') - UNION + @@ -79,25 +87,44 @@ SELECT lawId,timeName,DATE_FORMAT(SSRQ,'%Y-%m-%d') as SSRQ FROM ( - select attr.STAND_ID as lawId,'SSRQ' as timeName, - substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ - from sar_stand_attr_info attr - join mysql.help_topic b - on b.help_topic_id < (length(attr.SSRQ) - length(replace(attr.SSRQ,',',''))+1) + select attr.STAND_ID as lawId,'-1' as itemId,'SSRQ' as timeName, + substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_attr_info attr + join mysql.help_topic b + on b.help_topic_id > (length(attr.SSRQ) - length(replace(attr.SSRQ,',',''))+1) - UNION ALL + UNION ALL - select attr.STAND_ID as lawId,'XCXSSRQ' as timeName, - substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ - from sar_stand_attr_info attr - join mysql.help_topic b - on b.help_topic_id < (length(attr.XCXSSRQ) - length(replace(attr.SSRQ,',',''))+1) - UNION ALL - select attr.STAND_ID as lawId,'ZCCSSRQ' as timeName, - substring_index(substring_index(attr.ZCCSSRQ,',',b.help_topic_id+1),',',-1) SSRQ - from sar_stand_attr_info attr - join mysql.help_topic b - on b.help_topic_id < (length(attr.SSRQ) - length(replace(attr.SSRQ,',',''))+1) + select attr.STAND_ID as lawId,'-1' as itemId,'XCXSSRQ' as timeName, + substring_index(substring_index(attr.SSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_attr_info attr + join mysql.help_topic b + on b.help_topic_id > (length(attr.XCXSSRQ) - length(replace(attr.XCXSSRQ,',',''))+1) + + + + UNION ALL + select attr.STAND_ID as lawId,'-1' as itemId,'ZCCSSRQ' as timeName, + substring_index(substring_index(attr.ZCCSSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_attr_info attr + join mysql.help_topic b + on b.help_topic_id > (length(attr.SSRQ) - length(replace(attr.ZCCSSRQ,',',''))+1) + + + + UNION All + select item.STAND_ID as lawId,item.ID as itemId,'ZCCSSRQ' as timeName, + substring_index(substring_index(item.ZCCSSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_items item + join mysql.help_topic b + on b.help_topic_id > (length(item.ZCCSSRQ) - length(replace(item.ZCCSSRQ,',',''))+1) + + UNION All + select item.STAND_ID as lawId,item.ID as itemId,'XCXSSRQ' as timeName, + substring_index(substring_index(item.XCXSSRQ,',',b.help_topic_id+1),',',-1) SSRQ + from sar_stand_items item + join mysql.help_topic b + on b.help_topic_id > (length(item.XCXSSRQ) - length(replace(item.XCXSSRQ,',',''))+1) ) as T WHERE diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 5a0d04b0..59dcc305 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -758,6 +758,9 @@ (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) + + or (stand_name like concat(concat('%',#{page.standNumber}),'%')) + )