标准拆分,拆分之后分解单里也有数据
This commit is contained in:
+3
@@ -1,5 +1,6 @@
|
|||||||
package com.adc.da.slrs.standardSplit.dao;
|
package com.adc.da.slrs.standardSplit.dao;
|
||||||
|
|
||||||
|
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
|
||||||
import com.adc.da.slrs.standardSplit.dto.FileSplitItemsExportDto;
|
import com.adc.da.slrs.standardSplit.dto.FileSplitItemsExportDto;
|
||||||
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO;
|
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO;
|
||||||
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEOPage;
|
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEOPage;
|
||||||
@@ -21,6 +22,8 @@ public interface SarFileSplitItemsEODao extends BaseMapper<SarFileSplitItemsEO>
|
|||||||
|
|
||||||
int insertForeach(List<SarFileSplitItemsEO> list);
|
int insertForeach(List<SarFileSplitItemsEO> list);
|
||||||
|
|
||||||
|
int insertStandSplitForeach(@Param(value = "list") List<SarStandItems> list);
|
||||||
|
|
||||||
int deleteByIds(SarFileSplitItemsEO sarFileSplitItemsEO);
|
int deleteByIds(SarFileSplitItemsEO sarFileSplitItemsEO);
|
||||||
|
|
||||||
int deleteByItemsIds(SarFileSplitItemsEO sarFileSplitItemsEO);
|
int deleteByItemsIds(SarFileSplitItemsEO sarFileSplitItemsEO);
|
||||||
|
|||||||
+28
-2
@@ -2,6 +2,7 @@ package com.adc.da.slrs.standardSplit.service.impl;
|
|||||||
|
|
||||||
import com.adc.da.att.service.IAttFileEOService;
|
import com.adc.da.att.service.IAttFileEOService;
|
||||||
import com.adc.da.person.entity.PersonMsgEO;
|
import com.adc.da.person.entity.PersonMsgEO;
|
||||||
|
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
|
||||||
import com.adc.da.slrs.standardSplit.dao.*;
|
import com.adc.da.slrs.standardSplit.dao.*;
|
||||||
import com.adc.da.slrs.standardSplit.service.SarLawsInfoEOService;
|
import com.adc.da.slrs.standardSplit.service.SarLawsInfoEOService;
|
||||||
import com.adc.da.att.entity.AttFileEO;
|
import com.adc.da.att.entity.AttFileEO;
|
||||||
@@ -31,10 +32,12 @@ import org.springframework.stereotype.Service;
|
|||||||
import org.springframework.transaction.annotation.Propagation;
|
import org.springframework.transaction.annotation.Propagation;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import com.adc.da.common.SplitFilePragraTypeEnum;
|
import com.adc.da.common.SplitFilePragraTypeEnum;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
import com.adc.da.person.dao.PersonShareEODao;
|
import com.adc.da.person.dao.PersonShareEODao;
|
||||||
import com.adc.da.person.dao.PersonCollectEODao;
|
import com.adc.da.person.dao.PersonCollectEODao;
|
||||||
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
||||||
@@ -106,6 +109,11 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
|
|||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public int fileAplit(SarFileSplitInfoEO sarFileSplitInfoEO) {
|
public int fileAplit(SarFileSplitInfoEO sarFileSplitInfoEO) {
|
||||||
|
|
||||||
|
//用来往标准分解单里添加数据
|
||||||
|
List<SarStandItems> standList = new ArrayList<>();
|
||||||
|
|
||||||
|
|
||||||
// 拆分文件主表中插入数据
|
// 拆分文件主表中插入数据
|
||||||
sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20());
|
sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20());
|
||||||
sarFileSplitInfoEO.setValidFlag(0);
|
sarFileSplitInfoEO.setValidFlag(0);
|
||||||
@@ -244,8 +252,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
|
|||||||
addItermsConditionsText(messageList.get(messageList.size()-1),itemValList, p.getText());
|
addItermsConditionsText(messageList.get(messageList.size()-1),itemValList, p.getText());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} else if (messageNumber >= 3) {
|
||||||
else if (messageNumber>=3){
|
|
||||||
ptest = Pattern.compile("^[\\d.]*$");
|
ptest = Pattern.compile("^[\\d.]*$");
|
||||||
boolean hasGoIf = false;
|
boolean hasGoIf = false;
|
||||||
for (int i=0;i<nowStart.size();i++){
|
for (int i=0;i<nowStart.size();i++){
|
||||||
@@ -326,6 +333,24 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
|
|||||||
sarFileSplitMenuEODao.insertForeach(treeList);
|
sarFileSplitMenuEODao.insertForeach(treeList);
|
||||||
sarFileSplitItemsEODao.insertForeach(messageList);
|
sarFileSplitItemsEODao.insertForeach(messageList);
|
||||||
sarFileSplitItemsValEODao.insertForeach(itemValList);
|
sarFileSplitItemsValEODao.insertForeach(itemValList);
|
||||||
|
|
||||||
|
|
||||||
|
//用来往标准分解单插入数据
|
||||||
|
messageList.forEach(item -> {
|
||||||
|
//new一个对象
|
||||||
|
SarStandItems standItems1 = new SarStandItems();
|
||||||
|
//standItems1里的这个值为messageList里的ItermsConditions
|
||||||
|
standItems1.setId(UUIDUtils.randomUUID20())
|
||||||
|
.setFileType(sarFileSplitInfoEO.getFileType())
|
||||||
|
.setStandId(sarFileSplitInfoEO.getStandId())
|
||||||
|
.setItemsNum(item.getItemsNum())
|
||||||
|
.setItemsName(item.getItemsName())
|
||||||
|
.setTermsConditions(item.getItermsConditions());
|
||||||
|
standList.add(standItems1);
|
||||||
|
});
|
||||||
|
sarFileSplitItemsEODao.insertStandSplitForeach(standList);
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@@ -494,6 +519,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过传递过来的编号,得出下次可能出现的编号
|
* 通过传递过来的编号,得出下次可能出现的编号
|
||||||
|
*
|
||||||
* @param nowStart
|
* @param nowStart
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
|||||||
+14
@@ -471,6 +471,20 @@
|
|||||||
</foreach>
|
</foreach>
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
<!-- 用来往标准分解单插入数据 -->
|
||||||
|
<insert id="insertStandSplitForeach" parameterType="java.util.List">
|
||||||
|
insert into SAR_STAND_ITEMS
|
||||||
|
(id, STAND_ID, items_num, items_name, TERMS_CONDITIONS,FILE_TYPE)
|
||||||
|
values
|
||||||
|
<foreach collection="list" item="item" index="index" separator=",">
|
||||||
|
(
|
||||||
|
#{item.id, jdbcType=VARCHAR}, #{item.standId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR},
|
||||||
|
#{item.itemsName, jdbcType=VARCHAR}, #{item.termsConditions, jdbcType=CLOB},
|
||||||
|
#{item.fileType, jdbcType=VARCHAR}
|
||||||
|
)
|
||||||
|
</foreach>
|
||||||
|
</insert>
|
||||||
|
|
||||||
<delete id="deleteByIds" parameterType="com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO">
|
<delete id="deleteByIds" parameterType="com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO">
|
||||||
delete from SAR_FILE_SPLIT_ITEMS
|
delete from SAR_FILE_SPLIT_ITEMS
|
||||||
where info_id in
|
where info_id in
|
||||||
|
|||||||
Reference in New Issue
Block a user