修改户用经销商详情接口

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/CommerceDto.java

@@ -39,7 +39,7 @@ public class CommerceDto {
 
     public void setBusinessLicensePhotoUrl(List<FileDto> businessLicensePhotoUrl) {
         String url=null;
-        if(businessLicensePhotoUrl!=null&&!businessLicensePhotoUrl.isEmpty()){
+        if(businessLicensePhotoUrl!=null&&!businessLicensePhotoUrl.isEmpty()&&!businessLicensePhotoUrl.isEmpty()){
             url=businessLicensePhotoUrl.get(0).getUrl();
         }
         this.businessLicensePhoto=url;
@@ -47,7 +47,7 @@ public class CommerceDto {
     }
 
     public void setBusinessLicensePhoto(String businessLicensePhoto) {
-        if(this.businessLicensePhoto!=null&&this.businessLicensePhotoUrl==null){
+        if(this.businessLicensePhoto!=null&&!businessLicensePhoto.isEmpty()&&this.businessLicensePhotoUrl==null){
             List<FileDto> businessLicensePhotoUrl =new ArrayList<>();
             FileDto d=new FileDto(this.businessLicensePhoto);
             businessLicensePhotoUrl.add(d);
@@ -58,7 +58,7 @@ public class CommerceDto {
 
     public void setLegalPersonCardPhotoFrontUrl(List<FileDto> legalPersonCardPhotoFrontUrl) {
         String url=null;
-        if(legalPersonCardPhotoFrontUrl!=null&&!legalPersonCardPhotoFrontUrl.isEmpty()){
+        if(legalPersonCardPhotoFrontUrl!=null&&!legalPersonCardPhotoFrontUrl.isEmpty()&&!legalPersonCardPhotoFrontUrl.isEmpty()){
             url=legalPersonCardPhotoFrontUrl.get(0).getUrl();
         }
         this.legalPersonCardPhotoFront=url;
@@ -66,7 +66,7 @@ public class CommerceDto {
     }
 
     public void setLegalPersonCardPhotoFront(String legalPersonCardPhotoFront) {
-        if(this.legalPersonCardPhotoFront!=null&&this.legalPersonCardPhotoFrontUrl==null){
+        if(this.legalPersonCardPhotoFront!=null&&!legalPersonCardPhotoFront.isEmpty()&&this.legalPersonCardPhotoFrontUrl==null){
             List<FileDto> legalPersonCardPhotoFrontUrl =new ArrayList<>();
             FileDto d=new FileDto(this.legalPersonCardPhotoFront);
             legalPersonCardPhotoFrontUrl.add(d);
@@ -77,7 +77,7 @@ public class CommerceDto {
 
     public void setLegalPersonCardPhotoBackUrl(List<FileDto> legalPersonCardPhotoBackUrl) {
         String url=null;
-        if(legalPersonCardPhotoBackUrl!=null&&!legalPersonCardPhotoBackUrl.isEmpty()){
+        if(legalPersonCardPhotoBackUrl!=null&&!legalPersonCardPhotoBackUrl.isEmpty()&&!legalPersonCardPhotoBackUrl.isEmpty()){
             url=legalPersonCardPhotoBackUrl.get(0).getUrl();
         }
         this.legalPersonCardPhotoBack=url;
@@ -85,7 +85,7 @@ public class CommerceDto {
     }
 
     public void setLegalPersonCardPhotoBack(String legalPersonCardPhotoBack) {
-        if(this.legalPersonCardPhotoBack!=null&& this.legalPersonCardPhotoBackUrl==null){
+        if(this.legalPersonCardPhotoBack!=null&&!legalPersonCardPhotoBack.isEmpty()&& this.legalPersonCardPhotoBackUrl==null){
             List<FileDto> legalPersonCardPhotoBackUrl =new ArrayList<>();
             FileDto d=new FileDto(this.legalPersonCardPhotoBack);
             legalPersonCardPhotoBackUrl.add(d);

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UnitInformation.java

@@ -71,7 +71,7 @@ public class UnitInformation {
 
     public void setRegisterPcdCodeList(List<Integer> registerPcdCodeList) {
         StringBuilder code=new StringBuilder();
-        if(registerPcdCodeList!=null&&!registerPcdCodeList.isEmpty()){
+        if(registerPcdCodeList!=null&&!registerPcdCodeList.isEmpty()&&!registerPcdCodeList.isEmpty()){
             for (int i = 0, len = registerPcdCodeList.size(); i < len; i++) {
                 code.append(registerPcdCodeList.get(i).toString());
                 if(i != len-1) {
@@ -87,7 +87,7 @@ public class UnitInformation {
 
     public void setWorkPcdCodeList(List<Integer> workPcdCodeList) {
         StringBuilder code=new StringBuilder();
-        if(workPcdCodeList!=null&&!workPcdCodeList.isEmpty()){
+        if(workPcdCodeList!=null&&!workPcdCodeList.isEmpty()&&!workPcdCodeList.isEmpty()){
             for (int i = 0, len = workPcdCodeList.size(); i < len; i++) {
                 code.append(workPcdCodeList.get(i).toString());
                 if(i != len-1) {
@@ -102,7 +102,7 @@ public class UnitInformation {
     }
 
     public void setRegisterPcdCode(String registerPcdCode) {
-        if(this.registerPcdCode!=null&&this.registerPcdCodeList ==null){
+        if(this.registerPcdCode!=null&&!registerPcdCode.isEmpty()&&this.registerPcdCodeList ==null){
         List<Integer> registerPcdCodeList =new ArrayList<>();
         String[] da=  registerPcdCode.split("-");
             for (String s : da) {
@@ -115,7 +115,7 @@ public class UnitInformation {
     }
 
     public void setWorkPcdCode(String workPcdCode) {
-        if(this.workPcdCode!=null&&this.workPcdCodeList==null ){
+        if(this.workPcdCode!=null&&!workPcdCode.isEmpty()&&this.workPcdCodeList==null ){
             List<Integer> workPcdCodeList =new ArrayList<>();
             String[] da=  workPcdCode.split("-");
             for (String s : da) {
@@ -127,7 +127,7 @@ public class UnitInformation {
     }
 
     public void setHeadCardPhotoFront(String headCardPhotoFront) {
-        if(this.headCardPhotoFront!=null&&this.headCardPhotoFrontUrl==null){
+        if(this.headCardPhotoFront!=null&&!headCardPhotoFront.isEmpty()&&this.headCardPhotoFrontUrl==null){
             List<FileDto> headCardPhotoFrontUrl =new ArrayList<>();
             FileDto d=new FileDto(this.headCardPhotoFront);
             headCardPhotoFrontUrl.add(d);
@@ -137,7 +137,7 @@ public class UnitInformation {
     }
 
     public void setHeadCardPhotoBack(String headCardPhotoBack) {
-        if(this.headCardPhotoBack!=null&&this.headCardPhotoBackUrl==null){
+        if(this.headCardPhotoBack!=null&&!headCardPhotoBack.isEmpty()&&this.headCardPhotoBackUrl==null){
             List<FileDto> headCardPhotoBackUrl =new ArrayList<>();
             FileDto d=new FileDto(this.headCardPhotoBack);
             headCardPhotoBackUrl.add(d);
@@ -150,7 +150,7 @@ public class UnitInformation {
     public void setHeadCardPhotoFrontUrl(List<FileDto> headCardPhotoFrontUrl) {
 
         String url=null;
-        if(headCardPhotoFrontUrl!=null&&!headCardPhotoFrontUrl.isEmpty()){
+        if(headCardPhotoFrontUrl!=null&&!headCardPhotoFrontUrl.isEmpty()&&!headCardPhotoFrontUrl.isEmpty()){
             url=headCardPhotoFrontUrl.get(0).getUrl();
         }
 
@@ -160,7 +160,7 @@ public class UnitInformation {
 
     public void setHeadCardPhotoBackUrl(List<FileDto> headCardPhotoBackUrl) {
         String url=null;
-        if(headCardPhotoBackUrl!=null&&!headCardPhotoBackUrl.isEmpty()){
+        if(headCardPhotoBackUrl!=null&&!headCardPhotoBackUrl.isEmpty()&&!headCardPhotoBackUrl.isEmpty()){
             url=headCardPhotoBackUrl.get(0).getUrl();
         }
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/DealerReviewMapper.xml

@@ -32,7 +32,7 @@
         d.flow_task_id flowTaskId,
         d.plan_instance_id planInstanceId,
         u.admin_user_id  adminUserId,
-        u.regional_companies_name regionalCompaniesName
+        (select GROUP_CONCAT(hygf_regional_companies.regional_companies_name) from hygf_regional_companies where hygf_regional_companies.unit_info_id=u.sequence_nbr ) regionalCompaniesName
         from  hygf_commerce_info c  LEFT JOIN hygf_unit_info u on c.unit_seq=u.sequence_nbr LEFT JOIN hygf_dealer_review d on d.unit_info_id=u.sequence_nbr
         <where>
             u.is_delete=0