diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java index 3af95a89..8879dfb8 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java @@ -120,7 +120,7 @@ public class ElasticsearchServiceImpl implements ElasticsearchService { } /** - * 指定ID数据添加接口实现， + * 指定ID数据添加接口实现 * @param jsonObject 要增加的数据 * @param index 索引，类似数据库 * @param type 类型，类似表 (自6.0改版以后，一个索引里只允许有一种类型， diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 51136ac1..c2677851 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -3,6 +3,8 @@ package com.adc.da.search.service.impl; import com.adc.da.search.entity.*; import com.adc.da.search.service.SearchCenterService; import com.adc.da.search.util.InitStandAttrSearchUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -96,6 +98,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standNature.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("textStatus.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("content.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*")); break; case "laws": @@ -217,6 +221,23 @@ public class SearchCenterServiceImpl implements SearchCenterService { Map.Entry::getKey, Map.Entry::getValue)); + if(sarStandAttrEOStr == null){ + collectAttrMap = new TreeMap<>(); + + if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){ + List 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); + } + + if(searchInfoEO.getCLLX() != null && StringUtils.isNotBlank(searchInfoEO.getCLLX())){ + List fieldList = Arrays.asList(searchInfoEO.getCLLX() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList)); + collectAttrMap.put("CLLX",array); + } + + } + String fieldInfo = InitStandAttrSearchUtil.queryField; List fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); @@ -224,8 +245,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { for (String field : fieldInfoList) { // 关键字查询属性字段 String keyWordField = field + ".keyword"; + String keyWordField2 = field + "Name.keyword"; if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){ - boolQueryBuilderMust.should(QueryBuilders.wildcardQuery(keyWordField, "*"+searchInfoEO.getSelectValue()+"*")); + boolQueryBuilderMust.should(QueryBuilders.wildcardQuery(keyWordField2, "*"+searchInfoEO.getSelectValue()+"*")); }else { if(collectAttrMap.containsKey(field)){ List fields = new ArrayList<>(); @@ -967,7 +989,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){ QueryBuilder multiQueryBuilder = QueryBuilders.multiMatchQuery(""); multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), - "title","textContent","issue_time" + "title","textContent" ).minimumShouldMatch("100%").field("title",10f); boolQueryBuilder.must(multiQueryBuilder); // boolQueryBuilder.should() @@ -1067,11 +1089,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery(); QueryBuilder multiQueryBuilder; multiQueryBuilder = QueryBuilders.multiMatchQuery(value, - "title","textContent","issue_time").minimumShouldMatch("100%").field("title",1f); + "title","textContent").minimumShouldMatch("100%").field("title",1f); boolQueryMust.must(multiQueryBuilder); boolQueryShould.should(QueryBuilders.wildcardQuery("title", "*"+searchInfoEO.getSelectValue()+"*").boost(10f)) .should(QueryBuilders.wildcardQuery("textContent", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("issue_time", "*"+searchInfoEO.getSelectValue()+"*")) .should(multiQueryBuilder); boolQueryBuilder.should(boolQueryShould); //在结果中检索 diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index ad72d012..dde8aed7 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -164,48 +164,48 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { }else { contentBuilder.append("标准体系:").append(attrInfoMap.get("standSystem")).append(" "); if (StringUtils.isBlank(String.valueOf(attrInfoMap.get("BDTBH")))){ - contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBH")).append(" "); + contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBHName")).append(" "); }else { - contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBZBH")).append(" "); + contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBZBHName")).append(" "); } } - contentBuilder.append("实施日期(标准文本):").append(attrInfoMap.get("SSRQ")).append(" "); - contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("XCXSSRQ")).append(" "); - contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ZCCSSRQ")).append(" "); + contentBuilder.append("实施日期(标准文本):").append(attrInfoMap.get("SSRQName")).append(" "); + contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("XCXSSRQName")).append(" "); + contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ZCCSSRQName")).append(" "); if (isForeign) { - contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLB")).append(" "); + contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); }else { - contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDW")).append(" "); - contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJG")).append(" "); - contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMR")).append(" "); - contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSD")).append(" "); - contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPM")).append(" "); + contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDWName")).append(" "); + contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); + contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); + contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSDName")).append(" "); + contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPMName")).append(" "); } - contentBuilder.append("适用车型:").append(attrInfoMap.get("CLLX")).append(" "); - contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLX")).append(" "); - contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPX")).append(" "); - contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZ")).append(" "); - contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBM")).append(" "); - contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCS")).append(" "); - contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBM")).append(" "); - contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCN")).append(" "); - contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBM")).append(" "); - contentBuilder.append("关联模块--卡车vpps中文名称:").append(attrInfoMap.get("KCCVPPSCN")).append(" "); - contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("DYBXH")).append(" "); - contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("DYMC")).append(" "); + contentBuilder.append("适用车型:").append(attrInfoMap.get("CLLXName")).append(" "); + contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXName")).append(" "); + contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXName")).append(" "); + contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZName")).append(" "); + contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); + contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); + contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBMName")).append(" "); + contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append(" "); + contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append(" "); + contentBuilder.append("关联模块--卡车vpps中文名称:").append(attrInfoMap.get("KCCVPPSCNName")).append(" "); + contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("DYBXHName")).append(" "); + contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("DYMCName")).append(" "); - contentBuilder.append("代替标准号:").append(attrInfoMap.get("DTBJH")).append(" "); - contentBuilder.append("引用标准:").append(attrInfoMap.get("YYBJ")).append(" "); - contentBuilder.append("被引用标准:").append(attrInfoMap.get("BYYBJ")).append(" "); + contentBuilder.append("代替标准号:").append(attrInfoMap.get("DTBJHName")).append(" "); + contentBuilder.append("引用标准:").append(attrInfoMap.get("YYBJName")).append(" "); + contentBuilder.append("被引用标准:").append(attrInfoMap.get("BYYBJName")).append(" "); if (isForeign) { - contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLB")).append(" "); + contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); }else { - contentBuilder.append("采标编号:").append(attrInfoMap.get("CBBH")).append(" "); - contentBuilder.append("采标程度:").append(attrInfoMap.get("CBCD")).append(" "); - contentBuilder.append("部分代替标准号:").append(attrInfoMap.get("BFDTBZ")).append(" "); - contentBuilder.append("被部分代替标准号:").append(attrInfoMap.get("BBFDTBZ")).append(" "); + contentBuilder.append("采标编号:").append(attrInfoMap.get("CBBHName")).append(" "); + contentBuilder.append("采标程度:").append(attrInfoMap.get("CBCDName")).append(" "); + contentBuilder.append("部分代替标准号:").append(attrInfoMap.get("BFDTBZName")).append(" "); + contentBuilder.append("被部分代替标准号:").append(attrInfoMap.get("BBFDTBZName")).append(" "); } if (attrInfoMap.containsKey("content")){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java index 16cb5288..f6660306 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java @@ -9,6 +9,7 @@ import com.adc.da.utils.util.InitStandAttrUtil; import com.rabbitmq.client.Channel; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; +import org.json.JSONTokener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.amqp.rabbit.annotation.Exchange; @@ -72,6 +73,7 @@ public class SendStandMQService { SarStandardsInfo infoEO = (SarStandardsInfo) JSONObject.toBean(jsonobject,SarStandardsInfo.class); String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr(); Map attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr); + Map infoMap = infoEO.getAttrInfoMap(); // 往索引表中插入数据 String getCodeName = ""; @@ -111,6 +113,7 @@ public class SendStandMQService { } saveMap.put("issueTime",dateFormatToStr(infoEO.getIssueTime())); + saveMap.put("standNature",infoEO.getStandNature()); saveMap.put("synopsis",infoEO.getSynopsis()); saveMap.put("standType",infoEO.getStandType()); saveMap.put("textStatus",infoEO.getTextStatus()); @@ -134,6 +137,12 @@ public class SendStandMQService { // 动态存储属性字段 for (String field : fieldInfoList) { saveMap.put(field,attrInfoMap.getOrDefault(field,"")); + Object json= new JSONTokener(infoMap.get(field).toString()).nextValue(); + String fieldValue = ""; + if(!json.toString().equals("null")){ + fieldValue = infoMap.get(field).toString(); + } + saveMap.put(field+"Name",fieldValue); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index dfb79043..85bf0364 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -5,9 +5,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; -import com.adc.da.slrs.sarStandItems.entity.FindStandDto; -import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; -import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; +import com.adc.da.slrs.sarStandItems.entity.*; import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +13,6 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; @@ -55,6 +52,17 @@ public class SarStandItemsController extends BaseController { } } + @ApiOperation(value = "分解单查询") + @GetMapping("/querySarItemAndInterpretation") + public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ + List sarItemVOS = ServiceImpl.querySarItemAndInterpretation(page); + + return Result.success("200",sarItemVOS); + } + + + + @ApiOperation(value = "分解单查询(带时间)") @GetMapping("/findAllItemsTimes") public List findAllItemsTimes(@RequestParam("type") String type,@RequestParam("ids") String ids){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 0f5aa0d4..f37ea8b3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -1,8 +1,6 @@ package com.adc.da.slrs.sarStandItems.dao; -import com.adc.da.slrs.sarStandItems.entity.SarStandItems; -import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; -import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto; +import com.adc.da.slrs.sarStandItems.entity.*; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.sys.common.SelectionResult; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -24,6 +22,8 @@ import java.util.Set; @Mapper public interface SarStandItemsDao extends BaseMapper { + List querySarItemAndInterpretation(FindSarItemsPageReqDTO page); + List querySarStandItemsList(SarStandItemsEOPage page); int querySarStandItemsListCount(SarStandItemsEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java new file mode 100644 index 00000000..5ed30c32 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java @@ -0,0 +1,36 @@ +package com.adc.da.slrs.sarStandItems.entity; + +import com.adc.da.base.page.BasePage; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + + +@Data +public class FindSarItemsPageReqDTO { + + private static final long serialVersionUID = 1L; + private Integer page = 1; + private Integer pageSize = 20; + + + @ApiModelProperty(value = "标准id") + private String standId; + + @ApiModelProperty(value = "条款名称") + private String itemsName; + + @ApiModelProperty(value = "新车型实施日期") + @DateTimeFormat(pattern = "yyy-MM-dd") + private Date XCXSSRQ; + + @ApiModelProperty(value = "在产车实施日期") + @DateTimeFormat(pattern = "yyy-MM-dd") + private Date ZCCSSRQ; + + @ApiModelProperty(value = "文件类型") + private String fileType; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java new file mode 100644 index 00000000..ac471308 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java @@ -0,0 +1,67 @@ +package com.adc.da.slrs.sarStandItems.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@ApiModel(value="标准分解单显示对象", description="") +public class SarItemVO extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + + @ApiModelProperty(value = "标准ID") + private String standId; + + @ApiModelProperty(value = "条款号") + private String itemsNum; + + @ApiModelProperty(value = "条款名称") + private String itemsName; + + @ApiModelProperty(value = "条款内容") + private String itemsTitle; + + @ApiModelProperty(value = "解读内容--条款要求") + private String termsConditions; + + @ApiModelProperty(value = "新车实施日期") + @DateTimeFormat + private Date XCXSSRQ; + + @ApiModelProperty(value = "在产车实施日期") + @DateTimeFormat + private Date ZCCSSRQ; + + @ApiModelProperty(value = "适用车型") + private String applyArctic; + + + @ApiModelProperty(value = "责任部门") + private String responsibleUnit; + + + @ApiModelProperty(value = "责任工程师") + private String dutyEngineer; + + @ApiModelProperty(value = "相对于上一版本变化点") + private String comparedWithPrevious; + + @ApiModelProperty(value = "合规性分析") + private String complianceState; + + @ApiModelProperty(value = "符合性要求-符合性状态") + private String complianceRequire; + + @ApiModelProperty(value = "文件类型") + private String fileType; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 3c58b975..a4addb97 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -189,4 +189,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl findAllItems(String type,String[] ids){ return dao.selectAllItemsByIds(type,ids); } + + + public List querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ + return dao.querySarItemAndInterpretation(page); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index f939742f..ea59b101 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -382,6 +382,30 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId()); + if (InitStandAttrUtil.clobFieldList != null && !InitStandAttrUtil.clobFieldList.isEmpty()) { + // 遍历修改所有clob类型的值 + for (String clobField : InitStandAttrUtil.clobFieldList) { + Clob clobValue = (Clob) getAttrMap.get(clobField); + String fieldValue = FieldConvertUtil.ClobToString(clobValue); + getAttrMap.put(clobField, fieldValue); + } + } + + if (getAttrMap != null && !getAttrMap.isEmpty()) { + row.setAttrInfoCaseMap(transformUpperCase(getAttrMap)); + } + + row.setAttrInfoMap(getAttrMap); + } + } + private Map transformUpperCase(Map orgMap) { Map resultMap = new HashMap<>(); @@ -428,6 +452,25 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getAttrMap = row.getAttrInfoMap(); + if (getAttrMap != null && getAttrMap.size() > 0) { + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + String value = ""; + if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { + value = entry.getValue().toString(); + List valArr = Arrays.asList(value.split(",")); + value = dicTypeEODao.getDicNamesByCodes(valArr); + entry.setValue(value); + } + } + } + } + } + public void attrInfoShow(List sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); @@ -1099,7 +1142,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl bhs = new ArrayList<>(Arrays.asList(String.valueOf(map.get("DTBJH")).split(","))); for (String bh :bhs) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 0de0d471..b1949451 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -2,65 +2,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id ,TS_ORG.org_name as responsibleUnitShow,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,tsFo.UNAME as foShow,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps, SAR_STAND_ITEMS.claim_type,SAR_STAND_ITEMS.bus_stand_cover,SAR_STAND_ITEMS.file_type,dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.UNAME as dutyEngineerShow,SAR_STAND_ITEMS.fo - + SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id ,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps, @@ -69,91 +86,97 @@ - left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and SAR_STANDARDS_INFO.valid_flag=0) - left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and dicClaimType.dic_id is + left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and + SAR_STANDARDS_INFO.valid_flag=0) + left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and + dicClaimType.dic_id is not null and dicClaimType.valid_flag = 0) - left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID = SAR_STAND_ITEMS.duty_engineer and tsdutyEngineer.valid_flag=0 + left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID = SAR_STAND_ITEMS.duty_engineer and + tsdutyEngineer.valid_flag=0 and tsdutyEngineer.DISABLE_FLAG=0) - left join TS_USER tsFo on (tsFo.USID = SAR_STAND_ITEMS.fo and tsFo.valid_flag=0 + left join TS_USER tsFo on (tsFo.USID = SAR_STAND_ITEMS.fo and tsFo.valid_flag=0 and tsFo.DISABLE_FLAG=0) where 1=1 - - + + and SAR_STAND_ITEMS.file_type = #{fileType} - + and SAR_STAND_ITEMS.modify_time ${modifyTimeOperator} #{modifyTime} - + and SAR_STAND_ITEMS.modify_time >= #{modifyTime1} - + and SAR_STAND_ITEMS.modify_time <= #{modifyTime2} - + and SAR_STAND_ITEMS.creation_time ${creationTimeOperator} #{creationTime} - + and SAR_STAND_ITEMS.creation_time >= #{creationTime1} - + and SAR_STAND_ITEMS.creation_time <= #{creationTime2} - + and SAR_STAND_ITEMS.creation_user ${creationUserOperator} #{creationUser} - + and SAR_STAND_ITEMS.valid_flag ${validFlagOperator} #{validFlag} - + and SAR_STAND_ITEMS.remarks ${remarksOperator} #{remarks} - + and SAR_STAND_ITEMS.responsible_unit = #{responsibleUnit} - + and SAR_STAND_ITEMS.energy_kind ${energyKindOperator} #{energyKind} - + and SAR_STAND_ITEMS.apply_arctic ${applyArcticOperator} #{applyArctic} - + and SAR_STAND_ITEMS.tack_time ${tackTimeOperator} #{tackTime} - + and SAR_STAND_ITEMS.tack_time >= #{tackTime1} - + and SAR_STAND_ITEMS.tack_time <= #{tackTime2} - + and SAR_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%') - - and (SAR_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or SAR_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%')) + + and (SAR_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or + SAR_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%')) - + and SAR_STAND_ITEMS.items_name ${itemsNameOperator} #{itemsName} - + and SAR_STAND_ITEMS.items_num ${itemsNumOperator} #{itemsNum} - + and SAR_STAND_ITEMS.stand_id ${standIdOperator} #{standId} - + and ((SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER || '-' || - SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is not null) - or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like concat(concat('%',#{standNum}),'%') + SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR + is not null) + or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like + concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is null)) - + and SAR_STAND_ITEMS.id ${idOperator} #{id} - + and SAR_STAND_ITEMS.id != #{noId} - + and SAR_PRODUCT_SAR_STATE.product_id = #{productId} @@ -162,7 +185,7 @@ #{item} - + and (SAR_STAND_ITEMS.claim_type='L7N7EEDAPR' or SAR_STAND_ITEMS.claim_type='RENVECPFGT') @@ -178,66 +201,66 @@ - + insert into SAR_STAND_ITEMS - - modify_time, - creation_time, - creation_user, - valid_flag, - remarks, - responsible_unit, - energy_kind, - apply_arctic, - tack_time, - parts, - items_name, - items_num, - stand_id, - id, + + modify_time, + creation_time, + creation_user, + valid_flag, + remarks, + responsible_unit, + energy_kind, + apply_arctic, + tack_time, + parts, + items_name, + items_num, + stand_id, + id, MAINPOINTS_IMPEMENTATION, TERMS_CONDITIONS, - fo, - duty_engineer, - svpps, - claim_type, + fo, + duty_engineer, + svpps, + claim_type, bus_stand_cover, file_type - - #{modifyTime, jdbcType=TIMESTAMP}, - #{creationTime, jdbcType=TIMESTAMP}, - #{creationUser, jdbcType=VARCHAR}, - #{validFlag, jdbcType=INTEGER}, - #{remarks, jdbcType=VARCHAR}, - #{responsibleUnit, jdbcType=VARCHAR}, - #{energyKind, jdbcType=VARCHAR}, - #{applyArctic, jdbcType=VARCHAR}, - #{tackTime, jdbcType=TIMESTAMP}, - #{parts, jdbcType=VARCHAR}, - #{itemsName, jdbcType=VARCHAR}, - #{itemsNum, jdbcType=VARCHAR}, - #{standId, jdbcType=VARCHAR}, - #{id, jdbcType=VARCHAR}, + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{creationUser, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{remarks, jdbcType=VARCHAR}, + #{responsibleUnit, jdbcType=VARCHAR}, + #{energyKind, jdbcType=VARCHAR}, + #{applyArctic, jdbcType=VARCHAR}, + #{tackTime, jdbcType=TIMESTAMP}, + #{parts, jdbcType=VARCHAR}, + #{itemsName, jdbcType=VARCHAR}, + #{itemsNum, jdbcType=VARCHAR}, + #{standId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, #{mainPointImplementation,jdbcType=VARCHAR}, #{termsConditions,jdbcType=CLOB}, - #{fo, jdbcType=VARCHAR}, - #{dutyEngineer, jdbcType=VARCHAR}, - #{svpps, jdbcType=VARCHAR}, - #{claimType, jdbcType=VARCHAR}, - #{busStandCover, jdbcType=VARCHAR}, - #{fileType, jdbcType=VARCHAR} + #{fo, jdbcType=VARCHAR}, + #{dutyEngineer, jdbcType=VARCHAR}, + #{svpps, jdbcType=VARCHAR}, + #{claimType, jdbcType=VARCHAR}, + #{busStandCover, jdbcType=VARCHAR}, + #{fileType, jdbcType=VARCHAR} - + update SAR_STAND_ITEMS set modify_time = #{modifyTime}, creation_time = #{creationTime}, @@ -258,69 +281,69 @@ update SAR_STAND_ITEMS - - + + modify_time = #{modifyTime}, - + creation_time = #{creationTime}, - + creation_user = #{creationUser}, - + valid_flag = #{validFlag}, - + remarks = #{remarks}, - + responsible_unit = #{responsibleUnit}, - + energy_kind = #{energyKind}, - + apply_arctic = #{applyArctic}, - + tack_time = #{tackTime}, tack_time = null, - + parts = #{parts}, - + items_name = #{itemsName}, - + items_num = #{itemsNum}, - + stand_id = #{standId}, - + MAINPOINTS_IMPEMENTATION = #{mainPointImplementation}, - + TERMS_CONDITIONS = #{termsConditions,jdbcType=CLOB}, - + fo = #{fo}, - + duty_engineer = #{dutyEngineer}, - + svpps = #{svpps}, - + claim_type = #{claimType}, - + bus_stand_cover = #{busStandCover}, @@ -329,7 +352,8 @@ + + @@ -492,7 +564,7 @@ @@ -524,39 +596,39 @@ update SAR_STAND_ITEMS - - + + svpps = #{item.svpps}, - + fo = #{item.fo}, - + file_type = #{item.fileType}, - + modify_time = #{item.modifyTime}, - + remarks = #{item.remarks}, - + apply_arctic = #{item.applyArctic}, - + items_name = #{item.itemsName}, - + items_num = #{item.itemsNum}, - + stand_id = #{item.standId}, - + TERMS_CONDITIONS = #{item.termsConditions,jdbcType=CLOB}, - where id = #{item.id, jdbcType=VARCHAR} + where id = #{item.id, jdbcType=VARCHAR} ; @@ -613,7 +685,8 @@ - select stand_id as label,claim_type as value from SAR_STAND_ITEMS where valid_flag = 0 and claim_type != '' @@ -627,7 +700,8 @@ - select stand_id as label,svpps as value from SAR_STAND_ITEMS where valid_flag = 0 and svpps != '' @@ -643,14 +717,17 @@