代码部分恢复

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -13,8 +13,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-@FeignClient(value = "bat-wkflow")
+//@FeignClient(value = "bat-wkflow")
-//@FeignClient(value = "shan")
+@FeignClient(value = "shan6")
 public interface workFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET)

adc-da-main/src/main/resources/application-dev.properties

@@ -3,8 +3,8 @@
 # 数据库配置
 #=============================================
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+#spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
-#spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
 spring.datasource.username = root
 spring.datasource.password = root
 
@@ -12,7 +12,7 @@ spring.datasource.password = root
 
 #==============================================
 # 应用设置
-spring.application.name=FotonLAWSSystem
+spring.application.name=FotonLAWSSystem556
 application.code=20200101
 application.center=1
 #==============================================

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

@@ -22,7 +22,7 @@ import java.util.List;
 public interface SarLawsAttrDetailedListDao extends BaseMapper<SarLawsAttrDetailedList> {
 
     //根据清单id，查出标准的id并排序
-    List<String> selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size,@Param("sar") SarFindDto sarFindDto);
+    List<String> selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size);
     //根据标准id查出数据
     List<LawsDto> selectLawsById(@Param("param1") List<String> LawsIds, @Param("sarFindDto") SarFindDto sarFindDto);
     //根据标准id查出数据用于清单查询

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 SSRQ;
+    private String putTime;
 
     @ColumnWidth(16)
     @ExcelProperty(value = "新车型实施日期", index = 9)
@@ -115,7 +115,4 @@ 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/SarFindDto.java

@@ -23,8 +23,5 @@ public class SarFindDto {
 //    private String ZCCSSRQGJ;
     private String zrbm;
     private String sycpx;
-    private String standSort;
-    private String standType;
-    private String standNumber;
 
 }

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 = "ssrq")
+    @TableField(value = "putTime")
-    private String ssrq;
+    private String putTime;
 
     @ApiModelProperty(value = "新车型实施日期")
     @TableField(value = "xcxssrq")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java

@@ -29,7 +29,7 @@ public class StandExcelDto {
     @ApiModelProperty(value = "能源类型")
     private String NYLX;
     @ApiModelProperty(value = "标准实施日期")
-    private String SSRQ;
+    private String putTime;
     @ApiModelProperty(value = "新车型实施日期")
     private String newCarTime;
     @ApiModelProperty(value = "在产车实施日期")

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

@@ -45,21 +45,18 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
         wrapper.eq("detailed_list_id", sarFindDto.getId());
         IPage<SarLawsAttrDetailedList> selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper);
         //查询标准id
-        List<String> lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto);
+        List<String> lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize());
         if (CollectionUtils.isEmpty(lawsIds)){
             return null;
         }
         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).getSsrq())){
+              if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getPutTime())){
-                  lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq());
+                  lawsDto.setPutTime(sarLawsAttrDetailedLists.get(0).getPutTime());
               }
               if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){
                   lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq());
@@ -202,7 +199,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
                             .standId(timeDto1.getStandId())
                             .detailedListId(standId)
                             .number(String.valueOf(a))
-                            .ssrq(timeDto1.getSsrq())
+                            .putTime(timeDto1.getPutTime())
                             .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 carType) {
+                                       String detailedListName) {
         if (StringUtils.isNotEmpty(sortKey)) {
             IPage<SarLawsDetailedList> publicList1 = sarLawsDetailedListService.AllSelectD(page, pageSize, sortKey,
-                    countryArea, projectName, detailedList, detailedListName,carType);
+                    countryArea, projectName, detailedList, detailedListName);
             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,6 +40,5 @@ 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,8 +81,5 @@ 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 ssrq;
+    private String putTime;
 
     @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 carType);
+                                          String detailedList, String detailedListName);
 //    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,11 +166,14 @@ 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);
     }
 

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

@@ -91,10 +91,6 @@ public class SarStandardComplianceProductAssess extends BaseEntity {
     @ApiModelProperty(value = "在产产品合规信息")
     private String productionCompliance;
 
-    @ApiModelProperty(value = "在产产品不合规信息")
-    @TableField("production_non_compliance")
-    private String productionNonCompliance;
-
     @ApiModelProperty(value = "在产产品不合规应对措施")
     private String productionCountermeasures;
 
@@ -117,10 +113,6 @@ public class SarStandardComplianceProductAssess extends BaseEntity {
     @TableField("clause_name")
     private String clauseName;
 
-    @ApiModelProperty(value = "流程UUID")
-    @TableField("type")
-    private String type;
-
 
     private String id;
 

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

@@ -18,10 +18,6 @@ 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,9 +25,6 @@ public class SarStandardsInfoEO {
     @ApiModelProperty(value = "国内1，国外2")
     private Integer position=1;
 
-    @ApiModelProperty(value = "流程UUID")
-    @TableField("type")
-    private String type;
 
     @ApiModelProperty("页数")
     private Integer current=1;