修改问题

qianhe-ydsj/src/main/java/com/qianhe/controller/BzscCyglqglscZbController.java

 package com.qianhe.controller;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
+
+import com.qianhe.domain.BzscCyglqglscCb;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -66,7 +71,17 @@ public class BzscCyglqglscZbController extends BaseController
     @GetMapping(value = "/{ID}")
     public AjaxResult getInfo(@PathVariable("ID") Long ID)
     {
-        return success(bzscCyglqglscZbService.selectBzscCyglqglscZbByID(ID));
+        BzscCyglqglscZb bzscCyglqglscZb = bzscCyglqglscZbService.selectBzscCyglqglscZbByID(ID);
+        Map<String,Object> map =new HashMap<>();
+        BzscCyglqglscCb cb = bzscCyglqglscZb.getBzscCyglqglscCbList().size() > 0 ? bzscCyglqglscZb.getBzscCyglqglscCbList().get(0) : null;
+        map.put("nr",cb!=null ?cb.getChildList():new ArrayList<BzscCyglqglscCb>());
+        if(cb!=null){
+            cb.setChildList(new ArrayList<>());
+        }
+        map.put("bt",cb);
+        bzscCyglqglscZb.setBzscCyglqglscCbList(new ArrayList<>());
+        map.put("bzscCyglqglscZb",bzscCyglqglscZb);
+        return success(map);
     }
 
     /**

qianhe-ydsj/src/main/java/com/qianhe/controller/BzscZczscZbController.java

 package com.qianhe.controller;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
+
+import com.qianhe.domain.BzscCyglqglscCb;
+import com.qianhe.domain.BzscZczscCb;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -66,7 +72,17 @@ public class BzscZczscZbController extends BaseController
     @GetMapping(value = "/{ID}")
     public AjaxResult getInfo(@PathVariable("ID") Long ID)
     {
-        return success(bzscZczscZbService.selectBzscZczscZbByID(ID));
+        BzscZczscZb bzscZczscZb = bzscZczscZbService.selectBzscZczscZbByID(ID);
+        Map<String,Object> map =new HashMap<>();
+        BzscZczscCb cb = bzscZczscZb.getBzscZczscCbList().size() > 0 ? bzscZczscZb.getBzscZczscCbList().get(0) : null;
+        map.put("nr",cb!=null ?cb.getChildList():new ArrayList<BzscZczscCb>());
+        if(cb!=null){
+            cb.setChildList(new ArrayList<>());
+        }
+        map.put("bt",cb);
+        bzscZczscZb.setBzscZczscCbList(new ArrayList<>());
+        map.put("bzscZczscZb",bzscZczscZb);
+        return success(map );
     }
 
     /**

qianhe-ydsj/src/main/java/com/qianhe/domain/BzscZczscZb.java

@@ -32,7 +32,7 @@ public class BzscZczscZb extends BaseEntity
 
     /** 预留1 */
     @Excel(name = "预留1")
-    private Long yl1;
+    private String yl1;
 
     /** 预留2 */
     @Excel(name = "预留2")

qianhe-ydsj/src/main/resources/mapper/BzscZczscZbMapper.xml

@@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ( #{item.ID}, #{item.zbId}, #{item.deptId}, #{item.nd}, #{item.parentId}, #{item.mc}, #{item.ms}, #{item.nr}, #{item.px}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark}, #{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5})
         </foreach>
     </insert>
-    <insert id="insertBzscZczscCb">
+    <insert id="insertBzscZczscCb" parameterType="BzscZczscCb" useGeneratedKeys="true" keyProperty="ID">
         insert into bzsc_zczsc_cb
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="zbId != null">zb_id,</if>