Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicDataRegionalListDto.java

@@ -14,6 +14,12 @@ import javax.validation.constraints.NotNull;
 @Data
 public class OpRegionalEconomicDataRegionalListDto {
 
+    /**
+     * id
+     */
+    @NotNull(message = "id 不能为空")
+    private Integer id;
+
     /**
      * 省Id
      */

dsk-operate-ui/src/layout/components/TagsView/index.vue

@@ -28,9 +28,16 @@
       <li v-if="!isLastView()" @click="closeRightTags"><i class="el-icon-right"></i> 关闭右侧</li>
       <li @click="closeAllTags(selectedTag)"><i class="el-icon-circle-close"></i> 全部关闭</li>
     </ul>
-    <div class="alltags" @click="closeall">
-      <div class=""><i class="el-icon-arrow-down" v-if="!showall"></i> <i class="el-icon-arrow-up" v-if="showall"></i></div>
+    <div class="alltags" v-if="visitedViews.length > 0">
+      <div class="" @click="closeall"><i class="el-icon-arrow-down" v-if="!showall"></i> <i class="el-icon-arrow-up" v-if="showall"></i></div>
       <div class="tagslist" v-if="showall">
+        <!--<div v-for="(tag, index) in visitedViews"-->
+             <!--:key="tag.path"-->
+             <!--:class="isActive(tag)?'active':''"-->
+        <!--&gt;-->
+          <!--<i class="el-icon-check"></i>-->
+
+        <!--</div>-->
         <router-link
           v-for="(tag, index) in visitedViews"
           ref="tag"
@@ -39,11 +46,12 @@
           :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
           tag="span"
           class="tags-view-item"
-          @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
           @contextmenu.prevent.native="openMenu(tag,$event)"
         >
+          <div @click="changetags">
           <i class="el-icon-check"></i>
           <span :id="isActive(tag)?'tagTitle':''">{{ tag.title }}</span>
+          </div>
         </router-link>
         <div class="clasall"  @click="closeAllTag(selectedTag)">关闭全部标签</div>
       </div>
@@ -104,13 +112,17 @@ export default {
       } else {
         document.body.removeEventListener('click', this.closeMenu)
       }
-    }
+    },
   },
   mounted() {
     this.initTags()
     this.addTags()
   },
   methods: {
+    changetags(){
+      console.log(88)
+      this.showall = false
+    },
     closeall(){
       if(this.showall == true){
         this.showall = false
@@ -231,9 +243,10 @@ export default {
       })
     },
     closeAllTag(view){
-      this.showall = false
-
-      this.closeAllTags(view)
+      this.$nextTick(()=>{
+        this.showall = false
+        this.closeAllTags(view)
+      })
     },
     closeAllTags(view) {
       this.$tab.closeAllPage().then(({ visitedViews }) => {
@@ -401,9 +414,11 @@ export default {
       text-align: left;
       box-shadow: 0 2px 9px 2px rgba(0,0,0,.09), 0 1px 2px -2px rgba(0,0,0,.16);
       .tags-view-item{
-        padding: 8px 24px;
         display: block;
         position: relative;
+        >div{
+          padding: 8px 24px;
+        }
         &:hover{
           color: #0081FF;
         }
@@ -424,6 +439,9 @@ export default {
         border-top: 1px solid #EFEFEF;
         padding: 10px 24px 0;
         margin-top: 10px;
+        &:hover{
+          color: #0081FF;
+        }
       }
     }
   }

dsk-operate-ui/src/views/custom/historicalCustomers/index.vue

@@ -349,24 +349,24 @@ export default {
   .app-container{
     height: calc(100vh - 134px)
   }
-.box-card{
-  padding-top: 16px;
-  width: 100%;
-  height: 100%;
-}
-.box{
-  position: relative;
-  >span{
-    position: absolute;
-    right: 10px;
-    bottom: 0;
-    color: #0081FF;
-    cursor: pointer;
-    &:hover{
-      color: #006AD1;
+  .box-card{
+    padding-top: 16px;
+    width: 100%;
+    height: 100%;
+  }
+  .box{
+    position: relative;
+    >span{
+      position: absolute;
+      right: 10px;
+      bottom: 0;
+      color: #0081FF;
+      cursor: pointer;
+      &:hover{
+        color: #006AD1;
+      }
     }
   }
-}
   .dc{
     font-size: 12px;
     color: #3D3D3D;
@@ -397,8 +397,8 @@ export default {
   }
   .tables{
     position: relative;
-    height: calc(100vh - 134px);
-    overflow: auto;
+    min-height: calc(100vh - 134px);
+    /*overflow: auto;*/
     .empty{
       position: absolute;
       top: 50%;
@@ -425,7 +425,7 @@ export default {
         >img{
           float: right;
           margin: 3px 0 0 4px;
-          width: 16px;
+          width: 14px;
         }
         .i{
           display: inline-block;

dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue

@@ -204,26 +204,26 @@ export default {
   methods: {
     //认领
     async handleClaim(){
-      if(this.companyInfo.uipId){
-        this.claimLoading = true
-        let param = {
-          companyId:this.companyId,
-          uipId:this.companyInfo.uipId,
-          companyName:this.companyInfo.companyName,
-          creditLevel:this.companyInfo.bratingSubjectLevel || '',
-          legalPerson:this.companyInfo.corporatePerson || '',
-          registerCapital:this.companyInfo.registeredCapital || '',
-          provinceId:this.companyInfo.provinceId || '',
-          cityId:this.companyInfo.cityId || '',
-          districtId:this.companyInfo.districtCode || '',
-          registerAddress:this.companyInfo.provinceName+(this.companyInfo.cityName?'-'+this.companyInfo.cityName:'')+(this.companyInfo.districtName?'-'+this.companyInfo.districtName:''),
-          creditCode:this.companyInfo.creditCode
-        }
-        let res = await api.customerStatus(this.companyInfo.companyName)
-        if(res.data === 1){
-          this.claimLoading = false
-          this.dialogVisible2=true;
-        }else{
+      let res = await api.customerStatus(this.companyInfo.companyName)
+      if(res.data === 1){
+        this.claimLoading = false
+        this.dialogVisible2=true;
+      }else{
+        if(this.companyInfo.uipId){
+          this.claimLoading = true
+          let param = {
+            companyId:this.companyId,
+            uipId:this.companyInfo.uipId,
+            companyName:this.companyInfo.companyName,
+            creditLevel:this.companyInfo.bratingSubjectLevel || '',
+            legalPerson:this.companyInfo.corporatePerson || '',
+            registerCapital:this.companyInfo.registeredCapital || '',
+            provinceId:this.companyInfo.provinceId || '',
+            cityId:this.companyInfo.cityId || '',
+            districtId:this.companyInfo.districtCode || '',
+            registerAddress:this.companyInfo.provinceName+(this.companyInfo.cityName?'-'+this.companyInfo.cityName:'')+(this.companyInfo.districtName?'-'+this.companyInfo.districtName:''),
+            creditCode:this.companyInfo.creditCode
+          }
           let res = await claim(param)
           this.claimLoading = false
           if(res.code==200){
@@ -231,9 +231,9 @@ export default {
             this.companyInfo.claimStatus = 1
             this.customerId = res.data.customerId
           }
+        }else{
+          this.$message.warning('对不起，当前不能认领')
         }
-      }else{
-        this.$message.warning('对不起，当前不能认领')
       }
     },
     //取消认领

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -919,6 +919,7 @@ export default {
               line-height: 32px;
               font-size: 12px;
               padding-left: 6px;
+              border-right: 0;
             }
             .el-input__suffix{
               margin-top: -1px;

dsk-system/src/main/java/com/dsk/system/domain/customer/vo/CustomerStatusListVo.java

@@ -20,5 +20,9 @@ public class CustomerStatusListVo implements Serializable {
      * 城投id
      */
     private String uipId;
+    /**
+     * 企业名称
+     */
+    private String companyName;
 
 }

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -59,6 +59,7 @@ public class EnterpriseService {
         companyData.put("uipId", null);
         companyData.put("claimStatus", 0);
         companyData.put("bratingSubjectLevel", null);
+        String companyName = MapUtils.getString(companyData, "companyName", "");
 
         Map<String, Object> map = BeanUtil.beanToMap(body, false, false);
         map.put("cid", body.getCompanyId());
@@ -74,6 +75,11 @@ public class EnterpriseService {
             ArrayList<String> uipIds = new ArrayList<>();
             uipIds.add(uipId);
             companyData.put("claimStatus", CollectionUtils.isEmpty(iCustomerService.selectStatusList(uipIds)) ? 0 : 1);
+        } else {
+            Integer status = iCustomerService.status(companyName);
+            if (ObjectUtil.isNotEmpty(status)) {
+                companyData.put("claimStatus", status.equals(0) ? 1 : 0);
+            }
         }
 
         Map<String, Object> bondCreditRatingMap = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRating", map);

dsk-system/src/main/java/com/dsk/system/mapper/CustomerMapper.java

@@ -28,6 +28,8 @@ public interface CustomerMapper extends BaseMapper<Customer> {
 
     List<CustomerStatusListVo> selectStatusList(@Param("uipIds") List<String> uipIds, @Param("userId") Long userId);
 
+    List<CustomerStatusListVo> selectStatusListByCompanyName(@Param("companyNames") List<String> companyNames, @Param("userId") Long userId);
+
 //    List<String> selectUipIdList(@Param("uipIds") List<String> uipIds, @Param("userId") Long userId);
 
 }

dsk-system/src/main/java/com/dsk/system/service/ICustomerService.java

@@ -29,6 +29,8 @@ public interface ICustomerService {
 
     List<CustomerStatusListVo> selectStatusList(List<String> uipIds);
 
+    List<CustomerStatusListVo> selectStatusListByCompanyName(List<String> companyNames);
+
 //    List<String> selectUipIdList(List<String> uipIds);
 
     Integer status(String companyName);

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java

@@ -237,8 +237,16 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     @Transactional
     public int deleteBusinessInfoByIds(Long[] ids) {
         //删除项目详情，用户关联项目，项目工作代办，项目联系人，项目跟进记录，项目标签，项目相关企业
-        return businessInfoMapper.deleteBusinessInfoByIds(ids);
-        //TODO 删除项目上传的文件
+        int deleteBusiness = businessInfoMapper.deleteBusinessInfoByIds(ids);
+        //删除项目上传的文件
+        for (Long id : ids) {
+            try {
+                FileUtils.delFolder(RuoYiConfig.getUploadPath() + id);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return deleteBusiness;
     }
 
     /**

dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java

@@ -119,6 +119,11 @@ public class CustomerServiceImpl implements ICustomerService {
         return baseMapper.selectStatusList(uipIds, SecurityUtils.getUserId());
     }
 
+    @Override
+    public List<CustomerStatusListVo> selectStatusListByCompanyName(List<String> companyNames) {
+        return baseMapper.selectStatusListByCompanyName(companyNames, SecurityUtils.getUserId());
+    }
+
 
 //    @Override
 //    public List<String> selectUipIdList(List<String> uipIds) {

dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml

@@ -58,6 +58,17 @@
         </foreach>
     </select>
 
+    <select id="selectStatusListByCompanyName" resultType="com.dsk.system.domain.customer.vo.CustomerStatusListVo">
+        select
+            ct.customer_id, ct.company_name
+        from customer ct
+        join customer_user ctu on ct.customer_id = ctu.customer_id
+        where ctu.user_id = #{userId} and ctu.status = 0 and ct.company_name in
+        <foreach collection="companyNames" item="companyName" open="(" separator="," close=")">
+            #{companyName}
+        </foreach>
+    </select>
+
 <!--    <select id="selectUipIdList" resultType="java.lang.String">-->
 <!--        select-->
 <!--            ct.uip_id-->