修改bug

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

@@ -168,24 +168,33 @@ public class EsProcessEnterpriseController {
     })
     @PostMapping(value= "/emergencySupport/esProcessEnterprise/importByEntity", headers= "content-type= multipart/form-data", consumes= "multipart/*")
     public Map<String,Object> importByEntity(@RequestParam(value= "file", required = true) MultipartFile file) throws IOException {
-
-        Map<String,Object> map = new HashMap<String,Object>();
-        if(file== null){
-            map.put("massage","无文件数据");
-            map.put("status","500");
+        Map<String, Object> map = new HashMap<>();
+        try {
+            if (file == null || file.isEmpty()) {
+                map.put("message", "无文件数据");
+                map.put("status", "500");
+                return map;
+            }
+            // 获得文件名
+            String fileName = file.getOriginalFilename();
+            // 判断文件是否是excel文件
+            if (!fileName.endsWith("xls") && !fileName.endsWith("xlsx")) {
+                map.put("message", "请使用正确的导入模板");
+                map.put("status", "500");
+                return map;
+            }
+
+            return esProcessEnterpriseService.importByEntityResult(file, map);
+        } catch (IOException e) {
+            map.put("message", "文件处理异常: " + e.getMessage());
+            map.put("status", "500");
             return map;
-        }
-        //获得文件名
-        String fileName = file.getOriginalFilename();
-        //判断文件是否是excel文件
-        if (!fileName.endsWith("xls") && !fileName.endsWith("xlsx")) {
-            map.put("massage","请使用正确的导入模板");
-            map.put("status","500");
+        } catch (Exception e) {
+            map.put("message", "发生异常: " + e.getMessage());
+            map.put("status", "500");
             return map;
         }
 
-        return esProcessEnterpriseService.importByEntityResult(file,map);
-
     }
 
 

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

@@ -14,6 +14,7 @@ package com.unis.emergencySupport.modular.es.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -293,7 +294,11 @@ public class EsProcessEnterpriseServiceImpl extends ServiceImpl<EsProcessEnterpr
 
                         EsProcessEnterprise.setHeadquarterCreditCode(strings[11]);//所属总公司企业信用代码
                         EsProcessEnterprise.setEnterpriseName(strings[12]);//企业名称
-                        EsProcessEnterprise.setCreditCode(strings[13]);//统一社会信用代码
+                        if (strings[13] != null && strings[13].length() > 18) {
+                            throw new IllegalArgumentException(strings[13]+"统一社会信用代码长度不能超过18位");
+                        } else {
+                            EsProcessEnterprise.setCreditCode(strings[13]);//统一社会信用代码
+                        }
                         EsProcessEnterprise.setActualBusinessAddress(strings[14]);//实际经营地址（省、市、县、乡镇街道门牌号）
 
                         QueryWrapper<BizDict> queryWrapper7 = new QueryWrapper<>();
@@ -305,10 +310,40 @@ public class EsProcessEnterpriseServiceImpl extends ServiceImpl<EsProcessEnterpr
                         List<BizDict> list8 = BizDictServiceImpl.list(queryWrapper8);
                         EsProcessEnterprise.setEnterpriseType(strings[16]);//企业类型
 
-                        EsProcessEnterprise.setLongitude(new BigDecimal(strings[17]));//经度
+//                        EsProcessEnterprise.setLongitude(new BigDecimal(strings[17]));//经度
+//
+//                        EsProcessEnterprise.setLatitude(new BigDecimal(strings[18]));//纬度
+
+                        // 假设 strings 是字符串数组，其中包含经度和纬度的数据
+                        if (strings[17] != null) {
+                            try {
+                                if(NumberUtil.isNumber(strings[17])){
+                                    BigDecimal longitude = new BigDecimal(strings[17]);
+                                    // 进行后续的处理
+                                    EsProcessEnterprise.setLongitude(longitude);
+                                }else{
+                                    throw new NumberFormatException(strings[17] + " 经度格式不正确");
+                                }
+
+                            } catch (NumberFormatException e) {
+                                throw new NumberFormatException(strings[17] + " 经度格式不正确");
+                            }
+                        }
 
-                        EsProcessEnterprise.setLatitude(new BigDecimal(strings[18]));//纬度
+                        if (strings[18] != null) {
+                            try {
+                                if(NumberUtil.isNumber(strings[17])){
+                                    BigDecimal longitude = new BigDecimal(strings[18]);
+                                    // 进行后续的处理
+                                    EsProcessEnterprise.setLongitude(longitude);
+                                }{
+                                    throw new NumberFormatException(strings[18] + " 经度格式不正确");
+                                }
 
+                            } catch (NumberFormatException e) {
+                                throw new NumberFormatException(strings[18] + " 纬度格式不正确");
+                            }
+                        }
 
                         EsProcessEnterprise.setLegalRepresentative(strings[19]);//法人姓名
                         EsProcessEnterprise.setLegalContact(strings[20]);//法人联系方式

unis-plugin/unis-plugin-biz/src/main/java/com/unis/purchaseAndSalesSupervision/modular/yjbj/entity/StorageRotationWarning.java

@@ -77,4 +77,8 @@ public class StorageRotationWarning {
     @ApiModelProperty(value = "最后修改时间", position = 18)
     private Date updatetime;
 
+
+    private String storehouseName;
+
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/purchaseAndSalesSupervision/modular/yjbj/mapper/mapping/YjbjMapper.xml

@@ -52,29 +52,30 @@
 
     <select id="selectLhList" resultType="com.unis.purchaseAndSalesSupervision.modular.yjbj.entity.StorageRotationWarning" parameterType="map">
         select
-            id, ch, hwh, lspz, lsxz, kcsl, scnf, zhycrq, cbnx, cccxrq, bjrq, bjlx, clzt, clr,
-            clsj, org_id, scsj, updatetime, remark, clyj
-        from storage_rotation_warning
+        srw.id, srw.ch, srw.hwh, srw.lspz, srw.lsxz,srw.kcsl, srw.scnf, srw.zhycrq, srw.cbnx, srw.cccxrq, srw.bjrq, srw.bjlx, srw.clzt, srw.clr,
+        srw.clsj, srw.org_id, srw.scsj, srw.updatetime, srw.remark, srw.clyj,bs.storehouse_name storehouseName
+        from depot_qh.storage_rotation_warning srw
+        left join depot_qh.basic_storehouse bs on bs.storehouse_id=srw.ch
         where 1=1
         <if test="record.bjlx != null">
-            and bjlx = #{record.bjlx, jdbcType=VARCHAR}
+            and srw.bjlx = #{record.bjlx, jdbcType=VARCHAR}
         </if>
         <if test="record.orgId != null">
-            and org_id = #{record.orgId, jdbcType=INTEGER}
+            and srw.org_id = #{record.orgId, jdbcType=INTEGER}
         </if>
         <if test="record.lspz != null">
-            and lspz = #{record.lspz, jdbcType=INTEGER}
+            and srw.lspz = #{record.lspz, jdbcType=INTEGER}
         </if>
         <if test="record.ch != null">
-            and ch = #{record.ch, jdbcType=INTEGER}
+            and srw.ch = #{record.ch, jdbcType=INTEGER}
         </if>
         <if test="record.startTime != null">
-            and STR_TO_DATE(zhycrq, '%Y-%m-%d %H:%i:%s') >= #{record.startTime, jdbcType=VARCHAR}
+            and srw.STR_TO_DATE(zhycrq, '%Y-%m-%d %H:%i:%s') >= #{record.startTime, jdbcType=VARCHAR}
         </if>
         <if test="record.endTime != null">
-            and STR_TO_DATE(zhycrq, '%Y-%m-%d %H:%i:%s') &lt;= #{record.endTime, jdbcType=VARCHAR}
+            and srw.STR_TO_DATE(zhycrq, '%Y-%m-%d %H:%i:%s') &lt;= #{record.endTime, jdbcType=VARCHAR}
         </if>
-        order by scsj desc
+        order by srw.scsj desc
     </select>
 
     <select id="queryLhById" parameterType="java.lang.String" resultType="com.unis.purchaseAndSalesSupervision.modular.yjbj.entity.StorageRotationWarning">