src/main/java/com/ruoyi/approve/bean/vo/ApproveProcessVO.java
@@ -3,12 +3,9 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import com.ruoyi.sales.pojo.CommonFile; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -76,4 +73,6 @@ * 报修金额 */ private BigDecimal maintenancePrice; private Long recordId; } src/main/java/com/ruoyi/approve/bean/vo/KnowledgeBaseVo.java
@@ -1,13 +1,13 @@ package com.ruoyi.approve.bean.vo; import com.ruoyi.approve.pojo.KnowledgeBase; import com.ruoyi.approve.pojo.KnowledgeBaseFile; import lombok.Data; import java.util.List; @Data public class KnowledgeBaseVo extends KnowledgeBase { private List<KnowledgeBaseFile> files; } //package com.ruoyi.approve.bean.vo; // //import com.ruoyi.approve.pojo.KnowledgeBase; //import com.ruoyi.approve.pojo.KnowledgeBaseFile; //import lombok.Data; // //import java.util.List; // //@Data //public class KnowledgeBaseVo extends KnowledgeBase { // // private List<KnowledgeBaseFile> files; //} src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
@@ -2,12 +2,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.approve.mapper.KnowledgeBaseMapper; import com.ruoyi.approve.bean.vo.KnowledgeBaseVo; import com.ruoyi.approve.pojo.KnowledgeBase; import com.ruoyi.approve.pojo.RpaProcessAutomation; import com.ruoyi.approve.pojo.KnowledgeBaseFile; import com.ruoyi.approve.service.KnowledgeBaseFileService; import com.ruoyi.approve.service.KnowledgeBaseService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.web.domain.AjaxResult; src/main/java/com/ruoyi/approve/mapper/KnowledgeBaseMapper.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.approve.bean.vo.KnowledgeBaseVo; import com.ruoyi.approve.pojo.KnowledgeBase; import org.apache.ibatis.annotations.Mapper;
@@ -3,9 +3,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.approve.bean.vo.KnowledgeBaseVo; import com.ruoyi.approve.pojo.KnowledgeBase; public interface KnowledgeBaseService extends IService<KnowledgeBase> { IPage<KnowledgeBase> listpage(Page page, KnowledgeBase knowledgeBase); src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -83,7 +83,7 @@ // String approveID = today + formattedCount; SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); ApproveProcess approveProcess = new ApproveProcess(); String no = OrderUtils.countTodayByCreateTime(approveProcessMapper, "approve_id"); String no = OrderUtils.countTodayByCreateTime(approveProcessMapper, "approve_id","SP"); approveProcess.setApproveId(no); approveProcess.setApproveUser(sysUser.getUserId()); approveProcess.setApproveUserName(sysUser.getNickName()); src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
@@ -4,20 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.approve.pojo.ApproveProcess; import com.ruoyi.approve.service.IApproveProcessService; import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl; import com.ruoyi.approve.bean.vo.ApproveGetAndUpdateVo; import com.ruoyi.approve.bean.vo.ApproveProcessVO; import com.ruoyi.basic.dto.CustomerPrivatePoolDto; import com.ruoyi.basic.mapper.CustomerPrivatePoolMapper; import com.ruoyi.approve.pojo.ApproveProcess; import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl; import com.ruoyi.common.utils.OrderUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.common.utils.uuid.UUID; import com.ruoyi.framework.security.LoginUser; import com.ruoyi.sales.dto.QuotationRecordJSON; import com.ruoyi.sales.dto.SalesQuotationDto; import com.ruoyi.sales.mapper.SalesQuotationMapper; import com.ruoyi.sales.mapper.SalesQuotationProductMapper; @@ -26,9 +23,9 @@ import com.ruoyi.sales.service.SalesQuotationProductService; import com.ruoyi.sales.service.SalesQuotationService; import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.time.LocalDate; import java.util.Collections; @@ -127,6 +124,12 @@ approveProcessService.updateApproveUser(vo); return true; } @Override public QuotationRecordJSON importData(MultipartFile file, String approveUserIdsJson) { return null; } @Override public boolean delete(Long id) { SalesQuotation salesQuotation = salesQuotationMapper.selectById(id);
