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_master

Browse Source
This commit is contained in:
yuezhihang
2021-09-27 19:45:26 +08:00
parent 07a5ca6fc2 44b33c39d3
commit ee340ad056
14 changed files with 189 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+75 -6
View File
@@ -178,6 +178,12 @@ public class SearchCenterServiceImpl implements SearchCenterService {
if (StringUtils.isNotBlank(searchInfoEO.getStandType())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getTextStatus())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatus.keyword", "*"+searchInfoEO.getTextStatus()+"*"));
}
boolQueryBuilder.must(boolQueryShould);
}else {
boolQueryBuilder.must(boolQueryShould);
@@ -245,7 +251,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
}
if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){
List<String> fieldList = Arrays.asList(searchInfoEO.getCYSD() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
List<String> fieldList = Arrays.asList(searchInfoEO.getCYSD().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList));
collectAttrMap.put("CYSD",array);
}
@@ -287,15 +293,60 @@ public class SearchCenterServiceImpl implements SearchCenterService {
}
}
if(!fields.isEmpty()){
for (String str : fields) {
boolQueryBuilderMust.must(QueryBuilders.wildcardQuery(keyWordField, "*"+str+"*"));
if(fields.size() > 1){
BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder();
fields.forEach(s -> {
boolQueryBuilderShould.should(QueryBuilders.wildcardQuery(keyWordField, "*"+s+"*"));
});
boolQueryBuilder.must(boolQueryBuilderShould);
}else {
boolQueryBuilderMust.must(QueryBuilders.wildcardQuery(keyWordField, "*"+fields.get(0)+"*"));
}
}
}
}
}
if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())) {
boolQueryBuilder.should(boolQueryBuilderMust);
if(searchInfoEO.getQCDW() != null && StringUtils.isNotBlank(searchInfoEO.getQCDW())){
List<String> list = Arrays.asList(searchInfoEO.getQCDW().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
if(list.size() > 1){
BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder();
list.forEach(s -> {
boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("QCDW.keyword", "*"+s+"*"));
});
boolQueryBuilder.must(boolQueryBuilderShould);
}else {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("QCDW.keyword", "*"+searchInfoEO.getQCDW()+"*"));
}
}
if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){
List<String> list = Arrays.asList(searchInfoEO.getCYSD().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
if(list.size() > 1){
BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder();
list.forEach(s -> {
boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("CYSD.keyword", "*"+s+"*"));
});
boolQueryBuilder.must(boolQueryBuilderShould);
}else {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("CYSD.keyword", "*"+searchInfoEO.getCYSD()+"*"));
}
}
if(searchInfoEO.getCLLX() != null && StringUtils.isNotBlank(searchInfoEO.getCLLX())){
List<String> list = Arrays.asList(searchInfoEO.getCLLX().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
if(list.size() > 1){
BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder();
list.forEach(s -> {
boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("CLLX.keyword", "*"+s+"*"));
});
boolQueryBuilder.must(boolQueryBuilderShould);
}else {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("CLLX.keyword", "*"+searchInfoEO.getCLLX()+"*"));
}
}
}else {
boolQueryBuilder.must(boolQueryBuilderMust);
}
@@ -312,7 +363,16 @@ public class SearchCenterServiceImpl implements SearchCenterService {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getStandSort()+"*"));
List<String> list = Arrays.asList(searchInfoEO.getStandSort().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
if(list.size() > 1){
BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder();
list.forEach(s -> {
boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+s+" "+"*"));
});
boolQueryBuilder.must(boolQueryBuilderShould);
}else {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getStandSort()+" "+"*"));
}
}
if (StringUtils.isNotBlank(searchInfoEO.getStandNumber())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getStandNumber()+"*"));
@@ -584,7 +644,16 @@ public class SearchCenterServiceImpl implements SearchCenterService {
}
if (StringUtils.isNotBlank(searchInfoEO.getTextStatusBuss())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getTextStatusBuss()+"*"));
List<String> list = Arrays.asList(searchInfoEO.getTextStatusBuss().split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
if(list.size() > 1){
BoolQueryBuilder boolQueryBuilderShould = new BoolQueryBuilder();
list.forEach(s -> {
boolQueryBuilderShould.should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+s+"*"));
});
boolQueryBuilder.must(boolQueryBuilderShould);
}else {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getTextStatusBuss()+"*"));
}
}
if (searchInfoEO.getIssueTime() != null) {
@@ -644,7 +713,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
// 循环统计各种类型数据
String[] seniortype;
if("stand".equals(searchInfoEO.getSelectIndex())) {
String[] seniortypeStand = {"standSort", "statecode","CYSD","ZRLX","CLLX","CBCD"};
String[] seniortypeStand = {"standSort", "statecode","CYSD","ZRLX","CLLX","CBCD","textStatus","textStatusName"};
seniortype = seniortypeStand.clone();
} else if("laws".equals(searchInfoEO.getSelectIndex())){
String[] seniortypeLaws = {"country","statecode","SYCLLX","ZRLX","WSSFCY"};
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java
+2 -1
View File
@@ -8,6 +8,7 @@ import com.adc.da.http.Result;
import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
import com.adc.da.slrs.sarStandItems.entity.*;
import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
@@ -55,7 +56,7 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
@ApiOperation(value = "分解单查询")
@GetMapping("/querySarItemAndInterpretation")
public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
public ResponseMessage<PageInfo<SarStandItems>> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
List<SarStandItems> rows = ServiceImpl.querySarItemAndInterpretation(page);
PageInfo<SarStandItems> pageInfo = getPageInfo(page.getPager(), rows);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java
-3
View File
@@ -13,9 +13,6 @@ import java.util.Date;
public class FindSarItemsPageReqDTO extends BasePage {
private static final long serialVersionUID = 1L;
private Integer page = 1;
private Integer pageSize = 20;
@ApiModelProperty(value = "标准id")
private String standId;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+3 -5
View File
@@ -225,10 +225,6 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
public List<SarStandItems> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
//分页查询的总数
Integer count=dao.sarItemCount(page);
page.getPager().setRowCount(count);
//排序
if (page.getOrderBy()!=null && page.getOrder()!=null){
@@ -246,7 +242,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
page.setOrder("DESC");
}
//分页查询的总数
Integer count=dao.sarItemCount(page);
page.getPager().setRowCount(count);
List<SarStandItems> sarStandItems = dao.querySarItemAndInterpretation(page);
return sarStandItems;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
+10
View File
@@ -155,6 +155,8 @@ public class SarStandardsInfo extends BaseEntity {
@TableField(exist = false)
private String standNatureShow; // 标准性质显示名称
@TableField(exist = false)
private String standtextStatusShow; // 标准文本状态显示名称
@TableField(exist = false)
private String sychronId; // 同步数据ID
@TableField(exist = false)
private List<DicTypeEO> dicTypeList = new ArrayList(); // 记录标准涉及到的所有数据字典数据
@@ -607,5 +609,13 @@ public class SarStandardsInfo extends BaseEntity {
public void setStandSystemName(String standSystemName) {
this.standSystemName = standSystemName;
}
public String getStandtextStatusShow() {
return standtextStatusShow;
}
public void setStandtextStatusShow(String standtextStatusShow) {
this.standtextStatusShow = standtextStatusShow;
}
}
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/java/com/adc/da/utils/util/FieldConvertUtil.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class FieldConvertUtil {
"文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28
public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," +
"文本状态,发布日期,文本说明,是否纳入认证清单,体系类别,标签,适用产品线,适用认证,能源类型,责任工程师," +
"文本状态,发布日期,文本说明,是否纳入认证清单,体系类别,标签,适用认证,能源类型," +
"关联文件,发布稿,增补件,勘误件,草案"; // 导出基础表字段
public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," +
adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java
+8 -4
View File
@@ -101,10 +101,14 @@ public class StandExportUtil {
Map<String,Object> attrValueMap = sarStandardsInfoEO.getAttrInfoMap();
switch (name) {
case "标准性质":
value = sarStandardsInfoEO.getStandNature();
value = sarStandardsInfoEO.getStandNatureShow();
break;
case "是否纳入认证清单":
value = sarStandardsInfoEO.getIsRelateAccess();
switch (sarStandardsInfoEO.getIsRelateAccess()){
case "0": value="否"; break;
case "1": value="是"; break;
default:value="";
}
break;
case "标准体系":
value = sarStandardsInfoEO.getStandSystem();
@@ -137,8 +141,8 @@ public class StandExportUtil {
case "英文名称":
value = sarStandardsInfoEO.getStandEnName();
break;
case "标准状态":
value = sarStandardsInfoEO.getStandStateShow();
case "文本状态":
value = sarStandardsInfoEO.getStandtextStatusShow();
break;
case "发布日期":
if (sarStandardsInfoEO.getIssueTime() != null) {
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
+3 -5
View File
@@ -408,16 +408,14 @@
<select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap"
parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO">
SELECT
*
sar_stand_items.*,split_pid(sar_stand_items.ITEMS_NUM,'.') as tt
FROM
sar_stand_items
<include refid="sarItemWhere"/>
<if test="orderBy !=null and orderBy!=''">
order by ${orderBy} ${order}
order by tt ${order}
</if>
LIMIT #{page},#{pageSize}
LIMIT ${pager.startIndex-1},${pageSize}
</select>
<!-- 查询SAR_STAND_ITEMS列表 -->
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+14 -4
View File
@@ -61,7 +61,7 @@
SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time,
concat(SAR_STANDARDS_INFO.synopsis, '') as synopsis, concat(replace_stand_num, '') as replace_stand_num, replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag,
SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME as countryShow, dicstandSort.DIC_TYPE_NAME as standSortShow,
dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,dicstandTextStatus.DIC_TYPE_NAME as standtextStatusShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
</sql>
<sql id="Group_Column_List_Show">
@@ -70,7 +70,7 @@
SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time,
concat(SAR_STANDARDS_INFO.synopsis, ''), concat(replace_stand_num, ''), replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag,
SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME, dicstandSort.DIC_TYPE_NAME,
dicstandState.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
dicstandState.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,dicstandTextStatus.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
</sql>
<!-- 查询条件 -->
@@ -380,6 +380,11 @@
dicstandState.dic_id is not null and dicstandState.valid_flag = 0 )
left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and
dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 )
LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
AND dicstandNature.dic_id IS NOT NULL
AND dicstandNature.valid_flag = 0
)
left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id
left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
@@ -652,9 +657,9 @@
FROM sar_standards_info
LEFT JOIN sar_stand_attr_info ssai ON ssai.STAND_ID = SAR_STANDARDS_INFO.ID
WHERE
DATE_FORMAT(ssai.SSRQ, '%Y-%m-%D') >= DATE_FORMAT(
DATE_FORMAT(ssai.SSRQ, '%Y-%m-%d') >= DATE_FORMAT(
SAR_STANDARDS_INFO.ISSUE_TIME,
'%Y-%m-%D'
'%Y-%m-%d'
)
AND
sar_standards_info.VALID_FLAG='0'
@@ -746,6 +751,11 @@
dicstandState.dic_id is not null and dicstandState.valid_flag = 0 )
left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and
dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 )
LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
AND dicstandNature.dic_id IS NOT NULL
AND dicstandNature.valid_flag = 0
)
left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id
where SAR_STANDARDS_INFO.id = #{id}
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>