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

分解单->关联条款

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-09-23 01:12:51 +08:00
parent d4a293cbef
commit 5d1e39fa32
5 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java
+54 -12
View File
@@ -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<SarFileSplitInf
}
}
@Autowired
private SarStandItemsServiceImpl ServiceImpl;
@ApiOperation(value = "|SarFileSplitInfoEO|关联")
@PostMapping("/connectToStandItems")
public ResponseMessage connectToStandItems(@RequestBody List<SarFileSplitInfoEO> sarFileSplitInfoEOList) throws Exception {
for (SarFileSplitInfoEO sarFileSplitInfoEO:sarFileSplitInfoEOList) {
List<SarStandardsInfoEO> getList = new ArrayList<>();
List<SarLawsInfoEO> sarLawsInfoEOList = new ArrayList<>();
List<SarFileSplitItemsEO> querySame = null;
/**
* 删除原来的分解单
*/
QueryWrapper<SarStandItems> 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<SarStandardsInfoEO> getList = new ArrayList<>();
// List<SarLawsInfoEO> sarLawsInfoEOList = new ArrayList<>();
querySame = sarFileSplitInfoEOService.querySame(sarFileSplitInfoEO);
/**
* 使选定的拆分条款 插入分解单
*/
querySame.forEach(item->{
QueryWrapper<SarStandItems> 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<SarFileSplitInf
// return Result.error("0", "该条数据标准号在标准库中不存在");
// }
}
return Result.error("0","关联失败");
// return Result.error("0","关联失败");
return Result.success(querySame);
}
@ApiOperation(value = "|SarFileSplitInfoEO|标准拆分编辑")
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java
+3
View File
@@ -2,6 +2,7 @@ package com.adc.da.slrs.standardSplit.dao;
import com.adc.da.base.page.BasePage;
import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO;
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -36,4 +37,6 @@ public interface SarFileSplitInfoEODao extends BaseMapper<SarFileSplitInfoEO> {
int deleteByIds(SarFileSplitInfoEO sarFileSplitInfoEO);
List<SarFileSplitItemsEO> querySame (SarFileSplitInfoEO sarFileSplitInfoEO);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java
+3
View File
@@ -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<SarFileSplitItemsEO> querySame (SarFileSplitInfoEO sarFileSplitInfoEO);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
+5
View File
@@ -735,4 +735,9 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
return rows.get(0).getId();
}
@Override
public List<SarFileSplitItemsEO> querySame (SarFileSplitInfoEO sarFileSplitInfoEO){
return dao.querySame(sarFileSplitInfoEO);
};
}
adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml
+8 -2
View File
@@ -195,7 +195,7 @@
<!-- 根据id查询 SAR_FILE_SPLIT_INFO -->
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select <include refid="Base_Column_List" />
select <include refid="Base_Column_List" />
from SAR_FILE_SPLIT_INFO
where id = #{value}
@@ -290,7 +290,7 @@
<select id="queryByCountOwn" resultType="java.lang.Integer" parameterType="com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage">
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 @@
</foreach>
</delete>
<select id="querySame" resultType="com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO" parameterType="com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO">
select * from SAR_FILE_SPLIT_ITEMS
LEFT JOIN SAR_FILE_SPLIT_INFO ON SAR_FILE_SPLIT_ITEMS.INFO_ID = SAR_FILE_SPLIT_INFO.ID
where SAR_FILE_SPLIT_INFO.ID = #{id}
</select>
</mapper>