From 0816be447ea4905514b5347bdfa4372398812e1f Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Sat, 15 Feb 2025 17:02:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E9=A2=86=E7=94=A8=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/domain/lease/LeaseApplyInfo.java | 13 ++++ .../common/biz/enums/LeaseTaskStatusEnum.java | 3 +- .../common/biz/enums/TmTaskTypeEnum.java | 3 +- .../controller/LeaseApplyInfoController.java | 15 ++++ .../lease/service/ILeaseApplyInfoService.java | 7 ++ .../impl/LeaseApplyInfoServiceImpl.java | 45 ++++++++++- .../StandardConfigManageController.java | 25 +++++-- .../ma/controller/TypeController.java | 11 +++ .../ma/domain/vo/StandardConfigDetailsVo.java | 3 + .../ma/mapper/StandardConfigManageMapper.java | 8 ++ .../bonus/material/ma/mapper/TypeMapper.java | 9 +++ .../material/ma/service/ITypeService.java | 10 +++ .../service/StandardConfigManageService.java | 10 ++- .../impl/StandardConfigManageServiceImpl.java | 74 ++++++++++++------- .../ma/service/impl/TypeServiceImpl.java | 17 +++++ .../material/lease/LeaseApplyInfoMapper.xml | 6 ++ .../ma/StandardConfigManageMapper.xml | 34 +++++++-- .../mapper/material/ma/TypeMapper.xml | 31 ++++++++ 18 files changed, 278 insertions(+), 46 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java index 9b0c95f6..b1758e67 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java @@ -237,4 +237,17 @@ public class LeaseApplyInfo extends BaseEntity{ */ @ApiModelProperty(value = "分包商单位委托书") List bmFileInfos; + + + /** + * 标准配置id + */ + @ApiModelProperty(value = "标准配置id") + private Long configId; + + /** + * 是否为领用申请 + */ + @ApiModelProperty(value = "是否为领用申请") + private Integer isLease; } diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java index 5b7b8c6a..3e08e37d 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java @@ -9,7 +9,8 @@ import lombok.Getter; */ @Getter public enum LeaseTaskStatusEnum { - + //0-领用申请任务待审核，其余为领料申请流程状态 + LEASE_TASK_ZERO(0, "待审核"), LEASE_TASK_TO_PUBLISHED(1, "待发布"), LEASE_TASK_TO_AUDIT(2, "待审核"), LEASE_TASK_IN_PROGRESS(3, "出库进行中"), 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 0cb71ff4..9640cb9a 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 @@ -19,7 +19,8 @@ public enum TmTaskTypeEnum { TM_TASK_REPAIR_INPUT(11, "修饰后入库任务"), TM_TASK_PART_LEASE(12, "配件领料任务"), TM_TASK_PART_TYPE(13, "配件新购"), - TM_TASK_REPAIR_NUM(14, "数量维修人员信息附件"); + TM_TASK_REPAIR_NUM(14, "数量维修人员信息附件"), + TM_TASK_LEASE_INPUT(15, "领用任务"); private final Integer taskTypeId; private final String taskTypeName; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java index 5303cb81..b934e9c2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java @@ -264,4 +264,19 @@ public class LeaseApplyInfoController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(leaseApplyInfoService.deleteLeaseApplyInfoByIds(ids)); } + + + /** + * 领用任务批量审核 + */ + @ApiOperation(value = "领用任务批量审核") + @PreventRepeatSubmit + @SysLog(title = "领用任务批量审核", businessType = OperaType.UPDATE, logType = 1,module = "领用审核->领用任务批量审核") + @PostMapping("/useExamine") + public AjaxResult useExamine(@RequestBody @NotNull(message = "任务信息不能为空") List leaseApplyInfos) { + for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfos) { + leaseApplyInfoService.useExamine(leaseApplyInfo); + } + return success("审核完成"); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java index cca49010..149ba088 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java @@ -135,4 +135,11 @@ public interface ILeaseApplyInfoService { * @return */ AjaxResult leaseOutBack(LeaseOutDetails leaseOutDetails); + + /** + * 领用任务批量审核 + * @param leaseApplyInfo + * @return + */ + AjaxResult useExamine(LeaseApplyInfo leaseApplyInfo); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index 6bc966d8..398fa048 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -184,18 +184,26 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { @Override public AjaxResult insertLeaseApplyInfo(LeaseApplyRequestVo leaseApplyRequestVo) { if (null == leaseApplyRequestVo.getLeaseApplyInfo()) { - return AjaxResult.error("请先填写领料任务信息"); + return AjaxResult.error("请先填写任务信息"); } if (CollectionUtil.isEmpty(leaseApplyRequestVo.getLeaseApplyDetailsList())) { - return AjaxResult.error("请先添加领料任务物资明细"); + return AjaxResult.error("请先添加任务物资明细"); } leaseApplyRequestVo.getLeaseApplyInfo().setCreateTime(DateUtils.getNowDate()); leaseApplyRequestVo.getLeaseApplyInfo().setCreateBy(SecurityUtils.getUsername()); try { int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId()); String taskCode = genderTaskCode(thisMonthMaxOrder); + Integer taskStatus; + if (leaseApplyRequestVo.getLeaseApplyInfo().getIsLease()!=null){ + //领用申请任务 + taskStatus=LeaseTaskStatusEnum.LEASE_TASK_ZERO.getStatus(); + } else { + //领料申请任务 + taskStatus=LeaseTaskStatusEnum.LEASE_TASK_TO_PUBLISHED.getStatus(); + } TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId(), - LeaseTaskStatusEnum.LEASE_TASK_TO_PUBLISHED.getStatus(), + taskStatus, leaseApplyRequestVo.getLeaseApplyInfo().getCompanyId(),thisMonthMaxOrder + 1, taskCode); tmTask.setCreateTime(DateUtils.getNowDate()); tmTask.setCreateBy(SecurityUtils.getUsername()); @@ -270,6 +278,37 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { } } + /** + * 领用任务审核 + */ + @Override + public AjaxResult useExamine(LeaseApplyInfo leaseApplyInfo) { + if (leaseApplyInfo.getId() == null) { + return AjaxResult.error("ID为空,请完善后重新发布!"); + } + if (leaseApplyInfo.getTaskId() == null) { + return AjaxResult.error("任务ID为空,请完善后重新发布!"); + } + try { + int result = leaseApplyInfoMapper.updateLeaseApplyInfo(leaseApplyInfo); + if (result > 0) { + // 同步修改tm_task任务状态, 如果不需要审核，改成 LEASE_TASK_IN_PROGRESS， 如果需要审核，改成 LEASE_TASK_TO_AUDIT + TmTask tmTask = new TmTask(); + tmTask.setTaskType(TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId()); + tmTask.setTaskId(leaseApplyInfo.getTaskId()); + tmTask.setTaskStatus(LeaseTaskStatusEnum.LEASE_TASK_TO_PUBLISHED.getStatus()); + tmTaskMapper.updateTmTask(tmTask); + return AjaxResult.success("审核成功"); + } + return AjaxResult.error("审核失败"); + } catch (DataAccessException e) { + // 抛出异常、回滚数据 + throw new RuntimeException(); + } catch (Exception e) { + return AjaxResult.error("审核失败:" + e.getMessage()); + } + } + private AjaxResult insertPurchaseCheckDetails(List leaseApplyDetailsList, Long parentId) { if (!CollectionUtils.isEmpty(leaseApplyDetailsList)) { for (LeaseApplyDetails details : leaseApplyDetailsList) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/StandardConfigManageController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/StandardConfigManageController.java index d3818741..21ad07c2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/StandardConfigManageController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/StandardConfigManageController.java @@ -6,6 +6,7 @@ import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.material.common.annotation.PreventRepeatSubmit; +import com.bonus.material.common.domain.dto.SelectDto; import com.bonus.material.ma.domain.StandardConfigBean; import com.bonus.material.ma.domain.Type; import com.bonus.material.ma.domain.vo.StandardConfigDetailsVo; @@ -38,6 +39,17 @@ public class StandardConfigManageController extends BaseController { return service.getConfigTreeSelect(configName, parentId); } + /** + * 标准配置下拉选--只有二级数据 + * @param bean + * @return + */ + @ApiOperation(value = "标准配置下拉选") + @PostMapping("getConfigLevelTwoList") + public AjaxResult getConfigLevelTwoList(@RequestBody StandardConfigBean bean){ + return service.getConfigLevelTwoList(bean); + } + /** * 根据左配置id查询右表格 */ @@ -85,15 +97,12 @@ public class StandardConfigManageController extends BaseController { @SysLog(title = "机械设备标准配置管理", businessType = OperaType.INSERT, module = "机械设备标准配置管理->新增标准配置明细") @PostMapping(value = "/addConfigDetails") public AjaxResult addConfigDetails(@RequestBody StandardConfigDetailsVo bean) { - int result = service.addConfigDetails(bean); - if (result == 0){ - return AjaxResult.error("操作失败！"); - } else if (result == -2){ - return AjaxResult.error("该类型下已存在该配置！"); - } else if (result >0){ + try { + service.addConfigDetails(bean); return AjaxResult.success(); - } else { - return AjaxResult.error("操作失败！"); + } catch (Exception e) { + // 这里无需手动回滚，因为@Transactional会自动处理 + return AjaxResult.error(e.getMessage()); } } 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 5f80fcaa..fc1babf2 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 @@ -154,6 +154,17 @@ public class TypeController extends BaseController { return success(listByMaType); } + /** + * 查询物资类型3级--前端联动式下拉框 + * 没有4级规格型号 + */ + @ApiOperation(value = "获取物资类型连动式下拉框") + @GetMapping("/equipmentThreeType") + public AjaxResult equipmentThreeType(@RequestParam(required = false) Long typeId, @RequestParam(required = false) String typeName) { + List listByMaType = typeService.getEquipmentThreeType(typeId, typeName); + return success(listByMaType); + } + /** * TODO : 后续优化代码逻辑 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java index e73b40ef..fb054ad7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java @@ -47,6 +47,9 @@ public class StandardConfigDetailsVo extends Type { @ApiModelProperty(value = "规格ID") private Long typeId; + @ApiModelProperty(value = "规格IDs") + private Long[] typeIds; + @ApiModelProperty(value = "规格型号") private String typeModelName; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/StandardConfigManageMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/StandardConfigManageMapper.java index 49a62245..e1a2fb1a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/StandardConfigManageMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/StandardConfigManageMapper.java @@ -1,6 +1,7 @@ package com.bonus.material.ma.mapper; import com.bonus.common.biz.domain.lease.LeaseOutDetails; +import com.bonus.material.common.domain.vo.SelectVo; import com.bonus.material.ma.domain.MaTypeHistory; import com.bonus.material.ma.domain.StandardConfigBean; import com.bonus.material.ma.domain.Type; @@ -106,4 +107,11 @@ public interface StandardConfigManageMapper { * @return */ int delConfigDetails(StandardConfigDetailsVo bean); + + /** + * 标准配置下拉选--只有二级数据 + * @param bean + * @return + */ + List getConfigLevelTwoList(StandardConfigBean bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java index 80539ba6..fd5976a6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java @@ -24,6 +24,14 @@ public interface TypeMapper { List selectMaTypeList(String typeName); + /** + * 查询物资类型3级--前端联动式下拉框 + * 没有4级规格型号 + * @param typeName + * @return + */ + List selectMaTypeThreeList(String typeName); + /** * 查询物资类型 * @@ -174,4 +182,5 @@ public interface TypeMapper { * @return */ int addMaTypeStockNum(@Param("record") LeaseOutDetails leaseOutDetails); + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeService.java index 34dbaecf..9d65bd5d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeService.java @@ -27,6 +27,15 @@ public interface ITypeService { List getEquipmentType(Long typeId, String typeName); + /** + * 查询物资类型3级--前端联动式下拉框 + * 没有4级规格型号 + * @param typeId + * @param typeName + * @return + */ + List getEquipmentThreeType(Long typeId, String typeName); + List selectMaTypeListByHouseId(Long houseId); List getListByParentId(Long typeId, MaTypeVo type); @@ -112,4 +121,5 @@ public interface ITypeService { // AjaxResult getMaTypeConfigList(MaTypeConfigDto maTypeConfigDto); List getMyTypeAndBindUsers(List list,Long userId); + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/StandardConfigManageService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/StandardConfigManageService.java index 42c6c5be..7dde2f9e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/StandardConfigManageService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/StandardConfigManageService.java @@ -57,9 +57,10 @@ public interface StandardConfigManageService { /** * 新增机械设备标准配置管理明细 * @param bean + * @throws Exception * @return */ - int addConfigDetails(StandardConfigDetailsVo bean); + int addConfigDetails(StandardConfigDetailsVo bean) throws Exception; /** * 修改机械设备标准配置管理明细 @@ -74,4 +75,11 @@ public interface StandardConfigManageService { * @return */ AjaxResult delConfigDetails(StandardConfigDetailsVo bean); + + /** + * 标准配置下拉选--只有二级数据 + * @param bean + * @return + */ + AjaxResult getConfigLevelTwoList(StandardConfigBean bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/StandardConfigManageServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/StandardConfigManageServiceImpl.java index 90fc8153..5e238cea 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/StandardConfigManageServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/StandardConfigManageServiceImpl.java @@ -9,6 +9,7 @@ import com.bonus.common.core.utils.ServletUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; +import com.bonus.material.common.domain.vo.SelectVo; import com.bonus.material.ma.domain.StandardConfigBean; import com.bonus.material.ma.domain.Type; import com.bonus.material.ma.domain.vo.MaTypeVo; @@ -17,6 +18,7 @@ import com.bonus.material.ma.mapper.StandardConfigManageMapper; import com.bonus.material.ma.mapper.TypeMapper; import com.bonus.material.ma.service.StandardConfigManageService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -57,13 +59,18 @@ public class StandardConfigManageServiceImpl implements StandardConfigManageServ Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); try { - //根据level层级和配置id 查询父级ID - List parentIds = mapper.selectParentId(bean); - if (CollectionUtils.isEmpty(parentIds)) { - return AjaxResult.success(new ArrayList<>()); - } - for (Integer parentId : parentIds) { - list.addAll(mapper.getListByParentId(parentId.longValue(), bean)); + if (StringUtils.isNull(bean.getConfigId())){ + //查全部 + list.addAll(mapper.getListByParentId(null, bean)); + }else { + //根据level层级和配置id 查询父级ID + List parentIds = mapper.selectParentId(bean); + if (CollectionUtils.isEmpty(parentIds)) { + return AjaxResult.success(new ArrayList<>()); + } + for (Integer parentId : parentIds) { + list.addAll(mapper.getListByParentId(parentId.longValue(), bean)); + } } return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } catch (Exception e) { @@ -104,11 +111,11 @@ public class StandardConfigManageServiceImpl implements StandardConfigManageServ if (StringUtils.isNull(bean.getConfigId())){ return AjaxResult.error("删除失败,缺少参数"); } - //根据configId查询删除类型下属是否有关联，有关联无法删除 - List list = mapper.selectByConfigId(bean.getConfigId()); - if (list!=null && list.size()>0) { - return AjaxResult.error("该类型下有子类型，无法删除"); - } +// //根据configId查询删除类型下属是否有关联，有关联无法删除 +// List list = mapper.selectByConfigId(bean.getConfigId()); +// if (list!=null && list.size()>0) { +// return AjaxResult.error("该类型下有子类型，无法删除"); +// } bean.setUpdateTime(DateUtils.getNowDate()); bean.setUpdateBy(SecurityUtils.getUserId().toString()); int result = mapper.deleteConfigByConfigId(bean); @@ -119,21 +126,27 @@ public class StandardConfigManageServiceImpl implements StandardConfigManageServ } @Override - public int addConfigDetails(StandardConfigDetailsVo bean) { - try { - //根据configId和typeId 查询是否存在数据 - int count = mapper.getCountById(bean); - if (count > 0) { - return -2; + @Transactional(rollbackFor = Exception.class) + public int addConfigDetails(StandardConfigDetailsVo bean) throws Exception { + if (bean.getTypeIds() != null && bean.getTypeIds().length > 0){ + for (Long typeId : bean.getTypeIds()) { + // 根据configId和typeId 查询是否存在数据 + StandardConfigDetailsVo bean1 = new StandardConfigDetailsVo(); + bean1.setConfigId(bean.getConfigId()); + bean1.setTypeId(typeId); + int count = mapper.getCountById(bean1); + if (count > 0) { + throw new Exception("该类型下已存在该配置！"); + } + bean1.setCreateTime(DateUtils.getNowDate()); + bean1.setCreateBy(SecurityUtils.getUserId().toString()); + int result = mapper.addConfigDetails(bean1); + if(result <= 0){ + throw new Exception("操作失败！"); + } } - bean.setCreateTime(DateUtils.getNowDate()); - bean.setCreateBy(SecurityUtils.getUserId().toString()); - int result = mapper.addConfigDetails(bean); - return result; - } catch (Exception e) { - e.printStackTrace(); - return 0; } + return 1; } @Override @@ -163,6 +176,17 @@ public class StandardConfigManageServiceImpl implements StandardConfigManageServ } } + @Override + public AjaxResult getConfigLevelTwoList(StandardConfigBean bean) { + List list = new ArrayList<>(); + try { + list = mapper.getConfigLevelTwoList(bean); + } catch (Exception e) { + return AjaxResult.success(new ArrayList()); + } + return AjaxResult.success(list); + } + public List getConfigTree(String typeName, String parentId) { List standardConfigs = mapper.selectStandardConfigTree(); List builtConfigList = buildConfigTree(standardConfigs); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java index 3a79db1c..7ff05082 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java @@ -99,6 +99,23 @@ public class TypeServiceImpl implements ITypeService { return list; } + @Override + public List getEquipmentThreeType(Long typeId, String typeName) { + List maTypes = typeMapper.selectMaTypeThreeList(""); + List list = new ArrayList<>(); + for (Type maType : maTypes) { + if (maType.getParentId() == 0) { + list.add(maType); + } + } + //根据父节点获取对应的儿子节点 + for (Type maType : list) { + List child = getChild(maTypes, maType.getTypeId()); + maType.setChildren(child); + } + return list; + } + @Override public List selectMaTypeListByHouseId(Long houseId) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml index ba4940bc..03fa243e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml @@ -112,6 +112,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and lai.lease_type = #{leaseType} and lai.estimate_lease_time = #{estimateLeaseTime} and lai.cost_bearing_party = #{costBearingParty} + and tt.task_status != '0' + + and lai.config_id is not null + GROUP BY lai.id ORDER BY tt.task_status,tt.create_time desc @@ -149,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lease_type, estimate_lease_time, cost_bearing_party, + config_id, #{code}, @@ -175,6 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{leaseType}, #{estimateLeaseTime}, #{costBearingParty}, + #{configId}, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/StandardConfigManageMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/StandardConfigManageMapper.xml index a980b087..ef4e3e78 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/StandardConfigManageMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/StandardConfigManageMapper.xml @@ -60,11 +60,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update bm_standard_config - set - del_flag = 2, - update_by = #{updateBy}, - update_time = #{updateTime} - where id = #{configId} + set del_flag = 2, + update_by = #{updateBy}, + update_time = #{updateTime} + where id = #{configId}; + + update bm_standard_config_details + set del_flag = 2, + update_by = #{updateBy}, + update_time = #{updateTime} + where config_id = #{configId} update bm_standard_config_details @@ -154,8 +159,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND mt.del_flag = '0' ) a ON a.typeId = bscd.type_id WHERE - bscd.config_id = #{configId} - AND bscd.del_flag = 0 + bscd.del_flag = 0 + + AND bscd.config_id = #{configId} + AND (a.houseName like concat('%',#{bean.keyWord},'%') or a.constructionType like concat('%',#{bean.keyWord},'%') @@ -165,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" or bscd.remark like concat('%',#{bean.keyWord},'%') ) + order by bscd.type_id asc + 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 0c6046ed..4867137b 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 @@ -523,6 +523,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +