diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 9424c392..d5e3f78d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -130,7 +130,7 @@ public class ScheduledJob { for (String s : item.getSSRQ().split(",")) { - String pattern = "^\\d{4}-\\d{1,2}-\\d{1,2}$"; + String pattern = term.getTermStr(); Pattern r = Pattern.compile(pattern); Matcher m = r.matcher(s); 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 2b43e214..640a820f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -246,7 +246,7 @@ public class SarBussionessStandController extends BaseController> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception { if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { @@ -295,5 +295,33 @@ public class SarBussionessStandController extends BaseController> getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception { + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } + + if (null != page.getNowOrderBy()) { + nowOrderFunc(page); + } + List rows = sarBussionessStandEOService.getSarBussionStandPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index e721dc00..f909068e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -135,6 +135,9 @@ public class QualityEvaluationServiceImpl extends ServiceImpl page = new Page<>(1, 1000); + /** + * 查询得到 每个流程节点的质量评分 和 动态评分值 (已经计算了打分权重,之后汇总计算流程节点权重) + */ List list = qualityEvaluationDao.getHistory(page, queryWrapper).getRecords(); // return list.stream() // .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType, @@ -152,7 +155,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { @@ -137,7 +137,7 @@ public class SarStandardsInfoController extends BaseController if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { @@ -216,7 +216,7 @@ public class SarStandardsInfoController extends BaseController if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java index 0fc3aec2..ba950ca9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java @@ -22,6 +22,13 @@ public class SarBussionessStandEOPage extends BasePage { this.textStatusBuss = textStatusBuss; } + private String startIssueTime; + private String endIssueTime; + private String startPutTime; + private String endPutTime; + + + private String modifyTime; private String modifyTime1; private String modifyTime2; @@ -1130,4 +1137,37 @@ public class SarBussionessStandEOPage extends BasePage { public void setSql(String sql) { this.sql = sql; } + + public String getStartIssueTime() { + return startIssueTime; + } + + public void setStartIssueTime(String startIssueTime) { + this.startIssueTime = startIssueTime; + } + + public String getEndIssueTime() { + return endIssueTime; + } + + public void setEndIssueTime(String endIssueTime) { + this.endIssueTime = endIssueTime; + } + + + public String getStartPutTime() { + return startPutTime; + } + + public void setStartPutTime(String startPutTime) { + this.startPutTime = startPutTime; + } + + public String getEndPutTime() { + return endPutTime; + } + + public void setEndPutTime(String endPutTime) { + this.endPutTime = endPutTime; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index 72b2f6bc..1b872090 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -81,13 +81,13 @@ public class SarAdvanceSearchUtil { /** - * 国内外标准高级查询 对SAR_STAND_ATTR_INFO表自定义字段生成条件语句 + * 国内外标准高级查询 对tableName表自定义字段生成条件语句 * @param searchVOList * @return */ - public static String createStandSql(List searchVOList) { + public static String createStandSql(List searchVOList,String tableName) { + tableName=tableName+"."; String sqlInfo = ""; - String tableName="SAR_STAND_ATTR_INFO."; StringBuilder sqlBuilder = new StringBuilder(); if (searchVOList != null && !searchVOList.isEmpty()) { 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 396482be..6acb36cd 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 @@ -475,9 +475,27 @@ and DATE_FORMAT(issue_time,'%Y-%m-%D') >= #{issueTime1} - -- and to_char(issue_time,'YYYY-MM-DD') <= #{issueTime2} and DATE_FORMAT(issue_time,'%Y-%m-%D') <= #{issueTime2} + + + + + and DATE_FORMAT(put_time,'%Y-%m-%d') >= #{startPutTime} + + + and DATE_FORMAT(put_time,'%Y-%m-%d') <= #{endPutTime} + + + and DATE_FORMAT(issue_time,'%Y-%m-%d') >= #{startIssueTime} + + + and DATE_FORMAT(issue_time,'%Y-%m-%d') <= #{endIssueTime} + + + + + and SAR_BUSS_STAND_MENU.MENU_ID in 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 e0ca3281..991027a6 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 @@ -55,7 +55,13 @@ LEFT JOIN ts_user `user` ON quality_evaluation.user_id = `user` .USID LEFT JOIN evaluation_index AS `index` ON `index`.id = quality_evaluation.evaluation_index ${ew.customSqlSegment} - + AND create_time IN ( + SELECT + MAX(create_time) + FROM + quality_evaluation + ${ew.customSqlSegment} + ) ORDER BY `index`.index_sort diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index e8abcc3b..494904e7 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 @@ -112,10 +112,11 @@ FROM sar_stand_warning AS warning LEFT JOIN sar_standards_info AS sarInfo on sarInfo.id=warning.STAND_ID LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID - LEFT JOIN ts_dictype as dicType on dicType.DIC_TYPE_CODE =attr.CLLX + LEFT JOIN ts_dictype as dicType on (attr.CLLX = dicType.DIC_TYPE_CODE AND attr.CLLX !=null AND attr.CLLX != '') POWER = '1' AND (MARK = 'stand') + AND sarInfo.VALID_FLAG='0' AND warning.ID @@ -148,12 +149,13 @@ FROM sar_stand_warning AS warning LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID - LEFT JOIN sar_stand_items AS items ON items.STAND_ID = warning.STAND_ID + LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEMS_ID LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID - LEFT JOIN ts_dictype as dicType on dicType.DIC_TYPE_CODE =items.APPLY_ARCTIC + LEFT JOIN ts_dictype as dicType on (dicType.DIC_TYPE_CODE = items.APPLY_ARCTIC AND items.APPLY_ARCTIC !=null AND items.APPLY_ARCTIC != '') POWER = '1' AND (MARK = 'item') + AND sarInfo.VALID_FLAG='0' AND warning.ID @@ -169,10 +171,11 @@ WARNING_RESULT LEFT JOIN ( - SELECT law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date - GROUP BY warning_date.law_id + SELECT item_id,law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date + GROUP BY warning_date.law_id,item_id ) warning_date ON warning_date.law_id = WARNING_RESULT.STAND_ID + AND warning_date.item_id = WARNING_RESULT.ITEMS_ID ORDER BY warning_date.SSRQ_MIN @@ -205,6 +208,7 @@ POWER = '1' AND (MARK = 'stand') + AND sarInfo.VALID_FLAG='0' AND attr.CLLX LIKE CONCAT('%', #{waringEO.applyType},'%') @@ -249,6 +253,7 @@ POWER = '1' AND (MARK = 'item') + AND sarInfo.VALID_FLAG='0' AND items.APPLY_ARCTIC LIKE CONCAT('%', #{waringEO.applyType},'%')