修改bug

zksy-admin/src/main/java/com/zksy/web/controller/basicData/CrmAdministrativeConfirmationController.java

@@ -20,12 +20,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.util.Base64;
 import java.util.List;
 
 /**

zksy-admin/src/main/java/com/zksy/web/controller/basicData/CrmNewEnterpriseRecognitionDetailsController.java

@@ -93,7 +93,7 @@ public class CrmNewEnterpriseRecognitionDetailsController extends BaseController
             }
             //excel单元格合并导入
             //参数：文件， 表头列数， 是否读取序号0-读取、1-不读取， 表头占的行数下标从0开始的
-            List<Map<String,String>> list = MergeReadsExcelUtil.readExcelToObj(file,CrmNewEnterpriseRecognitionDetails.class.getDeclaredFields().length - 2,1,3, CrmNewEnterpriseRecognitionDetails.class);
+            List<Map<String,String>> list = MergeReadsExcelUtil.readExcelToObj(file,CrmNewEnterpriseRecognitionDetails.class.getDeclaredFields().length - 2,1,1, CrmNewEnterpriseRecognitionDetails.class);
             List<CrmNewEnterpriseRecognitionDetails> crmNewEnterpriseRecognitionDetails= JSON.parseObject(JSON.toJSONString(list), new TypeReference<List<CrmNewEnterpriseRecognitionDetails>>() {});
 
             if(list.size() > 0){

zksy-admin/src/main/resources/application.yml

@@ -42,7 +42,7 @@ spring:
       # 单个文件大小
       max-file-size:  10MB
       # 设置总上传的文件大小
-      max-request-size:  20MB
+      max-request-size:  60MB
   # 服务模块
   devtools:
     restart:

zksy-common/src/main/java/com/zksy/common/utils/file/ExcelUtils.java

@@ -117,7 +117,6 @@ public class ExcelUtils {
      * 获取每个对象的数据
      */
     private static <T> T getBean(Class<T> c, JSONObject obj, Map<Integer, String> uniqueMap) throws Exception {
-        log.info("原始obj======"+obj);
         T t = c.newInstance();
         Field[] fields = c.getDeclaredFields();
         List<String> errMsgList = new ArrayList<>();
@@ -308,30 +307,28 @@ public class ExcelUtils {
             } else if ("LocalDate".equalsIgnoreCase(fieldClassName)) {
                 val = val.trim().replaceAll("\\u00A0", " ").trim();
                 val = val.replace("/", "-");
-
-                DateTimeFormatter formatter = null;
-                try {
-                    // 尝试解析 "yyyy-MM-dd HH:mm:ss" 格式的日期时间
-                    formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                    LocalDate date = LocalDate.parse(val, formatter);
-                    field.set(t, date);
-                } catch (DateTimeParseException e) {
+                if (!val.contains("/") && !val.contains("-")) {
+                    String stringDate = convertExcelNumberToDate(Long.parseLong(val));
                     try {
-                        // 如果上面的解析失败，尝试解析 "yyyy-MM-dd" 格式的日期
-                        formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-                        LocalDate date = LocalDate.parse(val, formatter);
-                        field.set(t, date);
-                    } catch (DateTimeParseException ex) {
-                        String stringDate = convertExcelNumberToDate(Long.parseLong(val));
-                        try {
-                            LocalDate date = LocalDate.parse(stringDate, formatter);
-                            field.set(t, date); // 直接将 Date 对象赋值给 field
-                        } catch (NumberFormatException | IllegalAccessException ex2) {
-                            throw new IllegalArgumentException("Invalid date format: " + val, ex2);
-                        }
+                        LocalDate date = LocalDate.parse(stringDate);
+                        field.set(t, date); // 直接将 Date 对象赋值给 field
+                    } catch (IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    // 如果 val 包含了分隔符，你可能需要解析这个字符串
+                    DateTimeFormatter sdf;
+                    if (val.contains(" ")) {
+                        sdf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                    } else {
+                        sdf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                    }
+                    try {
+                        LocalDate parsedDate = LocalDate.parse(val,sdf);
+                        field.set(t, parsedDate);
+                    } catch (Exception e) {
+                        e.printStackTrace();
                     }
-                } catch (IllegalAccessException ex) {
-                    throw new RuntimeException(ex);
                 }
             }
         } catch (Exception e) {
@@ -653,6 +650,12 @@ public static Map<String, PictureData> readPicture(MultipartFile mFile) throws I
 
     private static Map<String, PictureData> getPictures(XSSFSheet sheet) {
         Map<String, PictureData> picMap = new HashMap<>();
+        // 获取绘图父级
+        Drawing<?> drawing = sheet.getDrawingPatriarch();
+        // 检查绘图父级是否为 null
+        if (drawing == null) {
+            return picMap; // 如果没有绘图父级，直接返回空的图片映射
+        }
         List<XSSFShape> list = sheet.getDrawingPatriarch().getShapes();
 
         if (CollectionUtils.isEmpty(list)) {

zksy-system/src/main/java/com/zksy/system/basicData/domain/CrmAdministrativeLicense.java

@@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * <p>
@@ -161,21 +162,21 @@ public class CrmAdministrativeLicense extends Model<CrmAdministrativeLicense> {
      */
     @ExcelImport(value = "许可决定日期")
     @ExcelExport(value = "许可决定日期")
-    private LocalDate licenseDecisionDate;
+    private Date licenseDecisionDate;
 
     /**
      * 有效期自
      */
     @ExcelImport(value = "有效期自")
     @ExcelExport(value = "有效期自")
-    private LocalDate validFrom;
+    private Date validFrom;
 
     /**
      * 有效期至
      */
     @ExcelImport(value = "有效期至")
     @ExcelExport(value = "有效期至")
-    private LocalDate validUntil;
+    private Date validUntil;
 
     /**
      * 许可机关

zksy-system/src/main/java/com/zksy/system/basicData/domain/CrmEnterpriseTrademarkInformation.java

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.net.URL;
 import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * 企业商标信息对象 crm_enterprise_trademark_information
@@ -54,12 +55,12 @@ private static final long serialVersionUID=1L;
     /** 申请日期 */
                 @ExcelImport(value = "申请日期")
                 @ExcelExport(value = "申请日期")
-    private LocalDate applicationDate;
+    private Date applicationDate;
 
 @ApiModelProperty(value = "商标图片")
     /** 商标图片 */
                 @ExcelImport(value = "商标图片")
-
+                @ExcelExport(value = "商标图片")
     private String trademarkImage;
 
                 @ExcelExport(value = "商标图片")
@@ -94,18 +95,18 @@ private static final long serialVersionUID=1L;
     /** 注册公告日期 */
                 @ExcelImport(value = "注册公告日期")
                 @ExcelExport(value = "注册公告日期")
-    private LocalDate registrationPublicationDate;
+    private Date registrationPublicationDate;
 
 @ApiModelProperty(value = "专用期开始日期")
     /** 专用期开始日期 */
                 @ExcelImport(value = "专用期开始日期")
                 @ExcelExport(value = "专用期开始日期")
-    private LocalDate exclusivePeriodStartDate;
+    private Date exclusivePeriodStartDate;
 
 @ApiModelProperty(value = "专用期结束日期")
     /** 专用期结束日期 */
                 @ExcelImport(value = "专用期结束日期")
                 @ExcelExport(value = "专用期结束日期")
-    private LocalDate exclusivePeriodEndDate;
+    private Date exclusivePeriodEndDate;
 
         }

zksy-system/src/main/java/com/zksy/system/basicData/domain/CrmEnvironmentalCreditEvaluationNotification.java

@@ -59,7 +59,7 @@ private static final long serialVersionUID=1L;
     /** 评价时间 */
                 @ExcelImport(value = "评价时间")
                 @ExcelExport(value = "评价时间")
-    private LocalDate evaluationTime;
+    private Date evaluationTime;
 
 @ApiModelProperty(value = "所属年度")
     /** 所属年度 */

zksy-system/src/main/resources/mapper/basicData/CrmHighTechZoneEnterprisesMapper.xml

@@ -664,14 +664,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         CASE
 
         WHEN
-        esi.remarks NOT LIKE '%未参保%'
-        AND esi.remarks NOT LIKE '%无人员参保%' THEN
+        esi.unified_social_credit_code THEN
         1 ELSE 0.5
         END
         FROM
         crm_enterprise_social_security_info esi
         WHERE
-        esi.unified_social_credit_code = e.unified_social_credit_code
+        esi.unified_social_credit_code = e.unified_social_credit_code and esi.remarks LIKE CONCAT('%', EXTRACT(YEAR FROM CURDATE()), '%')
         ),
         0
         ) AS socialSecurityScore,
@@ -880,14 +879,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         CASE
 
         WHEN
-        esi.remarks NOT LIKE '%未参保%'
-        AND esi.remarks NOT LIKE '%无人员参保%' THEN
+        esi.unified_social_credit_code THEN
         1 ELSE 0.5
         END
         FROM
         crm_enterprise_social_security_info esi
         WHERE
-        esi.unified_social_credit_code = e.unified_social_credit_code
+        esi.unified_social_credit_code = e.unified_social_credit_code and esi.remarks LIKE CONCAT('%', EXTRACT(YEAR FROM CURDATE()), '%')
         ),
         0
         ) + COALESCE ( ( SELECT LEAST( 1, SUM( 0.5 )) FROM crm_charity_info ci WHERE ci.unified_social_credit_code = e.unified_social_credit_code ), 0 )

zksy-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -41,9 +41,7 @@
 			<if test="visible != null and visible != ''">
 				AND visible = #{visible}
 			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
+				AND status = '0'
 		</where>
 		order by parent_id, order_num
 	</select>
@@ -67,9 +65,7 @@
 		<if test="visible != null and visible != ''">
             AND m.visible = #{visible}
 		</if>
-		<if test="status != null and status != ''">
-            AND m.status = #{status}
-		</if>
+            AND m.status = '0'
 		order by m.parent_id, m.order_num
 	</select>