From f607dcacaaaaedea12607a49a8b4efbe275ad13b Mon Sep 17 00:00:00 2001
From: jiang <BnsGit@123!>
Date: Tue, 15 Jul 2025 16:39:12 +0800
Subject: [PATCH] 1

---
 .../backstage/mapper/PurchaseMapper.java      |  2 ++
 .../service/PurchaseServiceImpl.java          |  1 +
 .../service/plan/PlanApplyServiceImpl.java    | 30 ++++++++++++++++++-
 .../business/backstage/PurchaseMapper.xml     | 11 +++++--
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/bonus/aqgqj/business/backstage/mapper/PurchaseMapper.java b/src/main/java/com/bonus/aqgqj/business/backstage/mapper/PurchaseMapper.java
index 5ed2193..b6abd75 100644
--- a/src/main/java/com/bonus/aqgqj/business/backstage/mapper/PurchaseMapper.java
+++ b/src/main/java/com/bonus/aqgqj/business/backstage/mapper/PurchaseMapper.java
@@ -173,4 +173,6 @@ public interface PurchaseMapper {
     int getJsData(@Param("planId") String planId);
 
     int deleteDetail(Long id);
+
+    int updateDetail(Long id);
 }
diff --git a/src/main/java/com/bonus/aqgqj/business/backstage/service/PurchaseServiceImpl.java b/src/main/java/com/bonus/aqgqj/business/backstage/service/PurchaseServiceImpl.java
index ed28afd..95f2a5b 100644
--- a/src/main/java/com/bonus/aqgqj/business/backstage/service/PurchaseServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/business/backstage/service/PurchaseServiceImpl.java
@@ -525,6 +525,7 @@ public class PurchaseServiceImpl implements PurchaseService {
     public AjaxResult deleteDetail(Long id) {
         try {
             int i = mapper.deleteDetail(id);
+            mapper.updateDetail(id);
             return i > 0 ? AjaxResult.success("撤销成功") : AjaxResult.error();
         } catch (Exception e) {
             log.error(e.toString(), e);
diff --git a/src/main/java/com/bonus/aqgqj/business/backstage/service/plan/PlanApplyServiceImpl.java b/src/main/java/com/bonus/aqgqj/business/backstage/service/plan/PlanApplyServiceImpl.java
index deef7b4..fdeccce 100644
--- a/src/main/java/com/bonus/aqgqj/business/backstage/service/plan/PlanApplyServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/business/backstage/service/plan/PlanApplyServiceImpl.java
@@ -238,7 +238,7 @@ public class PlanApplyServiceImpl implements PlanApplyService {
                             log.warn("单元格为空");
                             data.setTimes("");
                         }
-                        data.setRemarks(row.getCell(7).getStringCellValue()); //备注
+                        data.setRemarks(getCellStringValue(row.getCell(7)));//备注
                         dataList.add(data);
                     }
                     workbook.close();
@@ -267,6 +267,34 @@ public class PlanApplyServiceImpl implements PlanApplyService {
         return ServerResponse.createError("导入失败，请检查表格数据",dataList);
     }
 
+    private String getCellStringValue(Cell cell) {
+        if (cell == null) return "";
+        switch (cell.getCellType()) {
+            case STRING:
+                return cell.getStringCellValue().trim();
+            case NUMERIC:
+                // 如果是整数，避免小数点
+                double value = cell.getNumericCellValue();
+                if (value == (long) value) {
+                    return String.valueOf((long) value);
+                } else {
+                    return String.valueOf(value);
+                }
+            case BOOLEAN:
+                return String.valueOf(cell.getBooleanCellValue());
+            case FORMULA:
+                try {
+                    return cell.getStringCellValue();
+                } catch (IllegalStateException e) {
+                    return String.valueOf(cell.getNumericCellValue());
+                }
+            case BLANK:
+                return "";
+            default:
+                return "";
+        }
+    }
+
     private static String getCode(int num) {
         num++;
         String year = DateTimeHelper.getNowYMD();
diff --git a/src/main/resources/mappers/business/backstage/PurchaseMapper.xml b/src/main/resources/mappers/business/backstage/PurchaseMapper.xml
index 47d25c4..e3227d6 100644
--- a/src/main/resources/mappers/business/backstage/PurchaseMapper.xml
+++ b/src/main/resources/mappers/business/backstage/PurchaseMapper.xml
@@ -27,8 +27,8 @@
 
     <delete id="deleteDetail">
         delete
-        from st_plan_apply
-        WHERE id = #{id}
+        from st_plan_out
+        WHERE apply_id=#{id}
     </delete>
 
     <!--查询详情数据-->
@@ -71,6 +71,13 @@
     <update id="updatePlanData">
         update st_plan_apply set ck_num=#{cgNum},lk_num=#{lkNum},fh_day=#{fhDay} where id=#{planId}
     </update>
+    <update id="updateDetail">
+        update st_plan_apply
+        set ck_num=0,
+            lk_num=0,
+            fh_day=null
+        where id = #{id}
+    </update>
 
 
     <select id="getProPurchaseList" resultType="com.bonus.aqgqj.business.backstage.entity.PurchaseVo">