diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseUserBookController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseUserBookController.java new file mode 100644 index 00000000..42935c50 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseUserBookController.java @@ -0,0 +1,44 @@ +package com.bonus.sgzb.app.controller; + +import com.bonus.sgzb.app.domain.LeaseUserBook; +import com.bonus.sgzb.app.service.LeaseUserBookService; +import com.bonus.sgzb.common.core.web.controller.BaseController; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; + +/** + * @author c liu + * @date 2024/1/4 + */ +@RestController +@RequestMapping("/leaseUserBook") +public class LeaseUserBookController extends BaseController { + @Autowired + private LeaseUserBookService service; + + @GetMapping + public AjaxResult getLeaseUserBook(){ + Long userId = SecurityUtils.getUserId(); + return AjaxResult.success(service.getLeaseUserBook(userId)); + } + + @PostMapping + public AjaxResult add(@RequestBody LeaseUserBook bean){ + return toAjax(service.add(bean)); + } + + @PostMapping("/update") + public AjaxResult update(@RequestBody LeaseUserBook bean){ + return toAjax(service.update(bean)); + } + @DeleteMapping + public AjaxResult batchDel(@RequestBody ArrayList ids){ + return toAjax(service.batchDel(ids)); + } + + +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index c80e51ce..0cec497a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -3,6 +3,7 @@ package com.bonus.sgzb.app.controller; import cn.hutool.core.collection.CollUtil; import com.bonus.sgzb.app.service.LeaseApplyDetailsService; import com.bonus.sgzb.app.service.LeaseApplyInfoService; +import com.bonus.sgzb.app.service.LeaseUserBookService; import com.bonus.sgzb.app.service.TmTaskService; import com.bonus.sgzb.base.api.domain.LeaseApplyDetails; import com.bonus.sgzb.base.api.domain.LeaseApplyInfo; @@ -14,9 +15,12 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -41,6 +45,9 @@ public class TmTaskController extends BaseController { @Resource private LeaseApplyDetailsService leaseApplyDetailsService; // 领料申请明细表Service + @Autowired + private LeaseUserBookService leaseUserBookService; + /** * 领料审核，分公司，分管，机具分公司统一接口 @@ -85,6 +92,7 @@ public class TmTaskController extends BaseController { */ @Log(title = "往来单位提交领料申请", businessType = BusinessType.INSERT) @PostMapping("submitLeaseApply") + @Transactional public AjaxResult submitLeaseApply(@RequestBody TmTask task) { if (StringUtils.isNull(task)) { return AjaxResult.error("参数错误"); @@ -132,14 +140,17 @@ public class TmTaskController extends BaseController { if (addLeaseTaskResult) { // 领料任务编号 Integer leaseTaskId = leaseApplyInfo.getId(); + ArrayList ids = new ArrayList(); if (StringUtils.isNotNull(leaseTaskId)) { for (LeaseApplyDetails leaseApplyDetails : leaseApplyDetailsList) { leaseApplyDetails.setParenntId(leaseTaskId); // 设置领料任务ID + ids.add(leaseApplyDetails.getId()); } // 插入领料任务明细 boolean addLeaseTaskDetailsResult = leaseApplyDetailsService.batchInsert(leaseApplyDetailsList) > 0; if (addLeaseTaskDetailsResult) { System.out.println("领料任务创建成功"); + leaseUserBookService.batchDel(ids); } else { System.out.println("领料任务创建成功，但领料任务明细插入失败"); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseUserBook.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseUserBook.java new file mode 100644 index 00000000..1d09f53e --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseUserBook.java @@ -0,0 +1,42 @@ +package com.bonus.sgzb.app.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author c liu + * @date 2024/1/4 + */ +@Data +@ApiModel(value="预约车") +public class LeaseUserBook { + /** + * id + */ + @ApiModelProperty(value = "id") + private Long id; + /** + * 用户ID + */ + @ApiModelProperty(value = "用户ID") + private Long userId; + /** + * 机具规格ID + */ + @ApiModelProperty(value = "机具规格ID") + private Long typeId; + /** + * 预约数量 + */ + @ApiModelProperty(value = "预约数量") + private int bookNum; + private Long companyId; + private String parentName; + private String typeName; + + /** 图片路径 */ + @ApiModelProperty(value = "图片路径") + private String photoUrl = "https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/zhcc/405D4B1F-0942-424e-B45A-C66FDDA74EEA.png"; + +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseUserBookMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseUserBookMapper.java new file mode 100644 index 00000000..4590897f --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseUserBookMapper.java @@ -0,0 +1,24 @@ +package com.bonus.sgzb.app.mapper; + +import com.bonus.sgzb.app.domain.LeaseUserBook; +import com.bonus.sgzb.base.api.domain.MaType; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author c liu + * @date 2024/1/4 + */ +@Mapper +public interface LeaseUserBookMapper { + List getLeaseUserBook(Long userId); + + int add(LeaseUserBook bean); + + int batchDel(@Param("ids") ArrayList ids); + + int update(LeaseUserBook bean); +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseUserBookService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseUserBookService.java new file mode 100644 index 00000000..e7ea6388 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseUserBookService.java @@ -0,0 +1,18 @@ +package com.bonus.sgzb.app.service; + +import com.bonus.sgzb.app.domain.LeaseUserBook; +import com.bonus.sgzb.base.api.domain.MaType; +import org.apache.ibatis.annotations.Param; + +import java.util.ArrayList; +import java.util.List; + +public interface LeaseUserBookService { + List getLeaseUserBook(Long userId); + + int add(LeaseUserBook bean); + + int batchDel(ArrayList ids); + + int update(LeaseUserBook bean); +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseUserBookServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseUserBookServiceImpl.java new file mode 100644 index 00000000..347a75fd --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseUserBookServiceImpl.java @@ -0,0 +1,42 @@ +package com.bonus.sgzb.app.service.impl; + +import com.bonus.sgzb.app.domain.LeaseUserBook; +import com.bonus.sgzb.app.mapper.LeaseApplyInfoMapper; +import com.bonus.sgzb.app.mapper.LeaseUserBookMapper; +import com.bonus.sgzb.app.service.LeaseUserBookService; +import com.bonus.sgzb.base.api.domain.MaType; +import com.bonus.sgzb.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +@Service +public class LeaseUserBookServiceImpl implements LeaseUserBookService { + @Autowired + private LeaseUserBookMapper mapper; + + @Override + public List getLeaseUserBook(Long userId) { + return mapper.getLeaseUserBook(userId); + } + + @Override + public int add(LeaseUserBook bean) { + Long userId = SecurityUtils.getUserId(); + bean.setUserId(userId); + return mapper.add(bean); + } + + @Override + public int batchDel(ArrayList ids) { + return mapper.batchDel(ids); + } + + @Override + public int update(LeaseUserBook bean) { + return mapper.update(bean); + } +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index b7c04157..79734bcd 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -10,6 +10,7 @@ import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.text.SimpleDateFormat; @@ -75,6 +76,7 @@ public class TmTaskServiceImpl implements TmTaskService{ * @param record 审核数据及信息 */ @Override + @Transactional public int updateLeaseTaskAuditInfo(TmTask record) { int result = 0; if (StringUtils.isNotNull(record)) { @@ -84,7 +86,7 @@ public class TmTaskServiceImpl implements TmTaskService{ if (CollUtil.isNotEmpty(record.getLeaseApplyInfoList())) { for (LeaseApplyInfo leaseApplyInfo : record.getLeaseApplyInfoList()) { if (leaseApplyInfo != null) { - leaseApplyInfo.setExamineStatusId(record.getExamineStatusId()); + //leaseApplyInfo.setExamineStatusId(record.getExamineStatusId()); result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(leaseApplyInfo); // 再审核领料任务详情表 if (CollUtil.isNotEmpty(leaseApplyInfo.getLeaseApplyDetails())) { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java index 542e5fb5..254dd666 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java @@ -84,18 +84,18 @@ public class MaTypeController extends BaseController { */ @ApiOperation(value = "获取规格层级的设备列表") @GetMapping("/selectMaTypeListByLevelIndex") - public AjaxResult selectMaTypeListByLevelIndex(@RequestParam(value = "level", required = false) Integer level, @RequestParam(value = "type") Integer type, @RequestParam(value = "parentId", required = false) Integer parentId){ + public AjaxResult selectMaTypeListByLevelIndex(@RequestParam(value = "level", required = false) Integer level, @RequestParam(value = "type") Integer type, @RequestParam(value = "parentId", required = false) Integer parentId, @RequestParam(value = "keyword", required = false) String keyword){ if (type == null) { return AjaxResult.error("参数错误,类型不能为空"); } if (type == 0) { // 查询全部机具类型 if (level == 0 || level == 1) { // 查询全部等级、一级 - List treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(null)); + List treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(null,null)); return AjaxResult.success(treeSelectList); } if (level == 2) { // 查询二级 - return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString())); + return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString(),keyword)); // List treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString())); // @@ -118,10 +118,12 @@ public class MaTypeController extends BaseController { // 查询施工机具 List treeSelectList; if (level != 2) { - treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(null)); - return AjaxResult.success(treeSelectList.stream().filter(item -> Objects.equals(item.getId(), 1L)).collect(Collectors.toList())); + treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(null,null)); +// treeSelectList.removeIf(item -> item.getId() == 1L); + List treeSelectList1 = treeSelectList.stream().filter(item -> Objects.equals(item.getId(), 1L)).collect(Collectors.toList()); + return AjaxResult.success(treeSelectList); } else { - return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString())); + return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString(),keyword)); // treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString())); // // 先过滤出施工机具 // treeSelectList = treeSelectList.stream().filter(item -> Objects.equals(item.getId(), 1L)).collect(Collectors.toList()); @@ -144,11 +146,11 @@ public class MaTypeController extends BaseController { } } if (type == 2) { - List treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(null)); - treeSelectList = treeSelectList.stream().filter(item -> Objects.equals(item.getId(), 2L)).collect(Collectors.toList()); + List treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(null,null)); + //treeSelectList = treeSelectList.stream().filter(item -> Objects.equals(item.getId(), 2L)).collect(Collectors.toList()); // 查询安全工器具 if (level == 2) { - return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString())); + return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString(),keyword)); // if (!treeSelectList.isEmpty()) { // for (TreeSelect treeSelect : treeSelectList) { // List children = treeSelect.getChildren(); @@ -165,7 +167,7 @@ public class MaTypeController extends BaseController { } return AjaxResult.success(treeSelectList); } - return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(null)); + return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(null,null)); } /** diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java index da9f8617..d22163dc 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java @@ -72,7 +72,7 @@ public interface MaTypeMapper { List selectMaTypeTreeByLevel(String id); - List selectMaTypeListByLevelNotFour(String parentId); + List selectMaTypeListByLevelNotFour(@Param("parentId") String parentId,@Param("keyword")String keyword); List getMaTypeSelect(String parentId); diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMapper.xml index 90c2d7ef..5ae2a421 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMapper.xml @@ -4,9 +4,9 @@ + select lub.id, + lub.user_id as userId, + lub.type_id as typeId, + mt2.type_name as parentName, + mt.type_name as typeName, + lub.book_num as bookNum, + lub.company_id as companyId + from lease_user_book lub + left join ma_type mt on lub.type_id = mt.type_id + left join ma_type mt2 on mt.parent_id = mt2.type_id + where lub.user_id = #{userId} + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index 9fc306cc..add2807c 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -600,6 +600,14 @@ direct_audit_time = now(), direct_audit_remark = #{record.companyAuditRemark}, + + update_by = #{record.companyAuditBy}, + update_time = now(), + + + update_by = #{record.companyAuditBy}, + update_time = now(), + WHERE task_id = #{record.taskId} diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml index c542e19e..233b8059 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml @@ -365,9 +365,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ma_type m m.level != 4 - + and m.parent_id = #{parentId} + + and locate(#{keyword}, m.type_name) > 0 +