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

Merge remote-tracking branch 'origin/develop_master' into develop_1

Browse Source 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
#	adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
This commit is contained in:
zzy
2021-07-22 16:25:23 +08:00
parent 91c4dea4db ae16a14ea1
commit 3cafbfbb6f
52 changed files with 1202 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
+1
View File
@@ -19,6 +19,7 @@ public class ActDefineStartMap {
map.put("3","standardCommentProcessWorkFlow");
map.put("4","standardregulatoryinventory");
map.put("5","projectEvaluationProcess");
map.put("6","Projectcomplianceassessment");
map.put("8","nonConformanceRectificationKey");
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+1 -1
View File
@@ -141,7 +141,7 @@ public class ActSarItemsEOService {
// String resId = standMap.get("standId").toString();
// //此处说明是带入的形式
// sarStandardsInfoEO.setId(resId);
// SarCompResAssess assessInfoByResId = sarCompResAssessEOService.getAssessInfoByResId(resId);
// SarCompResAssess assessInfoByResId = sarCompResAssessEOService.ssessInfoByResId(resId);
// if (assessInfoByResId != null) {
// assessInfoByResId.setProcessState("2");
// sarCompResAssessEOService.updateByPrimaryKeySelective(assessInfoByResId);