|
@@ -126,12 +126,12 @@ public class TemplateNormFacade<tranServiceClient> extends TemplateInfoServiceIm
|
|
//更新关系
|
|
//更新关系
|
|
if (res) {
|
|
if (res) {
|
|
Long orderNo = folderMappingServiceImpl.getMaxOrderNo(templateNormUpVO.getFolderId());
|
|
Long orderNo = folderMappingServiceImpl.getMaxOrderNo(templateNormUpVO.getFolderId());
|
|
- Long num = orderNo == null ? 0 : orderNo;
|
|
|
|
|
|
+// Long num = orderNo == null ? 0 : orderNo;
|
|
res = folderMappingFacade.update(new UpdateWrapper<FolderMapping>()
|
|
res = folderMappingFacade.update(new UpdateWrapper<FolderMapping>()
|
|
.eq("template_id", templateNormUpVO.getId())
|
|
.eq("template_id", templateNormUpVO.getId())
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
.set("folder_id", templateNormUpVO.getFolderId())
|
|
.set("folder_id", templateNormUpVO.getFolderId())
|
|
- .set("order_no", num));
|
|
|
|
|
|
+ .set("order_no", orderNo));
|
|
}
|
|
}
|
|
return res;
|
|
return res;
|
|
|
|
|
|
@@ -198,6 +198,8 @@ public class TemplateNormFacade<tranServiceClient> extends TemplateInfoServiceIm
|
|
folderMapping.setTemplateId(num);
|
|
folderMapping.setTemplateId(num);
|
|
folderMapping.setCreator(templateNormsVO.getDoctorId().toString());
|
|
folderMapping.setCreator(templateNormsVO.getDoctorId().toString());
|
|
folderMapping.setGmtCreate(DateUtil.now());
|
|
folderMapping.setGmtCreate(DateUtil.now());
|
|
|
|
+ Long orderNo = folderMappingServiceImpl.getMaxOrderNo(templateNormsVO.getFolderId());
|
|
|
|
+ folderMapping.setOrderNo(orderNo);
|
|
res = folderMappingFacade.save(folderMapping);
|
|
res = folderMappingFacade.save(folderMapping);
|
|
}
|
|
}
|
|
|
|
|