FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_3' into 'develop_master'

Browse Source 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!366
This commit is contained in:
王夏晖
2022-01-11 13:39:28 +08:00
parent 914d2c3d06 1b2c595f50
commit 925ab6219e
9 changed files with 116 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+29 -1
View File
@@ -246,7 +246,7 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
public ResponseMessage<PageInfo<SarBussionessStand>> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception {
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> 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<SarBussionessSt
}
/**
* 自定义分页查询列表 清单
* @param page 标准信息
* @return
*/
@ApiOperation(value = "|SarBussionessStandEO|清单分页查询列表")
@GetMapping("/getSarBussionStandPageQd")
public ResponseMessage<PageInfo<SarBussionessStand>> getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception {
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> 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<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
return Result.success(getPageInfo(page.getPager(), rows));
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java
+4 -1
View File
@@ -135,6 +135,9 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
.eq("`index`.value_type","number");
Page<QualityEvaluation> page = new Page<>(1, 1000);
/**
* 查询得到 每个流程节点的质量评分 和 动态评分值 (已经计算了打分权重,之后汇总计算流程节点权重)
*/
List<QualityEvaluation> list = qualityEvaluationDao.getHistory(page, queryWrapper).getRecords();
// return list.stream()
// .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType,
@@ -152,7 +155,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
/**
* 同一节点为多人评价时，需要取多人评价的平均分用以计算最终得分。
* 各环节评分权重分别设置为30%、40%、30%，
* 即：标准编写质量最终得分=征求意见会签人评价平均分*30%+技术委员会专家评价平均分*40%+标准法规工程师 "和" 标准法规部主管领导评价平均分*30%。
* 即：标准编写质量最终得分=征求意见会签人评价平均分*30%+技术委员会专家评价平均分*40%+标准法规工程师 "和" 标准法规部主管领导评价平均分*30%(标准法规工程师 * 15% + 标准法规部主管领导评价平均分 *15% )
*/
result.putAll(list.stream()
.collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType,
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+3 -3
View File
@@ -99,7 +99,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> 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<SarStandardsInfo>
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> 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<SarStandardsInfo>
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> 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 {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java
+40
View File
@@ -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;
}
}