Browse Source

无形资产

zhoulisky 10 months ago
parent
commit
3bcd816e5d

+ 38 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/AssetController.java

@@ -25,11 +25,13 @@ import org.sky.scientific.pojo.dto.XmAssetHoursDto;
 import org.sky.scientific.pojo.dto.XmAssetQueryParam;
 import org.sky.scientific.pojo.entity.AssetEntity;
 import org.sky.scientific.pojo.entity.XmFixedAsset;
+import org.sky.scientific.pojo.entity.XmIntangibleAsset;
 import org.sky.scientific.pojo.vo.AssetVO;
 import org.sky.scientific.pojo.vo.XmAssetHoursVO;
 import org.sky.scientific.service.IAssetService;
 import org.sky.scientific.service.IXmAssetHoursService;
 import org.sky.scientific.service.IXmFixedAssetService;
+import org.sky.scientific.service.IXmIntangibleAssetService;
 import org.sky.scientific.wrapper.ZcWrapper;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -51,6 +53,7 @@ public class AssetController extends KdController {
 
 	private final IAssetService service;
 	private final IXmFixedAssetService fixedAssetService;
+	private final IXmIntangibleAssetService intangibleAssetService;
 	private final IXmAssetHoursService hoursService;
 
 	@GetMapping("/detail")
@@ -224,4 +227,39 @@ public class AssetController extends KdController {
 		return R.status(fixedAssetService.physicalDeleteByIds(Func.toLongList(ids)));
 	}
 
+	@GetMapping("/intangible/page")
+	@ApiOperationSupport(order = 50)
+	@Operation(summary = "科研无形资产明细表-分页")
+	public R<IPage<XmIntangibleAsset>> pageIntangibleAsset(XmAssetQueryParam xmAsset, Query query) {
+		IPage<XmIntangibleAsset> pages = intangibleAssetService.selectPage(Condition.getPage(query), xmAsset);
+		return R.data(pages);
+	}
+	@GetMapping("/intangible/fetchData")
+	@ApiOperationSupport(order = 51)
+	@Operation(summary = "科研无形资产明细表-直接引用")
+	public R<Boolean> fetchIntangibleAssetData(String yearAndMonth) {
+		return R.status(intangibleAssetService.zhijieyinyong(yearAndMonth));
+	}
+
+	@PostMapping("/intangible/save")
+	@ApiOperationSupport(order = 52)
+	@Operation(summary = "科研无形资产明细表-新增")
+	public R saveIntangibleAsset(@Valid @RequestBody XmIntangibleAsset xmAsset) {
+		return R.status(intangibleAssetService.saveXmIntangibleAsset(xmAsset));
+	}
+
+	@PostMapping("/intangible/import")
+	@ApiOperationSupport(order = 53)
+	@Operation(summary = "科研无形资产明细表-导入")
+	public R importIntangibleAsset(MultipartFile file,String yearAndMonth) {
+		intangibleAssetService.xmIntangibleAssetImport(file, yearAndMonth);
+		return R.success("操作成功");
+	}
+
+	@PostMapping("/intangible/remove")
+	@ApiOperationSupport(order = 54)
+	@Operation(summary = "科研无形资产明细表-删除", description  = "传入ids")
+	public R removeIntangibleAsset(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(intangibleAssetService.physicalDeleteByIds(Func.toLongList(ids)));
+	}
 }