diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/BookCarInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/BookCarInfoDto.java index 30528a3..e210a0a 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/BookCarInfoDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/BookCarInfoDto.java @@ -32,7 +32,7 @@ public class BookCarInfoDto { private String bookCode; @ApiModelProperty(value = "订单日期") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date orderTime; @@ -58,7 +58,7 @@ public class BookCarInfoDto { private String creater; @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date createTime; @@ -66,11 +66,13 @@ public class BookCarInfoDto { private String updater; @ApiModelProperty(value = "修改日期") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date updateTime; private String address; private List detailList; + + private String devType; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/mapper/BookCarMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/mapper/BookCarMapper.java index 253e447..097cf33 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/mapper/BookCarMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/mapper/BookCarMapper.java @@ -17,6 +17,7 @@ public interface BookCarMapper { /** * 添加预约车详情 + * * @param bookCarInfoDto * @return */ @@ -24,6 +25,7 @@ public interface BookCarMapper { /** * 查询预约车详情 + * * @param devInfo * @return */ @@ -31,18 +33,22 @@ public interface BookCarMapper { /** * 查询设备详情 + * * @param maId * @param userId * @return */ - DevInfoVo selectDevInfoByMaId(@Param("maId") String maId, @Param("userId") Long userId); + DevInfoVo selectDevInfoByMaId(@Param("maId") String maId, @Param("userId") Long userId, @Param("devType") String devType); /** * 删除预约车 + * * @param id * @return */ int deleteById(Integer id); int deleteByIds(@Param("array") Integer[] ids); + + List getBookCarDetailsTool(BookCarInfoDto bookCarInfoDto); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java index 78119fe..aec57d8 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java @@ -43,7 +43,7 @@ public class BookCarServiceImpl implements BookCarService { bookCarInfoDto.setCreater(userId.toString()); bookCarInfoDto.setOrderUser(userId); //先根据设备id查询设备信息 - DevInfoVo devInfoVo = bookCarMapper.selectDevInfoByMaId(bookCarInfoDto.getMaId(), userId); + DevInfoVo devInfoVo = bookCarMapper.selectDevInfoByMaId(bookCarInfoDto.getMaId(), userId, bookCarInfoDto.getDevType()); if (devInfoVo != null) { return AjaxResult.error("该设备已添加到预约车，请勿重复添加"); } @@ -59,7 +59,8 @@ public class BookCarServiceImpl implements BookCarService { List list = new ArrayList<>(); Long userId = SecurityUtils.getLoginUser().getUserid(); bookCarInfoDto.setOrderUser(userId); - List bookCarDetails = bookCarMapper.getBookCarDetails(bookCarInfoDto); + List bookCarDetails = new ArrayList<>(); + bookCarDetails = bookCarMapper.getBookCarDetails(bookCarInfoDto); // 如果 bookCarDetails 不为空，处理文件信息 if (CollectionUtils.isNotEmpty(bookCarDetails)) { // 为每个 DevInfoVo 设置文件信息 @@ -73,6 +74,7 @@ public class BookCarServiceImpl implements BookCarService { bookCarDetail.setPicUrl(mainFileInfoList.get(0).getFileUrl()); } } + // 根据 companyName, person, personPhone 进行分组 Map> groupedByKey = bookCarDetails.stream() .collect(Collectors.groupingBy(bookCarDetail -> new CompanyPersonPhoneKey( @@ -101,6 +103,7 @@ public class BookCarServiceImpl implements BookCarService { /** * 删除预约车 + * * @param devInfo * @return */ @@ -124,12 +127,13 @@ public class BookCarServiceImpl implements BookCarService { /** * 查询立即承租详情 + * * @param devInfo * @return */ @Override public AjaxResult getBookCarDetailByMaId(BookCarInfoDto devInfo) { - log.info("查询立即承租详情{}",devInfo); + log.info("查询立即承租详情{}", devInfo); Long userId = SecurityUtils.getLoginUser().getUserid(); devInfo.setOrderUser(userId); List bookCarDetails = bookCarMapper.getBookCarDetails(devInfo); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/controller/MaDevInfoController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/controller/MaDevInfoController.java index 0f70f25..13324ff 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/controller/MaDevInfoController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/controller/MaDevInfoController.java @@ -171,7 +171,7 @@ public class MaDevInfoController extends BaseController { @PostMapping("/export") public void export(MaDevInfo o, HttpServletResponse response) throws IOException { // 1. 查询所有符合条件的数据（忽略分页） - List dataList = service.list(o); + List dataList = service.export(o); // 2. 转换数据为导出格式（处理特殊字段） List> exportData = dataList.stream() diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/MaDevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/MaDevInfo.java index e7b65b1..e440c11 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/MaDevInfo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/MaDevInfo.java @@ -340,4 +340,6 @@ public class MaDevInfo { private String remainingStopYear; + private String actualStopYear; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/MaDevInfoService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/MaDevInfoService.java index 0a8c010..15fc5ab 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/MaDevInfoService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/MaDevInfoService.java @@ -30,4 +30,6 @@ public interface MaDevInfoService { MaDevInfo getDevice(Integer maId); AjaxResult getDeviceByMaIds(String maIds); + + List export(MaDevInfo o); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/MaDevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/MaDevInfoServiceImpl.java index 945cd44..b8fd224 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/MaDevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/MaDevInfoServiceImpl.java @@ -120,6 +120,24 @@ public class MaDevInfoServiceImpl implements MaDevInfoService { return AjaxResult.success(mapper.getDeviceByMaIds(maIdArray)); } + /** + * @param o + * @return + */ + @Override + public List export(MaDevInfo o) { + /* Long thisLoginUserDeptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); + o.setPropertyUnitId(Math.toIntExact(thisLoginUserDeptId));*/ + List list = mapper.list(o); + list.forEach(item -> { + List propertiiesList = mapper.getProperties(item); + if (propertiiesList != null && !propertiiesList.isEmpty()) { + item.setPropertyVoList(propertiiesList); + } + }); + return list; + } + /** * 将扁平列表构建成树，并添加一个总的根节点，根节点名称包含设备总数 */ @@ -127,7 +145,7 @@ public class MaDevInfoServiceImpl implements MaDevInfoService { // 统计设备总数（列表的size即为总数量） //int totalCount = list == null ? 0 : list.size(); - Integer totalCount=mapper.selectTotalDeviceCount(); + Integer totalCount = mapper.selectTotalDeviceCount(); if (list == null || list.isEmpty()) { // 空列表时显示总数为0 diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java index b765ee1..d74e969 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java @@ -39,7 +39,7 @@ import java.util.Objects; */ @RestController @RequestMapping("/dev") -@Api(value = "设备信息",tags = "设备管理") +@Api(value = "设备信息", tags = "设备管理") public class DevInfoController extends BaseController { @Resource @@ -88,6 +88,7 @@ public class DevInfoController extends BaseController { /** * 获取公司列表(供装备新增及首页所属公司筛选使用) + * * @param obj * @return */ @@ -118,7 +119,7 @@ public class DevInfoController extends BaseController { return getDataTable(list); } - // @RequiresPermissions("equip:info:list") + // @RequiresPermissions("equip:info:list") @ApiOperation(value = "装备推荐列表") @GetMapping("/hotList") public AjaxResult hotList(DevInfoVo devInfo) { @@ -143,6 +144,18 @@ public class DevInfoController extends BaseController { } + /** + * 获取设备信息详细信息 + */ + //@RequiresPermissions("equip:info:query") + @ApiOperation(value = "装备详情") + @GetMapping(value = "/getInfo") + public AjaxResult getInfoById(Long id, String devType, + @RequestParam(value = "isHome", required = false) Boolean isHome) { + return success(devType.equals("0") ? devInfoService.selectDevInfoByMaId(id, isHome) : devInfoService.selectToolByMaId(id, isHome)); + } + + /** * 上下架（批量） */ @@ -156,7 +169,7 @@ public class DevInfoController extends BaseController { /** * 修改设备信息 */ - // @RequiresPermissions("equip:info:edit") + // @RequiresPermissions("equip:info:edit") @ApiOperation(value = "修改装备信息") @PostMapping("edit") public AjaxResult edit(@RequestBody @Valid DevInfo devInfo) { @@ -168,7 +181,7 @@ public class DevInfoController extends BaseController { */ //@RequiresPermissions("equip:info:remove") @ApiOperation(value = "删除装备") - @PostMapping("/remove") + @PostMapping("/remove") public AjaxResult remove(@RequestBody Long[] maIds) { return toAjax(devInfoService.deleteDevInfoByMaIds(maIds)); } @@ -176,6 +189,7 @@ public class DevInfoController extends BaseController { /** * 设备信息录入---录入经纬度 + * * @param infoMotionDto 设备信息 */ @ApiOperation(value = "装备信息录入--含经纬度") @@ -186,11 +200,12 @@ public class DevInfoController extends BaseController { /** * 添加设备--UUID生成CODE--字符串 + * * @param devInfo 设备信息 */ @ApiOperation(value = "添加设备--字符串传入--UUID生成CODE") @PostMapping("/outType") - public void outType(@RequestBody String devInfo){ + public void outType(@RequestBody String devInfo) { devInfoService.insertOutType(devInfo); } @@ -218,7 +233,7 @@ public class DevInfoController extends BaseController { /** * 导出设备信息列表 */ - // @RequiresPermissions("equip:info:export") + // @RequiresPermissions("equip:info:export") @ApiOperation(value = "导出装备信息") @PostMapping("/export") public void export(HttpServletResponse response, DevInfoVo devInfo) { @@ -269,28 +284,28 @@ public class DevInfoController extends BaseController { /** * 设备信息导入 + * * @param file * @return */ @ApiOperation(value = "设备信息导入") @PostMapping("/importData") - public AjaxResult importData(MultipartFile file) - { + public AjaxResult importData(MultipartFile file) { return devInfoService.importTbPeople(file); } @ApiOperation(value = "设备信息-审核") @PostMapping("/updateDeviceStatus") - public AjaxResult updateDeviceStatus(String ids, String status){ + public AjaxResult updateDeviceStatus(String ids, String status) { try { - Integer i = devInfoService.updateCheckStatus(ids,status); - if (i > 0){ + Integer i = devInfoService.updateCheckStatus(ids, status); + if (i > 0) { return AjaxResult.success("审核成功"); - }else { + } else { return AjaxResult.error("审核失败"); } - }catch (Exception e){ - logger.error("报错啦",e); + } catch (Exception e) { + logger.error("报错啦", e); return AjaxResult.error("调用异常，请联系管理员"); } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java index b48d88c..833463d 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java @@ -194,4 +194,8 @@ public class DevInfoVo extends DevInfo { private String status; private String csId; + + private String devType; + + private String manageMode; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java index 07a9d35..1455e17 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java @@ -307,5 +307,7 @@ public interface DevInfoMapper { int getTurnoverRateByLevel(DevInfoReq devInfoReq); int getProjectNUm(); + + DevInfoVo selectToolByMaId(Long maId); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java index 552cc19..7b969e0 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java @@ -130,4 +130,6 @@ public interface DevInfoService { List selectCheckDevInfoList(DevInfoVo devInfo); Integer updateCheckStatus(String ids, String status); + + DevInfoVo selectToolByMaId(Long maId, Boolean isHome); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index 148380f..a24f7c7 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -1075,6 +1075,16 @@ public class DevInfoServiceImpl implements DevInfoService { } } + /** + * @param maId + * @param isHome + * @return + */ + @Override + public DevInfoVo selectToolByMaId(Long maId, Boolean isHome) { + return devInfoMapper.selectToolByMaId(maId); + } + /** * 读取Excel表格数据，做非空判断 * diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 80a6e07..566af79 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -18,6 +18,7 @@ import com.bonus.material.lease.domain.DeptDto; import com.bonus.material.lease.mapper.LeaseRepairRecordMapper; import com.bonus.material.order.domain.OrderDetailDto; import com.bonus.material.order.domain.OrderInfoDto; +import com.bonus.material.order.domain.ProDto; import com.bonus.material.order.mapper.OrderMapper; import com.bonus.material.order.service.OrderService; import com.bonus.system.api.RemoteFileService; @@ -84,8 +85,8 @@ public class OrderController extends BaseController { @ApiOperation(value = "提交预约车到订单") @PostMapping("/submitBookCar") @PreventRepeatSubmit - public AjaxResult submitBookCar(@RequestBody List orderInfoDto) { - Integer i = orderService.submitOrderInfo(orderInfoDto); + public AjaxResult submitBookCar(@RequestBody ProDto proDto) { + Integer i = orderService.submitOrderInfo(proDto); if (i > 0) { return success("下单成功"); } else { @@ -128,6 +129,7 @@ public class OrderController extends BaseController { /** * 获取单个订单取件码 + * * @param dto * @return */ @@ -286,7 +288,9 @@ public class OrderController extends BaseController { if (text != null) { for (Map.Entry entry : replacements.entrySet()) { String entryValue = entry.getValue(); - if (entryValue == null) {continue;} + if (entryValue == null) { + continue; + } text = text.replace(entry.getKey(), entryValue); } run.setText(text, 0); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java index f220d93..bb6cedb 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java @@ -44,12 +44,16 @@ public class OrderDetailDto { @ApiModelProperty(value = "设备ids") private List maIds; - /** 设备编码 */ + /** + * 设备编码 + */ @Excel(name = "设备编码") @ApiModelProperty(value = "设备编码") private String code; - /** 设备唯一标识符，用户输入，比如车架号 */ + /** + * 设备唯一标识符，用户输入，比如车架号 + */ @Excel(name = "设备唯一标识符") @ApiModelProperty(value = "设备唯一标识符") private String identifyCode; @@ -190,4 +194,6 @@ public class OrderDetailDto { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private String receivingTime; + private String devType; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java index f49f6a0..be0969c 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java @@ -173,4 +173,31 @@ public class OrderInfoDto { private String maIds; + + private String devType; + + @ApiModelProperty(value = "需求单位") + private String useUnit; + + @ApiModelProperty(value = "项目编号") + private String proCode; + + @ApiModelProperty(value = "使用项目") + private String proName; + + @ApiModelProperty(value = "项目类型") + private String proType; + + @ApiModelProperty(value = "电压等级") + private String voltageLevel; + + @ApiModelProperty(value = "省") + private String proProvince; + + @ApiModelProperty(value = "市") + private String proCity; + + @ApiModelProperty(value = "区/县") + private String proCounty; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/ProDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/ProDto.java new file mode 100644 index 0000000..3392f12 --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/ProDto.java @@ -0,0 +1,42 @@ +package com.bonus.material.order.domain; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ProDto { + + @ApiModelProperty(value = "需求单位") + private String useUnit; + + @ApiModelProperty(value = "项目编号") + private String proCode; + + @ApiModelProperty(value = "使用项目") + private String proName; + + @ApiModelProperty(value = "项目类型") + private String proType; + + @ApiModelProperty(value = "电压等级") + private String voltageLevel; + + @ApiModelProperty(value = "省") + private String proProvince; + + @ApiModelProperty(value = "市") + private String proCity; + + @ApiModelProperty(value = "区/县") + private String proCounty; + + + List orderInfoDto; + +} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java index eb2bd42..62f5187 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java @@ -6,6 +6,7 @@ import com.bonus.material.device.domain.vo.DevInfoVo; import com.bonus.material.largeScreen.entity.OrderData; import com.bonus.material.order.domain.OrderDetailDto; import com.bonus.material.order.domain.OrderInfoDto; +import com.bonus.material.order.domain.ProDto; import java.util.List; @@ -15,7 +16,7 @@ import java.util.List; */ public interface OrderService { - Integer submitOrderInfo(List orderInfoDto); + Integer submitOrderInfo(ProDto proDto); List getOrderDetails(OrderInfoDto orderInfoDto) throws Exception; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 3616c6c..85ebfe6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -34,6 +34,7 @@ import com.bonus.material.lease.domain.LeaseRepairRecord; import com.bonus.material.lease.mapper.LeaseRepairRecordMapper; import com.bonus.material.order.domain.OrderDetailDto; import com.bonus.material.order.domain.OrderInfoDto; +import com.bonus.material.order.domain.ProDto; import com.bonus.material.order.mapper.OrderMapper; import com.bonus.material.order.service.OrderService; import com.bonus.material.task.domain.TmTask; @@ -88,10 +89,10 @@ public class OrderServiceImpl implements OrderService { @Override @Transactional - public Integer submitOrderInfo(List orderInfoDtos) { + public Integer submitOrderInfo(ProDto proDto) { int j = 0; - orderInfoDtos.removeIf(Objects::isNull); - for (OrderInfoDto orderInfoDto : orderInfoDtos) { + proDto.getOrderInfoDto().removeIf(Objects::isNull); + for (OrderInfoDto orderInfoDto : proDto.getOrderInfoDto()) { // 首先判断库存是否足够 List orderDetailDtos = orderInfoDto.getDetailsList(); if (orderDetailDtos == null) { @@ -111,14 +112,6 @@ public class OrderServiceImpl implements OrderService { throw new RuntimeException("设备非在库状态，无法下单!"); } String devPersonPhone = maInfo.getPersonPhone(); - - //如果是编码设备，改设备状态为共享中 -// orderDetailDto.setMaStatus(MaStatusEnum.UNDER_RENT.getCode().toString()); -// Integer updateDeviceStatus = orderMapper.updateDeviceStatus(orderDetailDto); -// if (updateDeviceStatus < 1) { -// throw new RuntimeException("设备状态修改失败"); -// } - // 更改购物车状态为已下单 orderMapper.updateMaStatus(orderDetailDto); } @@ -126,6 +119,14 @@ public class OrderServiceImpl implements OrderService { orderInfoDto.setBuyerId(userid.intValue()); orderInfoDto.setBuyerCompany(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()).intValue()); orderInfoDto.setCreater(userid); + orderInfoDto.setUseUnit(proDto.getUseUnit()); + orderInfoDto.setProCode(proDto.getProCode()); + orderInfoDto.setProName(proDto.getProName()); + orderInfoDto.setProType(proDto.getProType()); + orderInfoDto.setVoltageLevel(proDto.getVoltageLevel()); + orderInfoDto.setProProvince(proDto.getProProvince()); + orderInfoDto.setProCity(proDto.getProCity()); + orderInfoDto.setProCounty(proDto.getProCounty()); Integer i = orderMapper.insertOrderInfo(orderInfoDto); j += i; if (i > 0) { @@ -256,7 +257,11 @@ public class OrderServiceImpl implements OrderService { // 计算天数差 long days = ChronoUnit.DAYS.between(preOutboundLocalDate, rentEndLocalDate); - if (days == 0) { days = 1;} else {days = days + 1;} + if (days == 0) { + days = 1; + } else { + days = days + 1; + } return days; } catch (ParseException e) { throw new RuntimeException("日期转换错误", e); @@ -378,8 +383,7 @@ public class OrderServiceImpl implements OrderService { tmTask.setTaskStatus(minOrderStatus.getAsInt()); tmTask.setCode(dtos.get(0).getOrderCode()); if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_PENDING_SHIPMENT.getStatus().toString()) || - orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_TERMINATED.getStatus().toString())) - { + orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_TERMINATED.getStatus().toString())) { tmTask.setNoticeCompanyId(tmTask.getBuyerCompanyId()); } else if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_RECEIVE.getStatus().toString()) || diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/controller/ToolLedgerController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/controller/ToolLedgerController.java index fa0e8d0..697d721 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/controller/ToolLedgerController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/controller/ToolLedgerController.java @@ -76,4 +76,44 @@ public class ToolLedgerController extends BaseController { } + /** + * 工具台账表格 + * + * @param entity 实体 + * @return 表格 + */ + @ApiOperation(value = "工具台账表格") + @GetMapping("/getToolByTypeId") + public TableDataInfo getToolByTypeId(ToolLedgerEntity entity) { + try { + startPage(); + List list = toolLedgerService.getToolByTypeId(entity); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + + /** + * 工具台账表格 + * + * @param entity 实体 + * @return 表格 + */ + @ApiOperation(value = "工具台账表格") + @GetMapping("/getToolByPro") + public TableDataInfo getToolByPro(ToolLedgerEntity entity) { + try { + startPage(); + List list = toolLedgerService.getToolByPro(entity); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/domain/ToolLedgerEntity.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/domain/ToolLedgerEntity.java index 7a8eeb6..ef1300d 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/domain/ToolLedgerEntity.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/domain/ToolLedgerEntity.java @@ -74,6 +74,11 @@ public class ToolLedgerEntity implements Serializable { */ private BigDecimal scrapNum; + /** + * 共享数量 + */ + private BigDecimal shareNum; + /** * 厂家id（非空，默认0） */ @@ -186,4 +191,6 @@ public class ToolLedgerEntity implements Serializable { private String fileList; private List propertyVoList; + + private String proName; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/mapper/ToolLedgerMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/mapper/ToolLedgerMapper.java index 674b3ee..05e9cac 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/mapper/ToolLedgerMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/mapper/ToolLedgerMapper.java @@ -46,4 +46,9 @@ public interface ToolLedgerMapper { void delProperties(Long toolId); Integer insertDevInfoProperties(@Param("list") List item, @Param("toolId") Long toolId); + + List getToolByTypeId(ToolLedgerEntity entity); + + List getToolByPro(ToolLedgerEntity entity); + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/service/Impl/ToolLedgerServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/service/Impl/ToolLedgerServiceImpl.java index 6900ab1..ae25ec6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/service/Impl/ToolLedgerServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/service/Impl/ToolLedgerServiceImpl.java @@ -65,4 +65,22 @@ public class ToolLedgerServiceImpl implements ToolLedgerService { return AjaxResult.error("修改失败"); } } + + /** + * @param entity + * @return + */ + @Override + public List getToolByTypeId(ToolLedgerEntity entity) { + return mapper.getToolByTypeId(entity); + } + + /** + * @param entity + * @return + */ + @Override + public List getToolByPro(ToolLedgerEntity entity) { + return mapper.getToolByPro(entity); + } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/service/ToolLedgerService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/service/ToolLedgerService.java index 010890c..893726e 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/service/ToolLedgerService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/service/ToolLedgerService.java @@ -25,4 +25,9 @@ public interface ToolLedgerService { AjaxResult updateById(ToolLedgerEntity entity); + + List getToolByTypeId(ToolLedgerEntity entity); + + + List getToolByPro(ToolLedgerEntity entity); } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_local.yml b/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_local.yml index f6d8161..72abfef 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_local.yml +++ b/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_local.yml @@ -6,23 +6,20 @@ server: spring: cloud: nacos: - username: nacos - password: Jjsp@nacos2023 discovery: # 服务注册地址 server-addr: 127.0.0.1:18848 - namespace: material_mall + namespace: 37661b6d-55f6-4d12-b2ed-e6ff49e6bb9a config: # 配置中心地址 server-addr: 127.0.0.1:18848 - namespace: material_mall + namespace: 37661b6d-55f6-4d12-b2ed-e6ff49e6bb9a # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - #加密组件 jasypt: encryptor: diff --git a/bonus-modules/bonus-material-mall/src/main/resources/bootstrap.yml b/bonus-modules/bonus-material-mall/src/main/resources/bootstrap.yml index 0fbb05b..dfda269 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-material-mall/src/main/resources/bootstrap.yml @@ -5,4 +5,4 @@ spring: name: bonus-material-mall profiles: # 环境配置 - active: material_mall_test + active: material_mall_local diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml index 13731fd..a9d7af0 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml @@ -5,8 +5,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into book_car_detail(ma_id, order_status, order_company, order_user, address, creater, create_time) - values(#{maId}, 0, #{orderCompany}, #{orderUser}, #{address}, #{creater}, now()) + insert into book_car_detail(ma_id, order_status, order_company, order_user, address, creater, create_time, + devType) + values (#{maId}, 0, #{orderCompany}, #{orderUser}, #{address}, #{creater}, now(), #{devType}) @@ -21,45 +22,138 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - - \ No newline at end of file diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/cityScreen/CityScreenMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/cityScreen/CityScreenMapper.xml index 052cb89..0169648 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/cityScreen/CityScreenMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/cityScreen/CityScreenMapper.xml @@ -159,18 +159,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevRetireWarningMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevRetireWarningMapper.xml index 00c215a..cc1ea31 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevRetireWarningMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevRetireWarningMapper.xml @@ -13,33 +13,39 @@ mdi.`code` AS code, ms.supplier_name AS manufacturer, mdi.production_date AS productionDate, - mdi.expiration_time AS expirationTime, - IF(STR_TO_DATE(production_date, '%Y-%m-%d') IS NOT NULL AND STR_TO_DATE(expiration_time, '%Y-%m-%d') IS NOT - NULL, - TIMESTAMPDIFF(YEAR, STR_TO_DATE(production_date, - '%Y-%m-%d'), expiration_time), 0) AS expirationYears, + DATE_ADD(mdi.production_date, INTERVAL mdi.max_working_hours YEAR) AS expirationTime, + mdi.max_working_hours AS expirationYears, IF(STR_TO_DATE(production_date, '%Y-%m-%d') IS NOT NULL, DATEDIFF(CURDATE(), STR_TO_DATE(production_date, '%Y-%m-%d')), 0) AS daysDiff, IF(STR_TO_DATE(production_date, '%Y-%m-%d') IS NOT NULL, TIMESTAMPDIFF(YEAR, STR_TO_DATE(production_date, '%Y-%m-%d'), CURDATE()), 0) AS yearsDiff, - IF(STR_TO_DATE(expiration_time, '%Y-%m-%d') IS NOT NULL - AND STR_TO_DATE(expiration_time, '%Y-%m-%d') >= CURDATE(), DATEDIFF(STR_TO_DATE(expiration_time, '%Y-%m-%d'), + + IF(STR_TO_DATE(DATE_ADD(mdi.production_date, INTERVAL mdi.max_working_hours YEAR), '%Y-%m-%d') IS NOT NULL + AND STR_TO_DATE(DATE_ADD(mdi.production_date, INTERVAL mdi.max_working_hours YEAR), '%Y-%m-%d') >= CURDATE(), DATEDIFF(STR_TO_DATE(DATE_ADD(mdi.production_date, INTERVAL mdi.max_working_hours YEAR), '%Y-%m-%d'), CURDATE()), 0) AS remainingDays, - IF(STR_TO_DATE(expiration_time, '%Y-%m-%d') IS NOT NULL - AND STR_TO_DATE(expiration_time, '%Y-%m-%d') >= CURDATE(), TIMESTAMPDIFF(YEAR, CURDATE(), - STR_TO_DATE(expiration_time, '%Y-%m-%d')), 0) AS remainingYears, + + IF(STR_TO_DATE(DATE_ADD(mdi.production_date, INTERVAL mdi.max_working_hours YEAR), '%Y-%m-%d') IS NOT NULL + AND STR_TO_DATE(DATE_ADD(mdi.production_date, INTERVAL mdi.max_working_hours YEAR), '%Y-%m-%d') >= CURDATE(), TIMESTAMPDIFF(YEAR, CURDATE(), + STR_TO_DATE(DATE_ADD(mdi.production_date, INTERVAL mdi.max_working_hours YEAR), '%Y-%m-%d')), 0) AS remainingYears, + CASE - WHEN STR_TO_DATE(expiration_time, '%Y-%m-%d') IS NOT NULL - AND DATEDIFF(STR_TO_DATE(expiration_time, '%Y-%m-%d'), CURDATE()) > 365 - THEN '正常使用' - WHEN STR_TO_DATE(expiration_time, '%Y-%m-%d') IS NOT NULL - AND DATEDIFF(STR_TO_DATE(expiration_time, '%Y-%m-%d'), CURDATE()) > 0 - AND DATEDIFF(STR_TO_DATE(expiration_time, '%Y-%m-%d'), CURDATE()) <= 365 - THEN CONCAT('临近', DATEDIFF(STR_TO_DATE(expiration_time, '%Y-%m-%d'), CURDATE()), '天退役') - WHEN STR_TO_DATE(expiration_time, '%Y-%m-%d') IS NOT NULL - AND STR_TO_DATE(expiration_time, '%Y-%m-%d') <= CURDATE() - THEN '已过期' - ELSE '日期无效' + -- 告警2：已超期（剩余年限≤0） + WHEN ROUND(TIMESTAMPDIFF(DAY, mdi.production_date, NOW()) / 365.25, 1) >= mdi.max_working_hours + THEN CONCAT('告警：已超最大使用年限', ROUND( + ROUND(TIMESTAMPDIFF(DAY, mdi.production_date, NOW()) / 365.25, 1) - mdi.max_working_hours, + 1 + ), '年') + -- 告警1：未超期，但剩余可用年限≤1年（相差小于等于1年） + WHEN (mdi.max_working_hours - ROUND(TIMESTAMPDIFF(DAY, mdi.production_date, NOW()) / 365.25, 1)) <= 1 + THEN CONCAT('告警：即将超期，剩余可用年限', ROUND( + mdi.max_working_hours - ROUND(TIMESTAMPDIFF(DAY, mdi.production_date, NOW()) / 365.25, 1), + 1 + ), '年') + -- 正常：未超期，且剩余可用年限＞1年（相差大于1年） + ELSE CONCAT('正常：剩余可用年限', ROUND( + mdi.max_working_hours - ROUND(TIMESTAMPDIFF(DAY, mdi.production_date, NOW()) / 365.25, 1), + 1 + ), '年') END AS status FROM ma_dev_info mdi @@ -63,10 +69,10 @@ - AND device_status != '正常使用' + AND status like concat('%','告警','%') - AND device_status = '正常使用' + AND status like concat('%','正常','%') diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 83b3199..67063b5 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -49,66 +49,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -1531,4 +1598,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT COUNT(1) from jj_sing_project + diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml index 78c1482..420668a 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml @@ -15,8 +15,8 @@ SUM(CASE WHEN mdi.entry_status = 1 THEN 1 ELSE 0 END) AS agree, SUM(CASE WHEN mdi.entry_status = 2 THEN 1 ELSE 0 END) AS reject FROM - cs_device_status aaa - LEFT JOIN cs_device_real_dev bbb ON aaa.id = bbb.cs_id + ma_apply aaa + LEFT JOIN ma_apply_details bbb ON aaa.id = bbb.cs_id LEFT JOIN ma_dev_info mdi ON bbb.dev_id = mdi.ma_id AND mdi.is_active = '1' where aaa.is_active = 1 @@ -26,7 +26,7 @@ and aaa.create_user like concat('%', #{createUser}, '%') - and DATE_FORMAT(aaa.create_time,'%Y-%m-%d') between #{startCreateTime} and #{endCreateTime} + and aaa.create_time between #{startCreateTime} and #{endCreateTime} GROUP BY aaa.id @@ -63,9 +63,9 @@ c.operate_address as operateAddress, d.entry_status AS entryStatus, d.buy_price AS buyPrice - FROM cs_device_real_dev cdrd + FROM ma_apply_details cdrd LEFT JOIN ma_dev_info d ON cdrd.dev_id = d.ma_id AND d.is_active = '1' - LEFT JOIN cs_device_status cds ON cdrd.cs_id = cds.id + LEFT JOIN ma_apply cds ON cdrd.cs_id = cds.id LEFT JOIN sys_dept sd ON d.on_company = sd.dept_id LEFT JOIN bm_company_info c ON sd.dept_id = c.company_id INNER JOIN ma_type_view mtv ON mtv.typeId = d.type_id @@ -77,12 +77,12 @@ - INSERT INTO cs_device_status (create_user, order_number) + INSERT INTO ma_apply (create_user, order_number) VALUES (#{createUser}, #{orderNumber}) - INSERT INTO cs_device_real_dev (cs_id, dev_id) + INSERT INTO ma_apply_details (cs_id, dev_id) VALUES (#{orderId}, #{maId}) - UPDATE cs_device_status + UPDATE ma_apply SET status = #{status} WHERE id = #{id} @@ -165,12 +165,12 @@ UPDATE ma_dev_info SET entry_status = 0 WHERE ma_id IN (select dev_id - from cs_device_real_dev + from ma_apply_details where cs_id = #{id}) - update cs_device_status + update ma_apply set is_active = 0 where id = #{id} @@ -236,7 +236,7 @@ select count(1) from ma_dev_info where ma_id IN (select dev_id - from cs_device_real_dev + from ma_apply_details where cs_id = #{id}) and is_active = 1 and entry_status = 0 @@ -284,10 +284,10 @@ @@ -376,8 +376,8 @@ mdq.next_check_time AS nextMaintenanceDate, mdi.max_working_hours AS maxServiceLifeYears, sc.name AS province - from cs_device_status cds - LEFT JOIN cs_device_real_dev cdrd ON cdrd.cs_id = cds.id + from ma_apply cds + LEFT JOIN ma_apply_details cdrd ON cdrd.cs_id = cds.id LEFT JOIN ma_dev_info mdi ON cdrd.dev_id = mdi.ma_id INNER JOIN ma_type_view mtv ON mtv.typeId = mdi.type_id LEFT JOIN jj_sing_project jsp ON mdi.on_project = jsp.pro_code @@ -477,8 +477,8 @@ mdi.max_working_hours AS maxServiceLifeYears, mdi.entry_status AS entryStatus, sc.name AS province - from cs_device_status cds - LEFT JOIN cs_device_real_dev cdrd ON cdrd.cs_id = cds.id + from ma_apply cds + LEFT JOIN ma_apply_details cdrd ON cdrd.cs_id = cds.id LEFT JOIN ma_dev_info mdi ON cdrd.dev_id = mdi.ma_id INNER JOIN ma_type_view mtv ON mtv.typeId = mdi.type_id LEFT JOIN jj_sing_project jsp ON mdi.on_project = jsp.pro_code diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/ma/MaMachineTypeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/ma/MaMachineTypeMapper.xml index 4450d35..aa2761e 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/ma/MaMachineTypeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/ma/MaMachineTypeMapper.xml @@ -662,11 +662,11 @@ COUNT(*) AS monthly_outbound_count -- 当月出库次数（小类内所有设备） FROM cs_device_change_details cdcd -- 关联设备信息表，筛选有效设备 - LEFT JOIN ma_dev_info mdi ON mdi.ma_id = cdcd.dev_id + LEFT JOIN ma_dev_info mdi ON mdi.code = cdcd.dev_code -- 关联类型视图，限定小类和大类 INNER JOIN ma_type_view mtv ON mtv.typeId = mdi.type_id WHERE - cdcd.`use_time` is not null -- 出库状态 + cdcd.`use_time` is not null and cdcd.is_finished='1' -- 出库状态 AND mdi.is_active = '1' AND cdcd.use_time >= DATE_SUB(CURDATE(), INTERVAL 12 MONTH) -- 近12个月 @@ -837,60 +837,54 @@ ORDER BY inUser DESC diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index 4d06e31..f4efb2a 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -5,34 +5,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into ma_order_info (code, order_time, cost, buyer_id, address, creater, create_time, buyer_company) - values - (#{code}, now(), #{cost}, #{buyerId}, #{address}, #{creater}, now(), #{buyerCompany}) + insert into ma_order_info (code, order_time, cost, buyer_id, address, creater, create_time, buyer_company, + use_unit, pro_code, pro_name, pro_type, voltage_level, pro_province, pro_city, + pro_county) + values (#{code}, now(), #{cost}, #{buyerId}, #{address}, #{creater}, now(), #{buyerCompany}, #{useUnit}, + #{proCode}, #{proName}, #{proType}, #{voltageLevel}, #{proProvince}, #{proCity}, #{proCounty}) + - INSERT INTO `ma_order_details` ( - `order_id`, - `ma_id`, - `rent_begin_time`, - `rent_end_time`, - `days`, - `num`, - `costs`, - `order_status`, - `create_time`, - `update_time` - ) VALUES ( - #{orderId}, - #{maId}, - #{rentBeginTime}, - #{rentEndTime}, - #{days}, - #{num}, - #{costs}, - 1, - now(), - #{updateTime}) + INSERT INTO `ma_order_details` (`order_id`, + `ma_id`, + `rent_begin_time`, + `rent_end_time`, + `days`, + `num`, + `costs`, + `order_status`, + `create_time`, + `update_time`, + devType) + VALUES (#{orderId}, + #{maId}, + #{rentBeginTime}, + #{rentEndTime}, + #{days}, + #{num}, + #{costs}, + 1, + now(), + #{updateTime}, + #{devType}) diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolLedger/ToolLedgerMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolLedger/ToolLedgerMapper.xml index 2a65569..3f042c2 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolLedger/ToolLedgerMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolLedger/ToolLedgerMapper.xml @@ -70,11 +70,12 @@ tt2.type_name AS grandparentTypeName, -- 2级父节点名称 tt3.type_name AS greatGrandparentName, -- 3级父节点名称 tt4.type_name AS fourthParentName, -- 4级父节点名称 - SUM(COALESCE ( tl.available_num, 0 )) AS availableNum, - SUM(COALESCE ( tl.in_num, 0 )) AS inNum, - SUM(COALESCE ( tl.scrap_num, 0 )) AS scrapNum, - SUM(COALESCE ( tl.repair_num, 0 )) AS repairNum, - SUM(COALESCE ( tl.total_num, 0 )) AS totalNum + SUM(COALESCE ( tl.available_num, 0 )) AS availableNum, -- 在库 + SUM(COALESCE ( tl.in_num, 0 )) AS inNum, -- 自用 + SUM(COALESCE ( tl.share_num, 0 )) AS shareNum, -- 共享 + SUM(COALESCE ( tl.repair_num, 0 )) AS repairNum, -- 维修 + SUM(COALESCE ( tl.scrap_num, 0 )) AS scrapNum, -- 报废 + SUM(COALESCE ( tl.total_num, 0 )) AS totalNum -- 总数 FROM tool_type tt LEFT JOIN tool_ledger tl ON tl.type_id = tt.type_id @@ -268,6 +269,47 @@ FROM tool_properties WHERE tool_id = #{toolId} + + insert into tool_properties(tool_id, property_name, property_value, create_time) diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolProcess/ToolProcessMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolProcess/ToolProcessMapper.xml index d8576bd..bfffedd 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolProcess/ToolProcessMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolProcess/ToolProcessMapper.xml @@ -20,34 +20,26 @@ INSERT INTO tool_apply_details ( - - - - - apply_id, - type_id, - supplier_id, - apply_num, - tool_price, - production_date, - code, - identify_code, - - - ) VALUES - + apply_id, + type_id, + supplier_id, + apply_num, + tool_price, + production_date, + code, + identify_code + ) + VALUES ( - - #{item.applyId}, - #{item.typeId}, - #{item.supplierId}, - #{item.applyNum}, - #{item.toolPrice}, - #{item.productionDate}, - #{item.code}, - #{item.identifyCode}, - + #{item.applyId}, + #{item.typeId}, + #{item.supplierId}, + #{item.applyNum}, + #{item.toolPrice}, + #{item.productionDate}, + #{item.code}, + #{item.identifyCode} )