Merge branch 'develop_master' into develop_3

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

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-zhaokaiyao")
+@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
 

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

@@ -40,6 +40,7 @@ eureka.client.fetch-registry=true
 #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
 
 eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/
+#eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/
 
 # 请求连接的超时时间 默认的时间为 1 秒
 ribbon.ConnectTimeout=500000

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/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/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,7 +45,7 @@ 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;
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java

@@ -78,7 +78,7 @@ public class SarStandardComplianceAssessResultController {
             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");
+                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME");
                 if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
                     queryWrapper.like("STAND_NAME", eo.getStandName().trim());
                 }
@@ -96,7 +96,7 @@ public class SarStandardComplianceAssessResultController {
             } 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");
+                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME");
                 if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
                     queryWrapper.like("STAND_NAME", eo.getStandName().trim());
                 }
@@ -232,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/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;