解读入库

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java

@@ -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){
+                if (list1.getSSRQ()!=null){
-                    list1.setPutTime(list1.getPutTime().substring(0,10));
+                    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

@@ -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

@@ -44,8 +44,8 @@ public class SarLawsAttrDetailedList extends BaseEntity {
     private String number;
 
     @ApiModelProperty(value = "标准实施日期")
-    @TableField(value = "putTime")
+    @TableField(value = "ssrq")
-    private String putTime;
+    private String ssrq;
 
     @ApiModelProperty(value = "新车型实施日期")
     @TableField(value = "xcxssrq")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java

@@ -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())){
+              if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){
-                  lawsDto.setPutTime(sarLawsAttrDetailedLists.get(0).getPutTime());
+                  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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId());
-//        if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
+        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);
     }
 
@@ -235,7 +232,6 @@ public class SarStandardComplianceAssessResultController {
         } else {
 
 
-
             List<SarInterpretationForeignStandard> entityList = new ArrayList<>();
             for (int i = 0; i < insertEntity.entityList.size(); i++) {
                 SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java

@@ -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

@@ -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;