diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java index 9992db6..54621b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java @@ -12,8 +12,6 @@ import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoRequest; import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest; import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; -import com.ruoyi.jjh.ent.entity.JHeadQuartersRevenue; -import com.ruoyi.jjh.ent.entity.JServicesList; import com.ruoyi.jjh.ent.service.JHeadQuartersRevenueService; import com.ruoyi.jjh.ent.service.JServicesListService; import io.swagger.annotations.Api; @@ -26,7 +24,11 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; /** * 企业基础信息Controller @@ -148,23 +150,34 @@ public class BmsEnterpriseBasicInfoController extends BaseController { */ @ApiOperation(value = "将企业库企业更改分类", response = BmsEnterpriseBasicInfo.class) @PreAuthorize("@ss.hasAnyRoles('admin')") - @GetMapping(value = "/changeType") - public AjaxResult changeType() { + @PostMapping(value = "/changeType", consumes = "multipart/form-data") + public AjaxResult changeType(@RequestPart("file") MultipartFile file) throws IOException { List list = bmsEnterpriseBasicInfoService.list(); - //生活性服务业 - List list1 = jServicesListService.lambdaQuery().eq(JServicesList::getServicesType, 2).list(); + ExcelUtil util = new ExcelUtil<>(BmsEnterpriseBasicInfo.class); + List proList = util.importExcel(file.getInputStream()); + + //存储所有导入的信用代码 + Set tyshxydmSet = new HashSet<>(); + for (BmsEnterpriseBasicInfo y : proList) { + tyshxydmSet.add(y.getTyshxydm()); + } + for (BmsEnterpriseBasicInfo x : list) { - for (JServicesList y : list1) { - if (x.getTyshxydm().equals(y.getTyshxydm())) { - if ("2".equals(x.getType())) { - x.setType("7"); - } else { - x.setType(x.getType() + "," + "7"); - } + if (tyshxydmSet.contains(x.getTyshxydm())) { + if(!"2".equals(x.getType())&& !"3".equals(x.getType())){ + x.setType(x.getType()+","+"3"); bmsEnterpriseBasicInfoService.updateById(x); } } } + + for (BmsEnterpriseBasicInfo y : list) { + proList.removeIf(x->x.getTyshxydm().equals(y.getTyshxydm())); + } + proList.forEach(x->{ + x.setType("3"); + bmsEnterpriseBasicInfoService.save(x); + }); return success(); } } diff --git a/ruoyi-admin/src/main/resources/application-internet.yml b/ruoyi-admin/src/main/resources/application-internet.yml index 3474141..717800e 100644 --- a/ruoyi-admin/src/main/resources/application-internet.yml +++ b/ruoyi-admin/src/main/resources/application-internet.yml @@ -117,7 +117,7 @@ returnUrl: https://idp.sipac.gov.cn/bms #定时任务更新企业信息和联系人的开启 updateEnterprise: true #发送短信 -isTiming: false +isTiming: true #企业端正式环境应用系统编号 enterpriseAppId: 03f70874-39e9-11ef-bbd6-fa163e2b2e10