From 8dc5fc562cb480961060a0e8873396811f2eb499 Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Tue, 16 Jan 2024 17:09:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/MaPropInfoController.java | 25 +++-------- .../base/controller/MaPropSetController.java | 6 +-- .../com/bonus/sgzb/base/domain/MaPropSet.java | 5 +++ .../sgzb/base/mapper/MaPropInfoMapper.java | 4 ++ .../sgzb/base/service/IMaPropInfoService.java | 6 ++- .../service/impl/MaPropInfoServiceImpl.java | 44 ++++++++++++++++--- .../mapper/base/MaPropInfoMapper.xml | 42 +++++++++++++++--- .../impl/PurchaseCheckInfoServiceImpl.java | 2 +- .../system/controller/SelectController.java | 4 +- .../sgzb/system/mapper/SelectMapper.java | 2 +- .../sgzb/system/service/SelectService.java | 2 +- .../service/impl/SelectServiceImpl.java | 4 +- .../resources/mapper/system/SelectMapper.xml | 1 + 13 files changed, 105 insertions(+), 42 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java index a1eb62c2..8fec177b 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java @@ -89,24 +89,13 @@ public class MaPropInfoController extends BaseController { @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping("/save") public AjaxResult save(@Validated @RequestBody MaPropSet maPropSet){ - /* if (!maPropInfoService.checkPropIdUnique(maPropSet)) { - return error("资产名称'" + maPropSet.getTypeId() + "'失败，资产名称已存在"); - }*/ - Long fieldValue =maPropSet.getTypeId(); - Long fieldValues =maPropSet.getPropId(); - if (maPropSet.getPropName() != null){ - return toAjax(maPropInfoService.updateMaPropSet(maPropSet)); - } - /*List ben= maPropInfoService.checkPropIdUnique(maPropSet); - for (MaPropSet s:ben) { - if(s.) - Long fieldValue =s.getId(); - if(fieldValue !=null ){ - - } - }*/ - return toAjax(maPropInfoService.insertMaPropSet(maPropSet)); - +// Long fieldValue =maPropSet.getTypeId(); +// Long fieldValues =maPropSet.getPropId(); +// if (maPropSet.getPropName() != null){ +// return toAjax(maPropInfoService.updateMaPropSet(maPropSet)); +// } +// return toAjax(maPropInfoService.insertMaPropSet(maPropSet)); + return toAjax(maPropInfoService.save(maPropSet)); } /** diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropSetController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropSetController.java index 0a5a3d0a..77152334 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropSetController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropSetController.java @@ -36,12 +36,12 @@ public class MaPropSetController extends BaseController * 删除资产属性配置ma_prop_set */ @Log(title = "资产属性配置ma_prop_set", businessType = BusinessType.DELETE) - @DeleteMapping("/{propIds}") - public AjaxResult remove(@PathVariable Long propIds) + @DeleteMapping("/{typeIds}") + public AjaxResult remove(@PathVariable String typeIds) { AjaxResult b = null; try{ - b = toAjax(maPropInfoService.deleteMaPropSetByPropIds(propIds)); + b = toAjax(maPropInfoService.deleteMaPropSetByPropIds(typeIds)); }catch (Exception e){ logger.error(e.toString(),e); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropSet.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropSet.java index 7195155a..29a74ffc 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropSet.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPropSet.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.base.domain; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -18,6 +19,10 @@ public class MaPropSet { * 类型ID */ private long typeId; + + @ApiModelProperty(value = "类型ids") + private String typeIds; + /** * 帐号状态（0正常 1停用） */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java index d68149d5..84ed6b0c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java @@ -78,5 +78,9 @@ public interface MaPropInfoMapper { * @return 结果 */ public int deleteMaPropSetByPropIds(Long propIds); + + int deleteByIdsAll(String[] typeIds); + + int add(List list); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java index 6d44e33b..34fceca6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java @@ -90,9 +90,11 @@ public interface IMaPropInfoService { /** * 批量删除资产属性配置ma_prop_set * - * @param propIds 需要删除的资产属性配置ma_prop_set主键集合 + * @param typeIds 需要删除的资产属性配置ma_prop_set主键集合 * @return 结果 */ - public int deleteMaPropSetByPropIds(Long propIds); + public int deleteMaPropSetByPropIds(String typeIds); + + int save(MaPropSet maPropSet); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java index 4e9688ee..b9d7413d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java @@ -3,17 +3,21 @@ package com.bonus.sgzb.base.service.impl; import com.bonus.sgzb.base.api.domain.MaType; import com.bonus.sgzb.base.domain.MaPropInfo; import com.bonus.sgzb.base.domain.MaPropSet; +import com.bonus.sgzb.base.domain.WarehouseKeeper; import com.bonus.sgzb.base.mapper.MaPropInfoMapper; import com.bonus.sgzb.base.service.IMaPropInfoService; import com.bonus.sgzb.common.core.constant.UserConstants; import com.bonus.sgzb.common.core.exception.ServiceException; +import com.bonus.sgzb.common.core.utils.StringHelper; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.utils.bean.BeanValidators; +import com.bonus.sgzb.common.security.utils.SecurityUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.validation.Validator; +import java.util.ArrayList; import java.util.List; /** @@ -34,7 +38,7 @@ public class MaPropInfoServiceImpl implements IMaPropInfoService { /** * 查询资产属性列表 - * @param propName + * @param maPropInfo * @return */ @Override @@ -200,15 +204,45 @@ public class MaPropInfoServiceImpl implements IMaPropInfoService { /** * 批量删除资产属性配置ma_prop_set * - * @param propIds 需要删除的资产属性配置ma_prop_set主键 + * @param typeIds 需要删除的资产属性配置ma_prop_set主键 * @return 结果 */ @Override - public int deleteMaPropSetByPropIds(Long propIds) + public int deleteMaPropSetByPropIds(String typeIds) { + if(StringHelper.isNotEmpty(typeIds)){ + String[] splitTypeIds = typeIds.split("@"); + //删除 + return maPropInfoMapper.deleteByIdsAll(splitTypeIds); + }else { + return 0; + } + } - int deleteMaPropSetByPropIds = maPropInfoMapper.deleteMaPropSetByPropIds(propIds); - return deleteMaPropSetByPropIds; + @Override + public int save(MaPropSet bean) { + List list=new ArrayList<>(); + String typeIds=bean.getTypeIds(); + if(StringHelper.isNotEmpty(typeIds)){ + String[] splitTypeIds = typeIds.split("@"); + //先删除，在去添加 + maPropInfoMapper.deleteByIdsAll(splitTypeIds); + for (String typeId : splitTypeIds) { + MaPropSet beans = new MaPropSet(); + beans.setTypeIds(typeId); + beans.setPropId(bean.getPropId()); + beans.setCompanyId(bean.getCompanyId()); + beans.setCreateBy(String.valueOf(SecurityUtils.getUserId())); + list.add(beans); + } + } + int i =0; + if(list.size()>0){ + i= maPropInfoMapper.add(list); + }else{ + + } + return i; } } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml index 98666311..2f00bfe0 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml @@ -65,13 +65,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ma_prop_info select a.prop_id, a.prop_name, a.code, a.status, a.dept_id, a.del_flag, a.create_by, a.create_time, a.remark, a.company_id ,b.dept_name diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java index a7bfc22c..2aac6d44 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java @@ -125,7 +125,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService task.setCode(purchaseCodeRule()); task.setCreateTime(DateUtils.getNowDate()); task.setCompanyId(purchaseCheckInfo.getCompanyId()); - task.setCreateBy(SecurityUtils.getUsername()); + task.setCreateBy(String.valueOf(SecurityUtils.getUserId())); // 创建任务信息 taskMapper.insertTmTask(task); purchaseCheckInfo.setTaskId(task.getTaskId()); diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java index 20a2552f..e70ae203 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java @@ -96,8 +96,8 @@ public class SelectController { @ApiOperation(value = "配件所属上级树") @PostMapping("getAccessoryTree") - public AjaxResult getAccessoryTree(@RequestBody SelectDto dto){ - return service.getAccessoryTree(dto); + public AjaxResult getAccessoryTree(){ + return service.getAccessoryTree(); } @ApiOperation(value = "配件所属上级树") diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java index cf943426..82065db1 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java @@ -129,7 +129,7 @@ public interface SelectMapper { * @author cwchen * @date 2023/12/20 20:26 */ - List getAccessoryTree(SelectDto dto); + List getAccessoryTree(); /** * @param dto diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java index 745af904..dacf52da 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java @@ -124,7 +124,7 @@ public interface SelectService { * @author cwchen * @date 2023/12/20 20:25 */ - AjaxResult getAccessoryTree(SelectDto dto); + AjaxResult getAccessoryTree(); /** * @param dto diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java index d3e57741..3b3e463a 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java @@ -175,11 +175,11 @@ public class SelectServiceImpl implements SelectService { } @Override - public AjaxResult getAccessoryTree(SelectDto dto) { + public AjaxResult getAccessoryTree() { List groupList = new ArrayList<>(); List list = new ArrayList<>(); try { - list = mapper.getAccessoryTree(dto); + list = mapper.getAccessoryTree(); if (CollectionUtils.isNotEmpty(list)) { // 创建树形结构（数据集合作为参数） TreeBuild treeBuild = new TreeBuild(list); diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml index 10fef9df..2c85bd9d 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml @@ -141,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT pa_id AS id, pa_name AS label, parent_id AS parentId, + unit_id as unitName, level FROM ma_part_type WHERE del_flag = '0'