bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
sxu 2023-12-06 12:59:46 +08:00
parent 07ba6e4c23
commit 446a28ba71
8 changed files with 118 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/dto/ContractDto.java Normal file
View File

@ -0,0 +1,24 @@
package com.bonus.zlpt.common.core.domain.order.dto;
import lombok.Data;
import java.util.Date;
@Data
public class ContractDto {
//协议id
private Integer orderId;
//合同名称
private String contractName;
//创建时间
private Date createTime;
//创建人
private Integer userId;
//协议状态(0 启用, 1 停用)
private String status;
}

14
zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/dto/ContractInfoDto.java Normal file
View File

@ -0,0 +1,14 @@
package com.bonus.zlpt.common.core.domain.order.dto;
import lombok.Data;
@Data
@SuppressWarnings("serial")
public class ContractInfoDto {
private ContractDto contractDto;
private FileInfoDto fileInfoDto;
}

25
zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/dto/FileInfoDto.java Normal file
View File

@ -0,0 +1,25 @@
package com.bonus.zlpt.common.core.domain.order.dto;
import lombok.Data;
/**
* 附件表入参
*/
@Data
public class FileInfoDto {
//模块id
private Integer modelId;
//文件路径
private String fileUrl;
//字典类型
private Integer dicId;
//创建人
private String creator;
//创建时间
private String createTime;
}

16
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java
View File

@ -3,6 +3,8 @@ package com.bonus.zlpt.order.controller;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.bonus.zlpt.common.core.domain.order.dto.ContractInfoDto;
import com.bonus.zlpt.common.core.domain.order.vo.OrderDetailsVo;
import com.bonus.zlpt.common.core.utils.poi.ExcelUtil;
import com.bonus.zlpt.common.core.web.controller.BaseController;
@ -11,6 +13,7 @@ import com.bonus.zlpt.common.core.web.page.TableDataInfo;
import com.bonus.zlpt.common.log.annotation.Log;
import com.bonus.zlpt.common.log.enums.BusinessType;
import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
import com.bonus.zlpt.common.security.utils.SecurityUtils;
import com.bonus.zlpt.order.feign.EquipClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -121,4 +124,17 @@ public class OrderDetailsController extends BaseController
{
return toAjax(orderDetailsService.deleteOrderDetailsByIds(ids));
}
/**
* 新增合同文件
* @param dto
* @return
*/
@PostMapping("/addContract")
public AjaxResult addContract(@RequestBody ContractInfoDto dto)
{
Long userId = SecurityUtils.getUserId();
dto.getContractDto().setUserId(userId.intValue());
return toAjax(orderDetailsService.addContract(dto));
}
}

3
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java
View File

@ -2,6 +2,7 @@ package com.bonus.zlpt.order.mapper;
import java.util.List;
import com.bonus.zlpt.common.core.domain.order.OrderDetails;
import com.bonus.zlpt.common.core.domain.order.dto.FileInfoDto;
import com.bonus.zlpt.common.core.domain.order.vo.OrderDetailsVo;
/**
@ -59,4 +60,6 @@ public interface OrderDetailsMapper
* @return 结果
*/
public int deleteOrderDetailsByIds(Long[] ids);
public int insertAttachment(FileInfoDto fileInfoDto);
}

4
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java
View File

@ -2,6 +2,7 @@ package com.bonus.zlpt.order.service;
import java.util.List;
import com.bonus.zlpt.common.core.domain.order.OrderDetails;
import com.bonus.zlpt.common.core.domain.order.dto.ContractInfoDto;
import com.bonus.zlpt.common.core.domain.order.vo.OrderDetailsVo;
/**
@ -52,6 +53,9 @@ public interface IOrderDetailsService
*/
public int deleteOrderDetailsByIds(Long[] ids);
int addContract(ContractInfoDto dto);
/**
* 删除订单详细信息
*

16
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java
View File

@ -2,12 +2,16 @@ package com.bonus.zlpt.order.service.impl;
import java.util.List;
import com.bonus.zlpt.common.core.domain.order.dto.ContractInfoDto;
import com.bonus.zlpt.common.core.domain.order.vo.OrderDetailsVo;
import com.bonus.zlpt.common.security.utils.SecurityUtils;
import com.bonus.zlpt.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.bonus.zlpt.order.mapper.OrderDetailsMapper;
import com.bonus.zlpt.common.core.domain.order.OrderDetails;
import com.bonus.zlpt.order.service.IOrderDetailsService;
import org.springframework.transaction.annotation.Transactional;
/**
* 订单详细Service业务层处理
@ -18,6 +22,8 @@ import com.bonus.zlpt.order.service.IOrderDetailsService;
@Service
public class OrderDetailsServiceImpl implements IOrderDetailsService
{
private final Integer ORDER_ATTACHMENT_DIC_ID = 21;
@Autowired
private OrderDetailsMapper orderDetailsMapper;
@ -81,6 +87,16 @@ public class OrderDetailsServiceImpl implements IOrderDetailsService
return orderDetailsMapper.deleteOrderDetailsByIds(ids);
}
@Override
@Transactional
public int addContract(ContractInfoDto dto) {
dto.getFileInfoDto().setModelId(dto.getContractDto().getOrderId());
dto.getFileInfoDto().setDicId(ORDER_ATTACHMENT_DIC_ID);
LoginUser user = SecurityUtils.getLoginUser();
dto.getFileInfoDto().setCreator(String.valueOf(user.getUserid()));
return orderDetailsMapper.insertAttachment(dto.getFileInfoDto());
}
/**
* 删除订单详细信息
*

16
zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml
View File

@ -158,4 +158,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<insert id="insertAttachment">
insert into sys_file_info (
<if test="modelId != null and modelId != '' ">model_id,</if>
<if test="fileUrl != null and fileUrl != '' ">file_url,</if>
<if test="dicId != null and dicId != '' ">dic_id,</if>
<if test="creator != null and creator != '' ">creator,</if>
create_time
)values(
<if test="modelId != null and modelId != '' ">#{modelId},</if>
<if test="fileUrl != null and fileUrl != '' ">#{fileUrl},</if>
<if test="dicId != null and dicId != '' ">#{dicId},</if>
<if test="creator != null and creator != '' ">#{creator},</if>
sysdate()
)
</insert>
</mapper>