Merge remote-tracking branch 'origin/dev-nx' into dev-nx

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

@@ -8,6 +8,8 @@ import com.bonus.sgzb.material.domain.MaWholeSetDto;
 import com.bonus.sgzb.material.domain.MaWholeTreeVo;
 import com.bonus.sgzb.material.domain.MaWholeVo;
 import com.bonus.sgzb.material.service.MaWholeSetService;
+import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;
+import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
@@ -35,8 +37,7 @@ public class MaWholeSetController extends BaseController {
      */
     @ApiOperation("新增整套抱杆管理")
     @PostMapping("/addOrUpdate")
-    public AjaxResult addOrUpdate(@ApiParam(value = "添加信息", required = true)
-                          @RequestBody MaWholeSetDto dto) {
+    public AjaxResult addOrUpdate(@ApiParam(value = "添加信息", required = true) @RequestBody MaWholeSetDto dto) {
         if (dto.getId() != null) {
             log.info("修改整套抱杆管理：{}", dto);
             return maWholeSetService.update(dto);
@@ -51,11 +52,11 @@ public class MaWholeSetController extends BaseController {
      * @return
      */
     @ApiOperation("查询整套抱杆管理")
-    @PostMapping("/selectList")
-    public AjaxResult selectList(@ApiParam(value = "查询信息") @RequestBody MaWholeSetDto dto) {
-        log.info("查询整套抱杆管理：{}", dto);
-        PageResultVo<MaWholeVo> result = maWholeSetService.selectList(dto);
-        return AjaxResult.success(result);
+    @GetMapping("/selectList")
+    public TableDataInfo selectList(MaWholeSetDto dto) {
+        PageHelper.startPage(dto.getPageNum() == 0 ? 1 : dto.getPageNum(), dto.getPageSize());
+        List<MaWholeVo> maWholeVos = maWholeSetService.selectList(dto);
+        return getDataTable(maWholeVos);
     }
 
     /**
@@ -64,12 +65,11 @@ public class MaWholeSetController extends BaseController {
      * @return
      */
     @ApiOperation("查询整套抱杆明细")
-    @PostMapping("/selectListById")
-    public TableDataInfo selectListById(@ApiParam(value = "查询信息") @RequestBody MaWholeSetDto dto) {
-        log.info("查询整套抱杆明细：{}", dto);
+    @GetMapping("/selectListById")
+    public AjaxResult selectListById(MaWholeSetDto dto) {
         startPage();
         List<MaWholeVo> list = maWholeSetService.selectListById(dto);
-        return getDataTable(list);
+        return AjaxResult.success(getDataTable(list));
     }
 
     /**

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

@@ -24,16 +24,30 @@ public class MaWhole {
     private Integer id;
 
     /** 父级ID */
-    @ApiModelProperty(value = "父级ID")
+    @ApiModelProperty(value = "父级类型ID")
     private Integer parentId;
+    /** 父级ID */
+    @ApiModelProperty(value = "类型ID")
+    private Integer typeId;
+    @ApiModelProperty(value = "数量")
+    private Integer deviceNum;
 
     /** 配套数量 */
     @ApiModelProperty(value = "配套数量")
     private Integer totalNum;
+    /** 设备id */
+    @ApiModelProperty(value = "设备id")
+    private Integer deviceTypeId;
+    /** 设备类型 */
+    @ApiModelProperty(value = "设备类型（1主体设备  2配套设备）")
+    private Integer ascriptionType;
 
     /** 配套名称 */
     @ApiModelProperty(value = "配套名称")
     private String wholeTypeName;
+    /** 配套名称 */
+    @ApiModelProperty(value = "所属公司")
+    private String companyId;
 
     /** 创建时间 */
     @ApiModelProperty(value = "创建时间")

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

@@ -36,9 +36,22 @@ public class MaWholeSetDto {
     /** 关键字 */
     @ApiModelProperty(value = "关键字")
     private String keyWord;
+    /** 配套名称 */
+    @ApiModelProperty(value = "配套名称")
+    private String wholeTypeName;
+    /** 关键字 */
+    @ApiModelProperty(value = "所属公司")
+    private String companyId;
+    /** 关键字 */
+    @ApiModelProperty(value = "创建人")
+    private Integer createBy;
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
 
     /** 表单对象集合 */
     @ApiModelProperty(value = "表单对象集合")
-    private List<MaWhole> wholeList;
+    private List<MaWhole> deviceInfo;
 
 }

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,10 +21,25 @@ 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 = "规格型号")
@@ -30,8 +48,15 @@ public class MaWholeVo {
     /** 配套名称 */
     @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/java/com/bonus/sgzb/material/mapper/MaWholeSetMapper.java

@@ -25,10 +25,10 @@ public interface MaWholeSetMapper {
 
     /**
      * 根据parentId查询，去重
-     * @param parentId
+     * @param wholeTypeName
      * @return
      */
-    int selectByParentId(@Param("parentId") Integer parentId);
+    int selectByParentId(String wholeTypeName);
 
     /**
      * 查询整套抱杆管理
@@ -46,10 +46,10 @@ public interface MaWholeSetMapper {
 
     /**
      * 根据id删除
-     * @param id
+     * @param
      * @return
      */
-    int deleteById(@Param("id") Integer id);
+    int deleteById(MaWholeSetDto dto);
 
     /**
      * 根据id去ma_whole_set表中查询typeid

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/MaWholeSetService.java

@@ -27,7 +27,7 @@ public interface MaWholeSetService {
      * @param dto
      * @return
      */
-    PageResultVo<MaWholeVo> selectList(MaWholeSetDto dto);
+    List<MaWholeVo> selectList(MaWholeSetDto dto);
 
     /**
      * 查询整套抱杆明细

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java

@@ -18,6 +18,7 @@ import java.util.List;
 
 /**
  * 整套抱杆操作实现层
+ *
  * @Author ma_sh
  * @create 2024/4/15 17:17
  */
@@ -30,6 +31,7 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
 
     /**
      * 新增整套抱杆管理
+     *
      * @param dto
      * @return
      */
@@ -39,54 +41,51 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
         if (dto == null) {
             return AjaxResult.error("参数不能为空！！！");
         }
-        if (dto.getParentId() == null) {
-            return AjaxResult.error("父级id不能为空");
+
+        if (selectByParentId(dto.getWholeTypeName()) > 0) {
+            return AjaxResult.error("成套名称已存在");
         }
-        int count = selectByParentId(dto.getParentId());
-        if (count != 0) {
-            return AjaxResult.error("该物品类型已经绑定相关配件，无法再次绑定，请重新选择！！！");
-        }
-        if (CollectionUtils.isNotEmpty(dto.getWholeList())) {
-            for (MaWhole maWhole : dto.getWholeList()) {
+
+        if (CollectionUtils.isNotEmpty(dto.getDeviceInfo())) {
+            for (MaWhole maWhole : dto.getDeviceInfo()) {
+                maWhole.setCreateBy(dto.getCreateBy());
+                maWhole.setCompanyId(dto.getCompanyId());
+                maWhole.setTypeId(maWhole.getDeviceTypeId());
+                maWhole.setTotalNum(maWhole.getDeviceNum());
+                maWhole.setWholeTypeName(dto.getWholeTypeName());
                 maWhole.setParentId(dto.getParentId());
             }
-        }
-        int res = 0;
-        try {
-            res = insertMaWholeSet(dto.getWholeList());
-            if (res == 0) {
-                log.error("insertMaWholeSet方法插入异常");
-                throw new RuntimeException("insertMaWholeSet方法插入异常");
+            int res = 0;
+            try {
+                res = insertMaWholeSet(dto.getDeviceInfo());
+                if (res == 0) {
+                    log.error("insertMaWholeSet方法插入异常");
+                    throw new RuntimeException("insertMaWholeSet方法插入异常");
+                }
+            } catch (Exception e) {
+                log.error("新增计划管理异常:{}", e.getMessage());
+                return AjaxResult.error(ExceptionEnum.SAVE_TO_DATABASE.getCode(), ExceptionEnum.SAVE_TO_DATABASE.getMsg());
             }
-        } catch (Exception e) {
-            log.error("新增计划管理异常:{}",e.getMessage());
-            return AjaxResult.error(ExceptionEnum.SAVE_TO_DATABASE.getCode(), ExceptionEnum.SAVE_TO_DATABASE.getMsg());
+            return AjaxResult.success("新增成功", res);
+        } else {
+            return AjaxResult.error("请选择主/配套设备");
         }
-        return AjaxResult.success("新增成功", res);
     }
 
     /**
      * 查询整套抱杆管理
+     *
      * @param dto
      * @return
      */
     @Override
-    public PageResultVo<MaWholeVo> selectList(MaWholeSetDto dto) {
-        List<MaWholeVo> list = mapper.selectList(dto);
-        PageHelper.startPage(dto.getPageNum() == 0 ? 1 : dto.getPageNum(), dto.getPageSize());
-        PageResultVo pageResult = new PageResultVo();
-        // 分页信息
-        PageInfo<MaWholeVo> pageInfo = new PageInfo<>(list);
-        pageResult.setTotalCount(pageInfo.getTotal());
-        pageResult.setTotalPageCount(pageInfo.getPages());
-        pageResult.setResult(list);
-        pageResult.setPageNum(dto.getPageNum());
-        pageResult.setPageSize(dto.getPageSize());
-        return pageResult;
+    public List<MaWholeVo> selectList(MaWholeSetDto dto) {
+        return mapper.selectList(dto);
     }
 
     /**
      * 查询整套抱杆明细
+     *
      * @param dto
      * @return
      */
@@ -97,23 +96,24 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
 
     /**
      * 根据id删除
+     *
      * @param dto
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult deleteById(MaWholeSetDto dto) {
-        if (dto.getId() == null) {
+        if (dto == null) {
             return AjaxResult.error("删除标识id为空，无法进行删除");
         }
         int res = 0;
         try {
-            res = deleteMaWhole(dto.getId());
+            res = deleteMaWhole(dto);
             if (res == 0) {
                 throw new RuntimeException("删除失败");
             }
         } catch (Exception e) {
-            log.error("删除异常:{}",e.getMessage());
+            log.error("删除异常:{}", e.getMessage());
             return AjaxResult.error(ExceptionEnum.DELETE_TO_DATABASE.getCode(), ExceptionEnum.DELETE_TO_DATABASE.getMsg());
         }
         return AjaxResult.success("删除成功", res);
@@ -121,15 +121,17 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
 
     /**
      * 根据id删除整套配件信息
-     * @param id
+     *
+     * @param
      * @return
      */
-    private int deleteMaWhole(Integer id) {
-        return mapper.deleteById(id);
+    private int deleteMaWhole(MaWholeSetDto dto) {
+        return mapper.deleteById(dto);
     }
 
     /**
      * 修改整套抱杆管理
+     *
      * @param dto
      * @return
      */
@@ -137,27 +139,28 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult update(MaWholeSetDto dto) {
         log.info("修改整套抱杆管理传参：{}", dto);
-        int count = selectByParentId(dto.getParentId());
-        if (!dto.getId().equals(dto.getParentId()) && count != 0) {
-            return AjaxResult.error("该物品类型已经配套相关配件，无法再次绑定，请重新提交修改！！！");
-        }
-        if (CollectionUtils.isNotEmpty(dto.getWholeList())) {
-            for (MaWhole maWhole : dto.getWholeList()) {
+        if (CollectionUtils.isNotEmpty(dto.getDeviceInfo())) {
+            for (MaWhole maWhole : dto.getDeviceInfo()) {
+                maWhole.setCreateBy(dto.getCreateBy());
+                maWhole.setCompanyId(dto.getCompanyId());
+                maWhole.setTypeId(maWhole.getDeviceTypeId());
+                maWhole.setTotalNum(maWhole.getDeviceNum());
+                maWhole.setWholeTypeName(dto.getWholeTypeName());
                 maWhole.setParentId(dto.getParentId());
             }
         }
         int res = 0;
         try {
-            res = deleteMaWhole(dto.getId());
-            if (res == 0) {
-                log.error("deleteById方法删除异常");
-                throw new RuntimeException("deleteById方法删除异常");
-            }
-            res = insertMaWholeSet(dto.getWholeList());
+            deleteMaWhole(dto);
+            res = insertMaWholeSet(dto.getDeviceInfo());
             if (res == 0) {
                 log.error("insertMaWholeSet方法插入异常");
                 throw new RuntimeException("insertMaWholeSet方法插入异常");
             }
+          /*  int count = selectByParentId(dto.getWholeTypeName());
+            if (count > 1) {
+                throw new RuntimeException("配套名称已重复，请重新输入");
+            }*/
         } catch (Exception e) {
             e.printStackTrace();
             return AjaxResult.error(ExceptionEnum.UPDATE_TO_DATABASE.getCode(), ExceptionEnum.UPDATE_TO_DATABASE.getMsg());
@@ -167,6 +170,7 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
 
     /**
      * 修改时查询整套抱杆明细
+     *
      * @param id
      * @return
      */
@@ -188,17 +192,21 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
 
     /**
      * 方法提取，新增ma_whole_set表
+     *
      * @param wholeList
      * @return
      */
-    private int insertMaWholeSet(List<MaWhole> wholeList) { return mapper.insert(wholeList); }
+    private int insertMaWholeSet(List<MaWhole> wholeList) {
+        return mapper.insert(wholeList);
+    }
 
     /**
      * 根据parentId查询，去重
-     * @param parentId
+     *
+     * @param wholeTypeName
      * @return
      */
-    private int selectByParentId(Integer parentId) {
-        return mapper.selectByParentId(parentId);
+    private int selectByParentId(String wholeTypeName) {
+        return mapper.selectByParentId(wholeTypeName);
     }
 }

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

@@ -41,44 +41,30 @@
 
     <insert id="insert">
         <foreach item="item" index="index" collection="wholeList" separator=";">
-            insert into ma_whole_set
-            <trim prefix="(" suffix=")" suffixOverrides=",">
-                <if test="item.id != null">type_id,</if>
-                <if test="item.parentId != null">parent_id,</if>
-                <if test="item.totalNum != null">part_num,</if>
-                <if test="item.wholeTypeName != null">whole_type_name,</if>
-                <if test="item.createBy != null">create_by,</if>
-                <if test="item.createTime != null">create_time,</if>
-                status
-            </trim>
-            <trim prefix="values (" suffix=")" suffixOverrides=",">
-                <if test="item.id != null">#{item.id},</if>
-                <if test="item.parentId != null">#{item.parentId},</if>
-                <if test="item.totalNum != null">#{item.totalNum},</if>
-                <if test="item.wholeTypeName != null">#{item.wholeTypeName},</if>
-                <if test="item.createBy != null">#{item.createBy},</if>
-                <if test="item.createTime != null">#{item.createTime},</if>
-                1
-            </trim>
+            insert into ma_whole_set (type_id,parent_id,part_num,whole_type_name,create_by,ascription_type,create_time,status,company_id)
+            values(#{item.typeId},#{item.parentId},#{item.totalNum},#{item.wholeTypeName},#{item.createBy},#{item.ascriptionType}, now(),1,#{item.companyId})
         </foreach>
     </insert>
-    <delete id="deleteById" parameterType="java.lang.Integer">
+    <delete id="deleteById">
         delete from ma_whole_set
-        where parent_id = #{id}
+        where parent_id = #{id} and whole_type_name = #{wholeTypeName}
     </delete>
 
     <select id="selectByParentId" resultType="java.lang.Integer">
         select COUNT(*) from ma_whole_set
-        where parent_id = #{parentId}
+        where whole_type_name = #{wholeTypeName}
     </select>
     <select id="selectList" resultType="com.bonus.sgzb.material.domain.MaWholeVo">
         SELECT
             mws.parent_id AS id,
             mws.whole_type_name AS wholeTypeName,
+            mws.create_time AS createTime,
+            SUM(CASE WHEN mws.ascription_type = 2 THEN 1 ELSE 0 END) AS totalNum,
             mt2.type_name AS typeName,
             mt.type_name AS typeModelName,
-            SUM(mws.part_num) AS totalNum
+            su.nick_name AS nickName
         FROM ma_whole_set mws
+        JOIN sys_user su ON su.user_id = mws.create_by
         JOIN ma_type mt ON mws.parent_id = mt.type_id
         JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
         JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
@@ -86,20 +72,27 @@
         WHERE
         mt.`status` = '0'
         AND mt.del_flag = '0'
-        <if test="keyWord != null  and keyWord != ''">
-            and (
-            mt2.type_name like  concat('%', #{keyWord}, '%') or
-            mt.type_name like  concat('%', #{keyWord}, '%')
-            )
+        <if test="wholeTypeName != null and wholeTypeName != ''">
+            and mws.whole_type_name like concat('%', #{wholeTypeName}, '%')
         </if>
-        GROUP BY mws.parent_id
+        <if test="parentId != null and parentId != ''">
+            and mws.parent_id = #{parentId}
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != '' ">
+            and mws.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
+        </if>
+        GROUP BY mws.parent_id,mws.whole_type_name
     </select>
     <select id="selectListById" resultType="com.bonus.sgzb.material.domain.MaWholeVo">
         SELECT
             mws.parent_id AS id,
+            mt.type_id as deviceTypeId,
             mt2.type_name AS typeName,
-            mt.type_name AS typeModelName,
-            mws.part_num AS totalNum
+            mt.type_name AS deviceType,
+            mws.whole_type_name as wholeTypeName,
+            case when mws.ascription_type = 1 then '主体设备' else '配套设备' end as deviceAscription,
+            mws.ascription_type as ascriptionType,
+            mws.part_num AS deviceNum
         FROM
             ma_whole_set mws
             JOIN ma_type mt ON mws.type_id = mt.type_id
@@ -107,15 +100,8 @@
             JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
             JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
         WHERE
-        <if test="id != null  and id != ''">
-             mws.parent_id = #{id}
-        </if>
-        <if test="keyWord != null  and keyWord != ''">
-            and (
-            mt2.type_name like  concat('%', #{keyWord}, '%') or
-            mt.type_name like  concat('%', #{keyWord}, '%')
-          )
-        </if>
+            mws.parent_id = #{id} AND
+            mws.whole_type_name = #{wholeTypeName}
     </select>
 
     <select id="selectTypeTree" resultType="com.bonus.sgzb.material.domain.TreeSelectId">