bug

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/controller/EsNetworkEntryController.java

@@ -150,7 +150,7 @@ public class EsNetworkEntryController {
             @ApiImplicitParam(name = "file", value = "文件对象集合")
     })
     @PostMapping(value= "/emergencySupport/esNetworkEntry/importByEntity", headers= "content-type= multipart/form-data", consumes= "multipart/*")
-    public Map<String,Object> importByEntity(@RequestParam(value= "file", required = true) MultipartFile file) throws IOException {
+    public Map<String,Object> importByEntity(@RequestParam(value= "file", required = true) MultipartFile file) throws Exception {
 
         Map<String,Object> map = new HashMap<String,Object>();
         if(file== null){

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/service/EsNetworkEntryService.java

@@ -84,5 +84,5 @@ public interface EsNetworkEntryService extends IService<EsNetworkEntry> {
 
     List<EsNetworkEntryCountVO> selectCount(EsNetworkEntryCountParam esNetworkEntryCountParam);
 
-    Map<String, Object> importByEntityResult(MultipartFile file, Map<String, Object> map) throws IOException;
+    Map<String, Object> importByEntityResult(MultipartFile file, Map<String, Object> map) throws Exception;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/service/impl/EsDeliveryEnterpriseServiceImpl.java

@@ -253,16 +253,25 @@ public class EsDeliveryEnterpriseServiceImpl extends ServiceImpl<EsDeliveryEnter
                         QueryWrapper<BizDict> queryWrapper4 = new QueryWrapper<>();
                         queryWrapper4.eq("DICT_LABEL",strings[4]);
                         List<BizDict> list4 = BizDictServiceImpl.list(queryWrapper4);
+                        if(list4.isEmpty()){
+                            throw new IndexOutOfBoundsException(strings[4]+"不是正确的");
+                        }
                         EsNetworkEntry.setActualAddressProvince(list4.get(0).getId());//实际经营地址-省
 
                         QueryWrapper<BizDict> queryWrapper5 = new QueryWrapper<>();
                         queryWrapper5.eq("DICT_LABEL",strings[5]);
                         List<BizDict> list5 = BizDictServiceImpl.list(queryWrapper5);
+                        if(list5.isEmpty()){
+                            throw new IndexOutOfBoundsException(strings[5]+"不是正确的");
+                        }
                         EsNetworkEntry.setActualAddressCity(list5.get(0).getId());//实际经营地址-市
 
                         QueryWrapper<BizDict> queryWrapper6 = new QueryWrapper<>();
                         queryWrapper6.eq("DICT_LABEL",strings[6]);
                         List<BizDict> list6 = BizDictServiceImpl.list(queryWrapper6);
+                        if(list6.isEmpty()){
+                            throw new IndexOutOfBoundsException(strings[6]+"不是正确的");
+                        }
                         EsNetworkEntry.setActualAddressCounty(list6.get(0).getId());//实际经营地址-县
 
 

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/service/impl/EsNetworkEntryServiceImpl.java

@@ -201,7 +201,7 @@ public class EsNetworkEntryServiceImpl extends ServiceImpl<EsNetworkEntryMapper,
     }
     @Transactional
     @Override
-    public Map<String, Object> importByEntityResult(MultipartFile file, Map<String, Object> map) throws IOException {
+    public Map<String, Object> importByEntityResult(MultipartFile file, Map<String, Object> map) throws Exception {
         // TODO Auto-generated method stub
         Integer index = 6;
         List<String[]> list = FileImport.importByFile(file, index);
@@ -285,6 +285,9 @@ public class EsNetworkEntryServiceImpl extends ServiceImpl<EsNetworkEntryMapper,
                         QueryWrapper<BizDict> queryWrapper6 = new QueryWrapper<>();
                         queryWrapper6.eq("DICT_LABEL",strings[6]);
                         List<BizDict> list6 = BizDictServiceImpl.list(queryWrapper6);
+                        if(list6.isEmpty()){
+                            throw new IndexOutOfBoundsException(strings[6]+"不是正确的");
+                        }
                         EsNetworkEntry.setActualAddressCounty(list6.get(0).getId());//实际经营地址-县
 
 

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/service/impl/EsProcessEnterpriseServiceImpl.java

@@ -239,32 +239,50 @@ public class EsProcessEnterpriseServiceImpl extends ServiceImpl<EsProcessEnterpr
                         QueryWrapper<BizDict> queryWrapper1 = new QueryWrapper<>();
                         queryWrapper1.eq("DICT_LABEL",strings[1]);
                         List<BizDict> list1 = BizDictServiceImpl.list(queryWrapper1);
+                        if(list1.isEmpty()){
+                            throw new IndexOutOfBoundsException(strings[1]+"不是正确的");
+                        }
                         EsProcessEnterprise.setManagementAreaProvince(list1.get(0).getId());//归口管理地区-省
 
                         QueryWrapper<BizDict> queryWrapper2 = new QueryWrapper<>();
                         queryWrapper2.eq("DICT_LABEL",strings[2]);
                         List<BizDict> list2 = BizDictServiceImpl.list(queryWrapper2);
+                        if(list2.isEmpty()){
+                            throw new IndexOutOfBoundsException(strings[2]+"不是正确的");
+                        }
                         EsProcessEnterprise.setManagementAreaCity(list2.get(0).getId());//归口管理地区-市
 
                         QueryWrapper<BizDict> queryWrapper3 = new QueryWrapper<>();
                         queryWrapper3.eq("DICT_LABEL",strings[3]);
                         List<BizDict> list3 = BizDictServiceImpl.list(queryWrapper3);
+                        if(list3.isEmpty()){
+                            throw new IndexOutOfBoundsException(strings[3]+"不是正确的");
+                        }
                         EsProcessEnterprise.setManagementAreaCounty(list3.get(0).getId());//归口管理地区-县
 
 
                         QueryWrapper<BizDict> queryWrapper4 = new QueryWrapper<>();
                         queryWrapper4.eq("DICT_LABEL",strings[4]);
                         List<BizDict> list4 = BizDictServiceImpl.list(queryWrapper4);
+                        if(list4.isEmpty()){
+                            throw new IndexOutOfBoundsException(strings[4]+"不是正确的");
+                        }
                         EsProcessEnterprise.setActualAddressProvince(list4.get(0).getId());//实际经营地址-省
 
                         QueryWrapper<BizDict> queryWrapper5 = new QueryWrapper<>();
                         queryWrapper5.eq("DICT_LABEL",strings[5]);
                         List<BizDict> list5 = BizDictServiceImpl.list(queryWrapper5);
+                        if(list5.isEmpty()){
+                            throw new IndexOutOfBoundsException(strings[5]+"不是正确的");
+                        }
                         EsProcessEnterprise.setActualAddressCity(list5.get(0).getId());//实际经营地址-市
 
                         QueryWrapper<BizDict> queryWrapper6 = new QueryWrapper<>();
                         queryWrapper6.eq("DICT_LABEL",strings[6]);
                         List<BizDict> list6 = BizDictServiceImpl.list(queryWrapper6);
+                        if(list6.isEmpty()){
+                            throw new IndexOutOfBoundsException(strings[6]+"不是正确的");
+                        }
                         EsProcessEnterprise.setActualAddressCounty(list6.get(0).getId());//实际经营地址-县
 
 

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestmaintain/mapper/mapping/BusinessFsInterestMaintainMapper.xml

@@ -11,7 +11,7 @@
             SUM(other_deduction) other_deduction
         FROM
             business_fs_interest_maintain
-        where year=#{year}
+        where year=#{planYear}
         GROUP BY org_id
 
     </select>