成套机具bug修改

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/MaWholeSetController.java

@@ -66,8 +66,8 @@ public class MaWholeSetController extends BaseController {
      * @return
      */
     @ApiOperation("查询整套抱杆明细")
-    @PostMapping("/selectListById")
+    @GetMapping("/selectListById")
-    public TableDataInfo selectListById(@ApiParam(value = "查询信息") @RequestBody MaWholeSetDto dto) {
+    public TableDataInfo selectListById(@ApiParam(value = "查询信息") MaWholeSetDto dto) {
         log.info("查询整套抱杆明细：{}", dto);
         startPage();
         List<MaWholeVo> list = maWholeSetService.selectListById(dto);

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java

@@ -1,10 +1,13 @@
 package com.bonus.sgzb.material.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 /**
  * 整套抱杆最外层表单vo
  * @Author ma_sh
@@ -18,16 +21,42 @@ public class MaWholeVo {
     /** 主键ID */
     @ApiModelProperty(value = "主键ID")
     private Integer id;
+    /** 主键ID */
+    @ApiModelProperty(value = "设备类型（1：主体设备  2：配套设备）")
+    private Integer ascriptionType;
+    /** 设备id */
+    @ApiModelProperty(value = "设备id")
+    private Integer deviceTypeId;
+    /** 设备id */
+    @ApiModelProperty(value = "设备数量")
+    private Integer deviceNum;
 
     /** 机具名称 */
     @ApiModelProperty(value = "机具名称")
     private String typeName;
+    /** 机具名称 */
+    @ApiModelProperty(value = "配套设备类型")
+    private String deviceAscription;
+    /** 机具名称 */
+    @ApiModelProperty(value = "机具名称")
+    private String deviceType;
 
     /** 规格型号 */
     @ApiModelProperty(value = "规格型号")
     private String typeModelName;
 
+    /** 配套名称 */
+    @ApiModelProperty(value = "配套名称")
+    private String wholeTypeName;
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人")
+    private String nickName;
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
     /** 套装所需配件数量 */
-    @ApiModelProperty(value = "套装所需配件数量")
+    @ApiModelProperty(value = "套装所需配件种类数量")
     private Integer totalNum;
 }

sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml

@@ -41,8 +41,8 @@
 
     <insert id="insert">
         <foreach item="item" index="index" collection="wholeList" separator=";">
-            insert into ma_whole_set (type_id,parent_id,part_num,whole_type_name,create_by,ascription_type,create_time,status,company_id)
+            insert into ma_whole_set (type_id,parent_id,part_num,whole_type_name,create_by,ascription_type,create_time,status)
-            values(#{item.typeId},#{item.parentId},#{item.totalNum},#{item.wholeTypeName},#{item.createBy},#{item.ascriptionType}, now(),1,#{item.companyId})
+            values(#{item.typeId},#{item.parentId},#{item.totalNum},#{item.wholeTypeName},#{item.createBy},#{item.ascriptionType}, now(),1)
         </foreach>
     </insert>
     <delete id="deleteById" parameterType="java.lang.Integer">