diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index dc39c227..2fa07426 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -32,6 +32,9 @@ public class ActDefineStartMap { map.put("laws2","PolicyCommentProcessWorkFlow"); map.put("laws3","KCSTPReviewProcessWorkFlow"); + // 企标制修订流程及企业标准库流程 + map.put("buss1","bussLibraryWkflow"); + //张超然 map.put("20","StandardApplyMeetProcess"); map.put("21","StandardMeetProcess"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandCompareHisEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandCompareHisEOController.java index b632e56a..ef94128e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandCompareHisEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandCompareHisEOController.java @@ -5,8 +5,10 @@ import com.adc.da.http.PageInfo; import com.adc.da.person.dao.PersonCollectEODao; import com.adc.da.person.dao.PersonShareEODao; import com.adc.da.slrs.standardSplit.dao.SarStandCompareHisEODao; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO; import com.adc.da.slrs.standardSplit.entity.SarStandCompareHisEO; import com.adc.da.slrs.standardSplit.entity.SarStandCompareHisEOPage; +import com.adc.da.slrs.standardSplit.service.SarFileSplitInfoEOService; import com.adc.da.slrs.standardSplit.service.SarItemsCompareHisEOService; import com.adc.da.slrs.standardSplit.service.SarStandCompareHisEOService; import com.adc.da.slrs.standardSplit.service.SarStandItemsCompareHisEOService; @@ -36,6 +38,9 @@ public class SarStandCompareHisEOController extends BaseController fullTextComparison(String leftStandard, String rightStandard) throws Exception { - String id=UUIDUtils.randomUUID(32); - SarStandCompareHisEO sarStandCompareHisEO =new SarStandCompareHisEO(); + SarFileSplitInfoEO leftInfo = sarFileSplitInfoEOService.selectByPrimaryKey(leftStandard); + SarFileSplitInfoEO rightInfo = sarFileSplitInfoEOService.selectByPrimaryKey(rightStandard); + //保存标准比对历史表数据 + SarStandCompareHisEO sarStandCompareHisEO = new SarStandCompareHisEO(); +// String id = UUIDUtils.randomUUID20(); + String id=UUIDUtils.randomUUID(32); sarStandCompareHisEO.setId(id); + sarStandCompareHisEO.setOldStandId(leftStandard); + sarStandCompareHisEO.setNewStandId(rightStandard); + sarStandCompareHisEO.setOldFileType(leftInfo.getFileType()); + sarStandCompareHisEO.setNewFileType(rightInfo.getFileType()); + sarStandCompareHisEO.setOldStandName(leftInfo.getStandNameSplit()); + sarStandCompareHisEO.setNewStandName(rightInfo.getStandNameSplit()); + sarStandCompareHisEO.setOldStandNum(leftInfo.getStandNumSplit()); + sarStandCompareHisEO.setNewStandNum(rightInfo.getStandNumSplit()); + sarStandCompareHisEO.setOldSarType(leftInfo.getSarType()); + sarStandCompareHisEO.setNewSarType(rightInfo.getSarType()); + sarStandCompareHisEO.setCreateTime(new Date()); + sarStandCompareHisEO.setModifyTime(new Date()); + sarStandCompareHisEO.setCreateUser(LoginUserUtil.getUserId()); + sarStandCompareHisEO.setModifyUser(LoginUserUtil.getUserId()); sarStandCompareHisEO.setCompareStatus("比对中"); sarStandCompareHisEO.setCompareType("全文比对"); sarStandCompareHisEO.setCreateTime(new Date()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java index 1c808a4a..937dd5e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java @@ -460,20 +460,6 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ SarStandCompareHisEO sarStandCompareHisEO = new SarStandCompareHisEO(); // String id = UUIDUtils.randomUUID20(); sarStandCompareHisEO.setId(id); - sarStandCompareHisEO.setOldStandId(leftStandId); - sarStandCompareHisEO.setNewStandId(rightStandId); - sarStandCompareHisEO.setOldFileType(leftInfo.getFileType()); - sarStandCompareHisEO.setNewFileType(rightInfo.getFileType()); - sarStandCompareHisEO.setOldStandName(leftInfo.getStandNameSplit()); - sarStandCompareHisEO.setNewStandName(rightInfo.getStandNameSplit()); - sarStandCompareHisEO.setOldStandNum(leftInfo.getStandNumSplit()); - sarStandCompareHisEO.setNewStandNum(rightInfo.getStandNumSplit()); - sarStandCompareHisEO.setOldSarType(leftInfo.getSarType()); - sarStandCompareHisEO.setNewSarType(rightInfo.getSarType()); - sarStandCompareHisEO.setCreateTime(new Date()); - sarStandCompareHisEO.setModifyTime(new Date()); - sarStandCompareHisEO.setCreateUser(LoginUserUtil.getUserId()); - sarStandCompareHisEO.setModifyUser(LoginUserUtil.getUserId()); sarStandCompareHisEO.setCompareType(compareType); sarStandCompareHisEO.setCompareStatus("比对完成"); dao.updateByPrimaryKeySelective(sarStandCompareHisEO);