1.tab动态赋值

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPropertyfieldEntity.java

@@ -37,15 +37,15 @@ import org.springblade.core.tenant.mp.TenantEntity;
 public class BasicPropertyfieldEntity extends TenantEntity {
 
 	/**
-	 * 预留1
+	 * 说明
 	 */
-	@ApiModelProperty(value = "预留1")
+	@ApiModelProperty(value = "说明")
 	private String node;
 	/**
-	 * 预留2
+	 * 是否必填
 	 */
-	@ApiModelProperty(value = "预留2")
+	@ApiModelProperty(value = "是否必填")
-	private String reserve2;
+	private String isput;
 	/**
 	 * 预留3
 	 */

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPropertyController.java

@@ -45,6 +45,7 @@ import org.springblade.core.tool.constant.BladeConstant;
 import springfox.documentation.annotations.ApiIgnore;
 import java.util.Map;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -118,8 +119,17 @@ public class BasicPropertyController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入basicProperty")
-	public R update(@Valid @RequestBody BasicPropertyEntity basicProperty) {
+	public R update(@Valid @RequestBody BasicPropertyDTO basicProperty) {
-		return R.status(basicPropertyService.updateById(basicProperty));
+		boolean b = basicPropertyService.updateById(basicProperty);
+		//修改子表
+		if (b && basicProperty.getField().size()>0){
+			//删除所有子表
+			basicPropertyfieldService.deleteByMasterId(Func.toLongList(String.valueOf(basicProperty.getId())));
+			//将参数所有子表id清空,防止逻辑删除有主键冲突,并关联master
+			AtomicReference<Integer> i = new AtomicReference<>(1);
+			basicProperty.getField().forEach(e->{e.setId(null);e.setMasterId(basicProperty.getId()); e.setProperty("value"+i);i.getAndSet(i.get() + 1);});
+		}
+		return R.status(basicPropertyfieldService.saveBatch(basicProperty.getField()));
 	}
 
 	/**
@@ -139,6 +149,8 @@ public class BasicPropertyController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+			//删除所有子表
+			 basicPropertyfieldService.deleteByMasterId(Func.toLongList(ids));
 		return R.status(basicPropertyService.deleteLogic(Func.toLongList(ids)));
 	}
 

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPropertyfieldController.java

@@ -75,6 +75,8 @@ public class BasicPropertyfieldController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicPropertyfield")
 	public R<IPage<BasicPropertyfieldEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicPropertyfield, Query query) {
+		//设置排序
+		query.setAscs("sort");
 		IPage<BasicPropertyfieldEntity> pages = basicPropertyfieldService.page(Condition.getPage(query), Condition.getQueryWrapper(basicPropertyfield, BasicPropertyfieldEntity.class));
 		return R.data(pages);
 	}

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPropertyvalueController.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.basic.controller;
 
+import com.logpm.basic.dto.BasicPropertyvalueDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -52,7 +53,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("basicPropertyvalue/basicPropertyvalue")
+@RequestMapping("/propertyvalue")
 @Api(value = "资产值表", tags = "资产值表接口")
 public class BasicPropertyvalueController extends BladeController {
 
@@ -96,7 +97,7 @@ public class BasicPropertyvalueController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入basicPropertyvalue")
-	public R save(@Valid @RequestBody BasicPropertyvalueEntity basicPropertyvalue) {
+	public R save(@Valid @RequestBody BasicPropertyvalueDTO basicPropertyvalue) {
 		return R.status(basicPropertyvalueService.save(basicPropertyvalue));
 	}
 
@@ -106,7 +107,7 @@ public class BasicPropertyvalueController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入basicPropertyvalue")
-	public R update(@Valid @RequestBody BasicPropertyvalueEntity basicPropertyvalue) {
+	public R update(@Valid @RequestBody BasicPropertyvalueDTO basicPropertyvalue) {
 		return R.status(basicPropertyvalueService.updateById(basicPropertyvalue));
 	}
 

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPropertyfieldService.java

@@ -55,4 +55,10 @@ public interface IBasicPropertyfieldService extends BaseService<BasicPropertyfie
 	 * @return
 	 */
     Boolean savefiled(BasicPropertyDTO basicProperty);
+	/**
+	 * 通过主id修改
+	 *
+	 * @return
+	 */
+	Integer deleteByMasterId(List<Long> masterId);
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPropertyfieldServiceImpl.java

@@ -16,12 +16,18 @@
  */
 package com.logpm.basic.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.basic.dto.BasicPropertyDTO;
+import com.logpm.basic.entity.BasicLineNodeEntity;
 import com.logpm.basic.entity.BasicPropertyfieldEntity;
+import com.logpm.basic.entity.BasicPropertyvalueEntity;
+import com.logpm.basic.mapper.BasicPropertyMapper;
+import com.logpm.basic.mapper.BasicPropertyvalueMapper;
 import com.logpm.basic.vo.BasicPropertyfieldVO;
 import com.logpm.basic.excel.BasicPropertyfieldExcel;
 import com.logpm.basic.mapper.BasicPropertyfieldMapper;
 import com.logpm.basic.service.IBasicPropertyfieldService;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -36,8 +42,11 @@ import java.util.concurrent.atomic.AtomicReference;
  * @since 2023-06-06
  */
 @Service
+@AllArgsConstructor
 public class BasicPropertyfieldServiceImpl extends BaseServiceImpl<BasicPropertyfieldMapper, BasicPropertyfieldEntity> implements IBasicPropertyfieldService {
 
+	private final BasicPropertyvalueMapper basicPropertyvalueMapper;
+
 	@Override
 	public IPage<BasicPropertyfieldVO> selectBasicPropertyfieldPage(IPage<BasicPropertyfieldVO> page, BasicPropertyfieldVO basicPropertyfield) {
 		return page.setRecords(baseMapper.selectBasicPropertyfieldPage(page, basicPropertyfield));
@@ -66,4 +75,13 @@ public class BasicPropertyfieldServiceImpl extends BaseServiceImpl<BasicProperty
 		return this.saveBatch(basicProperty.getField());
 	}
 
+	@Override
+	public Integer deleteByMasterId(List<Long> masterId) {
+		//将值表也删除
+		QueryWrapper<BasicPropertyvalueEntity> wrappervalus = new QueryWrapper();
+		basicPropertyvalueMapper.delete(wrappervalus.lambda().in(BasicPropertyvalueEntity::getMasterId,masterId));
+		QueryWrapper<BasicPropertyfieldEntity> wrapper = new QueryWrapper();
+		return baseMapper.delete(wrapper.lambda().in(BasicPropertyfieldEntity::getMasterId,masterId));
+	}
+
 }