diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java index c79f845c..bf3768e7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java @@ -5,6 +5,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage; import com.adc.da.slrs.fileMaterialCenter.service.IFileMaterialService; +import com.adc.da.slrs.zlTree.dao.ZlTreeDataDao; import com.adc.da.slrs.zlTree.entity.ZlTreeData; import com.adc.da.slrs.zlTree.service.IZlTreeDataService; import com.adc.da.util.UUIDUtils; @@ -44,6 +45,9 @@ public class FileMaterialController extends BaseController { @Autowired IZlTreeDataService iZlTreeService; + @Autowired + ZlTreeDataDao zlTreeDataDao; + @PostMapping @ApiOperation("新增文件资料组") public ResponseMessage addFileMaterial(@RequestBody FileMaterial material){ @@ -95,12 +99,7 @@ public class FileMaterialController extends BaseController { @ApiOperation("修改文件资料组") public ResponseMessage updateFileMaterial(@RequestBody FileMaterial fileMaterial){ boolean b = iFileMaterialService.updateById(fileMaterial); - ZlTreeData zlTreeData=new ZlTreeData(); - zlTreeData.setId(fileMaterial.getTreeId()); - zlTreeData.setDataId(fileMaterial.getId()); - QueryWrapper wrapper=new QueryWrapper<>(); - wrapper.eq("data_id",fileMaterial.getId()); - iZlTreeService.update(zlTreeData,wrapper); + zlTreeDataDao.updateZT(fileMaterial.getTreeId(),fileMaterial.getId()); return Result.success(b); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java index 636a2766..d7b923a8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java @@ -75,4 +75,7 @@ public class FileMaterial extends BaseEntity { @ApiModelProperty(value = "树id") @TableField(exist = false) private String treeId; + + @TableField(exist = false) + private String treeName; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDataDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDataDao.java index f4b0b546..b8930ef3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDataDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDataDao.java @@ -2,6 +2,8 @@ package com.adc.da.slrs.zlTree.dao; import com.adc.da.slrs.zlTree.entity.ZlTreeData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; /** *

@@ -13,5 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ZlTreeDataDao extends BaseMapper { + @Update("update zl_data SET id = #{treeId}, data_id = #{dataId} WHERE data_id = #{dataId}") + boolean updateZT(@Param("treeId")String treeId,@Param("dataId")String dataId); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml index c4fa2869..a0d1a851 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml @@ -18,10 +18,11 @@