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

Merge branch 'develop_master' into 'FOTON'

Browse Source 
Develop master

See merge request LiuChao/foton-slrs-system-rest!367
This commit is contained in:
王夏晖
2022-01-11 13:40:07 +08:00
parent 67395f75c7 925ab6219e
commit 5b6bb36588
11 changed files with 119 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java
+2 -1
View File
@@ -186,7 +186,8 @@ public class ProcessTimer {
}
}
@Scheduled(cron = "0 0 10 * * ? ")//每天十点执行
// @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行
@Scheduled(cron = "0 0 * * * ？ ")//每天十点执行
// @Scheduled(cron = "*/40 * * * * ? ")//20s
public void everyDayTenOlockScanSAM() {
List<BusProcessNew> busProcessNews=new ArrayList<>();
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+1 -1
View File
@@ -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);
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;
}
}
adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java
+3 -3
View File
@@ -81,13 +81,13 @@ public class SarAdvanceSearchUtil {
/**
* 国内外标准高级查询 对SAR_STAND_ATTR_INFO表自定义字段生成条件语句
* 国内外标准高级查询 对tableName表自定义字段生成条件语句
* @param searchVOList
* @return
*/
public static String createStandSql(List<SarAdvanceSearchVO> searchVOList) {
public static String createStandSql(List<SarAdvanceSearchVO> searchVOList,String tableName) {
tableName=tableName+".";
String sqlInfo = "";
String tableName="SAR_STAND_ATTR_INFO.";
StringBuilder sqlBuilder = new StringBuilder();
if (searchVOList != null && !searchVOList.isEmpty()) {
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+19 -1
View File
@@ -475,9 +475,27 @@
and DATE_FORMAT(issue_time,'%Y-%m-%D') &gt;= #{issueTime1}
</if>
<if test="issueTime2 != null" >
-- and to_char(issue_time,'YYYY-MM-DD') &lt;= #{issueTime2}
and DATE_FORMAT(issue_time,'%Y-%m-%D') &lt;= #{issueTime2}
</if>
<!-- 日期查询 -->
<if test="startPutTime != null" >
and DATE_FORMAT(put_time,'%Y-%m-%d') &gt;= #{startPutTime}
</if>
<if test="endPutTime != null" >
and DATE_FORMAT(put_time,'%Y-%m-%d') &lt;= #{endPutTime}
</if>
<if test="startIssueTime != null" >
and DATE_FORMAT(issue_time,'%Y-%m-%d') &gt;= #{startIssueTime}
</if>
<if test="endIssueTime != null" >
and DATE_FORMAT(issue_time,'%Y-%m-%d') &lt;= #{endIssueTime}
</if>
<!-- 目录判断 -->
<if test="menuId != null and menuId !='nomenu' and menuAllChildrenIdList != null" >
and SAR_BUSS_STAND_MENU.MENU_ID in
adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml
+7 -1
View File
@@ -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
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
+1 -4
View File
@@ -39,11 +39,8 @@
left join ts_user on ts_user.USID=sar_public_idea_all.user_id
left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
WHERE sar_public_idea_all.idea_id = #{cid}
<if test="null==type or ''==type">
and sar_public_idea_all.wk_flag is null
</if>
<if test="null!=type and type != ''">
and sar_public_idea_all.wk_flag ='1'
and sar_public_idea_all.wk_flag ='1' and sar_public_idea_all.state in ('1','2')
</if>
ORDER BY part_code ASC
</select>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+10 -5
View File
@@ -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 != '')
<where>
POWER = '1'
AND (MARK = 'stand')
AND sarInfo.VALID_FLAG='0'
<if test="idList != null and idList.size() > 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 != '')
<where>
POWER = '1'
AND (MARK = 'item')
AND sarInfo.VALID_FLAG='0'
<if test="idList != null and idList.size() > 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 @@
<where>
POWER = '1'
AND (MARK = 'stand')
AND sarInfo.VALID_FLAG='0'
<include refid="stand_where"/>
<if test="waringEO.applyType != null and waringEO.applyType != ''">AND attr.CLLX LIKE CONCAT('%',
#{waringEO.applyType},'%')
@@ -249,6 +253,7 @@
<where>
POWER = '1'
AND (MARK = 'item')
AND sarInfo.VALID_FLAG='0'
<include refid="stand_where"/>
<if test="waringEO.applyType != null and waringEO.applyType != ''">
AND items.APPLY_ARCTIC LIKE CONCAT('%', #{waringEO.applyType},'%')