From 8e8b6e5842f4c0d88c7e3747c257969ab53b1820 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 6 Nov 2024 16:26:37 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=AF=BC=E5=87=BArepair?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/ma/domain/Type.java | 8 +++ .../mapper/material/ma/TypeMapper.xml | 70 +++++++++++++++++-- 2 files changed, 74 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java index 4e3af21f..937046b3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java @@ -35,6 +35,14 @@ public class Type extends BaseEntity { @ApiModelProperty(value = "类型名称") private String typeName; + /** 库管员昵称 */ + @ApiModelProperty(value = "库管员昵称") + private String keeperNickName; + + /** 维修员昵称 */ + @ApiModelProperty(value = "维修员昵称") + private String repairNickName; + /** 仓库名称 */ @ApiModelProperty(value = "物资仓库名称") private String houseName; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml index 72f157ac..9384f98e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml @@ -8,7 +8,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -503,13 +506,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select mt4.type_id, mt4.type_name, mt4.parent_id, mt4.storage_num, mt4.type_code, mt4.model_code, mt4.unit_id, mt4.unit_name, mt4.manage_type, mt4.lease_price, mt4.eff_time, mt4.rent_price, mt4.buy_price, mt4.pay_ratio, mt4.pay_price, mt4.tax_ratio, mt4.level, mt4.rated_load, mt4.test_load, mt4.holding_time, mt4.warn_num, - mt4.create_by, mt4.create_time, mt4.update_by, mt4.update_time, mt4.is_plan,mt4.is_ancuo, mt4.remark, mt4.fac_model, mt4.intelligent_code, whs.house_id, mtk.user_id + mt4.create_by, mt4.create_time, mt4.update_by, mt4.update_time, mt4.is_plan,mt4.is_ancuo, mt4.remark, mt4.fac_model, mt4.intelligent_code, whs.house_id, whi.house_name,su.nick_name as keeper_nick_name from ma_type mt4 left join ma_type mt3 on mt3.type_id=mt4.parent_id left join ma_type mt2 on mt2.type_id=mt3.parent_id left join ma_type mt1 on mt1.type_id=mt2.parent_id left join wh_house_set whs on mt1.type_id=whs.type_id + left join wh_house_info whi on whs.house_id=whi.house_id left join ma_type_keeper mtk on mt4.type_id=mtk.type_id + left join sys_user su on mtk.user_id=su.user_id where mt4.del_flag = 0 and mt4.level = 4 UNION @@ -517,11 +522,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select mt3.type_id, mt3.type_name, mt3.parent_id, mt3.storage_num, mt3.type_code, mt3.model_code, mt3.unit_id, mt3.unit_name, mt3.manage_type, mt3.lease_price, mt3.eff_time, mt3.rent_price, mt3.buy_price, mt3.pay_ratio, mt3.pay_price, mt3.tax_ratio, mt3.level, mt3.rated_load, mt3.test_load, mt3.holding_time, mt3.warn_num, - mt3.create_by, mt3.create_time, mt3.update_by, mt3.update_time, mt3.is_plan,mt3.is_ancuo, mt3.remark, mt3.fac_model, mt3.intelligent_code, whs.house_id, null as user_id + mt3.create_by, mt3.create_time, mt3.update_by, mt3.update_time, mt3.is_plan,mt3.is_ancuo, mt3.remark, mt3.fac_model, mt3.intelligent_code, whs.house_id, whi.house_name,null as keeper_nick_name from ma_type mt3 left join ma_type mt2 on mt2.type_id=mt3.parent_id left join ma_type mt1 on mt1.type_id=mt2.parent_id left join wh_house_set whs on mt1.type_id=whs.type_id + left join wh_house_info whi on whs.house_id=whi.house_id where mt3.del_flag = 0 and mt3.level = 3 UNION @@ -529,10 +535,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select mt2.type_id, mt2.type_name, mt2.parent_id, mt2.storage_num, mt2.type_code, mt2.model_code, mt2.unit_id, mt2.unit_name, mt2.manage_type, mt2.lease_price, mt2.eff_time, mt2.rent_price, mt2.buy_price, mt2.pay_ratio, mt2.pay_price, mt2.tax_ratio, mt2.level, mt2.rated_load, mt2.test_load, mt2.holding_time, mt2.warn_num, - mt2.create_by, mt2.create_time, mt2.update_by, mt2.update_time, mt2.is_plan,mt2.is_ancuo, mt2.remark, mt2.fac_model, mt2.intelligent_code, whs.house_id, null as user_id + mt2.create_by, mt2.create_time, mt2.update_by, mt2.update_time, mt2.is_plan,mt2.is_ancuo, mt2.remark, mt2.fac_model, mt2.intelligent_code, whs.house_id, whi.house_name, null as keeper_nick_name from ma_type mt2 left join ma_type mt1 on mt1.type_id=mt2.parent_id left join wh_house_set whs on mt1.type_id=whs.type_id + left join wh_house_info whi on whs.house_id=whi.house_id where mt2.del_flag = 0 and mt2.level = 2 UNION @@ -540,9 +547,64 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select mt1.type_id, mt1.type_name, mt1.parent_id, mt1.storage_num, mt1.type_code, mt1.model_code, mt1.unit_id, mt1.unit_name, mt1.manage_type, mt1.lease_price, mt1.eff_time, mt1.rent_price, mt1.buy_price, mt1.pay_ratio, mt1.pay_price, mt1.tax_ratio, mt1.level, mt1.rated_load, mt1.test_load, mt1.holding_time, mt1.warn_num, - mt1.create_by, mt1.create_time, mt1.update_by, mt1.update_time, mt1.is_plan,mt1.is_ancuo, mt1.remark, mt1.fac_model, mt1.intelligent_code, whs.house_id, null as user_id + mt1.create_by, mt1.create_time, mt1.update_by, mt1.update_time, mt1.is_plan,mt1.is_ancuo, mt1.remark, mt1.fac_model, mt1.intelligent_code, whs.house_id, whi.house_name,null as keeper_nick_name from ma_type mt1 left join wh_house_set whs on mt1.type_id=whs.type_id + left join wh_house_info whi on whs.house_id=whi.house_id + where mt1.del_flag = 0 and mt1.level = 1 + + order by type_id + + + - - - and type_name like concat('%', #{typeName}, '%') - and parent_id = #{parentId} - and storage_num = #{storageNum} - and type_code = #{typeCode} - and model_code = #{modelCode} - and unit_id = #{unitId} - and manage_type = #{manageType} - and lease_price = #{leasePrice} - and eff_time = #{effTime} - and rent_price = #{rentPrice} - and buy_price = #{buyPrice} - and pay_ratio = #{payRatio} - and `level` = #{level} - and rated_load = #{ratedLoad} - and test_load = #{testLoad} - and holding_time = #{holdingTime} - and warn_num = #{warnNum} - and is_plan = #{isPlan} - and is_ancuo = #{isAncuo} - and fac_model = #{facModel} - and intelligent_code = #{intelligentCode} - and del_flag = #{delFlag} - + select + mt4.type_id, mt4.type_name, mt4.parent_id, mt4.storage_num, mt4.type_code, mt4.model_code, mt4.unit_id, mt4.unit_name, mt4.manage_type, mt4.lease_price, + mt4.eff_time, mt4.rent_price, mt4.buy_price, mt4.pay_ratio, mt4.pay_price, mt4.tax_ratio, mt4.level, mt4.rated_load, mt4.test_load, mt4.holding_time, mt4.warn_num, + mt4.create_by, mt4.create_time, mt4.update_by, mt4.update_time, mt4.is_plan,mt4.is_ancuo, mt4.remark, mt4.fac_model, mt4.intelligent_code, whs.house_id, whi.house_name + from ma_type mt4 + left join ma_type mt3 on mt3.type_id=mt4.parent_id + left join ma_type mt2 on mt2.type_id=mt3.parent_id + left join ma_type mt1 on mt1.type_id=mt2.parent_id + left join wh_house_set whs on mt1.type_id=whs.type_id + left join wh_house_info whi on whs.house_id=whi.house_id + where mt4.del_flag = 0 and mt4.level = 4 + + UNION + + select + mt3.type_id, mt3.type_name, mt3.parent_id, mt3.storage_num, mt3.type_code, mt3.model_code, mt3.unit_id, mt3.unit_name, mt3.manage_type, mt3.lease_price, + mt3.eff_time, mt3.rent_price, mt3.buy_price, mt3.pay_ratio, mt3.pay_price, mt3.tax_ratio, mt3.level, mt3.rated_load, mt3.test_load, mt3.holding_time, mt3.warn_num, + mt3.create_by, mt3.create_time, mt3.update_by, mt3.update_time, mt3.is_plan,mt3.is_ancuo, mt3.remark, mt3.fac_model, mt3.intelligent_code, whs.house_id, whi.house_name + from ma_type mt3 + left join ma_type mt2 on mt2.type_id=mt3.parent_id + left join ma_type mt1 on mt1.type_id=mt2.parent_id + left join wh_house_set whs on mt1.type_id=whs.type_id + left join wh_house_info whi on whs.house_id=whi.house_id + where mt3.del_flag = 0 and mt3.level = 3 + + UNION + + select + mt2.type_id, mt2.type_name, mt2.parent_id, mt2.storage_num, mt2.type_code, mt2.model_code, mt2.unit_id, mt2.unit_name, mt2.manage_type, mt2.lease_price, + mt2.eff_time, mt2.rent_price, mt2.buy_price, mt2.pay_ratio, mt2.pay_price, mt2.tax_ratio, mt2.level, mt2.rated_load, mt2.test_load, mt2.holding_time, mt2.warn_num, + mt2.create_by, mt2.create_time, mt2.update_by, mt2.update_time, mt2.is_plan,mt2.is_ancuo, mt2.remark, mt2.fac_model, mt2.intelligent_code, whs.house_id, whi.house_name + from ma_type mt2 + left join ma_type mt1 on mt1.type_id=mt2.parent_id + left join wh_house_set whs on mt1.type_id=whs.type_id + left join wh_house_info whi on whs.house_id=whi.house_id + where mt2.del_flag = 0 and mt2.level = 2 + + UNION + + select + mt1.type_id, mt1.type_name, mt1.parent_id, mt1.storage_num, mt1.type_code, mt1.model_code, mt1.unit_id, mt1.unit_name, mt1.manage_type, mt1.lease_price, + mt1.eff_time, mt1.rent_price, mt1.buy_price, mt1.pay_ratio, mt1.pay_price, mt1.tax_ratio, mt1.level, mt1.rated_load, mt1.test_load, mt1.holding_time, mt1.warn_num, + mt1.create_by, mt1.create_time, mt1.update_by, mt1.update_time, mt1.is_plan,mt1.is_ancuo, mt1.remark, mt1.fac_model, mt1.intelligent_code, whs.house_id, whi.house_name + from ma_type mt1 + left join wh_house_set whs on mt1.type_id=whs.type_id + left join wh_house_info whi on whs.house_id=whi.house_id + where mt1.del_flag = 0 and mt1.level = 1 + + order by type_id - select mt4.type_id, mt4.type_name, mt4.parent_id, mt4.storage_num, mt4.type_code, mt4.model_code, mt4.unit_id, mt4.unit_name, mt4.manage_type, mt4.lease_price, mt4.eff_time, mt4.rent_price, mt4.buy_price, mt4.pay_ratio, mt4.pay_price, mt4.tax_ratio, mt4.level, mt4.rated_load, mt4.test_load, mt4.holding_time, mt4.warn_num, From ca943b0156f31e6a995971d08291583dac51718f Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 6 Nov 2024 17:04:53 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E7=89=A9=E8=B5=84=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E5=87=BA=E7=8E=B0=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/material/ma/TypeMapper.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml index e9b90480..79f672e5 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml @@ -458,14 +458,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select DISTINCT m.type_id, m.type_name, m.parent_id, m.unit_id, m.unit_name, m.manage_type, m.lease_price,m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load, m.holding_time, m.warn_num, - mtk.user_id keeperUserId, - su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time, + -- mtk.user_id keeperUserId, + -- su.nick_name keeperUserName, + mpi.prop_name, m.del_flag, m.create_by, m.create_time, m.remark,m.type_id id , m.type_name label from ma_type m left join ma_prop_set mps on m.type_id = mps.type_id and mps.`status`='0' and mps.del_flag='0' left join ma_prop_info mpi on mps.prop_id = mpi.prop_id and mpi.`status`='0' and mpi.del_flag='0' - left join ma_type_keeper mtk on m.type_id = mtk.type_id - left join sys_user su on mtk.user_id = su.user_id + -- left join ma_type_keeper mtk on m.type_id = mtk.type_id + -- left join sys_user su on mtk.user_id = su.user_id m.del_flag = '0' From 7d18c5641badc13f4493a289203bef1e9afe234b Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 6 Nov 2024 18:49:08 +0800 Subject: [PATCH 05/17] =?UTF-8?q?Revert=20"=E7=89=A9=E8=B5=84=E5=8E=82?= =?UTF-8?q?=E5=AE=B6=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit da4123c8ce171d7ccf504e215a3c6210cdf1e891. --- .../material/basic/domain/BmFileInfo.java | 11 +++++++ .../material/basic/domain/BmUnitType.java | 30 +++++++++++++++++++ .../material/basic/BmFileInfoMapper.xml | 14 ++++++++- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java index 709b00ba..0b2fa507 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java @@ -29,6 +29,11 @@ public class BmFileInfo extends BaseEntity @ApiModelProperty(value = "任务类型") private Long taskType; + /** 任务id */ + @Excel(name = "任务id") + @ApiModelProperty(value = "任务id") + private Long taskId; + /** 模块id */ @Excel(name = "模块id") @ApiModelProperty(value = "模块id") @@ -49,4 +54,10 @@ public class BmFileInfo extends BaseEntity @ApiModelProperty(value = "文件类型") private Long fileType; + /** 数据字典 */ + @Excel(name = "数据字典") + @ApiModelProperty(value = "数据字典") + private Long dicId; + + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java new file mode 100644 index 00000000..764bc863 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java @@ -0,0 +1,30 @@ +//package com.bonus.material.basic.domain; +// +//import com.bonus.common.core.annotation.Excel; +//import com.bonus.common.core.web.domain.BaseEntity; +//import io.swagger.annotations.ApiModelProperty; +//import lombok.Data; +// +///** +// * @Author ma_sh +// * @create 2024/10/14 15:29 +// */ +//@Data +//public class BmUnitType extends BaseEntity { +// +// private Integer isAll; +// +// @ApiModelProperty(value = "主键id") +// private Long typeId; +// +// @ApiModelProperty(value = "单位类型名称") +// @Excel(name = "单位类型") +// private String typeName; +// +// @ApiModelProperty(value = "单位类型") +// private String dictType; +// +// /** 删除标志（0代表存在 2代表删除） */ +// private String delFlag; +// +//} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml index 15e24530..7aa97639 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml @@ -6,26 +6,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, task_type, model_id, name, url, file_type, create_by, create_time from bm_file_info + select id, task_type, task_id, model_id, name, url, file_type, dic_id, create_by, create_time from bm_file_info @@ -38,19 +42,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into bm_file_info task_type, + task_id, model_id, name, url, file_type, + dic_id, create_by, create_time, #{taskType}, + #{taskId}, #{modelId}, #{name}, #{url}, #{fileType}, + #{dicId}, #{createBy}, #{createTime}, @@ -60,10 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update bm_file_info task_type = #{taskType}, + task_id = #{taskId}, model_id = #{modelId}, name = #{name}, url = #{url}, file_type = #{fileType}, + dic_id = #{dicId}, create_by = #{createBy}, create_time = #{createTime}, @@ -85,8 +95,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from bm_file_info and task_type = #{taskType} + and task_id = #{taskId} and model_id = #{modelId} and file_type = #{fileType} + and dic_id = #{dicId} \ No newline at end of file From 2e3516d110942859e7ed110fe17d07f213b10b0d Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 6 Nov 2024 18:49:38 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E7=89=A9=E8=B5=84=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E5=87=BA=E7=8E=B0=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ma/controller/PartTypeController.java | 31 ++++++++++++++ .../ma/controller/TypeController.java | 9 +--- .../material/ma/mapper/PartTypeMapper.java | 10 +++++ .../material/ma/service/IPartTypeService.java | 5 +++ .../ma/service/impl/PartTypeServiceImpl.java | 10 +++++ .../mapper/material/ma/PartTypeMapper.xml | 42 +++++++++++++++++++ 6 files changed, 100 insertions(+), 7 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/PartTypeController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/PartTypeController.java index f986f9c7..a1c8e1a4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/PartTypeController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/PartTypeController.java @@ -1,12 +1,21 @@ package com.bonus.material.ma.controller; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; + +import cn.hutool.core.convert.Convert; +import com.bonus.common.biz.config.ListPagingUtil; +import com.bonus.common.core.utils.ServletUtils; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; +import com.bonus.material.ma.domain.vo.MaTypeVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.BooleanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -48,6 +57,28 @@ public class PartTypeController extends BaseController return partTypeService.selectPartTypeList(partType); } + /** + * 根据左列表类型id查询右表格 + * + * @param partType + * @return + */ + @ApiOperation(value = "根据左列表类型id查询右表格") + @GetMapping("/getListByPartType") + public AjaxResult getListByPartType(PartType partType) { + List parentIds = partTypeService.selectParentId(partType); + if (CollectionUtils.isEmpty(parentIds)) { + return AjaxResult.success(new ArrayList<>()); + } + List maTypeVos = new ArrayList<>(); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); + for (Integer parentId : parentIds) { + maTypeVos.addAll(partTypeService.getListByParentId(parentId.longValue(), partType)); + } + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, maTypeVos)); + } + @ApiOperation(value = "配件类型所属上级树") @RequiresPermissions("ma:type:query") @GetMapping("/getPartTree") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java index a259b412..407b4d45 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java @@ -79,16 +79,11 @@ public class TypeController extends BaseController { for (Integer parentId : parentIds) { maTypeVos.addAll(typeService.getListByParentId(parentId.longValue(), maTypeVo)); } - List updatedMaTypeVos = maTypeVos.stream() - .map(obj -> { - obj.setHouseId(maTypeVo.getHouseId()); - return obj; - }).collect(Collectors.toList()); if (BooleanUtils.isTrue(maTypeVo.getDisplayBindRelationship())) { - List finalMaTypeVos = typeService.getMyTypeAndBindUsers(updatedMaTypeVos); + List finalMaTypeVos = typeService.getMyTypeAndBindUsers(maTypeVos); return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, finalMaTypeVos)); } else { - return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, updatedMaTypeVos)); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, maTypeVos)); } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/PartTypeMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/PartTypeMapper.java index d6c03b93..f8910016 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/PartTypeMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/PartTypeMapper.java @@ -4,6 +4,8 @@ import java.util.List; import com.bonus.common.biz.domain.TreeNode; import com.bonus.material.ma.domain.PartType; +import com.bonus.material.ma.domain.vo.MaTypeVo; +import org.apache.ibatis.annotations.Param; /** * 配件类型管理Mapper接口 @@ -87,4 +89,12 @@ public interface PartTypeMapper * @return */ int selectPart(Long id); + + /** + * 根据level层级和typeID 查询父级ID + * @param partType + */ + List selectParentId(PartType partType); + + List getListByTypeName(@Param("paId") Long id, @Param("type") PartType partType); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IPartTypeService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IPartTypeService.java index 8255fc1a..0f99d4b5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IPartTypeService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IPartTypeService.java @@ -4,6 +4,7 @@ import java.util.List; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.ma.domain.PartType; +import com.bonus.material.ma.domain.vo.MaTypeVo; /** * 配件类型管理Service接口 @@ -66,4 +67,8 @@ public interface IPartTypeService * @return */ List getTypeList(PartType partType); + + List selectParentId(PartType partType); + + List getListByParentId(Long id, PartType type); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/PartTypeServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/PartTypeServiceImpl.java index 020d6d6c..a7ad207e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/PartTypeServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/PartTypeServiceImpl.java @@ -10,6 +10,7 @@ import com.bonus.common.biz.enums.HttpCodeEnum; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; +import com.bonus.material.ma.domain.vo.MaTypeVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -183,4 +184,13 @@ public class PartTypeServiceImpl implements IPartTypeService return partTypeMapper.getTypeList(partType); } + @Override + public List selectParentId(PartType partType) { + return partTypeMapper.selectParentId(partType); + } + + @Override + public List getListByParentId(Long id, PartType type) { + return partTypeMapper.getListByTypeName(id, type); + } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/PartTypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/PartTypeMapper.xml index d77654a4..b253e837 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/PartTypeMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/PartTypeMapper.xml @@ -151,4 +151,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update ma_part_type set del_flag = '2' where pa_id = #{id} + + + \ No newline at end of file From cb3e5d011694c15e3b8c39235d16ddc9aea4d98d Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 7 Nov 2024 09:06:50 +0800 Subject: [PATCH 07/17] =?UTF-8?q?bmfile=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/basic/domain/BmFileInfo.java | 6 ---- .../material/basic/domain/BmUnitType.java | 30 ------------------- .../material/basic/BmFileInfoMapper.xml | 9 ++---- 3 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java index 0b2fa507..24cc05c1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java @@ -54,10 +54,4 @@ public class BmFileInfo extends BaseEntity @ApiModelProperty(value = "文件类型") private Long fileType; - /** 数据字典 */ - @Excel(name = "数据字典") - @ApiModelProperty(value = "数据字典") - private Long dicId; - - } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java deleted file mode 100644 index 764bc863..00000000 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java +++ /dev/null @@ -1,30 +0,0 @@ -//package com.bonus.material.basic.domain; -// -//import com.bonus.common.core.annotation.Excel; -//import com.bonus.common.core.web.domain.BaseEntity; -//import io.swagger.annotations.ApiModelProperty; -//import lombok.Data; -// -///** -// * @Author ma_sh -// * @create 2024/10/14 15:29 -// */ -//@Data -//public class BmUnitType extends BaseEntity { -// -// private Integer isAll; -// -// @ApiModelProperty(value = "主键id") -// private Long typeId; -// -// @ApiModelProperty(value = "单位类型名称") -// @Excel(name = "单位类型") -// private String typeName; -// -// @ApiModelProperty(value = "单位类型") -// private String dictType; -// -// /** 删除标志（0代表存在 2代表删除） */ -// private String delFlag; -// -//} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml index 7aa97639..e112a2d1 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml @@ -11,13 +11,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - select id, task_type, task_id, model_id, name, url, file_type, dic_id, create_by, create_time from bm_file_info + select id, task_type, task_id, model_id, name, url, file_type, create_by, create_time from bm_file_info @@ -47,7 +46,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" name, url, file_type, - dic_id, create_by, create_time, @@ -58,7 +56,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{name}, #{url}, #{fileType}, - #{dicId}, #{createBy}, #{createTime}, @@ -73,7 +70,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" name = #{name}, url = #{url}, file_type = #{fileType}, - dic_id = #{dicId}, create_by = #{createBy}, create_time = #{createTime}, @@ -98,7 +94,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and task_id = #{taskId} and model_id = #{modelId} and file_type = #{fileType} - and dic_id = #{dicId} \ No newline at end of file From 6e13f55e0770d19f65cde941292982185c8182fc Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 7 Nov 2024 09:07:17 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/common/biz/constant/MaterialConstants.java | 3 --- .../material/ma/service/impl/SupplierInfoServiceImpl.java | 3 --- 2 files changed, 6 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java index 97c383e0..6ca260ac 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java @@ -109,9 +109,6 @@ public class MaterialConstants { */ public static final Integer TEN_CONSTANT = 10; - // 营业执照 FILE_TYPE - public static final Long FILE_TYPE_YINGYEZHIZHAO = 4L; - // 物资厂家管理任务类型 TASK_TYPE public static final Long TASK_TYPE_WUZI_CHANGJIA = 9L; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java index 15e67fd6..d058e7e3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java @@ -48,7 +48,6 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService { BmFileInfo bmFileInfo = new BmFileInfo(); bmFileInfo.setModelId(supplierInfo.getSupplierId()); bmFileInfo.setTaskType(MaterialConstants.TASK_TYPE_WUZI_CHANGJIA); - bmFileInfo.setFileType(MaterialConstants.FILE_TYPE_YINGYEZHIZHAO); List fileInfos = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); supplierInfo.setBmFileInfos(fileInfos); return supplierInfo; @@ -110,7 +109,6 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService { BmFileInfo bmFileInfoToDelete = new BmFileInfo(); bmFileInfoToDelete.setModelId(supplierInfo.getSupplierId()); bmFileInfoToDelete.setTaskType(MaterialConstants.TASK_TYPE_WUZI_CHANGJIA); - bmFileInfoToDelete.setFileType(MaterialConstants.FILE_TYPE_YINGYEZHIZHAO); bmFileInfoMapper.deleteBmFileInfoByBizInfo(bmFileInfoToDelete); if (CollectionUtils.isEmpty(supplierInfo.getBmFileInfos())) { return AjaxResult.success("修改任务成功,无营业执照附件"); @@ -143,7 +141,6 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService { bmFileInfoToDelete = new BmFileInfo(); bmFileInfoToDelete.setModelId(supplierIds[i]); bmFileInfoToDelete.setTaskType(MaterialConstants.TASK_TYPE_WUZI_CHANGJIA); - bmFileInfoToDelete.setFileType(MaterialConstants.FILE_TYPE_YINGYEZHIZHAO); bmFileInfoMapper.deleteBmFileInfoByBizInfo(bmFileInfoToDelete); } return supplierInfoMapper.deleteSupplierInfoBySupplierIds(supplierIds); From 9b2007f8ebd786e355a9f01b3bcbb27585c65a78 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 7 Nov 2024 09:26:21 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/domain/PurchaseCheckDetails.java | 3 +++ .../material/purchase/domain/dto/PurchaseDto.java | 4 ++-- .../purchase/PurchaseCheckDetailsMapper.xml | 13 +++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java index 4c4b13cc..b1b5167d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java @@ -134,5 +134,8 @@ public class PurchaseCheckDetails extends BaseEntity { @ApiModelProperty(value = "数据所属组织") private Long companyId; + /** 是否是固定资产编号(0 否，1 是) */ + @ApiModelProperty(value = "是否是固定资产编号(0 否，1 是)") + private String fixCode; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java index 86aaefae..b45dffd2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java @@ -74,8 +74,8 @@ public class PurchaseDto { @ApiModelProperty(value = "提交绑定数据集合") private List dtoList; - /** 是否是固定资产编号(0,是 1,否) */ - @ApiModelProperty(value = "是否是固定资产编号(0,是 1,否)") + /** 是否是固定资产编号(0 否，1 是) */ + @ApiModelProperty(value = "是否是固定资产编号(0 否，1 是)") private String fixCode; /** 编号类型 */ diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml index f6e39dc4..18732385 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml @@ -32,17 +32,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, task_id, type_id, purchase_price, purchase_tax_price, purchase_num, check_num, bind_num, check_result, supplier_id, status, create_by, production_time, create_time, update_by, update_time, remark, check_url_name, check_url, input_num, input_status, input_time, file_name, file_url, company_id from purchase_check_details + select id, task_id, type_id, purchase_price, purchase_tax_price, purchase_num, check_num, bind_num, check_result, supplier_id, status, create_by, production_time, create_time, update_by, update_time, remark, check_url_name, check_url, input_num, input_status, input_time, file_name, file_url, company_id, fix_code from purchase_check_details select pcd.id, pcd.task_id, pcd.type_id, pcd.purchase_price, pcd.purchase_tax_price, pcd.purchase_num, pcd.check_num, pcd.bind_num, pcd.check_result, pcd.supplier_id, pcd.status, pcd.create_by, pcd.production_time, pcd.create_time, pcd.update_by, pcd.update_time, pcd.remark, pcd.check_url_name, pcd.check_url, pcd.input_num, pcd.input_status, pcd.input_time, pcd.file_name, - pcd.file_url, pcd.company_id, mt.type_name, mt.unit_name, mtp.type_name as ma_type_name + pcd.file_url, pcd.company_id, pcd.fix_code, mt.type_name, mt.unit_name, mtp.type_name as ma_type_name from purchase_check_details pcd left join ma_type mt on pcd.type_id = mt.type_id left join ma_type mtp on mt.parent_id = mtp.type_id @@ -70,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and file_name like concat('%', #{fileName}, '%') and file_url = #{fileUrl} and company_id = #{companyId} + and fix_code = #{fixCode} @@ -132,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" file_name, file_url, company_id, + fix_code, #{taskId}, @@ -158,6 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{fileName}, #{fileUrl}, #{companyId}, + #{fixCode}, @@ -188,6 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" file_name = #{fileName}, file_url = #{fileUrl}, company_id = #{companyId}, + fix_code = #{fixCode}, where id = #{id} @@ -227,14 +232,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" purchase_num,check_num,bind_num,check_result,supplier_id, status,production_time,create_by,create_time,update_by, update_time,remark,check_url_name,check_url,input_num, - input_status,input_time,file_name,file_url,company_id) + input_status,input_time,file_name,file_url,company_id,fix_code) values (#{item.taskId},#{item.typeId},#{item.purchasePrice},#{item.purchaseTaxPrice}, #{item.purchaseNum},#{item.checkNum},#{item.bindNum},#{item.checkResult},#{item.supplierId}, #{item.status},#{item.productionTime},#{item.createBy},#{item.createTime},#{item.updateBy}, #{item.updateTime},#{item.remark},#{item.checkUrlName},#{item.checkUrl},#{item.inputNum}, - #{item.inputStatus},#{item.inputTime},#{item.fileName},#{item.fileUrl},#{item.companyId}) + #{item.inputStatus},#{item.inputTime},#{item.fileName},#{item.fileUrl},#{item.companyId},#{item.fixCode}) From 00e588e8b3550c2e4f245cc664e2c8dc5c327ffc Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 7 Nov 2024 10:05:24 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/BmFileInfoController.java | 11 +++++++++++ .../material/basic/mapper/BmFileInfoMapper.java | 3 +++ .../basic/service/IBmFileInfoService.java | 2 ++ .../service/impl/BmFileInfoServiceImpl.java | 9 +++++++++ .../purchase/domain/PurchaseCheckDetails.java | 7 +++++++ .../impl/PurchaseCheckInfoServiceImpl.java | 14 ++++++++++++++ .../mapper/material/basic/BmFileInfoMapper.xml | 17 +++++++++++++++++ 7 files changed, 63 insertions(+) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java index b3655c5d..3e424c53 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java @@ -95,6 +95,17 @@ public class BmFileInfoController extends BaseController return toAjax(bmFileInfoService.insertBmFileInfo(bmFileInfo)); } + @ApiOperation(value = "批量新增附件") + @PreventRepeatSubmit + @RequiresPermissions("basic:info:add") + @SysLog(title = "附件", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->批量新增附件") + @PostMapping + public AjaxResult add(@RequestBody List bmFileInfos) + { + return toAjax(bmFileInfoService.insertBmFileInfos(bmFileInfos)); + } + + /** * 修改附件 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java index 75d56c9f..0d3f6f64 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java @@ -2,6 +2,7 @@ package com.bonus.material.basic.mapper; import java.util.List; import com.bonus.material.basic.domain.BmFileInfo; +import org.apache.ibatis.annotations.Param; /** * 附件Mapper接口 @@ -32,6 +33,8 @@ public interface BmFileInfoMapper { */ int insertBmFileInfo(BmFileInfo bmFileInfo); + int insertBmFileInfos(@Param("list") List bmFileInfos); + /** * 修改附件 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java index 0e3ecefe..d36d2d35 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java @@ -44,6 +44,8 @@ public interface IBmFileInfoService */ public int insertBmFileInfo(BmFileInfo bmFileInfo); + public int insertBmFileInfos(List bmFileInfos); + /** * 修改附件 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java index 9fb79cb3..1aecf747 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.bonus.material.basic.service.impl; import java.util.List; +import java.util.stream.Collectors; + import com.bonus.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -66,6 +68,13 @@ public class BmFileInfoServiceImpl implements IBmFileInfoService return bmFileInfoMapper.insertBmFileInfo(bmFileInfo); } + @Override + public int insertBmFileInfos(List bmFileInfos) + { + bmFileInfos.stream().forEach(o -> o.setCreateTime(DateUtils.getNowDate())); + return bmFileInfoMapper.insertBmFileInfos(bmFileInfos); + } + /** * 修改附件 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java index b1b5167d..0a595f2b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java @@ -2,6 +2,9 @@ package com.bonus.material.purchase.domain; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + +import com.bonus.material.basic.domain.BmFileInfo; import com.fasterxml.jackson.annotation.JsonFormat; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; @@ -138,4 +141,8 @@ public class PurchaseCheckDetails extends BaseEntity { @ApiModelProperty(value = "是否是固定资产编号(0 否，1 是)") private String fixCode; + /** 验收附件列表 */ + @Excel(name = "验收附件列表") + @ApiModelProperty(value = "验收附件列表") + private List bmFileInfos; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index a9480ee6..f19a4943 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -12,6 +12,8 @@ import java.util.stream.Collectors; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.basic.domain.BmFileInfo; +import com.bonus.material.basic.mapper.BmFileInfoMapper; import com.bonus.material.purchase.config.PurchaseTaskEnum; import com.bonus.material.purchase.domain.PurchaseCheckDetails; import com.bonus.material.purchase.domain.dto.PurchaseCheckDto; @@ -54,6 +56,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { @Resource private TmTaskMapper tmTaskMapper; + @Resource + BmFileInfoMapper bmFileInfoMapper; + /** * 查询新购验收任务 * @@ -188,6 +193,15 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { }); // 批量插入详情数据 boolean purchaseCheckDetailsListAddResult = purchaseCheckDetailsMapper.insertPurchaseCheckDetailsList(purchaseCheckInfo.getPurchaseCheckDetailsList()) > 0; + + // 批量插入附件列表 + List purchaseCheckDetailsList = purchaseCheckInfo.getPurchaseCheckDetailsList(); + for (PurchaseCheckDetails purchaseCheckDetails : purchaseCheckDetailsList) { + List bmFileInfos = purchaseCheckDetails.getBmFileInfos(); + bmFileInfos.stream().forEach(o -> o.setTaskId(taskId)); + bmFileInfoMapper.insertBmFileInfos(bmFileInfos); + } + if (purchaseCheckDetailsListAddResult) { transactionManager.commit(transactionStatus); return AjaxResult.success("新增任务成功"); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml index e112a2d1..ee21a5e1 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml @@ -61,6 +61,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + insert into bm_file_info (task_type,type_id,model_id,name,url,file_type,create_by,create_time) + values + + ( + #{item.taskType}, + #{item.taskId}, + #{item.modelId}, + #{item.name}, + #{item.url}, + #{item.fileType}, + #{item.createBy}, + #{item.createTime} + ) + + + update bm_file_info From 0d2536234f2a7298a0b7fc9cdefc745a6652b4ee Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 7 Nov 2024 10:16:24 +0800 Subject: [PATCH 11/17] =?UTF-8?q?Revert=20"=E6=96=B0=E8=B4=AD=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 00e588e8b3550c2e4f245cc664e2c8dc5c327ffc. --- .../basic/controller/BmFileInfoController.java | 11 ----------- .../material/basic/mapper/BmFileInfoMapper.java | 3 --- .../basic/service/IBmFileInfoService.java | 2 -- .../service/impl/BmFileInfoServiceImpl.java | 9 --------- .../purchase/domain/PurchaseCheckDetails.java | 7 ------- .../impl/PurchaseCheckInfoServiceImpl.java | 14 -------------- .../mapper/material/basic/BmFileInfoMapper.xml | 17 ----------------- 7 files changed, 63 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java index 3e424c53..b3655c5d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java @@ -95,17 +95,6 @@ public class BmFileInfoController extends BaseController return toAjax(bmFileInfoService.insertBmFileInfo(bmFileInfo)); } - @ApiOperation(value = "批量新增附件") - @PreventRepeatSubmit - @RequiresPermissions("basic:info:add") - @SysLog(title = "附件", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->批量新增附件") - @PostMapping - public AjaxResult add(@RequestBody List bmFileInfos) - { - return toAjax(bmFileInfoService.insertBmFileInfos(bmFileInfos)); - } - - /** * 修改附件 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java index 0d3f6f64..75d56c9f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java @@ -2,7 +2,6 @@ package com.bonus.material.basic.mapper; import java.util.List; import com.bonus.material.basic.domain.BmFileInfo; -import org.apache.ibatis.annotations.Param; /** * 附件Mapper接口 @@ -33,8 +32,6 @@ public interface BmFileInfoMapper { */ int insertBmFileInfo(BmFileInfo bmFileInfo); - int insertBmFileInfos(@Param("list") List bmFileInfos); - /** * 修改附件 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java index d36d2d35..0e3ecefe 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java @@ -44,8 +44,6 @@ public interface IBmFileInfoService */ public int insertBmFileInfo(BmFileInfo bmFileInfo); - public int insertBmFileInfos(List bmFileInfos); - /** * 修改附件 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java index 1aecf747..9fb79cb3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java @@ -1,8 +1,6 @@ package com.bonus.material.basic.service.impl; import java.util.List; -import java.util.stream.Collectors; - import com.bonus.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -68,13 +66,6 @@ public class BmFileInfoServiceImpl implements IBmFileInfoService return bmFileInfoMapper.insertBmFileInfo(bmFileInfo); } - @Override - public int insertBmFileInfos(List bmFileInfos) - { - bmFileInfos.stream().forEach(o -> o.setCreateTime(DateUtils.getNowDate())); - return bmFileInfoMapper.insertBmFileInfos(bmFileInfos); - } - /** * 修改附件 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java index 0a595f2b..b1b5167d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java @@ -2,9 +2,6 @@ package com.bonus.material.purchase.domain; import java.math.BigDecimal; import java.util.Date; -import java.util.List; - -import com.bonus.material.basic.domain.BmFileInfo; import com.fasterxml.jackson.annotation.JsonFormat; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; @@ -141,8 +138,4 @@ public class PurchaseCheckDetails extends BaseEntity { @ApiModelProperty(value = "是否是固定资产编号(0 否，1 是)") private String fixCode; - /** 验收附件列表 */ - @Excel(name = "验收附件列表") - @ApiModelProperty(value = "验收附件列表") - private List bmFileInfos; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index f19a4943..a9480ee6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -12,8 +12,6 @@ import java.util.stream.Collectors; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.material.basic.domain.BmFileInfo; -import com.bonus.material.basic.mapper.BmFileInfoMapper; import com.bonus.material.purchase.config.PurchaseTaskEnum; import com.bonus.material.purchase.domain.PurchaseCheckDetails; import com.bonus.material.purchase.domain.dto.PurchaseCheckDto; @@ -56,9 +54,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { @Resource private TmTaskMapper tmTaskMapper; - @Resource - BmFileInfoMapper bmFileInfoMapper; - /** * 查询新购验收任务 * @@ -193,15 +188,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { }); // 批量插入详情数据 boolean purchaseCheckDetailsListAddResult = purchaseCheckDetailsMapper.insertPurchaseCheckDetailsList(purchaseCheckInfo.getPurchaseCheckDetailsList()) > 0; - - // 批量插入附件列表 - List purchaseCheckDetailsList = purchaseCheckInfo.getPurchaseCheckDetailsList(); - for (PurchaseCheckDetails purchaseCheckDetails : purchaseCheckDetailsList) { - List bmFileInfos = purchaseCheckDetails.getBmFileInfos(); - bmFileInfos.stream().forEach(o -> o.setTaskId(taskId)); - bmFileInfoMapper.insertBmFileInfos(bmFileInfos); - } - if (purchaseCheckDetailsListAddResult) { transactionManager.commit(transactionStatus); return AjaxResult.success("新增任务成功"); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml index ee21a5e1..e112a2d1 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml @@ -61,23 +61,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - insert into bm_file_info (task_type,type_id,model_id,name,url,file_type,create_by,create_time) - values - - ( - #{item.taskType}, - #{item.taskId}, - #{item.modelId}, - #{item.name}, - #{item.url}, - #{item.fileType}, - #{item.createBy}, - #{item.createTime} - ) - - - update bm_file_info From 281a73b295d9423d33d054e836a2a17ae5be4bf5 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 7 Nov 2024 10:33:44 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/basic/mapper/BmFileInfoMapper.java | 3 +++ .../basic/service/IBmFileInfoService.java | 2 ++ .../service/impl/BmFileInfoServiceImpl.java | 7 +++++++ .../mapper/material/basic/BmFileInfoMapper.xml | 17 +++++++++++++++++ 4 files changed, 29 insertions(+) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java index 75d56c9f..0d3f6f64 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java @@ -2,6 +2,7 @@ package com.bonus.material.basic.mapper; import java.util.List; import com.bonus.material.basic.domain.BmFileInfo; +import org.apache.ibatis.annotations.Param; /** * 附件Mapper接口 @@ -32,6 +33,8 @@ public interface BmFileInfoMapper { */ int insertBmFileInfo(BmFileInfo bmFileInfo); + int insertBmFileInfos(@Param("list") List bmFileInfos); + /** * 修改附件 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java index 0e3ecefe..d36d2d35 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java @@ -44,6 +44,8 @@ public interface IBmFileInfoService */ public int insertBmFileInfo(BmFileInfo bmFileInfo); + public int insertBmFileInfos(List bmFileInfos); + /** * 修改附件 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java index 9fb79cb3..376112e4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java @@ -66,6 +66,13 @@ public class BmFileInfoServiceImpl implements IBmFileInfoService return bmFileInfoMapper.insertBmFileInfo(bmFileInfo); } + @Override + public int insertBmFileInfos(List bmFileInfos) + { + bmFileInfos.stream().forEach(o -> o.setCreateTime(DateUtils.getNowDate())); + return bmFileInfoMapper.insertBmFileInfos(bmFileInfos); + } + /** * 修改附件 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml index e112a2d1..ee21a5e1 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml @@ -61,6 +61,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + insert into bm_file_info (task_type,type_id,model_id,name,url,file_type,create_by,create_time) + values + + ( + #{item.taskType}, + #{item.taskId}, + #{item.modelId}, + #{item.name}, + #{item.url}, + #{item.fileType}, + #{item.createBy}, + #{item.createTime} + ) + + + update bm_file_info From 191261d42ef5ec393e8b712bacd430cbf9f4e546 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 7 Nov 2024 10:39:39 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/domain/PurchaseCheckDetails.java | 7 +++++++ .../service/impl/PurchaseCheckInfoServiceImpl.java | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java index b1b5167d..0a595f2b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java @@ -2,6 +2,9 @@ package com.bonus.material.purchase.domain; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + +import com.bonus.material.basic.domain.BmFileInfo; import com.fasterxml.jackson.annotation.JsonFormat; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; @@ -138,4 +141,8 @@ public class PurchaseCheckDetails extends BaseEntity { @ApiModelProperty(value = "是否是固定资产编号(0 否，1 是)") private String fixCode; + /** 验收附件列表 */ + @Excel(name = "验收附件列表") + @ApiModelProperty(value = "验收附件列表") + private List bmFileInfos; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index a9480ee6..f19a4943 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -12,6 +12,8 @@ import java.util.stream.Collectors; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.basic.domain.BmFileInfo; +import com.bonus.material.basic.mapper.BmFileInfoMapper; import com.bonus.material.purchase.config.PurchaseTaskEnum; import com.bonus.material.purchase.domain.PurchaseCheckDetails; import com.bonus.material.purchase.domain.dto.PurchaseCheckDto; @@ -54,6 +56,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { @Resource private TmTaskMapper tmTaskMapper; + @Resource + BmFileInfoMapper bmFileInfoMapper; + /** * 查询新购验收任务 * @@ -188,6 +193,15 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { }); // 批量插入详情数据 boolean purchaseCheckDetailsListAddResult = purchaseCheckDetailsMapper.insertPurchaseCheckDetailsList(purchaseCheckInfo.getPurchaseCheckDetailsList()) > 0; + + // 批量插入附件列表 + List purchaseCheckDetailsList = purchaseCheckInfo.getPurchaseCheckDetailsList(); + for (PurchaseCheckDetails purchaseCheckDetails : purchaseCheckDetailsList) { + List bmFileInfos = purchaseCheckDetails.getBmFileInfos(); + bmFileInfos.stream().forEach(o -> o.setTaskId(taskId)); + bmFileInfoMapper.insertBmFileInfos(bmFileInfos); + } + if (purchaseCheckDetailsListAddResult) { transactionManager.commit(transactionStatus); return AjaxResult.success("新增任务成功"); From e8e15d6f92bb38ad35c2d35bf714e606f914a27d Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 7 Nov 2024 10:56:37 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/material/basic/BmFileInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml index ee21a5e1..61fba911 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into bm_file_info (task_type,type_id,model_id,name,url,file_type,create_by,create_time) + insert into bm_file_info (task_type,task_id,model_id,name,url,file_type,create_by,create_time) values ( From fbad0e817827332fb446c4ca4039dad271a13e75 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 7 Nov 2024 13:17:28 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/material/basic/BmFileInfoMapper.xml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml index 61fba911..c816ebc5 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml @@ -61,20 +61,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - insert into bm_file_info (task_type,task_id,model_id,name,url,file_type,create_by,create_time) - values - - ( - #{item.taskType}, + + INSERT INTO bm_file_info(task_type,task_id,model_id,name,url,file_type,create_by,create_time) + VALUES + + (#{item.taskType}, #{item.taskId}, #{item.modelId}, #{item.name}, #{item.url}, #{item.fileType}, #{item.createBy}, - #{item.createTime} - ) + #{item.createTime}) From 0d3fe514b82dada9ea2d6aa8e3c8a55b8a429c25 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 7 Nov 2024 13:56:29 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseCheckInfoController.java | 4 ++-- .../PurchaseNoticePersonController.java | 18 +++++++-------- .../service/IPurchaseCheckInfoService.java | 4 ++-- .../impl/PurchaseCheckInfoServiceImpl.java | 23 ++++++++++++++----- 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java index 9611c33e..eb9ed653 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java @@ -84,9 +84,9 @@ public class PurchaseCheckInfoController extends BaseController { @RequiresPermissions("purchase:info:edit") @SysLog(title = "新购验收任务", businessType = OperaType.UPDATE, module = "物资新购->修改新购验收任务") @PutMapping - public AjaxResult edit(@RequestBody PurchaseCheckInfo purchaseCheckInfo) { + public AjaxResult edit(@RequestBody PurchaseCheckDto purchaseCheckDto) { try { - return toAjax(purchaseCheckInfoService.updatePurchaseCheckInfo(purchaseCheckInfo)); + return toAjax(purchaseCheckInfoService.updatePurchaseCheckInfo(purchaseCheckDto)); } catch (Exception e) { return error("系统错误, " + e.getMessage()); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java index 7aa32225..04f4c1da 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java @@ -45,7 +45,7 @@ public class PurchaseNoticePersonController extends BaseController { * 查询新购短信通知人员列表 */ @ApiOperation(value = "查询新购短信通知人员列表") - @RequiresPermissions("purchase:person:list") + @RequiresPermissions("purchase:person:notice") @GetMapping("/list") public TableDataInfo list(PurchaseNoticePerson purchaseNoticePerson) { List list = purchaseNoticePersonService.selectPurchaseNoticePersonList(purchaseNoticePerson); @@ -56,7 +56,7 @@ public class PurchaseNoticePersonController extends BaseController { * 查询新购短信通知人员列表 */ @ApiOperation(value = "查询等待选择的新购短信通知人员列表") - @RequiresPermissions("purchase:person:list") + @RequiresPermissions("purchase:person:notice") @GetMapping("/listUnSelected") public TableDataInfo listUnSelected() { List list = purchaseNoticePersonService.getUnSelectedUserList(); @@ -68,7 +68,7 @@ public class PurchaseNoticePersonController extends BaseController { */ @ApiOperation(value = "导出新购短信通知人员列表") @PreventRepeatSubmit - @RequiresPermissions("purchase:person:export") + @RequiresPermissions("purchase:person:notice") @SysLog(title = "新购短信通知人员", businessType = OperaType.EXPORT, module = "物资新购->导出新购短信通知人员") @PostMapping("/export") public void export(HttpServletResponse response, PurchaseNoticePerson purchaseNoticePerson) { @@ -81,7 +81,7 @@ public class PurchaseNoticePersonController extends BaseController { * 获取新购短信通知人员详细信息 */ @ApiOperation(value = "获取新购短信通知人员详细信息") - @RequiresPermissions("purchase:person:query") + @RequiresPermissions("purchase:person:notice") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { return success(purchaseNoticePersonService.selectPurchaseNoticePersonById(id)); @@ -92,7 +92,7 @@ public class PurchaseNoticePersonController extends BaseController { */ @ApiOperation(value = "新增新购短信通知人员") @PreventRepeatSubmit - @RequiresPermissions("purchase:person:add") + @RequiresPermissions("purchase:person:notice") @SysLog(title = "新购短信通知人员", businessType = OperaType.INSERT, module = "物资新购->新增新购短信通知人员") @PostMapping public AjaxResult add(@RequestBody PurchaseNoticePerson purchaseNoticePerson) { @@ -108,7 +108,7 @@ public class PurchaseNoticePersonController extends BaseController { */ @ApiOperation(value = "批量新增新购短信通知人员") @PreventRepeatSubmit - @RequiresPermissions("purchase:person:add") + @RequiresPermissions("purchase:person:notice") @SysLog(title = "批量新增新购短信通知人员", businessType = OperaType.INSERT, module = "物资新购->批量新增新购短信通知人员") @PostMapping("/batchAddNoticePerson") public AjaxResult batchAddNoticePerson(@RequestBody List purchaseNoticePersonList) { @@ -124,7 +124,7 @@ public class PurchaseNoticePersonController extends BaseController { */ @ApiOperation(value = "批量发送短信") @PreventRepeatSubmit - @RequiresPermissions("purchase:person:edit") + @RequiresPermissions("purchase:person:notice") @SysLog(title = "批量发送短信", businessType = OperaType.UPDATE, module = "物资新购->批量发送短信") @PutMapping("/batchSendSms") public AjaxResult batchSendSms(@NotNull @Valid @RequestBody PurchaseNoticePersonDto purchaseNoticePersonDto) { @@ -136,7 +136,7 @@ public class PurchaseNoticePersonController extends BaseController { */ @ApiOperation(value = "修改新购短信通知人员") @PreventRepeatSubmit - @RequiresPermissions("purchase:person:edit") + @RequiresPermissions("purchase:person:notice") @SysLog(title = "新购短信通知人员", businessType = OperaType.UPDATE, module = "物资新购->修改新购短信通知人员") @PutMapping public AjaxResult edit(@RequestBody PurchaseNoticePerson purchaseNoticePerson) { @@ -152,7 +152,7 @@ public class PurchaseNoticePersonController extends BaseController { */ @ApiOperation(value = "删除新购短信通知人员") @PreventRepeatSubmit - @RequiresPermissions("purchase:person:remove") + @RequiresPermissions("purchase:person:notice") @SysLog(title = "新购短信通知人员", businessType = OperaType.DELETE, module = "物资新购->删除新购短信通知人员") @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java index 7d39fa8f..b5775f58 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java @@ -53,10 +53,10 @@ public interface IPurchaseCheckInfoService { /** * 修改新购验收任务 * - * @param purchaseCheckInfo 新购验收任务 + * @param purchaseCheckDto 新购验收任务 * @return 结果 */ - int updatePurchaseCheckInfo(PurchaseCheckInfo purchaseCheckInfo); + boolean updatePurchaseCheckInfo(PurchaseCheckDto purchaseCheckDto); /** * 批量删除新购验收任务 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index f19a4943..4e9c7c34 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -12,6 +12,7 @@ import java.util.stream.Collectors; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.basic.domain.BmFileInfo; import com.bonus.material.basic.mapper.BmFileInfoMapper; import com.bonus.material.purchase.config.PurchaseTaskEnum; @@ -31,6 +32,7 @@ import com.bonus.material.purchase.service.IPurchaseCheckInfoService; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.DefaultTransactionDefinition; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -165,6 +167,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { public AjaxResult insertPurchaseCheckInfo(PurchaseCheckDto purchaseCheckInfo) { // 赋值创建时间 purchaseCheckInfo.getPurchaseCheckInfo().setCreateTime(DateUtils.getNowDate()); + purchaseCheckInfo.getPurchaseCheckInfo().setCreateBy(SecurityUtils.getLoginUser().getUsername()); try { // 查询新购任务当月最大单号 Integer thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), Long.valueOf(PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_NOTICE.getTaskTypeId())); @@ -198,8 +201,10 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { List purchaseCheckDetailsList = purchaseCheckInfo.getPurchaseCheckDetailsList(); for (PurchaseCheckDetails purchaseCheckDetails : purchaseCheckDetailsList) { List bmFileInfos = purchaseCheckDetails.getBmFileInfos(); - bmFileInfos.stream().forEach(o -> o.setTaskId(taskId)); - bmFileInfoMapper.insertBmFileInfos(bmFileInfos); + if (!CollectionUtils.isEmpty(bmFileInfos)) { + bmFileInfos.stream().forEach(o -> o.setTaskId(taskId)); + bmFileInfoMapper.insertBmFileInfos(bmFileInfos); + } } if (purchaseCheckDetailsListAddResult) { @@ -297,14 +302,20 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { /** * 修改新购验收任务 * - * @param purchaseCheckInfo 新购验收任务 + * @param purchaseCheckDto 新购验收任务 * @return 结果 */ @Override - public int updatePurchaseCheckInfo(PurchaseCheckInfo purchaseCheckInfo) { - purchaseCheckInfo.setUpdateTime(DateUtils.getNowDate()); + public boolean updatePurchaseCheckInfo(PurchaseCheckDto purchaseCheckDto) { + purchaseCheckDto.getPurchaseCheckInfo().setUpdateTime(DateUtils.getNowDate()); + purchaseCheckDto.getPurchaseCheckInfo().setUpdateBy(SecurityUtils.getUsername()); try { - return purchaseCheckInfoMapper.updatePurchaseCheckInfo(purchaseCheckInfo); + List purchaseCheckDetailsList = purchaseCheckDto.getPurchaseCheckDetailsList(); + for (PurchaseCheckDetails purchaseCheckDetails : purchaseCheckDetailsList) { + purchaseCheckDetailsMapper.updatePurchaseCheckDetails(purchaseCheckDetails); + } + purchaseCheckInfoMapper.updatePurchaseCheckInfo(purchaseCheckDto.getPurchaseCheckInfo()); + return true; } catch (Exception e) { throw new ServiceException("错误信息描述"); } From 2cfcff21ec289d62d4f82ff6c952fbd6e1d673d6 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 7 Nov 2024 14:21:55 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/BmFileInfoController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java index b3655c5d..f3bc711a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java @@ -44,7 +44,7 @@ public class BmFileInfoController extends BaseController 列表 */ @ApiOperation(value = "查询附件列表") - @RequiresPermissions("basic:info:list") + @RequiresPermissions("basic:file:manage") @GetMapping("/list") public TableDataInfo list(BmFileInfo bmFileInfo) { @@ -59,7 +59,7 @@ public class BmFileInfoController extends BaseController */ @ApiOperation(value = "导出附件列表") @PreventRepeatSubmit - @RequiresPermissions("basic:info:export") + @RequiresPermissions("basic:file:manage") @SysLog(title = "附件", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出附件") @PostMapping("/export") public void export(HttpServletResponse response, BmFileInfo bmFileInfo) @@ -74,7 +74,7 @@ public class BmFileInfoController extends BaseController 详细信息 */ @ApiOperation(value = "获取附件详细信息") - @RequiresPermissions("basic:info:query") + @RequiresPermissions("basic:file:manage") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -87,7 +87,7 @@ public class BmFileInfoController extends BaseController */ @ApiOperation(value = "新增附件") @PreventRepeatSubmit - @RequiresPermissions("basic:info:add") + @RequiresPermissions("basic:file:manage") @SysLog(title = "附件", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增附件") @PostMapping public AjaxResult add(@RequestBody BmFileInfo bmFileInfo) @@ -101,7 +101,7 @@ public class BmFileInfoController extends BaseController */ @ApiOperation(value = "修改附件") @PreventRepeatSubmit - @RequiresPermissions("basic:info:edit") + @RequiresPermissions("basic:file:manage") @SysLog(title = "附件", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改附件") @PutMapping public AjaxResult edit(@RequestBody BmFileInfo bmFileInfo) @@ -115,7 +115,7 @@ public class BmFileInfoController extends BaseController */ @ApiOperation(value = "删除附件") @PreventRepeatSubmit - @RequiresPermissions("basic:info:remove") + @RequiresPermissions("basic:file:manage") @SysLog(title = "附件", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除附件") @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids)