交接单修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service-api/blade-project-api/pom.xml

@@ -14,4 +14,13 @@
     <version>2.8.2.RELEASE</version>
     <packaging>jar</packaging>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-client-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
 </project>

blade-service-api/blade-project-api/src/main/java/org/springblade/project/entity/HandoverItem.java

@@ -16,17 +16,20 @@
  */
 package org.springblade.project.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.client.entity.CommonFile;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 交接单明细表实体类
@@ -122,5 +125,7 @@ public class HandoverItem implements Serializable {
 	@ApiModelProperty(value = "是否已删除（0-否、1-是）")
 	private Integer isDeleted;
 
+	@TableField(exist = false)
+	private List<CommonFile> fileList;
 
 }

blade-service/blade-project/src/main/java/org/springblade/project/controller/HandoverItemController.java

@@ -22,6 +22,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.client.entity.CommonFile;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -33,6 +34,7 @@ import org.springblade.project.vo.HandoverItemVO;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 交接单明细表 控制器
@@ -42,7 +44,7 @@ import javax.validation.Valid;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/handoveritem")
+@RequestMapping("/handover-item")
 @Api(value = "交接单明细表", tags = "交接单明细表接口")
 public class HandoverItemController extends BladeController {
 
@@ -122,5 +124,24 @@ public class HandoverItemController extends BladeController {
 		return R.status(handoverItemService.removeHandoverItem(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 附件上传
+	 */
+	@PostMapping("/file")
+	@ApiOperationSupport(order = 15)
+	@ApiOperation(value = "附件上传", notes = "传入fileList")
+	public R file(@RequestBody List<CommonFile> fileList) {
+		return R.status(handoverItemService.file(fileList));
+	}
+
+	/**
+	 * 附件列表
+	 */
+	@GetMapping("/file-list")
+	@ApiOperationSupport(order = 16)
+	@ApiOperation(value = "附件列表", notes = "传入id")
+	public R fileList(Long id) {
+		return R.data(handoverItemService.fileList(id));
+	}
 
 }

blade-service/blade-project/src/main/java/org/springblade/project/service/IHandoverItemService.java

@@ -16,10 +16,11 @@
  */
 package org.springblade.project.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.client.entity.CommonFile;
 import org.springblade.project.entity.HandoverItem;
 import org.springblade.project.vo.HandoverItemVO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
 
@@ -48,4 +49,20 @@ public interface IHandoverItemService extends IService<HandoverItem> {
 	 */
 	boolean removeHandoverItem(List<Long> idList);
 
+	/**
+	 * 附件上传
+	 *
+	 * @param fileList
+	 * @return
+	 */
+	boolean file(List<CommonFile> fileList);
+
+	/**
+	 * 附件列表
+	 *
+	 * @param id
+	 * @return
+	 */
+	List<CommonFile> fileList(Long id);
+
 }

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/HandoverItemServiceImpl.java

@@ -18,12 +18,18 @@ package org.springblade.project.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springblade.client.entity.CommonFile;
+import org.springblade.client.feign.ICommonFileClient;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.project.entity.HandoverItem;
 import org.springblade.project.mapper.HandoverItemMapper;
 import org.springblade.project.service.IHandoverItemService;
 import org.springblade.project.vo.HandoverItemVO;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -33,8 +39,11 @@ import java.util.List;
  * @since 2022-04-07
  */
 @Service
+@AllArgsConstructor
 public class HandoverItemServiceImpl extends ServiceImpl<HandoverItemMapper, HandoverItem> implements IHandoverItemService {
 
+	private final ICommonFileClient commonFileClient;
+
 	@Override
 	public IPage<HandoverItemVO> selectHandoverItemPage(IPage<HandoverItemVO> page, HandoverItemVO handoverItem) {
 		return page.setRecords(baseMapper.selectHandoverItemPage(page, handoverItem));
@@ -51,4 +60,24 @@ public class HandoverItemServiceImpl extends ServiceImpl<HandoverItemMapper, Han
 		return true;
 	}
 
+	@Override
+	public boolean file(List<CommonFile> fileList) {
+		fileList.forEach(file -> {
+			if (ObjectUtil.isEmpty(file.getId())) {
+				file.setSource("SERVICE_HANDOVER_ITEM");
+			}
+		});
+		commonFileClient.saveList(fileList);
+		return true;
+	}
+
+	@Override
+	public List<CommonFile> fileList(Long id) {
+		R<List<CommonFile>> fileList = commonFileClient.getList(id, "SERVICE_HANDOVER_ITEM");
+		if (fileList.isSuccess() && fileList.getData() != null) {
+			return fileList.getData();
+		}
+		return Collections.emptyList();
+	}
+
 }

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/HandoverServiceImpl.java

@@ -25,6 +25,8 @@ import org.springblade.check.dto.AuditProecessDTO;
 import org.springblade.check.entity.AuditPathsActs;
 import org.springblade.check.entity.AuditPathsLevels;
 import org.springblade.check.feign.ICheckClient;
+import org.springblade.client.entity.CommonFile;
+import org.springblade.client.feign.ICommonFileClient;
 import org.springblade.client.feign.ISerialClient;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -61,6 +63,8 @@ public class HandoverServiceImpl extends ServiceImpl<HandoverMapper, Handover> i
 
 	private final ICheckClient checkClient;
 
+	private final ICommonFileClient commonFileClient;
+
 	@Override
 	public IPage<HandoverVO> selectHandoverPage(IPage<HandoverVO> page, HandoverVO handover) {
 		return page.setRecords(baseMapper.selectHandoverPage(page, handover));
@@ -125,6 +129,15 @@ public class HandoverServiceImpl extends ServiceImpl<HandoverMapper, Handover> i
 				item.setUpdateTime(new Date());
 				handoverItemMapper.updateById(item);
 			}
+
+			List<CommonFile> fileList = item.getFileList();
+			fileList.forEach(file -> {
+				if (ObjectUtil.isEmpty(file.getId())) {
+					file.setPid(item.getId());
+					file.setSource("SERVICE_HANDOVER_ITEM");
+				}
+			});
+			commonFileClient.saveList(fileList);
 		});
 		return handoverId;
 	}