diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/dto/ContractDto.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/dto/ContractDto.java new file mode 100644 index 0000000..4643bca --- /dev/null +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/dto/ContractDto.java @@ -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; +} diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/dto/ContractInfoDto.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/dto/ContractInfoDto.java new file mode 100644 index 0000000..ff2ce37 --- /dev/null +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/dto/ContractInfoDto.java @@ -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; + +} + diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/dto/FileInfoDto.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/dto/FileInfoDto.java new file mode 100644 index 0000000..e4ac132 --- /dev/null +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/dto/FileInfoDto.java @@ -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; +} diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java index 984fa64..fa599c0 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java @@ -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)); + } } diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java index 50bcf8c..de36c1f 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java @@ -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); } diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java index 8018c7c..419a033 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java @@ -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); + /** * 删除订单详细信息 * diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java index 43e55b7..068c403 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java @@ -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()); + } + /** * 删除订单详细信息 * diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml index cc88909..dbd7397 100644 --- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml +++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml @@ -158,4 +158,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + + insert into sys_file_info ( + model_id, + file_url, + dic_id, + creator, + create_time + )values( + #{modelId}, + #{fileUrl}, + #{dicId}, + #{creator}, + sysdate() + ) + \ No newline at end of file