From d69c5689abe0e9d0521a7d63ab10fe6141d47c47 Mon Sep 17 00:00:00 2001
From: xiezuo003 <zxc123456>
Date: Sun, 22 Oct 2023 20:57:01 +0800
Subject: [PATCH] =?UTF-8?q?1019=E6=96=87=E6=A1=A3=E9=9C=80=E6=B1=822?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 43 +++++++++++--------
 .../com/dsic/gj_erp/bean/jcsj/EmSbcnp.java    | 21 +++++----
 .../com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java  |  3 +-
 .../dsic/gj_erp/controller/SYController.java  |  4 +-
 .../controller/jcsj/EmSbjbbController.java    |  8 ++++
 .../controller/jhgk/DmXbjhController.java     |  2 +-
 .../gj_erp/dao/jcsj/EmSbjbbRepository.java    |  3 ++
 .../gj_erp/service/jcsj/EmSbjbbService.java   |  3 +-
 .../service/jcsj/impl/EmSbjbbServiceImpl.java | 10 +++++
 .../gj_erp/service/jhgk/DmXbjhService.java    |  2 +-
 .../service/jhgk/impl/DmXbjhServiceImpl.java  |  6 +--
 .../java/com/dsic/gj_erp/util/ExcelUtil.java  | 43 +++++++++++++------
 12 files changed, 98 insertions(+), 50 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8e628b5..2f5d156 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,25 +4,18 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="bug修复">
+    <list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="1019文档需求">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/request/EmSbwxjhBean.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/request/EmSbwxjhBean.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/SYController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/SYController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/dao/sy/Dm_zhbmpRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/dao/sy/Dm_zhbmpRepository.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbwxjhServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbwxjhServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmTzjhServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmTzjhServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/sy/SYService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/sy/SYService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java" afterDir="false" />
     </list>
     <list id="1843e6b0-3c18-45b6-89c7-e9efbe3d4674" name="Revert &quot;finish&quot;" comment="Revert &quot;finish&quot;" />
@@ -100,15 +93,13 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
       <option name="arquillianRunConfiguration">
         <value>
           <option name="containerStateName" value="" />
         </value>
       </option>
-      <option name="TEST_OBJECT" value="CLASS" />
-      <properties />
-      <listeners />
+      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -157,7 +148,8 @@
       <workItem from="1697763475514" duration="1179000" />
       <workItem from="1697800899358" duration="4279000" />
       <workItem from="1697852420526" duration="5738000" />
-      <workItem from="1697871559613" duration="4737000" />
+      <workItem from="1697871559613" duration="9557000" />
+      <workItem from="1697940710591" duration="5807000" />
     </task>
     <task id="LOCAL-00001" summary="finish">
       <created>1695345779307</created>
@@ -229,7 +221,14 @@
       <option name="project" value="LOCAL" />
       <updated>1695353309158</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="1019文档需求">
+      <created>1697885046984</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1697885046984</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -256,7 +255,8 @@
     <MESSAGE value="Revert &quot;TEST&quot;1" />
     <MESSAGE value="Revert &quot;finish&quot;&#10;&#10;test" />
     <MESSAGE value="111&#10;&#10;This reverts commit f64a4dcb" />
-    <option name="LAST_COMMIT_MESSAGE" value="111&#10;&#10;This reverts commit f64a4dcb" />
+    <MESSAGE value="1019文档需求" />
+    <option name="LAST_COMMIT_MESSAGE" value="1019文档需求" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -267,5 +267,10 @@
         </breakpoint>
       </breakpoints>
     </breakpoint-manager>
