diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java index 329e1fe9..dcd769af 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java @@ -7,12 +7,18 @@ import java.util.List; import com.adc.da.base.web.BaseController; import com.adc.da.http.PageInfo; import com.adc.da.person.entity.PersonMsgEO; +import com.adc.da.slrs.sarStandItems.entity.SarStandItems; +import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO; import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO; import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage; + +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; import com.adc.da.slrs.standardSplit.entity.SarLawsInfoEO; import com.adc.da.slrs.standardSplit.service.*; import com.adc.da.sys.util.LoginUserUtil; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -162,21 +168,56 @@ public class SarFileSplitInfoEOController extends BaseController sarFileSplitInfoEOList) throws Exception { - for (SarFileSplitInfoEO sarFileSplitInfoEO:sarFileSplitInfoEOList) { - List getList = new ArrayList<>(); - List sarLawsInfoEOList = new ArrayList<>(); + List querySame = null; + + /** + * 删除原来的分解单 + */ + + QueryWrapper removeWrapper = new QueryWrapper<>(); + removeWrapper.eq("STAND_ID",sarFileSplitInfoEOList.get(0).getStandId()) + .eq("FILE_TYPE",sarFileSplitInfoEOList.get(0).getFileType()); + ServiceImpl.remove(removeWrapper); + for (SarFileSplitInfoEO sarFileSplitInfoEO : sarFileSplitInfoEOList) { +// List getList = new ArrayList<>(); +// List sarLawsInfoEOList = new ArrayList<>(); + + querySame = sarFileSplitInfoEOService.querySame(sarFileSplitInfoEO); + + /** + * 使选定的拆分条款 插入分解单 + */ + querySame.forEach(item->{ + QueryWrapper sarStandItemsQueryWrapper = new QueryWrapper<>(); + sarStandItemsQueryWrapper.eq("edit_flag",item.getEditFlag()); + SarStandItems sarStandItems = new SarStandItems(); + sarStandItems.setStandId(sarFileSplitInfoEO.getStandId()); + sarStandItems.setEditFlag(item.getEditFlag()); + sarStandItems.setItemsName(item.getItemsName()); + sarStandItems.setTermsConditions(item.getItermsConditions()); + sarStandItems.setItemsNum(item.getItemsNum()); + sarStandItems.setId(UUIDUtils.randomUUID20()); + sarStandItems.setFileType(sarFileSplitInfoEO.getFileType()); + ServiceImpl.saveOrUpdate(sarStandItems,sarStandItemsQueryWrapper); + + }); + + //根据标准号查询标准是否存在 - String standNum=""; - if (StringUtils.isNotEmpty(sarFileSplitInfoEO.getStandId())) { - standNum=sarFileSplitInfoEO.getShowNumber(); - } else if(StringUtils.isNotEmpty(sarFileSplitInfoEO.getStandNumSplit())){ - standNum=sarFileSplitInfoEO.getStandNumSplit(); - }else{ - return Result.error("标准号不能为空"); - } +// String standNum=""; +// if (StringUtils.isNotEmpty(sarFileSplitInfoEO.getStandId())) { +// standNum=sarFileSplitInfoEO.getShowNumber(); +// } else if(StringUtils.isNotEmpty(sarFileSplitInfoEO.getStandNumSplit())){ +// standNum=sarFileSplitInfoEO.getStandNumSplit(); +// }else{ +// return Result.error("标准号不能为空"); +// } // if (sarFileSplitInfoEO.getFileType().equals("ZCWB") || sarFileSplitInfoEO.getFileType().equals("GCGJ")) { // SarLawsInfoEOPage page = new SarLawsInfoEOPage(); // page.setLawsType("FOREIGN"); @@ -201,7 +242,8 @@ public class SarFileSplitInfoEOController extends BaseController { int deleteByIds(SarFileSplitInfoEO sarFileSplitInfoEO); + List querySame (SarFileSplitInfoEO sarFileSplitInfoEO); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java index f54ed2ad..e99a16d7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java @@ -4,6 +4,7 @@ import com.adc.da.base.page.BasePage; import com.adc.da.person.entity.PersonMsgEO; import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO; import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; import java.util.List; @@ -30,4 +31,6 @@ public interface SarFileSplitInfoEOService { PersonMsgEO updateNew(PersonMsgEO val) throws Exception; String getClauseBySplitId(String standNum, String fileType); + + List querySame (SarFileSplitInfoEO sarFileSplitInfoEO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index 5ffde997..29d2813a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -735,4 +735,9 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService return rows.get(0).getId(); } + @Override + public List querySame (SarFileSplitInfoEO sarFileSplitInfoEO){ + return dao.querySame(sarFileSplitInfoEO); + }; + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml index 62a2d1d9..e1767956 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml @@ -195,7 +195,7 @@ SELECT - count(0) + count(1) FROM SAR_FILE_SPLIT_INFO LEFT JOIN SAR_STANDARDS_INFO ON SAR_FILE_SPLIT_INFO.STAND_ID = SAR_STANDARDS_INFO.id @@ -334,4 +334,10 @@ + +