From 16573aedc92f54630aa7577644790935214e8651 Mon Sep 17 00:00:00 2001 From: mashuai Date: Sat, 13 Sep 2025 01:02:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/biz/enums/TmTaskTypeEnum.java | 4 +- .../MaterialLeaseInfoController.java | 6 +- .../controller/MaterialMachineController.java | 70 ++- .../material/clz/domain/MaterialDto.java | 216 +++++++++ .../com/bonus/material/clz/domain/TeamVo.java | 136 ++++++ .../domain/lease/MaterialLeaseApplyInfo.java | 5 + .../vo/MaterialRetainedEquipmentInfo.java | 45 +- .../clz/domain/vo/MaterialTotalMentInfo.java | 22 +- .../clz/mapper/IwsTeamUserMapper.java | 7 + .../clz/mapper/MaterialLeaseInfoMapper.java | 30 +- .../clz/mapper/MaterialMachineMapper.java | 57 +++ .../clz/service/MaterialLeaseInfoService.java | 4 +- .../clz/service/MaterialMachineService.java | 10 +- .../impl/MaterialLeaseInfoServiceImpl.java | 42 +- .../impl/MaterialMachineServiceImpl.java | 157 +++---- .../material/task/mapper/TmTaskMapper.java | 8 +- .../mapper/material/clz/IwsTeamUserMapper.xml | 11 + .../material/clz/MaterialLeaseInfoMapper.xml | 35 +- .../material/clz/MaterialMachineMapper.xml | 412 ++++++++++++++++++ .../mapper/material/task/TmTaskMapper.xml | 10 +- 20 files changed, 1064 insertions(+), 223 deletions(-) create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/MaterialDto.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/TeamVo.java diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java index 87467be1..81b2355e 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java @@ -37,7 +37,9 @@ public enum TmTaskTypeEnum { // 材料站领料 TM_TASK_MATERIAL_LEASE(22, "材料站领料任务"), // 材料站退料 - TM_TASK_MATERIAL_BACK(23, "材料站退料任务"); + TM_TASK_MATERIAL_BACK(23, "材料站退料任务"), + // 材料站预约退料 + TM_TASK_MATERIAL_BACK_APPOINT(24, "材料站预约退料任务"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java index 69c86d59..856e0f49 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java @@ -277,9 +277,9 @@ public class MaterialLeaseInfoController extends BaseController { @ApiOperation(value = "删除领料任务") @PreventRepeatSubmit @SysLog(title = "领料任务", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除领料任务") - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(materialLeaseInfoService.deleteLeaseApplyInfoByIds(ids)); + @PostMapping("/delete") + public AjaxResult delete(@RequestBody MaterialLeaseApplyInfo info) { + return toAjax(materialLeaseInfoService.deleteLeaseApplyInfoByIds(info)); } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java index 20e139f0..f067fb23 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java @@ -7,6 +7,7 @@ import com.bonus.common.core.utils.ServletUtils; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.clz.domain.TeamVo; import com.bonus.material.clz.domain.machine.MaterialUseStorageInfo; import com.bonus.material.clz.domain.vo.MaterialRetainedTeamTotalVo; import com.bonus.material.clz.domain.vo.MaterialRetainedTeamVo; @@ -60,34 +61,12 @@ public class MaterialMachineController extends BaseController { @ApiOperation(value = "综合查询--保有设备总量查询") @GetMapping("/getRetainedEquipmentList") public AjaxResult getRetainedEquipmentList(MaterialRetainedEquipmentInfo bean) { - bean.setIsExport(1); - if (bean.getIsApp() != null && bean.getIsApp() == 1) { - List pageList = materialMachineService.getRetainedEquipmentList(bean); - return AjaxResult.success(pageList); - } Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); List list = materialMachineService.getRetainedEquipmentList(bean); return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } - /** - * 保有设备总量查询不带分页 - * @param bean - * @return - */ - @ApiOperation(value = "综合查询--保有设备总量查询不带分页") - @GetMapping("/getRetainedEquipmentListNoPage") - public AjaxResult getRetainedEquipmentListNoPage(MaterialRetainedEquipmentInfo bean) { - bean.setIsExport(0); - List list = materialMachineService.getRetainedEquipmentList(bean); - MaterialRetainedEquipmentInfo dto = new MaterialRetainedEquipmentInfo(); - if (CollectionUtils.isNotEmpty(list)) { - dto = list.get(0); - } - return AjaxResult.success(dto); - } - /** * 工器具台账 * @param bean @@ -96,24 +75,10 @@ public class MaterialMachineController extends BaseController { @ApiOperation(value = "工器具台账查询") @GetMapping("/getTotalList") public AjaxResult getTotalList(MaterialRetainedEquipmentInfo bean) { - Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); - Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); - List list = materialMachineService.getTotalList(bean); - return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); + MaterialTotalMentInfo info = materialMachineService.getTotalList(bean); + return AjaxResult.success(info); } - /** - * 导出工器具台账查询 - * @param bean - * @return - */ - @ApiOperation(value = "综合查询--导出工器具台账查询") - @PostMapping("/exportTotalList") - public void exportTotalList(HttpServletResponse response, MaterialRetainedEquipmentInfo bean) { - List list = materialMachineService.getTotalList(bean); - ExcelUtil util = new ExcelUtil<>(MaterialTotalMentInfo.class); - util.exportExcel(response, list, "综合查询--工器具台账查询"); - } /** * 导出保有设备总量查询 @@ -123,10 +88,9 @@ public class MaterialMachineController extends BaseController { @ApiOperation(value = "综合查询--导出保有设备总量查询") @PostMapping("/exportRetainedEquipmentList") public void exportRetainedEquipmentList(HttpServletResponse response, MaterialRetainedEquipmentInfo bean) { - bean.setIsExport(0); List list = materialMachineService.getRetainedEquipmentList(bean); ExcelUtil util = new ExcelUtil<>(MaterialRetainedEquipmentInfo.class); - util.exportExcel(response, list, "综合查询--在库机具设备详情"); + util.exportExcel(response, list, "综合查询--保有设备总量查询"); } /** @@ -339,4 +303,30 @@ public class MaterialMachineController extends BaseController { List list = materialMachineService.getTeamNumThirdList(bean); return AjaxResult.success(getDataTable(list)); } + + /** + * 班组进出场记录 + * @param bean + * @return + */ + @ApiOperation(value = "班组进出场记录") + @GetMapping("/getTeamInOrOutInfo") + public AjaxResult getTeamInOrOutInfo(TeamVo bean) { + startPage(); + List list = materialMachineService.getTeamInOrOutInfo(bean); + return AjaxResult.success(getDataTable(list)); + } + + /** + * 导出班组进出场记录 + * @param response + * @param bean + */ + @ApiOperation(value = "导出班组进出场记录") + @PostMapping("/exportTeamInOrOutInfo") + public void exportTeamInOrOutInfo(HttpServletResponse response, TeamVo bean) { + List list = materialMachineService.getTeamInOrOutInfo(bean); + ExcelUtil util = new ExcelUtil<>(TeamVo.class); + util.exportExcel(response, list, "导出班组进出场记录"); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/MaterialDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/MaterialDto.java new file mode 100644 index 00000000..93d4e49a --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/MaterialDto.java @@ -0,0 +1,216 @@ +package com.bonus.material.clz.domain; + +import com.bonus.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** +* @description 综合查询--保有设备总量查询 +* @author ma_sh +* @date 2024/2/26 14:51 +*/ +@ApiModel(description = "保有设备总量查询") +@Data +public class MaterialDto { + + private static final long serialVersionUID = 2227217051604273598L; + + @ApiModelProperty(value = "分公司名称") + private String impUnitName; + + @ApiModelProperty(value = "项目部名称") + private String departName; + + @ApiModelProperty(value = "工程id") + private String proId; + + @ApiModelProperty(value = "工程名称") + private String proName; + + @ApiModelProperty(value = "分包单位名称") + @Excel(name = "分包单位名称") + private String subUnitName; + + @ApiModelProperty(value = "物资类型") + @Excel(name = "物资类型") + private String materialType; + + @ApiModelProperty(value = "物资名称") + @Excel(name = "物资名称") + private String typeName; + + @ApiModelProperty(value = "规格ID") + private Integer typeId; + + @ApiModelProperty(value = "规格型号") + @Excel(name = "规格型号") + private String typeModelName; + + @ApiModelProperty(value = "计量单位") + @Excel(name = "计量单位") + private String unit; + + @ApiModelProperty(value = "在库数量") + @Excel(name = "在库数量") + private BigDecimal storeNum; + + @ApiModelProperty(value = "在用数量") + @Excel(name = "在用数量") + private BigDecimal usNum; + + @ApiModelProperty(value = "在修数量") + private BigDecimal repairNum; + + @ApiModelProperty(value = "新购待入库") + private BigDecimal inputNum; + + @ApiModelProperty(value = "修试后待入库") + private BigDecimal repairInputNum; + + @ApiModelProperty(value = "待报废数量") + private BigDecimal pendingScrapNum; + + @ApiModelProperty(value = "已审核报废数量") + private BigDecimal scrapNum; + + @ApiModelProperty(value = "总保有量") + @Excel(name = "总保有数量") + private BigDecimal allNum; + + @ApiModelProperty(value = "购置单价") + private BigDecimal buyPrice; + + @ApiModelProperty(value = "投入总价值") + //@Excel(name = "总保有量资产(万元)") + private BigDecimal totalPrice; + + @ApiModelProperty(value = "五年以内成新率") + private String fiveReplacementRate; + + @ApiModelProperty(value = "五年以内设备数量") + private BigDecimal fiveReplacementNum; + + @ApiModelProperty(value = "五年至十年成新率") + private String tenReplacementRate; + + @ApiModelProperty(value = "五年至十年设备数量") + private BigDecimal tenReplacementNum; + + @ApiModelProperty(value = "十年以上成新率") + private String tenPlusReplacementRate; + + @ApiModelProperty(value = "十年以上设备数量") + private BigDecimal tenPlusReplacementNum; + + @ApiModelProperty(value = "管理模式") + @Excel(name = "管理模式") + private String manageType; + + @ApiModelProperty(value = "创建者") + private String createBy; + + @ApiModelProperty(value = "创建时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @ApiModelProperty(value = "更新者") + private String updateBy; + + @ApiModelProperty(value = "更新时间 ") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + @ApiModelProperty(value = "关键字") + private String keyWord; + + @ApiModelProperty(value = "数据所属组织") + private Integer companyId; + + /** 1.机具仓储 2.调试仓储 */ + private String maType; + + private String maTypeName; + + @ApiModelProperty(value = "一级类型id") + private Integer firstTypeId; + + @ApiModelProperty(value = "二级类型id") + private Integer secondTypeId; + + @ApiModelProperty(value = "三级类型id") + private Integer thirdTypeId; + + private List modelList; + + /** + * 是否伸展（APP） + */ + private boolean expanded = false; + + /** + * 检验状态 + */ + private String checkStatus; + + private String maCode; + + /** 本次检验日期 */ + @ApiModelProperty(value = "本次检验日期") + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date thisCheckTime; + + /** 下次检验日期 */ + @ApiModelProperty(value = "下次检验日期") + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date nextCheckTime; + + /** + * 状态(0 =正常，1= 3个月检测到期，2= 1个月检测到期，3= 已过期) + */ + private String status; + + /** 正常设备数量 */ + private long normalNum; + + /** 3个月检测到期设备数量 */ + private long threeMonthNum; + + /** 1个月检测到期设备数量 */ + private long oneMonthNum; + + /** 已过期设备数量 */ + private long expiredNum; + + @ApiModelProperty(value = "班组名称") + private String teamName; + + @ApiModelProperty(value = "班组id") + private String teamId; + + /** + * 班组长账号 + */ + private String teamLeaderIdCard; + + @ApiModelProperty(value = "i8工程id") + private String externalId; + + @ApiModelProperty(value = "身份证号码") + private String idCard; + + @ApiModelProperty(value = "实施单位id") + private String impUnit; + + +} \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/TeamVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/TeamVo.java new file mode 100644 index 00000000..10cc2285 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/TeamVo.java @@ -0,0 +1,136 @@ +package com.bonus.material.clz.domain; + +import com.bonus.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * 班组管理 + * @Author ma_sh + * @create 2025/5/12 10:07 + */ +@Data +public class TeamVo { + + /** + * 是否下拉选 + */ + private Integer isAll; + + /** + * 主键 + */ + private Long id; + + /** + * 工程名称 + */ + @Excel(name = "工程名称", width = 70) + private String projectName; + + /** + * 分包商名称 + */ + @Excel(name = "班组分包名称", width = 30) + private String subcontractor; + + /** + * 班组名称 + */ + @Excel(name = "班组名称") + private String teamName; + + /** + * 班组状态 1：空闲，2：申报，3：进场 + */ + private String teamStatus; + + /** + * 班组状态 1：空闲，2：申报，3：进场 + */ + @Excel(name = "班组状态") + private String teamStatusName; + + /** + * 是否解散 0：否，1：是 + */ + private String isDismiss; + + /** + * 是否解散 0：否，1：是 + */ + @Excel(name = "是否解散") + private String isDismissName; + + /** + * 实际进场时间 + */ + @Excel(name = "实际进场时间") + private String actualProcessTime; + + /** + * 实际出场时间 + */ + @Excel(name = "实际出场时间") + private String actualExitTime; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 修改人 + */ + private String updateUser; + + /** + * 关键字 + */ + private String keyWord; + + /** + * i8工程id + */ + private String projectId; + + /** + * 工程id + */ + private String proId; + + /** + * 班组长身份证号 + */ + private String teamLeaderIdCard; + + /** + * 班组长名称 + */ + private String teamLeaderName; + + /** + * 班组长电话 + */ + private String teamLeaderPhone; + + /** + * i8工程id集合 + */ + private List projectIdList; + + @ApiModelProperty(value = "实施单位id") + private String impUnit; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyInfo.java index 2c1b4e96..1a6cc447 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyInfo.java @@ -310,4 +310,9 @@ public class MaterialLeaseApplyInfo extends BaseEntity { * i8工程id集合 */ private List projectIdList; + + /** + * 状态 + */ + private String status; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java index 8e47720f..37a896af 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java @@ -38,17 +38,25 @@ public class MaterialRetainedEquipmentInfo { @ApiModelProperty(value = "工程id") private String proId; + @ApiModelProperty(value = "分公司") + @Excel(name = "分公司") + private String impUnitName; + + @ApiModelProperty(value = "项目部") + @Excel(name = "项目部") + private String departName; + @ApiModelProperty(value = "工程名称") @Excel(name = "工程名称") private String proName; - @ApiModelProperty(value = "施工类型") - @Excel(name = "施工类型") - private String constructionType; + @ApiModelProperty(value = "分包单位") + @Excel(name = "分包单位") + private String subUnitName; - @ApiModelProperty(value = "物资类型") - @Excel(name = "物资类型") - private String materialType; + @ApiModelProperty(value = "班组名称") + @Excel(name = "班组名称") + private String teamName; @ApiModelProperty(value = "物资名称") @Excel(name = "物资名称") @@ -66,30 +74,13 @@ public class MaterialRetainedEquipmentInfo { private String unit; @ApiModelProperty(value = "在库数量") - @Excel(name = "在库数量") private BigDecimal storeNum; @ApiModelProperty(value = "在用数量") - @Excel(name = "在用数量") private BigDecimal usNum; - @ApiModelProperty(value = "在修数量") - private BigDecimal repairNum; - - @ApiModelProperty(value = "新购待入库") - private BigDecimal inputNum; - - @ApiModelProperty(value = "修试后待入库") - private BigDecimal repairInputNum; - - @ApiModelProperty(value = "待报废数量") - private BigDecimal pendingScrapNum; - - @ApiModelProperty(value = "已审核报废数量") - private BigDecimal scrapNum; - - @ApiModelProperty(value = "总保有量") - @Excel(name = "总保有数量") + @ApiModelProperty(value = "数量") + @Excel(name = "数量") private BigDecimal allNum; @ApiModelProperty(value = "购置单价") @@ -118,7 +109,6 @@ public class MaterialRetainedEquipmentInfo { private BigDecimal tenPlusReplacementNum; @ApiModelProperty(value = "管理模式") - @Excel(name = "管理模式") private String manageType; @ApiModelProperty(value = "创建者") @@ -200,9 +190,6 @@ public class MaterialRetainedEquipmentInfo { /** 已过期设备数量 */ private long expiredNum; - @ApiModelProperty(value = "班组名称") - private String teamName; - @ApiModelProperty(value = "班组id") private String teamId; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialTotalMentInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialTotalMentInfo.java index 2adb519a..b68d7c7a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialTotalMentInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialTotalMentInfo.java @@ -36,7 +36,27 @@ public class MaterialTotalMentInfo { @Excel(name = "工程名称", width = 80) private String proName; + @ApiModelProperty(value = "项目部总数") + @Excel(name = "项目部总数") + private Integer departNum; + + @ApiModelProperty(value = "工程总数") + @Excel(name = "工程总数") + private Integer proNum; + + @ApiModelProperty(value = "班组总数") + @Excel(name = "班组总数") + private Integer teamNum; + @ApiModelProperty(value = "总保有量") - @Excel(name = "总保有量", align = HorizontalAlignment.RIGHT) + @Excel(name = "总保有量") private BigDecimal allNum; + + @ApiModelProperty(value = "站内数量") + @Excel(name = "站内数量") + private BigDecimal inNum; + + @ApiModelProperty(value = "在用数量") + @Excel(name = "在用数量") + private BigDecimal useNum; } \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/IwsTeamUserMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/IwsTeamUserMapper.java index 1f16ed10..43677d2b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/IwsTeamUserMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/IwsTeamUserMapper.java @@ -36,4 +36,11 @@ public interface IwsTeamUserMapper { * @return List集合 */ List selectProjectTeamInfoByProjectIds(@Param("ids") List ids); + + /** + * 根据班组名称查询分包名称 + * @param teamName + * @return + */ + String getTeamName(String teamName); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialLeaseInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialLeaseInfoMapper.java index 75388c1e..fb7f20a5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialLeaseInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialLeaseInfoMapper.java @@ -141,16 +141,16 @@ public interface MaterialLeaseInfoMapper { /** * 删除站点领料详情数据 - * @param ids + * @param id * @return */ - int deleteLeaseApplyDetailsByParentIds(Long[] ids); + int deleteLeaseApplyDetailsByParentIds(Long id); /** * 删除站点领料记录 - * @param ids + * @param id */ - int deleteById(Long[] ids); + int deleteById(Long id); /** * 修改领料任务 @@ -181,10 +181,10 @@ public interface MaterialLeaseInfoMapper { /** * 删除站点领料记录 - * @param ids + * @param id * @return */ - int deleteLeaseApplyInfoByIds(Long[] ids); + int deleteLeaseApplyInfoByIds(Long id); /** * 工器具领料记录 @@ -353,10 +353,10 @@ public interface MaterialLeaseInfoMapper { /** * 根据任务id查询领料任务ID - * @param ids + * @param id * @return */ - List getTaskIds(Long[] ids); + Long getTaskIds(Long id); /** * ocr出库：根据code查询在库机具信息 @@ -371,4 +371,18 @@ public interface MaterialLeaseInfoMapper { * @return */ List getInfoByCode(BmQrcodeInfo bmQrcodeInfo); + + /** + * 删除协议表数据 + * @param id + * @return + */ + int deleteSltInfo(Long id); + + /** + * 先根据id查询该领料单是否已经退料 + * @param id + * @return + */ + List getSltInfoList(Long id); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java index 7c919418..e61519b1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java @@ -1,6 +1,7 @@ package com.bonus.material.clz.mapper; import com.bonus.material.back.domain.vo.MaCodeVo; +import com.bonus.material.clz.domain.TeamVo; import com.bonus.material.clz.domain.machine.MaterialUseStorageInfo; import com.bonus.material.clz.domain.vo.MaterialRetainedTeamTotalVo; import com.bonus.material.clz.domain.vo.MaterialRetainedTeamVo; @@ -157,4 +158,60 @@ public interface MaterialMachineMapper { * @return */ List getTotalInfoList(MaterialRetainedEquipmentInfo bean); + + /** + * 班组进出场记录 + * @param bean + * @return + */ + List getTeamInOrOutInfo(TeamVo bean); + + /** + * 获取项目部总数 + * @param bean + * @return + */ + Integer selectDepartNum(MaterialRetainedEquipmentInfo bean); + + /** + * 获取工程总数 + * @param bean + * @return + */ + Integer selectProjectNum(MaterialRetainedEquipmentInfo bean); + + /** + * 获取班组总数 + * @param bean + * @return + */ + Integer selectTeamNum(MaterialRetainedEquipmentInfo bean); + + /** + * 获取站内库存，在用量，保有量 + * @param bean + * @return + */ + MaterialRetainedEquipmentInfo getRetainTotalInfo(MaterialRetainedEquipmentInfo bean); + + /** + * 库存量 + * @param bean + * @return + */ + MaterialRetainedEquipmentInfo getRetainStoreInfo(MaterialRetainedEquipmentInfo bean); + + /** + * 查询目前还有库存的设备 + * @param bean + * @return + */ + List getRetainInfoList(MaterialRetainedEquipmentInfo bean); + + /** + * 查询目前正在使用的设备 + * @param bean + * @return + */ + List getUsInfoList(MaterialRetainedEquipmentInfo bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialLeaseInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialLeaseInfoService.java index 93adabec..b45fc5c2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialLeaseInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialLeaseInfoService.java @@ -112,10 +112,10 @@ public interface MaterialLeaseInfoService { /** * 删除领料任务 - * @param ids + * @param info * @return */ - int deleteLeaseApplyInfoByIds(Long[] ids); + int deleteLeaseApplyInfoByIds(MaterialLeaseApplyInfo info); /** * 工器具领料记录 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialMachineService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialMachineService.java index fc7edfb1..8cccf4a5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialMachineService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialMachineService.java @@ -1,6 +1,7 @@ package com.bonus.material.clz.service; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.clz.domain.TeamVo; import com.bonus.material.clz.domain.machine.MaterialUseStorageInfo; import com.bonus.material.clz.domain.vo.MaterialRetainedTeamTotalVo; import com.bonus.material.clz.domain.vo.MaterialRetainedTeamVo; @@ -127,5 +128,12 @@ public interface MaterialMachineService { * @param bean * @return */ - List getTotalList(MaterialRetainedEquipmentInfo bean); + MaterialTotalMentInfo getTotalList(MaterialRetainedEquipmentInfo bean); + + /** + * 班组进出场记录 + * @param bean + * @return + */ + List getTeamInOrOutInfo(TeamVo bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java index ad7ab015..59941d11 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java @@ -1044,7 +1044,7 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { leaseApplyInfo.setUpdateBy(createBy); // 去除创建一个新的数组对象，直接复用 - Long[] ids = {leaseApplyInfo.getId()}; + Long id = leaseApplyInfo.getId(); if (CollectionUtil.isNotEmpty(leaseApplyInfo.getBmFileInfos())) { // 删除原有数据 BmFileInfo bmFileInfo = new BmFileInfo(); @@ -1065,9 +1065,9 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { } if (CollectionUtil.isNotEmpty(leaseApplyRequestVo.getLeaseApplyDetailsList())) { // 业务逻辑代码,删除lease_apply_details - materialLeaseInfoMapper.deleteLeaseApplyDetailsByParentIds(ids); + materialLeaseInfoMapper.deleteLeaseApplyDetailsByParentIds(id); // 业务逻辑代码,删除lease_out_details - materialLeaseInfoMapper.deleteById(ids); + materialLeaseInfoMapper.deleteById(id); /*for (MaterialLeaseApplyDetails leaseApplyDetails : leaseApplyRequestVo.getLeaseApplyDetailsList()) { if (!CollectionUtils.isEmpty(leaseApplyDetails.getMaCodeList())) { for (MaterialLeaseMaCodeDto leaseMaCodeDto : leaseApplyDetails.getMaCodeList()) { @@ -1184,32 +1184,44 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { /** * 删除领料任务 * - * @param ids + * @param info * @return */ @Override - public int deleteLeaseApplyInfoByIds(Long[] ids) { + public int deleteLeaseApplyInfoByIds(MaterialLeaseApplyInfo info) { int result = 0; - // 根据ids查询任务id - List taskIds = materialLeaseInfoMapper.getTaskIds(ids); - if (!CollectionUtils.isEmpty(taskIds)) { + // 先根据id查询该领料单是否已经退料 + List list = materialLeaseInfoMapper.getSltInfoList(info.getId()); + if (!CollectionUtils.isEmpty(list)) { + // 如果list包含状态为1的数据 + if (list.stream().anyMatch(item -> "1".equals(item.getStatus()))) { + throw new ServiceException("该领料单已经进行退料操作，无法删除"); + } + } + // 根据id查询任务id + Long taskId = materialLeaseInfoMapper.getTaskIds(info.getId()); + if (taskId != null) { // 根据任务id删除任务表数据 - result = tmTaskMapper.deleteTaskByIds(taskIds); + result = tmTaskMapper.deleteTaskByIds(taskId); if (result < 1) { throw new ServiceException("删除任务信息失败"); } // 根据任务id删除任务协议表数据 - result = tmTaskMapper.deleteAgreementId(taskIds); + result = tmTaskMapper.deleteAgreementId(taskId); if (result < 1) { throw new ServiceException("删除任务协议信息失败"); } } - result = materialLeaseInfoMapper.deleteLeaseApplyInfoByIds(ids); + result = materialLeaseInfoMapper.deleteLeaseApplyInfoByIds(info.getId()); if (result > 0) { - // 删除lease_apply_details表数据 - result += materialLeaseInfoMapper.deleteLeaseApplyDetailsByParentIds(ids); - // 业务逻辑代码,删除lease_out_details - result += materialLeaseInfoMapper.deleteById(ids); + // 删除clz_lease_apply_details表数据 + result += materialLeaseInfoMapper.deleteLeaseApplyDetailsByParentIds(info.getId()); + // 业务逻辑代码,删除clz_lease_out_details + result += materialLeaseInfoMapper.deleteById(info.getId()); + // 如果为领料出库，删除协议表数据 + if ("1".equals(info.getType())) { + result += materialLeaseInfoMapper.deleteSltInfo(info.getId()); + } } return result; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java index 750382d6..51720b2d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java @@ -6,6 +6,7 @@ import com.alibaba.nacos.common.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.basic.domain.BmProject; +import com.bonus.material.clz.domain.TeamVo; import com.bonus.material.clz.domain.lease.MaterialLeaseApplyInfo; import com.bonus.material.clz.domain.machine.MaterialUseStorageInfo; import com.bonus.material.clz.domain.vo.*; @@ -16,7 +17,6 @@ import com.bonus.material.common.mapper.SelectMapper; import com.bonus.material.ma.domain.Machine; import com.bonus.material.clz.domain.BmTeam; import com.bonus.material.clz.domain.machine.MaterialStorageInfo; -import com.bonus.material.clz.mapper.BmTeamMapper; import com.bonus.material.clz.mapper.MaterialMachineMapper; import com.bonus.material.clz.service.MaterialMachineService; import lombok.extern.slf4j.Slf4j; @@ -24,11 +24,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.Period; -import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -43,9 +38,6 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { @Resource private MaterialMachineMapper materialMachineMapper; - @Resource - private BmTeamMapper bmTeamMapper; - @Resource private SelectMapper mapper; @@ -162,53 +154,32 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { bean.setProjectIdList(projectIdList); } } - BigDecimal totalPrice = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP); - BigDecimal totalStoreNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); - BigDecimal totalUsNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); - BigDecimal totalRepairNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); - BigDecimal totalInputNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); - BigDecimal totalRepairInputNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); - BigDecimal totalAllNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); if (deptId != null) { bean.setImpUnit(deptId.toString()); } - List recordList = materialMachineMapper.getRetainedEquipmentList(bean); - if (!org.springframework.util.CollectionUtils.isEmpty(recordList)) { + // 查询目前在用的设备信息 + List usList = materialMachineMapper.getUsInfoList(bean); + //查询目前还有库存的设备 + List recordList = materialMachineMapper.getRetainInfoList(bean); + if (!CollectionUtils.isEmpty(usList)) { + for (MaterialRetainedEquipmentInfo materialRetainedEquipmentInfo : usList) { + // 根据班组名称查询分包单位 + String subUnitName = iwsTeamUserMapper.getTeamName(materialRetainedEquipmentInfo.getTeamName()); + materialRetainedEquipmentInfo.setSubUnitName(subUnitName); + } + // 数据合并 + if (!CollectionUtils.isEmpty(recordList)) { + usList.addAll(recordList); + } if (teamData != null) { // 将sortedList中班组身份证号与username相同的元素过滤处理 - recordList = recordList.stream() + usList = usList.stream() .filter(item -> StringUtils.isBlank(item.getIdCard()) || username.equals(item.getIdCard())) .collect(Collectors.toList()); - } /*else { - recordList = filterInfo(recordList, username); - }*/ - } - if (CollectionUtils.isNotEmpty(recordList)) { - for (MaterialRetainedEquipmentInfo retainedEquipmentInfo : recordList) { - totalStoreNum = totalStoreNum.add(retainedEquipmentInfo.getStoreNum()); - totalUsNum = totalUsNum.add(retainedEquipmentInfo.getUsNum()); - totalAllNum = totalAllNum.add(retainedEquipmentInfo.getAllNum()); - BigDecimal equipmentPrice = retainedEquipmentInfo.getAllNum() - .multiply(retainedEquipmentInfo.getBuyPrice()) - .divide(new BigDecimal(10000), 2, RoundingMode.HALF_UP); - totalPrice = totalPrice.add(equipmentPrice); - retainedEquipmentInfo.setTotalPrice(equipmentPrice); - } - if (bean.getIsExport() == 0) { - MaterialRetainedEquipmentInfo retainedEquipmentInfo = new MaterialRetainedEquipmentInfo(); - retainedEquipmentInfo.setStoreNum(totalStoreNum); - retainedEquipmentInfo.setUsNum(totalUsNum); - retainedEquipmentInfo.setRepairNum(totalRepairNum); - retainedEquipmentInfo.setInputNum(totalInputNum); - retainedEquipmentInfo.setRepairInputNum(totalRepairInputNum); - retainedEquipmentInfo.setAllNum(totalAllNum); - retainedEquipmentInfo.setTotalPrice(totalPrice); - retainedEquipmentInfo.setUnit("合计"); - recordList.add(0, retainedEquipmentInfo); } } - return recordList; + return usList; } /** @@ -758,7 +729,8 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { * @return */ @Override - public List getTotalList(MaterialRetainedEquipmentInfo bean) { + public MaterialTotalMentInfo getTotalList(MaterialRetainedEquipmentInfo bean) { + MaterialTotalMentInfo info = new MaterialTotalMentInfo(); String username = SecurityUtils.getLoginUser().getUsername(); BmTeam teamData = null; Set userRoles = SecurityUtils.getLoginUser().getRoles(); @@ -771,9 +743,11 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { // 根据用户名查询项目部信息 List departId = mapper.getDepartId(username); // 根据项目部id查询工程信息 - List projectIdList = mapper.getProjectId(departId); - if (!org.springframework.util.CollectionUtils.isEmpty(projectIdList)) { - bean.setProjectIdList(projectIdList); + if (!CollectionUtils.isEmpty(departId)) { + List projectIdList = mapper.getProjectId(departId); + if (!CollectionUtils.isEmpty(projectIdList)) { + bean.setProjectIdList(projectIdList); + } } } Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); @@ -781,54 +755,47 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { bean.setImpUnit(deptId.toString()); } } + // 获取项目部总数 + Integer departNum = materialMachineMapper.selectDepartNum(bean); + // 获取工程总数 + Integer projectNum = materialMachineMapper.selectProjectNum(bean); + // 获取班组总数 + Integer teamNum = materialMachineMapper.selectTeamNum(bean); + // 获取在用量 + MaterialRetainedEquipmentInfo useInfo = materialMachineMapper.getRetainTotalInfo(bean); + BigDecimal useNum = (useInfo != null && useInfo.getUsNum() != null) ? + useInfo.getUsNum() : BigDecimal.ZERO; - List recordList = materialMachineMapper.getRetainedEquipmentList(bean); - if (!CollectionUtils.isEmpty(recordList)) { - if (teamData != null) { - // 将sortedList中班组身份证号与username相同的元素过滤处理 - recordList = recordList.stream() - .filter(item -> StringUtils.isBlank(item.getIdCard()) || username.equals(item.getIdCard())) - .collect(Collectors.toList()); - } + // 库存量 + MaterialRetainedEquipmentInfo storeInfo = materialMachineMapper.getRetainStoreInfo(bean); + BigDecimal storeNum = (storeInfo != null && storeInfo.getStoreNum() != null) ? + storeInfo.getStoreNum() : BigDecimal.ZERO; + BigDecimal storeUseNum = (storeInfo != null && storeInfo.getUsNum() != null) ? + storeInfo.getUsNum() : BigDecimal.ZERO; + + // 站内库存量 = 库存量 - 库存中已使用量，不能为负数 + BigDecimal inNum = storeNum.subtract(storeUseNum); + if (inNum.compareTo(BigDecimal.ZERO) < 0) { + inNum = BigDecimal.ZERO; } - List groupedList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(recordList)) { - // 用于分组的Map，键为包含proCenter和proId的组合对象，值为分组后的汇总信息 - Map groupMap = new HashMap<>(); + // 设置结果 + info.setInNum(inNum); + info.setUseNum(useNum); + info.setDepartNum(departNum); + info.setProNum(projectNum); + info.setTeamNum(teamNum); + info.setAllNum(inNum.add(useNum)); + return info; + } - for (MaterialRetainedEquipmentInfo record : recordList) { - // 构建唯一的分组键（将proCenter和proId拼接，确保相同组合的键一致） - String groupKey = record.getProCenter() + "_" + record.getProId(); - - // 检查Map中是否已存在该分组 - if (groupMap.containsKey(groupKey)) { - // 已存在则累加allNum - MaterialTotalMentInfo existingRecord = groupMap.get(groupKey); - existingRecord.setAllNum(existingRecord.getAllNum().add(record.getAllNum())); - } else { - // 不存在则新增分组（注意：如果需要保留原始对象其他字段，建议创建新对象避免修改原数据） - MaterialTotalMentInfo newRecord = new MaterialTotalMentInfo(); - newRecord.setProCenter(record.getProCenter()); - newRecord.setProId(record.getProId()); - newRecord.setProName(record.getProName()); - newRecord.setAllNum(record.getAllNum()); - // 如需保留其他字段，在这里继续设置 - groupMap.put(groupKey, newRecord); - } - } - - // 分组后的结果集合（可根据需要转换为List） - groupedList = new ArrayList<>(groupMap.values()); - // 如果关键字不为空，进行过滤 - if (CollectionUtils.isNotEmpty(groupedList)) { - if (StringUtils.isNotBlank(bean.getKeyWord())) { - groupedList = groupedList.stream() - .filter(item -> containsTotalKeyword(item, bean.getKeyWord())) - .collect(Collectors.toList()); - } - } - } - return groupedList; + /** + * 班组进出场记录 + * @param bean + * @return + */ + @Override + public List getTeamInOrOutInfo(TeamVo bean) { + return materialMachineMapper.getTeamInOrOutInfo(bean); } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java index 6febcee6..827e6c93 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java @@ -149,17 +149,17 @@ public interface TmTaskMapper { /** * 批量删除任务 - * @param taskIds + * @param taskId * @return */ - int deleteTaskByIds(@Param("taskIds") List taskIds); + int deleteTaskByIds(@Param("taskId") Long taskId); /** * 批量删除协议id - * @param taskIds + * @param taskId * @return */ - int deleteAgreementId(@Param("taskIds") List taskIds); + int deleteAgreementId(@Param("taskId") Long taskId); /** * 根据任务id查询任务状态 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/IwsTeamUserMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/IwsTeamUserMapper.xml index 0b21a612..cd0a86f5 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/IwsTeamUserMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/IwsTeamUserMapper.xml @@ -46,4 +46,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml index b0727cc0..435e38ed 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml @@ -370,24 +370,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from clz_lease_apply_details where parent_id in - - #{id} - + delete from clz_lease_apply_details where parent_id = #{id} - delete from clz_lease_out_details where parent_id in - - #{id} - + delete from clz_lease_out_details where parent_id = #{id} - delete from clz_lease_apply_info where id in - - #{id} - + delete from clz_lease_apply_info where id = #{id} + + + + delete from clz_slt_agreement_info where lease_id = #{id} + + \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml index 056d6831..51753e5c 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml @@ -945,4 +945,416 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml index 65bb4a6d..faf85c2f 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml @@ -140,17 +140,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from tm_task where task_id in - - #{taskId} - + delete from tm_task where task_id = #{taskId} - delete from tm_task_agreement where task_id in - - #{taskId} - + delete from tm_task_agreement where task_id = #{taskId}