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

解读入库

Browse Source
This commit is contained in:
yuezhihang
2021-08-18 14:44:27 +08:00
parent 39561c91d2
commit af1ffe9313
12 changed files with 62 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java
+2 -2
View File
@@ -222,8 +222,8 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
//产品线
List<Map<String, String>> sycpx = (List<Map<String, String>>)map.get("SYCPXCLASS");
for (LawsDto list1:data){
if (list1.getPutTime()!=null){
list1.setPutTime(list1.getPutTime().substring(0,10));
if (list1.getSSRQ()!=null){
list1.setSSRQ(list1.getSSRQ().substring(0,10));
}
if (list1.getZCCSSRQGJ()!=null){
list1.setZCCSSRQGJ(list1.getZCCSSRQGJ().substring(0,10));
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java
+4 -1
View File
@@ -63,7 +63,7 @@ public class LawsDto {
@ExcelProperty(value = "标准实施日期", index = 8)
@ApiModelProperty(value = "标准实施日期")
@DateTimeFormat("yyyy年MM月dd日")
private String putTime;
private String SSRQ;
@ColumnWidth(16)
@ExcelProperty(value = "新车型实施日期", index = 9)
@@ -115,4 +115,7 @@ public class LawsDto {
@ApiModelProperty(value = "文本状态")
private String textStatus;
@ApiModelProperty(value = "适用车型")
private String applyArctic;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java
+2 -2
View File
@@ -44,8 +44,8 @@ public class SarLawsAttrDetailedList extends BaseEntity {
private String number;
@ApiModelProperty(value = "标准实施日期")
@TableField(value = "putTime")
private String putTime;
@TableField(value = "ssrq")
private String ssrq;
@ApiModelProperty(value = "新车型实施日期")
@TableField(value = "xcxssrq")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
+6 -3
View File
@@ -51,12 +51,15 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
}
List<LawsDto> list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto);
for (LawsDto lawsDto:list){
if (StringUtils.isNoneEmpty(lawsDto.getApplyArctic())){
lawsDto.setApplyArctic(lawsDto.getApplyArctic());
}
QueryWrapper<SarLawsAttrDetailedList> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("stand_id",lawsDto.getId())
.eq("detailed_list_id",sarFindDto.getId());
List<SarLawsAttrDetailedList> sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper);
if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getPutTime())){
lawsDto.setPutTime(sarLawsAttrDetailedLists.get(0).getPutTime());
if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){
lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq());
}
if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){
lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq());
@@ -199,7 +202,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
.standId(timeDto1.getStandId())
.detailedListId(standId)
.number(String.valueOf(a))
.putTime(timeDto1.getPutTime())
.ssrq(timeDto1.getSsrq())
.xcxssrq(timeDto1.getXcxssrqgj())
.zccssrq(timeDto1.getZccssrqgj())
.build();
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java
+2 -2
View File
@@ -94,10 +94,10 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
public ResponseMessage getAllStand(Integer page,Integer pageSize, String sortKey,
String countryArea, String projectName,
String detailedList,
String detailedListName) {
String detailedListName,String carType) {
if (StringUtils.isNotEmpty(sortKey)) {
IPage<SarLawsDetailedList> publicList1 = sarLawsDetailedListService.AllSelectD(page, pageSize, sortKey,
countryArea, projectName, detailedList, detailedListName);
countryArea, projectName, detailedList, detailedListName,carType);
List<SarLawsDetailedList> list= publicList1.getRecords();//从封装中取出数据
List<FindFileNameDto> list1;//继承类集合实现
list1 = BeanConverUtil.converList(list,FindFileNameDto.class);//将原来类的数据赋给继承类
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java
+2 -1
View File
@@ -40,5 +40,6 @@ public class AddDetailedDto {
private String inforlist2;
@ApiModelProperty(value = "新车型实施时间")
private String inforlist3;
@ApiModelProperty(value = "车辆类别")
private String carType;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java
+3
View File
@@ -81,5 +81,8 @@ public class SarLawsDetailedList extends BaseEntity {
@TableField("file_id")
private String fileIds;
@ApiModelProperty(value = "附件id")
@TableField("car_type")
private String carType;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java
+1 -1
View File
@@ -15,7 +15,7 @@ public class TimeDto {
private String standId;
@ApiModelProperty(value = "实施日期")
private String putTime;
private String ssrq;
@ApiModelProperty(value = "在产车实施日期")
private String zccssrqgj;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java
+1 -1
View File
@@ -23,7 +23,7 @@ public interface ISarLawsDetailedListService extends IService<SarLawsDetailedLis
String add(AddDetailedDto addDetailedDto);
IPage<SarLawsDetailedList> AllSelectD(Integer pages, Integer size, String sortKey,
String countryArea,String projectName,
String detailedList, String detailedListName);
String detailedList, String detailedListName,String carType);
// IPage<SarLawsDetailedList> selectAllP(Integer pages,Integer size,String sortKey);
String updateList(DetailedUpDto detailedUpDto);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
+32 -36
View File
@@ -61,64 +61,64 @@ public class SarStandardComplianceAssessResultController {
IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type");
if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
queryWrapper.like("STAND_NAME",eo.getStandName().trim());
queryWrapper.like("STAND_NAME", eo.getStandName().trim());
}
if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim());
}
if (eo.getType() != null && !eo.getType().trim().equals("")) {
queryWrapper.like("type",eo.getType().trim());
queryWrapper.like("type", eo.getType().trim());
}
IPage<SarStandardComplianceProductAssess> page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper);
while(page.getRecords().remove(null));
while (page.getRecords().remove(null)) ;
return Result.success(page);
}else {
if(eo.getPosition()==1){
} else {
if (eo.getPosition() == 1) {
QueryWrapper<SarInterpretationNationalStandard> queryWrapper = new QueryWrapper<>();
IPage<SarInterpretationNationalStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type");
if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
queryWrapper.like("STAND_NAME",eo.getStandName().trim());
queryWrapper.like("STAND_NAME", eo.getStandName().trim());
}
if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim());
}
// if (eo.getType() != null && !eo.getType().trim().equals("")) {
// queryWrapper.like("type",eo.getType().trim());
// }
IPage<SarInterpretationNationalStandard> page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper);
while(page.getRecords().remove(null));
while (page.getRecords().remove(null)) ;
return Result.success(page);
}else{
} else {
QueryWrapper<SarInterpretationForeignStandard> queryWrapper = new QueryWrapper<>();
IPage<SarInterpretationForeignStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type");
if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
queryWrapper.like("STAND_NAME",eo.getStandName().trim());
queryWrapper.like("STAND_NAME", eo.getStandName().trim());
}
if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim());
}
// if (eo.getType() != null && !eo.getType().trim().equals("")) {
// queryWrapper.like("type",eo.getType().trim());
// }
IPage<SarInterpretationForeignStandard> page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper);
while(page.getRecords().remove(null));
while (page.getRecords().remove(null)) ;
return Result.success(page);
}
}
}
private static class InsertEntity<T>{
private static class InsertEntity<T> {
List<Map> entityList;
T eo;
}
@ApiOperation(value="（插入/更新）标准清单")
@ApiOperation(value = "（插入/更新）标准清单")
@PostMapping("/standard")
public ResponseMessage insertStandard(@RequestBody InsertEntity<SarStandardsInfoEO> insertEntity) throws InvocationTargetException, IllegalAccessException {
@@ -128,27 +128,27 @@ public class SarStandardComplianceAssessResultController {
List<SarStandardComplianceProductAssess> entityList = new ArrayList<>();
for (int i = 0; i < insertEntity.entityList.size(); i++) {
SarStandardComplianceProductAssess obj=new SarStandardComplianceProductAssess();
SarStandardComplianceProductAssess obj = new SarStandardComplianceProductAssess();
BeanUtils.populate(obj, insertEntity.entityList.get(i));
entityList.add(obj);
}
iSarStandardComplianceProductAssessService.saveOrUpdateBatch(entityList);
}else {
if(eo.getPosition()==1){
} else {
if (eo.getPosition() == 1) {
List<SarInterpretationNationalStandard> entityList = new ArrayList<>();
for (int i = 0; i < insertEntity.entityList.size(); i++) {
SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard();
SarInterpretationNationalStandard obj = new SarInterpretationNationalStandard();
BeanUtils.populate(obj, insertEntity.entityList.get(i));
entityList.add(obj);
}
iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList);
}else{
} else {
List<SarInterpretationForeignStandard> entityList = new ArrayList<>();
for (int i = 0; i < insertEntity.entityList.size(); i++) {
SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard();
SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard();
BeanUtils.populate(obj, insertEntity.entityList.get(i));
entityList.add(obj);
}
@@ -166,14 +166,11 @@ public class SarStandardComplianceAssessResultController {
public ResponseMessage<IPage<SarStandardComplianceProductAssess>> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception {
IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
if (eo.getType() != null) queryWrapper.eq("type", eo.getType());
if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName());
// if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId());
// if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId());
if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
IPage<SarStandardComplianceProductAssess> page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper);
// while(page.getRecords().remove(null));
return Result.success(page);
}
@@ -195,22 +192,22 @@ public class SarStandardComplianceAssessResultController {
@ApiOperation(value = "条件查询技术审核符合性清单")
@GetMapping("/interpretation")
public ResponseMessage<Object> selectNationalStandard(InterpretationEO eo) throws Exception {
if (eo.getPosition()==1) {
if (eo.getPosition() == 1) {
IPage<SarInterpretationNationalStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
QueryWrapper<SarInterpretationNationalStandard> queryWrapper = new QueryWrapper<>();
if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
if(eo.getStandId()!=null)queryWrapper.eq("STAND_ID",eo.getStandId());
if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId());
IPage<SarInterpretationNationalStandard> page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper);
while(page.getRecords().remove(null));
while (page.getRecords().remove(null)) ;
return Result.success(page);
} else {
IPage<SarInterpretationForeignStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
QueryWrapper<SarInterpretationForeignStandard> queryWrapper = new QueryWrapper<>();
if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
if(eo.getStandId()!=null)queryWrapper.eq("STAND_ID",eo.getStandId());
if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId());
IPage<SarInterpretationForeignStandard> page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper);
while(page.getRecords().remove(null));
while (page.getRecords().remove(null)) ;
return Result.success(page);
}
@@ -223,11 +220,11 @@ public class SarStandardComplianceAssessResultController {
InterpretationEO eo = insertEntity.eo;
if (eo.getPosition()==1) {
if (eo.getPosition() == 1) {
List<SarInterpretationNationalStandard> entityList = new ArrayList<>();
for (int i = 0; i < insertEntity.entityList.size(); i++) {
SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard();
SarInterpretationNationalStandard obj = new SarInterpretationNationalStandard();
BeanUtils.populate(obj, insertEntity.entityList.get(i));
entityList.add(obj);
}
@@ -235,10 +232,9 @@ public class SarStandardComplianceAssessResultController {
} else {
List<SarInterpretationForeignStandard> entityList = new ArrayList<>();
for (int i = 0; i < insertEntity.entityList.size(); i++) {
SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard();
SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard();
BeanUtils.populate(obj, insertEntity.entityList.get(i));
entityList.add(obj);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java
+4
View File
@@ -18,6 +18,10 @@ public class SarStandardComplianceProductAssessEO{
@TableField("STAND_ID")
private String standId;
@ApiModelProperty(value = "流程UUID")
@TableField("type")
private String type;
@ApiModelProperty(value = "'项目名称'")
private String productName;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java
+3
View File
@@ -25,6 +25,9 @@ public class SarStandardsInfoEO {
@ApiModelProperty(value = "国内1，国外2")
private Integer position=1;
@ApiModelProperty(value = "流程UUID")
@TableField("type")
private String type;
@ApiModelProperty("页数")
private Integer current=1;