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 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
This commit is contained in:
yuezhihang
2021-08-09 17:55:11 +08:00
parent 3dd392b411 07496aff43
commit ca80dd9feb
11 changed files with 517 additions and 250 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/ElasticsearchServiceImpl.java
+1 -1
View File
@@ -120,7 +120,7 @@ public class ElasticsearchServiceImpl implements ElasticsearchService {
} }
/** /**
* 指定ID数据添加接口实现， * 指定ID数据添加接口实现
* @param jsonObject 要增加的数据 * @param jsonObject 要增加的数据
* @param index 索引，类似数据库 * @param index 索引，类似数据库
* @param type 类型，类似表 (自6.0改版以后，一个索引里只允许有一种类型， * @param type 类型，类似表 (自6.0改版以后，一个索引里只允许有一种类型，
adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+25 -4
View File
@@ -3,6 +3,8 @@ package com.adc.da.search.service.impl;
import com.adc.da.search.entity.*; import com.adc.da.search.entity.*;
import com.adc.da.search.service.SearchCenterService; import com.adc.da.search.service.SearchCenterService;
import com.adc.da.search.util.InitStandAttrSearchUtil; import com.adc.da.search.util.InitStandAttrSearchUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; 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("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("standNature.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standNature.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("textStatus.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()+"*")); .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*"));
break; break;
case "laws": case "laws":
@@ -217,6 +221,23 @@ public class SearchCenterServiceImpl implements SearchCenterService {
Map.Entry::getKey, Map.Entry::getKey,
Map.Entry::getValue)); Map.Entry::getValue));
if(sarStandAttrEOStr == null){
collectAttrMap = new TreeMap<>();
if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){
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);
}
if(searchInfoEO.getCLLX() != null && StringUtils.isNotBlank(searchInfoEO.getCLLX())){
List<String> 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; String fieldInfo = InitStandAttrSearchUtil.queryField;
List<String> fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); List<String> 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) { for (String field : fieldInfoList) {
// 关键字查询属性字段 // 关键字查询属性字段
String keyWordField = field + ".keyword"; String keyWordField = field + ".keyword";
String keyWordField2 = field + "Name.keyword";
if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){ if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){
boolQueryBuilderMust.should(QueryBuilders.wildcardQuery(keyWordField, "*"+searchInfoEO.getSelectValue()+"*")); boolQueryBuilderMust.should(QueryBuilders.wildcardQuery(keyWordField2, "*"+searchInfoEO.getSelectValue()+"*"));
}else { }else {
if(collectAttrMap.containsKey(field)){ if(collectAttrMap.containsKey(field)){
List<String> fields = new ArrayList<>(); List<String> fields = new ArrayList<>();
@@ -967,7 +989,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){ if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){
QueryBuilder multiQueryBuilder = QueryBuilders.multiMatchQuery(""); QueryBuilder multiQueryBuilder = QueryBuilders.multiMatchQuery("");
multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(),
"title","textContent","issue_time" "title","textContent"
).minimumShouldMatch("100%").field("title",10f); ).minimumShouldMatch("100%").field("title",10f);
boolQueryBuilder.must(multiQueryBuilder); boolQueryBuilder.must(multiQueryBuilder);
// boolQueryBuilder.should() // boolQueryBuilder.should()
@@ -1067,11 +1089,10 @@ public class SearchCenterServiceImpl implements SearchCenterService {
BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery(); BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery();
QueryBuilder multiQueryBuilder; QueryBuilder multiQueryBuilder;
multiQueryBuilder = QueryBuilders.multiMatchQuery(value, multiQueryBuilder = QueryBuilders.multiMatchQuery(value,
"title","textContent","issue_time").minimumShouldMatch("100%").field("title",1f); "title","textContent").minimumShouldMatch("100%").field("title",1f);
boolQueryMust.must(multiQueryBuilder); boolQueryMust.must(multiQueryBuilder);
boolQueryShould.should(QueryBuilders.wildcardQuery("title", "*"+searchInfoEO.getSelectValue()+"*").boost(10f)) boolQueryShould.should(QueryBuilders.wildcardQuery("title", "*"+searchInfoEO.getSelectValue()+"*").boost(10f))
.should(QueryBuilders.wildcardQuery("textContent", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("textContent", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("issue_time", "*"+searchInfoEO.getSelectValue()+"*"))
.should(multiQueryBuilder); .should(multiQueryBuilder);
boolQueryBuilder.should(boolQueryShould); boolQueryBuilder.should(boolQueryShould);
//在结果中检索 //在结果中检索
adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
+31 -31
View File
@@ -164,48 +164,48 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
}else { }else {
contentBuilder.append("标准体系:").append(attrInfoMap.get("standSystem")).append(" "); contentBuilder.append("标准体系:").append(attrInfoMap.get("standSystem")).append(" ");
if (StringUtils.isBlank(String.valueOf(attrInfoMap.get("BDTBH")))){ if (StringUtils.isBlank(String.valueOf(attrInfoMap.get("BDTBH")))){
contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBH")).append(" "); contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBHName")).append(" ");
}else { }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("SSRQName")).append(" ");
contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("XCXSSRQ")).append(" "); contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("XCXSSRQName")).append(" ");
contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ZCCSSRQ")).append(" "); contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ZCCSSRQName")).append(" ");
if (isForeign) { if (isForeign) {
contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLB")).append(" "); contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" ");
}else { }else {
contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDW")).append(" "); contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDWName")).append(" ");
contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJG")).append(" "); contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" ");
contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMR")).append(" "); contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" ");
contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSD")).append(" "); contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSDName")).append(" ");
contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPM")).append(" "); contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPMName")).append(" ");
} }
contentBuilder.append("适用车型:").append(attrInfoMap.get("CLLX")).append(" "); contentBuilder.append("适用车型:").append(attrInfoMap.get("CLLXName")).append(" ");
contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLX")).append(" "); contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXName")).append(" ");
contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPX")).append(" "); contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXName")).append(" ");
contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZ")).append(" "); contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZName")).append(" ");
contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBM")).append(" "); contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" ");
contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCS")).append(" "); contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" ");
contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBM")).append(" "); contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBMName")).append(" ");
contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCN")).append(" "); contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append(" ");
contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBM")).append(" "); contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append(" ");
contentBuilder.append("关联模块--卡车vpps中文名称:").append(attrInfoMap.get("KCCVPPSCN")).append(" "); contentBuilder.append("关联模块--卡车vpps中文名称:").append(attrInfoMap.get("KCCVPPSCNName")).append(" ");
contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("DYBXH")).append(" "); contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("DYBXHName")).append(" ");
contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("DYMC")).append(" "); contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("DYMCName")).append(" ");
contentBuilder.append("代替标准号:").append(attrInfoMap.get("DTBJH")).append(" "); contentBuilder.append("代替标准号:").append(attrInfoMap.get("DTBJHName")).append(" ");
contentBuilder.append("引用标准:").append(attrInfoMap.get("YYBJ")).append(" "); contentBuilder.append("引用标准:").append(attrInfoMap.get("YYBJName")).append(" ");
contentBuilder.append("被引用标准:").append(attrInfoMap.get("BYYBJ")).append(" "); contentBuilder.append("被引用标准:").append(attrInfoMap.get("BYYBJName")).append(" ");
if (isForeign) { if (isForeign) {
contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLB")).append(" "); contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" ");
}else { }else {
contentBuilder.append("采标编号:").append(attrInfoMap.get("CBBH")).append(" "); contentBuilder.append("采标编号:").append(attrInfoMap.get("CBBHName")).append(" ");
contentBuilder.append("采标程度:").append(attrInfoMap.get("CBCD")).append(" "); contentBuilder.append("采标程度:").append(attrInfoMap.get("CBCDName")).append(" ");
contentBuilder.append("部分代替标准号:").append(attrInfoMap.get("BFDTBZ")).append(" "); contentBuilder.append("部分代替标准号:").append(attrInfoMap.get("BFDTBZName")).append(" ");
contentBuilder.append("被部分代替标准号:").append(attrInfoMap.get("BBFDTBZ")).append(" "); contentBuilder.append("被部分代替标准号:").append(attrInfoMap.get("BBFDTBZName")).append(" ");
} }
if (attrInfoMap.containsKey("content")){ if (attrInfoMap.containsKey("content")){
adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java
+9
View File
@@ -9,6 +9,7 @@ import com.adc.da.utils.util.InitStandAttrUtil;
import com.rabbitmq.client.Channel; import com.rabbitmq.client.Channel;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.json.JSONTokener;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.amqp.rabbit.annotation.Exchange; import org.springframework.amqp.rabbit.annotation.Exchange;
@@ -72,6 +73,7 @@ public class SendStandMQService {
SarStandardsInfo infoEO = (SarStandardsInfo) JSONObject.toBean(jsonobject,SarStandardsInfo.class); SarStandardsInfo infoEO = (SarStandardsInfo) JSONObject.toBean(jsonobject,SarStandardsInfo.class);
String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr(); String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr();
Map<String,Object> attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr); Map<String,Object> attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr);
Map<String,Object> infoMap = infoEO.getAttrInfoMap();
// 往索引表中插入数据 // 往索引表中插入数据
String getCodeName = ""; String getCodeName = "";
@@ -111,6 +113,7 @@ public class SendStandMQService {
} }
saveMap.put("issueTime",dateFormatToStr(infoEO.getIssueTime())); saveMap.put("issueTime",dateFormatToStr(infoEO.getIssueTime()));
saveMap.put("standNature",infoEO.getStandNature());
saveMap.put("synopsis",infoEO.getSynopsis()); saveMap.put("synopsis",infoEO.getSynopsis());
saveMap.put("standType",infoEO.getStandType()); saveMap.put("standType",infoEO.getStandType());
saveMap.put("textStatus",infoEO.getTextStatus()); saveMap.put("textStatus",infoEO.getTextStatus());
@@ -134,6 +137,12 @@ public class SendStandMQService {
// 动态存储属性字段 // 动态存储属性字段
for (String field : fieldInfoList) { for (String field : fieldInfoList) {
saveMap.put(field,attrInfoMap.getOrDefault(field,"")); 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);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java
+12 -4
View File
@@ -5,9 +5,7 @@ import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result; import com.adc.da.http.Result;
import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
import com.adc.da.slrs.sarStandItems.entity.FindStandDto; import com.adc.da.slrs.sarStandItems.entity.*;
import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl;
import com.adc.da.util.UUIDUtils; import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import com.adc.da.base.web.BaseController; import com.adc.da.base.web.BaseController;
@@ -55,6 +52,17 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
} }
} }
@ApiOperation(value = "分解单查询")
@GetMapping("/querySarItemAndInterpretation")
public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
List<SarItemVO> sarItemVOS = ServiceImpl.querySarItemAndInterpretation(page);
return Result.success("200",sarItemVOS);
}
@ApiOperation(value = "分解单查询(带时间)") @ApiOperation(value = "分解单查询(带时间)")
@GetMapping("/findAllItemsTimes") @GetMapping("/findAllItemsTimes")
public List<SarItemsTime> findAllItemsTimes(@RequestParam("type") String type,@RequestParam("ids") String ids){ public List<SarItemsTime> findAllItemsTimes(@RequestParam("type") String type,@RequestParam("ids") String ids){
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java
+3 -3
View File
@@ -1,8 +1,6 @@
package com.adc.da.slrs.sarStandItems.dao; package com.adc.da.slrs.sarStandItems.dao;
import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandItems.entity.*;
import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto;
import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
import com.adc.da.sys.common.SelectionResult; import com.adc.da.sys.common.SelectionResult;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -24,6 +22,8 @@ import java.util.Set;
@Mapper @Mapper
public interface SarStandItemsDao extends BaseMapper<SarStandItems> { public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page);
List<SarStandItems> querySarStandItemsList(SarStandItemsEOPage page); List<SarStandItems> querySarStandItemsList(SarStandItemsEOPage page);
int querySarStandItemsListCount(SarStandItemsEOPage page); int querySarStandItemsListCount(SarStandItemsEOPage page);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java
+36
View File
@@ -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;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
+67
View File
@@ -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;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+5
View File
@@ -189,4 +189,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
public List<SarStandItemsDto> findAllItems(String type,String[] ids){ public List<SarStandItemsDto> findAllItems(String type,String[] ids){
return dao.selectAllItemsByIds(type,ids); return dao.selectAllItemsByIds(type,ids);
} }
public List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
return dao.querySarItemAndInterpretation(page);
}
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+45 -1
View File
@@ -382,6 +382,30 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
} }
} }
public void attrInfoSearchDetails(SarStandardsInfo row) throws Exception {
String fieldInfo = InitStandAttrUtil.queryField;
String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
row.setCollectId(collectId);
// 查询属性表数据
if (StringUtils.isNotBlank(fieldInfo)) {
Map<String, Object> 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<String, Object> transformUpperCase(Map<String, Object> orgMap) { private Map<String, Object> transformUpperCase(Map<String, Object> orgMap) {
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
@@ -428,6 +452,25 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
} }
} }
public void attrInfoShowSearchDetails(SarStandardsInfo row) throws Exception {
if (row != null) {
attrInfoSearchDetails(row);
Map<String, Object> getAttrMap = row.getAttrInfoMap();
if (getAttrMap != null && getAttrMap.size() > 0) {
for (Map.Entry<String, Object> 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<String> valArr = Arrays.asList(value.split(","));
value = dicTypeEODao.getDicNamesByCodes(valArr);
entry.setValue(value);
}
}
}
}
}
public void attrInfoShow(List<SarStandardsInfo> sarlist) throws Exception { public void attrInfoShow(List<SarStandardsInfo> sarlist) throws Exception {
for (SarStandardsInfo row : sarlist) { for (SarStandardsInfo row : sarlist) {
attrInfoDetails(row); attrInfoDetails(row);
@@ -1099,7 +1142,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
// replaseStandState(sarStandardsInfoEO); // replaseStandState(sarStandardsInfoEO);
// 记录修改日志 // 记录修改日志
saveUpdateLog(sarStandardsInfoEO, beforeSarStandardsInfo); saveUpdateLog(sarStandardsInfoEO, beforeSarStandardsInfo);
if(elasflag) { if(elasflag) { //what?
attrInfoShowSearchDetails(sarStandardsInfoEO);
createStandMQService.sendStandMQ(sarStandardsInfoEO,"update"); createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");
List<String> bhs = new ArrayList<>(Arrays.asList(String.valueOf(map.get("DTBJH")).split(","))); List<String> bhs = new ArrayList<>(Arrays.asList(String.valueOf(map.get("DTBJH")).split(",")));
for (String bh :bhs) { for (String bh :bhs) {
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
+283 -206
View File
@@ -2,65 +2,82 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao"> <mapper namespace="com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao">
<!-- Result Map--> <!-- Result Map-->
<resultMap id="BaseResultMap" type="com.adc.da.slrs.sarStandItems.entity.SarStandItems" > <resultMap id="BaseResultMap" type="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
<id column="id" property="id" /> <id column="id" property="id"/>
<result column="modify_time" property="modifyTime" /> <result column="modify_time" property="modifyTime"/>
<result column="creation_time" property="creationTime" /> <result column="creation_time" property="creationTime"/>
<result column="creation_user" property="creationUser" /> <result column="creation_user" property="creationUser"/>
<result column="valid_flag" property="validFlag" /> <result column="valid_flag" property="validFlag"/>
<result column="remarks" property="remarks" /> <result column="remarks" property="remarks"/>
<result column="responsible_unit" property="responsibleUnit" /> <result column="responsible_unit" property="responsibleUnit"/>
<result column="energy_kind" property="energyKind" /> <result column="energy_kind" property="energyKind"/>
<result column="apply_arctic" property="applyArctic" /> <result column="apply_arctic" property="applyArctic"/>
<result column="tack_time" property="tackTime" /> <result column="tack_time" property="tackTime"/>
<result column="parts" property="parts" /> <result column="parts" property="parts"/>
<result column="items_name" property="itemsName" /> <result column="items_name" property="itemsName"/>
<result column="items_num" property="itemsNum" /> <result column="items_num" property="itemsNum"/>
<result column="stand_id" property="standId" /> <result column="stand_id" property="standId"/>
<result column="MAINPOINTS_IMPEMENTATION" property="mainPointImplementation" /> <result column="MAINPOINTS_IMPEMENTATION" property="mainPointImplementation"/>
<result column="TERMS_CONDITIONS" property="termsConditions" jdbcType="CLOB" javaType = "java.lang.String"/> <result column="TERMS_CONDITIONS" property="termsConditions" jdbcType="CLOB" javaType="java.lang.String"/>
<result column="fo" property="fo" /> <result column="fo" property="fo"/>
<result column="duty_engineer" property="dutyEngineer" /> <result column="duty_engineer" property="dutyEngineer"/>
<result column="svpps" property="svpps" /> <result column="svpps" property="svpps"/>
<result column="claim_type" property="claimType" /> <result column="claim_type" property="claimType"/>
<result column="bus_stand_cover" property="busStandCover" /> <result column="bus_stand_cover" property="busStandCover"/>
<result column="file_type" property="fileType" /> <result column="file_type" property="fileType"/>
<result column="claimTypeShow" property="claimTypeShow" /> <result column="claimTypeShow" property="claimTypeShow"/>
<result column="fileTypeShow" property="fileTypeShow" /> <result column="fileTypeShow" property="fileTypeShow"/>
<result column="applyArcticShow" property="applyArcticShow" /> <result column="applyArcticShow" property="applyArcticShow"/>
<result column="responsibleUnitShow" property="responsibleUnitShow" /> <result column="responsibleUnitShow" property="responsibleUnitShow"/>
<result column="itemState" property="itemState" /> <result column="itemState" property="itemState"/>
</resultMap> </resultMap>
<resultMap id="SecondResultMap" type="com.adc.da.slrs.sarStandItems.entity.SarStandItems" > <resultMap id="SecondResultMap" type="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
<id column="id" property="id" /> <id column="id" property="id"/>
<result column="modify_time" property="modifyTime" /> <result column="modify_time" property="modifyTime"/>
<result column="creation_time" property="creationTime" /> <result column="creation_time" property="creationTime"/>
<result column="creation_user" property="creationUser" /> <result column="creation_user" property="creationUser"/>
<result column="valid_flag" property="validFlag" /> <result column="valid_flag" property="validFlag"/>
<result column="remarks" property="remarks" /> <result column="remarks" property="remarks"/>
<result column="responsible_unit" property="responsibleUnit" /> <result column="responsible_unit" property="responsibleUnit"/>
<result column="energy_kind" property="energyKind" /> <result column="energy_kind" property="energyKind"/>
<result column="apply_arctic" property="applyArctic" /> <result column="apply_arctic" property="applyArctic"/>
<result column="tack_time" property="tackTime" /> <result column="tack_time" property="tackTime"/>
<result column="parts" property="parts" /> <result column="parts" property="parts"/>
<result column="items_name" property="itemsName" /> <result column="items_name" property="itemsName"/>
<result column="items_num" property="itemsNum" /> <result column="items_num" property="itemsNum"/>
<result column="stand_id" property="standId" /> <result column="stand_id" property="standId"/>
<result column="responsibleUnitShow" property="responsibleUnitShow" /> <result column="responsibleUnitShow" property="responsibleUnitShow"/>
<result column="foShow" property="foShow"/> <result column="foShow" property="foShow"/>
</resultMap> </resultMap>
<resultMap id="sarItemVOResultMap" type="com.adc.da.slrs.sarStandItems.entity.SarItemVO">
<id column="id" property="id"/>
<result column="STAND_ID" property="standId"/>
<result column="ITEMS_NUM" property="itemsNum"/>
<result column="ITEMS_NAME" property="itemsName"/>
<result column="ITEMS_TITLE" property="itemsTitle"/>
<result column="TERMS_CONDITIONS" property="termsConditions"/>
<result column="XCXSSRQ" property="XCXSSRQ"/>
<result column="ZCCSSRQ" property="ZCCSSRQ"/>
<result column="APPLY_ARCTIC" property="applyArctic"/>
<result column="RESPONSIBLE_UNIT" property="responsibleUnit"/>
<result column="DUTY_ENGINEER" property="dutyEngineer"/>
<result column="compared_with_previous" property="comparedWithPrevious"/>
<result column="compliance_state" property="complianceState"/>
<result column="COMPLIANCE_REQUIR" property="complianceRequire"/>
<result column="FILE_TYPE" property="fileType"/>
</resultMap>
<!-- SAR_STAND_ITEMS table all fields --> <!-- SAR_STAND_ITEMS table all fields -->
<sql id="Base_Column_List" > <sql id="Base_Column_List">
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.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, ,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.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
</sql> </sql>
<sql id="Base_Query_Column_List" > <sql id="Base_Query_Column_List">
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.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.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, ,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps,
@@ -69,91 +86,97 @@
<!-- 查询条件 --> <!-- 查询条件 -->
<sql id="Base_Where_Clause"> <sql id="Base_Where_Clause">
left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and SAR_STANDARDS_INFO.valid_flag=0) left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and
left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and dicClaimType.dic_id is 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) 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) 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) and tsFo.DISABLE_FLAG=0)
where 1=1 where 1=1
<trim suffixOverrides="," > <trim suffixOverrides=",">
<if test="fileType != null" > <if test="fileType != null">
and SAR_STAND_ITEMS.file_type = #{fileType} and SAR_STAND_ITEMS.file_type = #{fileType}
</if> </if>
<if test="modifyTime != null" > <if test="modifyTime != null">
and SAR_STAND_ITEMS.modify_time ${modifyTimeOperator} #{modifyTime} and SAR_STAND_ITEMS.modify_time ${modifyTimeOperator} #{modifyTime}
</if> </if>
<if test="modifyTime1 != null" > <if test="modifyTime1 != null">
and SAR_STAND_ITEMS.modify_time &gt;= #{modifyTime1} and SAR_STAND_ITEMS.modify_time &gt;= #{modifyTime1}
</if> </if>
<if test="modifyTime2 != null" > <if test="modifyTime2 != null">
and SAR_STAND_ITEMS.modify_time &lt;= #{modifyTime2} and SAR_STAND_ITEMS.modify_time &lt;= #{modifyTime2}
</if> </if>
<if test="creationTime != null" > <if test="creationTime != null">
and SAR_STAND_ITEMS.creation_time ${creationTimeOperator} #{creationTime} and SAR_STAND_ITEMS.creation_time ${creationTimeOperator} #{creationTime}
</if> </if>
<if test="creationTime1 != null" > <if test="creationTime1 != null">
and SAR_STAND_ITEMS.creation_time &gt;= #{creationTime1} and SAR_STAND_ITEMS.creation_time &gt;= #{creationTime1}
</if> </if>
<if test="creationTime2 != null" > <if test="creationTime2 != null">
and SAR_STAND_ITEMS.creation_time &lt;= #{creationTime2} and SAR_STAND_ITEMS.creation_time &lt;= #{creationTime2}
</if> </if>
<if test="creationUser != null" > <if test="creationUser != null">
and SAR_STAND_ITEMS.creation_user ${creationUserOperator} #{creationUser} and SAR_STAND_ITEMS.creation_user ${creationUserOperator} #{creationUser}
</if> </if>
<if test="validFlag != null" > <if test="validFlag != null">
and SAR_STAND_ITEMS.valid_flag ${validFlagOperator} #{validFlag} and SAR_STAND_ITEMS.valid_flag ${validFlagOperator} #{validFlag}
</if> </if>
<if test="remarks != null" > <if test="remarks != null">
and SAR_STAND_ITEMS.remarks ${remarksOperator} #{remarks} and SAR_STAND_ITEMS.remarks ${remarksOperator} #{remarks}
</if> </if>
<if test="responsibleUnit != null" > <if test="responsibleUnit != null">
and SAR_STAND_ITEMS.responsible_unit = #{responsibleUnit} and SAR_STAND_ITEMS.responsible_unit = #{responsibleUnit}
</if> </if>
<if test="energyKind != null" > <if test="energyKind != null">
and SAR_STAND_ITEMS.energy_kind ${energyKindOperator} #{energyKind} and SAR_STAND_ITEMS.energy_kind ${energyKindOperator} #{energyKind}
</if> </if>
<if test="applyArctic != null" > <if test="applyArctic != null">
and SAR_STAND_ITEMS.apply_arctic ${applyArcticOperator} #{applyArctic} and SAR_STAND_ITEMS.apply_arctic ${applyArcticOperator} #{applyArctic}
</if> </if>
<if test="tackTime != null" > <if test="tackTime != null">
and SAR_STAND_ITEMS.tack_time ${tackTimeOperator} #{tackTime} and SAR_STAND_ITEMS.tack_time ${tackTimeOperator} #{tackTime}
</if> </if>
<if test="tackTime1 != null" > <if test="tackTime1 != null">
and SAR_STAND_ITEMS.tack_time &gt;= #{tackTime1} and SAR_STAND_ITEMS.tack_time &gt;= #{tackTime1}
</if> </if>
<if test="tackTime2 != null" > <if test="tackTime2 != null">
and SAR_STAND_ITEMS.tack_time &lt;= #{tackTime2} and SAR_STAND_ITEMS.tack_time &lt;= #{tackTime2}
</if> </if>
<if test="parts != null" > <if test="parts != null">
and SAR_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%') and SAR_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%')
</if> </if>
<if test="nameOrRequest != null" > <if test="nameOrRequest != null">
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}),'%'))
</if> </if>
<if test="itemsName != null" > <if test="itemsName != null">
and SAR_STAND_ITEMS.items_name ${itemsNameOperator} #{itemsName} and SAR_STAND_ITEMS.items_name ${itemsNameOperator} #{itemsName}
</if> </if>
<if test="itemsNum != null" > <if test="itemsNum != null">
and SAR_STAND_ITEMS.items_num ${itemsNumOperator} #{itemsNum} and SAR_STAND_ITEMS.items_num ${itemsNumOperator} #{itemsNum}
</if> </if>
<if test="standId != null" > <if test="standId != null">
and SAR_STAND_ITEMS.stand_id ${standIdOperator} #{standId} and SAR_STAND_ITEMS.stand_id ${standIdOperator} #{standId}
</if> </if>
<if test="standNum != null" > <if test="standNum != null">
and ((SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER || '-' || 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) SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR
or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like concat(concat('%',#{standNum}),'%') 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_STANDARDS_INFO.STAND_YEAR is null))
</if> </if>
<if test="id != null" > <if test="id != null">
and SAR_STAND_ITEMS.id ${idOperator} #{id} and SAR_STAND_ITEMS.id ${idOperator} #{id}
</if> </if>
<if test="noId != null" > <if test="noId != null">
and SAR_STAND_ITEMS.id != #{noId} and SAR_STAND_ITEMS.id != #{noId}
</if> </if>
<if test="productId != null" > <if test="productId != null">
and SAR_PRODUCT_SAR_STATE.product_id = #{productId} and SAR_PRODUCT_SAR_STATE.product_id = #{productId}
</if> </if>
<if test="idlist != null"> <if test="idlist != null">
@@ -162,7 +185,7 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test='proType != null and proType == "process"' > <if test='proType != null and proType == "process"'>
and (SAR_STAND_ITEMS.claim_type='L7N7EEDAPR' or SAR_STAND_ITEMS.claim_type='RENVECPFGT') and (SAR_STAND_ITEMS.claim_type='L7N7EEDAPR' or SAR_STAND_ITEMS.claim_type='RENVECPFGT')
</if> </if>
</trim> </trim>
@@ -178,66 +201,66 @@
<!--</insert>--> <!--</insert>-->
<!-- 动态插入记录 主键是序列 --> <!-- 动态插入记录 主键是序列 -->
<insert id="insertSelective" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems" > <insert id="insertSelective" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
<!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id"> <!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
SELECT SEQ_SAR_STAND_ITEMS.NEXTVAL FROM DUAL SELECT SEQ_SAR_STAND_ITEMS.NEXTVAL FROM DUAL
</selectKey> --> </selectKey> -->
insert into SAR_STAND_ITEMS insert into SAR_STAND_ITEMS
<trim prefix="(" suffix=")" suffixOverrides="," > <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="modifyTime != null" >modify_time,</if> <if test="modifyTime != null">modify_time,</if>
<if test="creationTime != null" >creation_time,</if> <if test="creationTime != null">creation_time,</if>
<if test="creationUser != null" >creation_user,</if> <if test="creationUser != null">creation_user,</if>
<if test="validFlag != null" >valid_flag,</if> <if test="validFlag != null">valid_flag,</if>
<if test="remarks != null" >remarks,</if> <if test="remarks != null">remarks,</if>
<if test="responsibleUnit != null" >responsible_unit,</if> <if test="responsibleUnit != null">responsible_unit,</if>
<if test="energyKind != null" >energy_kind,</if> <if test="energyKind != null">energy_kind,</if>
<if test="applyArctic != null" >apply_arctic,</if> <if test="applyArctic != null">apply_arctic,</if>
<if test="tackTime != null" >tack_time,</if> <if test="tackTime != null">tack_time,</if>
<if test="parts != null" >parts,</if> <if test="parts != null">parts,</if>
<if test="itemsName != null" >items_name,</if> <if test="itemsName != null">items_name,</if>
<if test="itemsNum != null" >items_num,</if> <if test="itemsNum != null">items_num,</if>
<if test="standId != null" >stand_id,</if> <if test="standId != null">stand_id,</if>
<if test="id != null" >id,</if> <if test="id != null">id,</if>
<if test="mainPointImplementation != null">MAINPOINTS_IMPEMENTATION,</if> <if test="mainPointImplementation != null">MAINPOINTS_IMPEMENTATION,</if>
<if test="termsConditions != null">TERMS_CONDITIONS,</if> <if test="termsConditions != null">TERMS_CONDITIONS,</if>
<if test="fo != null" >fo,</if> <if test="fo != null">fo,</if>
<if test="dutyEngineer != null" >duty_engineer,</if> <if test="dutyEngineer != null">duty_engineer,</if>
<if test="svpps != null" >svpps,</if> <if test="svpps != null">svpps,</if>
<if test="claimType != null" >claim_type,</if> <if test="claimType != null">claim_type,</if>
<if test="busStandCover != null">bus_stand_cover,</if> <if test="busStandCover != null">bus_stand_cover,</if>
<if test="fileType != null">file_type</if> <if test="fileType != null">file_type</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides="," > <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if> <if test="modifyTime != null">#{modifyTime, jdbcType=TIMESTAMP},</if>
<if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if> <if test="creationTime != null">#{creationTime, jdbcType=TIMESTAMP},</if>
<if test="creationUser != null" >#{creationUser, jdbcType=VARCHAR},</if> <if test="creationUser != null">#{creationUser, jdbcType=VARCHAR},</if>
<if test="validFlag != null" >#{validFlag, jdbcType=INTEGER},</if> <if test="validFlag != null">#{validFlag, jdbcType=INTEGER},</if>
<if test="remarks != null" >#{remarks, jdbcType=VARCHAR},</if> <if test="remarks != null">#{remarks, jdbcType=VARCHAR},</if>
<if test="responsibleUnit != null" >#{responsibleUnit, jdbcType=VARCHAR},</if> <if test="responsibleUnit != null">#{responsibleUnit, jdbcType=VARCHAR},</if>
<if test="energyKind != null" >#{energyKind, jdbcType=VARCHAR},</if> <if test="energyKind != null">#{energyKind, jdbcType=VARCHAR},</if>
<if test="applyArctic != null" >#{applyArctic, jdbcType=VARCHAR},</if> <if test="applyArctic != null">#{applyArctic, jdbcType=VARCHAR},</if>
<if test="tackTime != null" >#{tackTime, jdbcType=TIMESTAMP},</if> <if test="tackTime != null">#{tackTime, jdbcType=TIMESTAMP},</if>
<if test="parts != null" >#{parts, jdbcType=VARCHAR},</if> <if test="parts != null">#{parts, jdbcType=VARCHAR},</if>
<if test="itemsName != null" >#{itemsName, jdbcType=VARCHAR},</if> <if test="itemsName != null">#{itemsName, jdbcType=VARCHAR},</if>
<if test="itemsNum != null" >#{itemsNum, jdbcType=VARCHAR},</if> <if test="itemsNum != null">#{itemsNum, jdbcType=VARCHAR},</if>
<if test="standId != null" >#{standId, jdbcType=VARCHAR},</if> <if test="standId != null">#{standId, jdbcType=VARCHAR},</if>
<if test="id != null" >#{id, jdbcType=VARCHAR},</if> <if test="id != null">#{id, jdbcType=VARCHAR},</if>
<if test="mainPointImplementation != null">#{mainPointImplementation,jdbcType=VARCHAR},</if> <if test="mainPointImplementation != null">#{mainPointImplementation,jdbcType=VARCHAR},</if>
<if test="termsConditions != null">#{termsConditions,jdbcType=CLOB},</if> <if test="termsConditions != null">#{termsConditions,jdbcType=CLOB},</if>
<if test="fo != null" >#{fo, jdbcType=VARCHAR},</if> <if test="fo != null">#{fo, jdbcType=VARCHAR},</if>
<if test="dutyEngineer != null" >#{dutyEngineer, jdbcType=VARCHAR},</if> <if test="dutyEngineer != null">#{dutyEngineer, jdbcType=VARCHAR},</if>
<if test="svpps != null" >#{svpps, jdbcType=VARCHAR},</if> <if test="svpps != null">#{svpps, jdbcType=VARCHAR},</if>
<if test="claimType != null" >#{claimType, jdbcType=VARCHAR},</if> <if test="claimType != null">#{claimType, jdbcType=VARCHAR},</if>
<if test="busStandCover != null" >#{busStandCover, jdbcType=VARCHAR},</if> <if test="busStandCover != null">#{busStandCover, jdbcType=VARCHAR},</if>
<if test="fileType != null" >#{fileType, jdbcType=VARCHAR}</if> <if test="fileType != null">#{fileType, jdbcType=VARCHAR}</if>
</trim> </trim>
</insert> </insert>
<!-- 根据pk，修改记录--> <!-- 根据pk，修改记录-->
<update id="updateByPrimaryKey" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems" > <update id="updateByPrimaryKey" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
update SAR_STAND_ITEMS update SAR_STAND_ITEMS
set modify_time = #{modifyTime}, set modify_time = #{modifyTime},
creation_time = #{creationTime}, creation_time = #{creationTime},
@@ -258,69 +281,69 @@
<!-- 修改记录，只修改只不为空的字段 --> <!-- 修改记录，只修改只不为空的字段 -->
<update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems"> <update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
update SAR_STAND_ITEMS update SAR_STAND_ITEMS
<set > <set>
<if test="modifyTime != null" > <if test="modifyTime != null">
modify_time = #{modifyTime}, modify_time = #{modifyTime},
</if> </if>
<if test="creationTime != null" > <if test="creationTime != null">
creation_time = #{creationTime}, creation_time = #{creationTime},
</if> </if>
<if test="creationUser != null" > <if test="creationUser != null">
creation_user = #{creationUser}, creation_user = #{creationUser},
</if> </if>
<if test="validFlag != null" > <if test="validFlag != null">
valid_flag = #{validFlag}, valid_flag = #{validFlag},
</if> </if>
<if test="remarks != null" > <if test="remarks != null">
remarks = #{remarks}, remarks = #{remarks},
</if> </if>
<if test="responsibleUnit != null" > <if test="responsibleUnit != null">
responsible_unit = #{responsibleUnit}, responsible_unit = #{responsibleUnit},
</if> </if>
<if test="energyKind != null" > <if test="energyKind != null">
energy_kind = #{energyKind}, energy_kind = #{energyKind},
</if> </if>
<if test="applyArctic != null" > <if test="applyArctic != null">
apply_arctic = #{applyArctic}, apply_arctic = #{applyArctic},
</if> </if>
<if test="tackTime != null" > <if test="tackTime != null">
tack_time = #{tackTime}, tack_time = #{tackTime},
</if> </if>
<if test="tackTime == null"> <if test="tackTime == null">
tack_time = null, tack_time = null,
</if> </if>
<if test="parts != null" > <if test="parts != null">
parts = #{parts}, parts = #{parts},
</if> </if>
<if test="itemsName != null" > <if test="itemsName != null">
items_name = #{itemsName}, items_name = #{itemsName},
</if> </if>
<if test="itemsNum != null" > <if test="itemsNum != null">
items_num = #{itemsNum}, items_num = #{itemsNum},
</if> </if>
<if test="standId != null" > <if test="standId != null">
stand_id = #{standId}, stand_id = #{standId},
</if> </if>
<if test="mainPointImplementation != null" > <if test="mainPointImplementation != null">
MAINPOINTS_IMPEMENTATION = #{mainPointImplementation}, MAINPOINTS_IMPEMENTATION = #{mainPointImplementation},
</if> </if>
<if test="termsConditions != null" > <if test="termsConditions != null">
TERMS_CONDITIONS = #{termsConditions,jdbcType=CLOB}, TERMS_CONDITIONS = #{termsConditions,jdbcType=CLOB},
</if> </if>
<if test="fo != null" > <if test="fo != null">
fo = #{fo}, fo = #{fo},
</if> </if>
<if test="dutyEngineer != null" > <if test="dutyEngineer != null">
duty_engineer = #{dutyEngineer}, duty_engineer = #{dutyEngineer},
</if> </if>
<if test="svpps != null" > <if test="svpps != null">
svpps = #{svpps}, svpps = #{svpps},
</if> </if>
<if test="claimType != null" > <if test="claimType != null">
claim_type = #{claimType}, claim_type = #{claimType},
</if> </if>
<if test="busStandCover != null" > <if test="busStandCover != null">
bus_stand_cover = #{busStandCover}, bus_stand_cover = #{busStandCover},
</if> </if>
</set> </set>
@@ -329,7 +352,8 @@
<!-- 根据id查询 SAR_STAND_ITEMS --> <!-- 根据id查询 SAR_STAND_ITEMS -->
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String"> <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select <include refid="Base_Query_Column_List" /> select
<include refid="Base_Query_Column_List"/>
from SAR_STAND_ITEMS from SAR_STAND_ITEMS
where id = #{value} where id = #{value}
@@ -348,35 +372,76 @@
<include refid="Base_Where_Clause"/> <include refid="Base_Where_Clause"/>
</select> </select>
<select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap"
parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO">
SELECT
*
FROM
sar_stand_items AS a
LEFT JOIN sar_interpretation_national_standard AS b ON a.STAND_ID = b.STAND_ID
<where>
<if test="standId!=null and standId!=''">
and a.stand_id=#{standId}
</if>
<if test="fileType !=null and fileType!=''">
and a.file_type=#{fileType}
</if>
<if test="itemsName != null and itemsName!=''">
and a.ITEMS_NAME=#{itemsName}
</if>
<if test="XCXSSRQ !=null and XCXSSRQ!=''">
and a.XCXSSRQ=#{XCXSSRQ}
</if>
<if test="ZCCSSRQ !=null and ZCCSSRQ != ''">
and a.ZCCSSRQ=#{ZCCSSRQ}
</if>
</where>
LIMIT #{page},#{pageSize}
</select>
<!-- 查询SAR_STAND_ITEMS列表 --> <!-- 查询SAR_STAND_ITEMS列表 -->
<select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage"> <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
select <include refid="Base_Column_List" /> from select
(select tmp_tb.* from <include refid="Base_Column_List"/>
(select 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 from
,TS_ORG.org_name as responsibleUnitShow,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS (select tmp_tb.* from
(select 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
from SAR_STAND_ITEMS from SAR_STAND_ITEMS
<include refid="Base_Where_Clause"/> <include refid="Base_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''" > <if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition} ${pager.orderCondition}
</if> </if>
) tmp_tb limit ${pager.startIndex-1},${pageSize}) a ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
</select> </select>
<select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage"> <select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
select <include refid="Base_Column_List"/> from SAR_STAND_ITEMS select
<include refid="Base_Column_List"/>
from SAR_STAND_ITEMS
<include refid="Base_Where_Clause"/> <include refid="Base_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''" > <if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition} ${pager.orderCondition}
</if> </if>
</select> </select>
<select id="queryItemsByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage"> <select id="queryItemsByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
select <include refid="Base_Column_List"/>, select<include refid="Base_Column_List"/>,
( (
SELECT SELECT
group_concat(TS_DICTYPE.DIC_TYPE_NAME ORDER BY SAR_STAND_ITEM_VAL.property_type separator ',') group_concat(TS_DICTYPE.DIC_TYPE_NAME ORDER BY SAR_STAND_ITEM_VAL.property_type separator ',')
FROM FROM
SAR_STAND_ITEM_VAL left join TS_DICTYPE on (TS_DICTYPE.dic_type_code = SAR_STAND_ITEM_VAL.property_val and TS_DICTYPE.dic_id is not null) SAR_STAND_ITEM_VAL left join TS_DICTYPE on (TS_DICTYPE.dic_type_code = SAR_STAND_ITEM_VAL.property_val and
TS_DICTYPE.dic_id is not null)
WHERE WHERE
SAR_STAND_ITEM_VAL.ITEM_ID = SAR_STAND_ITEMS.id SAR_STAND_ITEM_VAL.ITEM_ID = SAR_STAND_ITEMS.id
AND SAR_STAND_ITEM_VAL.property_type = 'APPLY_ARCTIC' AND SAR_STAND_ITEM_VAL.property_type = 'APPLY_ARCTIC'
@@ -385,93 +450,100 @@
SELECT SELECT
group_concat(TS_DICTYPE.DIC_TYPE_NAME ORDER BY SAR_STAND_ITEM_VAL.property_type separator ',') group_concat(TS_DICTYPE.DIC_TYPE_NAME ORDER BY SAR_STAND_ITEM_VAL.property_type separator ',')
FROM FROM
SAR_STAND_ITEM_VAL left join TS_DICTYPE on (TS_DICTYPE.dic_type_code = SAR_STAND_ITEM_VAL.property_val and TS_DICTYPE.dic_id is not null) SAR_STAND_ITEM_VAL left join TS_DICTYPE on (TS_DICTYPE.dic_type_code = SAR_STAND_ITEM_VAL.property_val and
TS_DICTYPE.dic_id is not null)
WHERE WHERE
SAR_STAND_ITEM_VAL.ITEM_ID = SAR_STAND_ITEMS.id SAR_STAND_ITEM_VAL.ITEM_ID = SAR_STAND_ITEMS.id
AND SAR_STAND_ITEM_VAL.property_type = 'ENERGY_KIND' AND SAR_STAND_ITEM_VAL.property_type = 'ENERGY_KIND'
) AS emergyKindShow ) AS emergyKindShow
from SAR_STAND_ITEMS left join TS_ORG on (SAR_STAND_ITEMS.responsible_unit =TS_ORG.id) from SAR_STAND_ITEMS left join TS_ORG on (SAR_STAND_ITEMS.responsible_unit =TS_ORG.id)
left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and SAR_STANDARDS_INFO.valid_flag=0) left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and
left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and dicClaimType.dic_id is 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) 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) 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) and tsFo.DISABLE_FLAG=0)
where 1=1 where 1=1
<if test="fileType != null" > <if test="fileType != null">
and SAR_STAND_ITEMS.file_type = #{fileType} and SAR_STAND_ITEMS.file_type = #{fileType}
</if> </if>
<if test="modifyTime != null" > <if test="modifyTime != null">
and SAR_STAND_ITEMS.modify_time ${modifyTimeOperator} #{modifyTime} and SAR_STAND_ITEMS.modify_time ${modifyTimeOperator} #{modifyTime}
</if> </if>
<if test="modifyTime1 != null" > <if test="modifyTime1 != null">
and SAR_STAND_ITEMS.modify_time &gt;= #{modifyTime1} and SAR_STAND_ITEMS.modify_time &gt;= #{modifyTime1}
</if> </if>
<if test="modifyTime2 != null" > <if test="modifyTime2 != null">
and SAR_STAND_ITEMS.modify_time &lt;= #{modifyTime2} and SAR_STAND_ITEMS.modify_time &lt;= #{modifyTime2}
</if> </if>
<if test="creationTime != null" > <if test="creationTime != null">
and SAR_STAND_ITEMS.creation_time ${creationTimeOperator} #{creationTime} and SAR_STAND_ITEMS.creation_time ${creationTimeOperator} #{creationTime}
</if> </if>
<if test="creationTime1 != null" > <if test="creationTime1 != null">
and SAR_STAND_ITEMS.creation_time &gt;= #{creationTime1} and SAR_STAND_ITEMS.creation_time &gt;= #{creationTime1}
</if> </if>
<if test="creationTime2 != null" > <if test="creationTime2 != null">
and SAR_STAND_ITEMS.creation_time &lt;= #{creationTime2} and SAR_STAND_ITEMS.creation_time &lt;= #{creationTime2}
</if> </if>
<if test="creationUser != null" > <if test="creationUser != null">
and SAR_STAND_ITEMS.creation_user ${creationUserOperator} #{creationUser} and SAR_STAND_ITEMS.creation_user ${creationUserOperator} #{creationUser}
</if> </if>
<if test="validFlag != null" > <if test="validFlag != null">
and SAR_STAND_ITEMS.valid_flag ${validFlagOperator} #{validFlag} and SAR_STAND_ITEMS.valid_flag ${validFlagOperator} #{validFlag}
</if> </if>
<if test="remarks != null" > <if test="remarks != null">
and SAR_STAND_ITEMS.remarks ${remarksOperator} #{remarks} and SAR_STAND_ITEMS.remarks ${remarksOperator} #{remarks}
</if> </if>
<if test="responsibleUnit != null" > <if test="responsibleUnit != null">
and SAR_STAND_ITEMS.responsible_unit = #{responsibleUnit} and SAR_STAND_ITEMS.responsible_unit = #{responsibleUnit}
</if> </if>
<if test="energyKind != null" > <if test="energyKind != null">
and SAR_STAND_ITEMS.energy_kind ${energyKindOperator} #{energyKind} and SAR_STAND_ITEMS.energy_kind ${energyKindOperator} #{energyKind}
</if> </if>
<if test="applyArctic != null" > <if test="applyArctic != null">
and SAR_STAND_ITEMS.apply_arctic ${applyArcticOperator} #{applyArctic} and SAR_STAND_ITEMS.apply_arctic ${applyArcticOperator} #{applyArctic}
</if> </if>
<if test="tackTime != null" > <if test="tackTime != null">
and SAR_STAND_ITEMS.tack_time ${tackTimeOperator} #{tackTime} and SAR_STAND_ITEMS.tack_time ${tackTimeOperator} #{tackTime}
</if> </if>
<if test="tackTime1 != null" > <if test="tackTime1 != null">
and SAR_STAND_ITEMS.tack_time &gt;= #{tackTime1} and SAR_STAND_ITEMS.tack_time &gt;= #{tackTime1}
</if> </if>
<if test="tackTime2 != null" > <if test="tackTime2 != null">
and SAR_STAND_ITEMS.tack_time &lt;= #{tackTime2} and SAR_STAND_ITEMS.tack_time &lt;= #{tackTime2}
</if> </if>
<if test="parts != null" > <if test="parts != null">
and SAR_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%') and SAR_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%')
</if> </if>
<if test="nameOrRequest != null" > <if test="nameOrRequest != null">
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}),'%'))
</if> </if>
<if test="itemsName != null" > <if test="itemsName != null">
and SAR_STAND_ITEMS.items_name ${itemsNameOperator} #{itemsName} and SAR_STAND_ITEMS.items_name ${itemsNameOperator} #{itemsName}
</if> </if>
<if test="itemsNum != null" > <if test="itemsNum != null">
and SAR_STAND_ITEMS.items_num ${itemsNumOperator} #{itemsNum} and SAR_STAND_ITEMS.items_num ${itemsNumOperator} #{itemsNum}
</if> </if>
<if test="standId != null" > <if test="standId != null">
and SAR_STAND_ITEMS.stand_id ${standIdOperator} #{standId} and SAR_STAND_ITEMS.stand_id ${standIdOperator} #{standId}
</if> </if>
<if test="standNum != null" > <if test="standNum != null">
and ((SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER || '-' || 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) SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is
or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like concat(concat('%',#{standNum}),'%') 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_STANDARDS_INFO.STAND_YEAR is null))
</if> </if>
<if test="id != null" > <if test="id != null">
and SAR_STAND_ITEMS.id ${idOperator} #{id} and SAR_STAND_ITEMS.id ${idOperator} #{id}
</if> </if>
<if test="noId != null" > <if test="noId != null">
and SAR_STAND_ITEMS.id != #{noId} and SAR_STAND_ITEMS.id != #{noId}
</if> </if>
<if test="idlist != null"> <if test="idlist != null">
@@ -480,10 +552,10 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test='proType != null and proType == "process"' > <if test='proType != null and proType == "process"'>
and (SAR_STAND_ITEMS.claim_type='L7N7EEDAPR' or SAR_STAND_ITEMS.claim_type='RENVECPFGT') and (SAR_STAND_ITEMS.claim_type='L7N7EEDAPR' or SAR_STAND_ITEMS.claim_type='RENVECPFGT')
</if> </if>
<if test="pager.orderCondition != null and pager.orderCondition != ''" > <if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition} ${pager.orderCondition}
</if> </if>
</select> </select>
@@ -492,7 +564,7 @@
<select id="queryIdsByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage"> <select id="queryIdsByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
select SAR_STAND_ITEMS.id from SAR_STAND_ITEMS select SAR_STAND_ITEMS.id from SAR_STAND_ITEMS
<include refid="Base_Where_Clause"/> <include refid="Base_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''" > <if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition} ${pager.orderCondition}
</if> </if>
</select> </select>
@@ -524,39 +596,39 @@
<update id="updateForeach" parameterType="java.util.List"> <update id="updateForeach" parameterType="java.util.List">
<foreach collection="list" item="item" index="index" separator=";"> <foreach collection="list" item="item" index="index" separator=";">
update SAR_STAND_ITEMS update SAR_STAND_ITEMS
<set > <set>
<if test="item.svpps != null" > <if test="item.svpps != null">
svpps = #{item.svpps}, svpps = #{item.svpps},
</if> </if>
<if test="item.fo != null" > <if test="item.fo != null">
fo = #{item.fo}, fo = #{item.fo},
</if> </if>
<if test="item.fileType != null" > <if test="item.fileType != null">
file_type = #{item.fileType}, file_type = #{item.fileType},
</if> </if>
<if test="item.modifyTime != null" > <if test="item.modifyTime != null">
modify_time = #{item.modifyTime}, modify_time = #{item.modifyTime},
</if> </if>
<if test="item.remarks != null" > <if test="item.remarks != null">
remarks = #{item.remarks}, remarks = #{item.remarks},
</if> </if>
<if test="item.applyArctic != null" > <if test="item.applyArctic != null">
apply_arctic = #{item.applyArctic}, apply_arctic = #{item.applyArctic},
</if> </if>
<if test="item.itemsName != null" > <if test="item.itemsName != null">
items_name = #{item.itemsName}, items_name = #{item.itemsName},
</if> </if>
<if test="item.itemsNum != null" > <if test="item.itemsNum != null">
items_num = #{item.itemsNum}, items_num = #{item.itemsNum},
</if> </if>
<if test="item.standId != null" > <if test="item.standId != null">
stand_id = #{item.standId}, stand_id = #{item.standId},
</if> </if>
<if test="item.termsConditions != null" > <if test="item.termsConditions != null">
TERMS_CONDITIONS = #{item.termsConditions,jdbcType=CLOB}, TERMS_CONDITIONS = #{item.termsConditions,jdbcType=CLOB},
</if> </if>
</set> </set>
where id = #{item.id, jdbcType=VARCHAR} where id = #{item.id, jdbcType=VARCHAR}
</foreach> </foreach>
; ;
</update> </update>
@@ -613,7 +685,8 @@
</if> </if>
</select> </select>
<select id="selectAllItemsClaimType" resultType="com.adc.da.sys.common.SelectionResult" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems"> <select id="selectAllItemsClaimType" resultType="com.adc.da.sys.common.SelectionResult"
parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
select stand_id as label,claim_type as value from SAR_STAND_ITEMS select stand_id as label,claim_type as value from SAR_STAND_ITEMS
where valid_flag = 0 and claim_type != '' where valid_flag = 0 and claim_type != ''
<if test="standId != null"> <if test="standId != null">
@@ -627,7 +700,8 @@
</if> </if>
</select> </select>
<select id="selectAllItemsSvpps" resultType="com.adc.da.sys.common.SelectionResult" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems"> <select id="selectAllItemsSvpps" resultType="com.adc.da.sys.common.SelectionResult"
parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
select stand_id as label,svpps as value from SAR_STAND_ITEMS select stand_id as label,svpps as value from SAR_STAND_ITEMS
where valid_flag = 0 and svpps != '' where valid_flag = 0 and svpps != ''
<if test="standId != null"> <if test="standId != null">
@@ -643,14 +717,17 @@
<select id="selectAllItemsByIds" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto"> <select id="selectAllItemsByIds" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto">
select
ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as
responsibleEngineer
select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq
from SAR_STAND_ITEMS from SAR_STAND_ITEMS
where FILE_TYPE=#{type} where FILE_TYPE=#{type}
<if test="ids != null"> <if test="ids != null">
and STAND_ID in and STAND_ID in
<foreach collection="ids" index="index" item="item" open="(" separator="," close=")"> <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</if> </if>
</select> </select>
<select id="selectStandTime" resultType="com.adc.da.slrs.sarStandItems.entity.StandsTimeDto"> <select id="selectStandTime" resultType="com.adc.da.slrs.sarStandItems.entity.StandsTimeDto">