fengzhenzhong 1 місяць тому
батько
коміт
d62a93445c

+ 1 - 1
assistMg/src/main/java/com/hotent/baseInfo/controller/CostDocumentTemplateFileController.java

@@ -69,7 +69,7 @@ public class CostDocumentTemplateFileController extends BaseController<CostDocum
 	@ApiOperation(value = "根据文书id查询", httpMethod = "GET", notes = "根据文书id查询")
 	public CommonResult<List<CostDocumentTemplateFile>> queryByDocumentId(@ApiParam(name="documentId",value="文书id", required = true)@RequestParam(required=true) String documentId
 	) throws Exception{
-		List<CostDocumentTemplateFile> costDocumentTemplateFiles = costDocumentTemplateFileManager.queryByDocumentId(documentId);
+		List<CostDocumentTemplateFile> costDocumentTemplateFiles = costDocumentTemplateFileManager.getDocumentFileList(documentId);
 		return CommonResult.<List<CostDocumentTemplateFile>>ok().value(costDocumentTemplateFiles);
 
 	}

+ 3 - 0
assistMg/src/main/java/com/hotent/baseInfo/manager/impl/CostDocumentTemplateManagerImpl.java

@@ -134,6 +134,9 @@ public class CostDocumentTemplateManagerImpl extends BaseManagerImpl<CostDocumen
 		CostDocumentTemplate costDocumentTemplate = this.getOne(queryWrapper, false);
 		CostDocumentTemplate entity = BeanUtil.copyProperties(req, CostDocumentTemplate.class);
 		if(costDocumentTemplate== null || costDocumentTemplate.getId().equals(entity.getId())){
+			if (costDocumentTemplate!=null){
+				entity.setStatus(costDocumentTemplate.getStatus());
+			}
 			super.update(entity);
 			LambdaQueryWrapper<CostDocumentTemplateFile> deleteWrapper = new LambdaQueryWrapper<>();
 			deleteWrapper.eq(CostDocumentTemplateFile::getDocumentId, entity.getId());