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-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/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;
     }
 
     /**