+    <pin-to-top-manager>
+      <pinned-members>
+        <PinnedItemInfo parentTag="java.util.HashMap$Node" memberName="value" />
+      </pinned-members>
+    </pin-to-top-manager>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java
index a631014..cc663c3 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java
@@ -39,6 +39,16 @@ public class EmSbcnp implements Serializable {
     @TableField("SBMC")
     private String sbmc;
 
+    @ApiModelProperty(value = "产能")
+    private Double sbcn;
+
+    @ApiModelProperty(value = "产能单位（张/米/...）")
+    private String dw;
+
+    @ApiModelProperty(value = "产能单位时间(天 或小时)")
+    private String dwsj;
+
+
     @ApiModelProperty(value = "所属部门")
     @TableField("SZCS")
     private String szcs;
@@ -50,15 +60,4 @@ public class EmSbcnp implements Serializable {
     @ApiModelProperty(value = "工序")
     @TableField("GX")
     private String gx;
-
-    @ApiModelProperty(value = "产能")
-    private Double sbcn;
-
-    @ApiModelProperty(value = "产能单位（张/米/...）")
-    private String dw;
-
-    @ApiModelProperty(value = "产能单位时间(天 或小时)")
-    private String dwsj;
-
-
 }
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java
index 85bb06a..9fcbc4c 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java
@@ -81,5 +81,6 @@ public class EmSbrydyp implements Serializable {
     @TableField("YLZD2")
     private String ylzd2;
 
-
+//    @TableField("YLZD2")
+//    private String szcs;
 }
diff --git a/src/main/java/com/dsic/gj_erp/controller/SYController.java b/src/main/java/com/dsic/gj_erp/controller/SYController.java
index b7e4d69..41d5f50 100644
--- a/src/main/java/com/dsic/gj_erp/controller/SYController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/SYController.java
@@ -1,6 +1,7 @@
 package com.dsic.gj_erp.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.sy.*;
@@ -267,7 +268,8 @@ public class SYController {
 
     @ApiOperation(value = "设备信息转码")
     @RequestMapping(value = "/emSbjbbZM")
-    public ResultBean em_sbjbb_ZM(@RequestParam String bmlb) {
+    public ResultBean em_sbjbb_ZM(@RequestBody JSONObject json) {
+        String bmlb=json.getString("bmlb");
         List<Map> dmZhbmp= syService.em_sbjbb_ZM(bmlb);
         return new ResultBean(dmZhbmp);
     }
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java
index 8cabf06..d4ff71d 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java
@@ -81,5 +81,13 @@ public class EmSbjbbController {
 
         return new ResultBean(emSbjbbs);
     }
+
+    @ApiOperation(value = "部门对应设备名称和编号")
+    @PostMapping(value = "/getBMMCBM")
+    public ResultBean getBMMCBM() {
+        Map<String,List<Map>> emSbjbbs= emSbjbbService.getBMMCBM();
+
+        return new ResultBean(emSbjbbs);
+    }
 }
 
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java
index 5864510..163cc2f 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java
@@ -41,7 +41,7 @@ public class DmXbjhController {
     @ApiOperation(value = "导入excel")
     @PostMapping(value = "/upload")
     public ResultBean upload(@RequestParam(value = "file") MultipartFile file) throws IOException {
-        List<DmXbjh> dmXbjhs= dmXbjhService.upload(file);
+        JSONObject dmXbjhs= dmXbjhService.upload(file);
         return new ResultBean(dmXbjhs);
     }
 
diff --git a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java
index 909fd66..53ad44a 100644
--- a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java
+++ b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java
@@ -16,4 +16,7 @@ public interface EmSbjbbRepository extends JpaRepository<EmSbjbb,String> {
 
     @Query(nativeQuery = true,value = "SELECT bm,bmsm,bmjb FROM dm_fjbmgl")
     List<Map> sblx();
+
+    @Query(nativeQuery = true,value = "SELECT szcs,sbbh,sbmc FROM EM_SBJBB")
+    List<Map> BMMCBM();
 }
diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java
index 803abf6..f130674 100644
--- a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java
@@ -1,6 +1,7 @@
 package com.dsic.gj_erp.service.jcsj;
 
 
+import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.bean.request.EmSbjbbBean;
@@ -32,5 +33,5 @@ public interface EmSbjbbService extends IService<EmSbjbb> {
 
     List<Map> getSBLX();
 
-
+    Map<String,List<Map>> getBMMCBM();
 }
diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java
index d67955a..c461698 100644
--- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java
@@ -1,6 +1,7 @@
 package com.dsic.gj_erp.service.jcsj.impl;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
@@ -93,4 +94,13 @@ public class EmSbjbbServiceImpl extends ServiceImpl<EmSbjbbMapper, EmSbjbb> impl
         List<Map> emSbjbbs=emSbjbbRepository.sblx();
         return emSbjbbs;
     }
+
+    @Override
+    public Map<String,List<Map>> getBMMCBM() {
+        List<Map> emSbjbbs=emSbjbbRepository.BMMCBM();
+
+        Map<String,List<Map>> listMap=emSbjbbs.stream().filter(map -> StringUtils.isNotEmpty(map.get("szcs") != null ? map.get("szcs").toString() : "")).collect(Collectors.groupingBy(map -> (String) map.get("szcs")));
+
+        return listMap;
+    }
 }
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java
index 84326e5..cc7d5dd 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java
@@ -19,7 +19,7 @@ import java.util.List;
 public interface DmXbjhService extends IService<DmXbjh> {
     List<DmXbjh> getList(JSONObject json);
 
-    List<DmXbjh> upload(MultipartFile file) throws IOException;
+    JSONObject upload(MultipartFile file) throws IOException;
 
     void save(List<DmXbjh> dmXbjhs);
 
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java
index fb7ba5d..1725739 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java
@@ -55,10 +55,10 @@ public class DmXbjhServiceImpl extends ServiceImpl<DmXbjhMapper, DmXbjh> impleme
     }
 
     @Override
-    public List<DmXbjh> upload(MultipartFile file) throws IOException {
+    public JSONObject upload(MultipartFile file) throws IOException {
     //    ExcelReader reader = ExcelUtil.getReader(file.getInputStream());
-        List<DmXbjh> dmXbjhs= ExcelUtil.readDmXbjh(file);
-
+        //List<DmXbjh> dmXbjhs= ExcelUtil.readDmXbjh(file);
+        JSONObject dmXbjhs= ExcelUtil.readDmXbjh(file);
 //        List<DmXbjh> list=new ArrayList<>();
 //        mapList.forEach(stringObjectMap -> {
 //            DmXbjh dmXbjh = modelMapper.map(stringObjectMap, DmXbjh.class);
diff --git a/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java b/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java
index 5571235..f2c516a 100644
--- a/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java
+++ b/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java
@@ -1,5 +1,7 @@
 package com.dsic.gj_erp.util;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.dsic.gj_erp.bean.jhgk.DmJtsyjh;
 import com.dsic.gj_erp.bean.jhgk.DmXbjh;
 import org.apache.commons.lang3.StringUtils;
@@ -154,7 +156,7 @@ public class ExcelUtil {
         }
     }
 
-    public static List<DmXbjh> readDmXbjh(MultipartFile file) {
+    public static JSONObject readDmXbjh(MultipartFile file) {
         try {
             Workbook workbook=isWorkBook(file);
             // 获取第一张表
@@ -169,15 +171,17 @@ public class ExcelUtil {
             }
            // String year="";
           //  List<Map<String,Object>> mapList=new ArrayList<>();
-            List<DmXbjh> dmXbjhs=new ArrayList<>();
+           // List<DmXbjh> dmXbjhs=new ArrayList<>();
+            JSONObject jsonObject=new JSONObject();
             for (int i = 4; i < sheet.getPhysicalNumberOfRows(); i++) {
                 Row row = sheet.getRow(i);
                 String dcch=row.getCell(0).toString();
                 if (dcch.contains("待接")||dcch.contains("已接")||dcch.contains("合计")){
                     break;
                 }
-                Map<String,Object> map=new HashMap<>();
-                map.put("dcCh",dcch);
+//                Map<String,Object> map=new HashMap<>();
+//                map.put("dcCh",dcch);
+                List<Map> mapList=new ArrayList<>();
                 for (int index = 1; index < row.getPhysicalNumberOfCells(); index++) {
                     Cell cell = row.getCell(index);
                     cell.setCellType(CellType.STRING);
@@ -188,22 +192,37 @@ public class ExcelUtil {
                     }
                     String cl=cell+"";
                     String year=getMergedRegionValue(sheet,2,index).toString();
-                    DmXbjh dmXbjh=new DmXbjh();
-                    dmXbjh.setZt("0");
-                    dmXbjh.setNf(year.replace("年",""));
-                    dmXbjh.setYf(String.format("%02d", Integer.parseInt(month.replace("月",""))));
+                 //   DmXbjh dmXbjh=new DmXbjh();
+                    Map map=new HashMap();
+                    map.put("zt","0");
+                    map.put("nf",year.replace("年",""));
+                    map.put("yf",String.format("%02d", Integer.parseInt(month.replace("月",""))));
                     if (StringUtils.isNotEmpty(cl)){
-                        dmXbjh.setZl(Double.parseDouble(cl));
+                        map.put("zl",Double.parseDouble(cl));
+                    }else {
+                        map.put("zl",0.0);
                     }
-                    dmXbjh.setDcCh(dcch);
-                    dmXbjhs.add(dmXbjh);
+//                    dmXbjh.setZt("0");
+//                    dmXbjh.setNf(year.replace("年",""));
+//                    dmXbjh.setYf(String.format("%02d", Integer.parseInt(month.replace("月",""))));
+//                    if (StringUtils.isNotEmpty(cl)){
+//                        dmXbjh.setZl(Double.parseDouble(cl));
+//                    }else {
+//                        dmXbjh.setZl(0.0);
+//                    }
+//                    dmXbjh.setDcCh(dcch);
 
+
+               //     dmXbjhs.add(dmXbjh);
+                    mapList.add(map);
 //                    map.put("cl"+year.replace("年","")+String.format("%02d", Integer.parseInt(month.replace("月",""))),cl);
                 }
 //                mapList.add(map);
+                jsonObject.put(dcch,mapList);
             }
+            return jsonObject;
 //            return mapList;
-            return dmXbjhs;
+          //  return dmXbjhs;
         } catch (Exception e) {
             e.printStackTrace();
             return null;